diff --git a/.gn b/.gn
index f14b600..d8529c7 100644
--- a/.gn
+++ b/.gn
@@ -181,7 +181,6 @@
   "//remoting/test:*",  # 20 errors
   "//remoting:*",  # 27 errors
   "//sandbox/linux:*",  # 13 errors
-  "//sandbox/mac:*",  # 14 errors
   "//sandbox/win:*",  # 7 errors
 
   "//third_party/breakpad:*",  # 34 errors
diff --git a/DEPS b/DEPS
index e19f5a7a..0e0cd6b8 100644
--- a/DEPS
+++ b/DEPS
@@ -199,11 +199,11 @@
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling Skia
   # and whatever else without interference from each other.
-  'skia_revision': '554e7574e960d48605156948ab658fd19b16697f',
+  'skia_revision': 'b87975c1338111cc447d884dd79432790d2eb7fc',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling V8
   # and whatever else without interference from each other.
-  'v8_revision': '53a11922d89285a3f15744d59e0cfcff2dd33f91',
+  'v8_revision': '4670e2c2930e89462938e85ba131caeb7c0d0419',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling swarming_client
   # and whatever else without interference from each other.
@@ -211,7 +211,7 @@
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling ANGLE
   # and whatever else without interference from each other.
-  'angle_revision': 'a13f6847238e7e74fcb9a81caeb810800c8a8fef',
+  'angle_revision': 'bcdd4e58fe54c3f0271fd7da582a61ade79dd98d',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling SwiftShader
   # and whatever else without interference from each other.
@@ -274,7 +274,7 @@
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling devtools-frontend
   # and whatever else without interference from each other.
-  'devtools_frontend_revision': '53fee9259fa3f1eeb1cfefbc00fbfdc8018eb2c7',
+  'devtools_frontend_revision': 'd9d73bd8981e09e9d5bf387178215b36689db085',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling libprotobuf-mutator
   # and whatever else without interference from each other.
@@ -326,7 +326,7 @@
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling feed
   # and whatever else without interference from each other.
-  'dawn_revision': '8a73e1876dbd2d862701fde91bc21630c4bd0e5b',
+  'dawn_revision': '61355d416d9c568bcfbed6518516fbe5ef219e42',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling feed
   # and whatever else without interference from each other.
@@ -365,7 +365,7 @@
   'ukey2_revision': '0275885d8e6038c39b8a8ca55e75d1d4d1727f47',
   # the commit queue can handle CLs rolling feed
   # and whatever else without interference from each other.
-  'tint_revision': 'b8a3078bbec908507ec4686d39c133dcaae8e105',
+  'tint_revision': '195917c0be32942769106bb4ae35194b23921664',
 
   # TODO(crbug.com/941824): The values below need to be kept in sync
   # between //DEPS and //buildtools/DEPS, so if you're updating one,
@@ -449,7 +449,7 @@
     'dep_type': 'cipd',
     'condition': 'host_os == "win"',
   },
-  'src/tools/reclient': {
+  'src/buildtools/reclient': {
     'packages': [
       {
         'package': 'infra/rbe/client/${{platform}}',
@@ -801,7 +801,7 @@
     Var('chromium_git') + '/angle/angle.git' + '@' +  Var('angle_revision'),
 
   'src/third_party/dav1d/libdav1d':
-    Var('chromium_git') + '/external/github.com/videolan/dav1d.git' + '@' + 'f90ada0d08e99ccfb676e59b8e3c497e77879915',
+    Var('chromium_git') + '/external/github.com/videolan/dav1d.git' + '@' + '920079edb1ead2f2cbeaf46fd6643ebb344b8b6b',
 
   'src/third_party/dawn':
     Var('dawn_git') + '/dawn.git' + '@' +  Var('dawn_revision'),
@@ -898,7 +898,7 @@
   # Tools used when building Chrome for Chrome OS. This affects both the Simple
   # Chrome workflow, as well as the chromeos-chrome ebuild.
   'src/third_party/chromite': {
-      'url': Var('chromium_git') + '/chromiumos/chromite.git' + '@' + '7bdee1ac459a4d26670e6291f3a36cec21b7106d',
+      'url': Var('chromium_git') + '/chromiumos/chromite.git' + '@' + '2a46c6172edb5e89f4732b3aa1a226f44694d79f',
       'condition': 'checkout_chromeos',
   },
 
@@ -1612,7 +1612,7 @@
     Var('chromium_git') + '/v8/v8.git' + '@' +  Var('v8_revision'),
 
   'src-internal': {
-    'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@9f9233f23f55ac96d58c06a7176791e3d56b9e97',
+    'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@a532031e70b438947759b647d6f2f4839f9003bb',
     'condition': 'checkout_src_internal',
   },
 
@@ -1620,7 +1620,7 @@
     'packages': [
       {
         'package': 'chromeos_internal/apps/help_app/app',
-        'version': 'fVqrzqnejoxXKgP8Q1x8KnBeyt9BgTlveT3nQam6WDsC',
+        'version': '4UjbGjoE2oGiiKMb5l4jAgc5C-UeSyq4pQkhcEafXNYC',
       },
     ],
     'condition': 'checkout_chromeos and checkout_src_internal',
@@ -1631,7 +1631,7 @@
     'packages': [
       {
         'package': 'chromeos_internal/apps/media_app/app',
-        'version': '4E0Kat64Xt3-kQkf_9Z8eXNVVOdY-Dm0TKYMn0bV9SEC',
+        'version': 'KriBr9HeOCHzyZWAsh77pMzuUefJo2RwHXpOaB1sFX4C',
       },
     ],
     'condition': 'checkout_chromeos and checkout_src_internal',
diff --git a/ash/app_list/views/apps_grid_view_unittest.cc b/ash/app_list/views/apps_grid_view_unittest.cc
index 9e1cc20..36307c5 100644
--- a/ash/app_list/views/apps_grid_view_unittest.cc
+++ b/ash/app_list/views/apps_grid_view_unittest.cc
@@ -1678,7 +1678,8 @@
   EXPECT_TRUE(folder_item->FindChildItem(second_item_id));
 }
 
-TEST_P(AppsGridViewTest, MouseDragFlipPage) {
+// Flaky: crbug.com/1156634
+TEST_P(AppsGridViewTest, DISABLED_MouseDragFlipPage) {
   apps_grid_view_->set_page_flip_delay_in_ms_for_testing(10);
   GetPaginationModel()->SetTransitionDurations(
       base::TimeDelta::FromMilliseconds(10),
diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd
index 2f06234..bb4c62df 100644
--- a/ash/ash_strings.grd
+++ b/ash/ash_strings.grd
@@ -303,7 +303,7 @@
         All available users have already been added to this session.
       </message>
       <message name="IDS_ASH_STATUS_TRAY_NEARBY_SHARE_BUTTON_LABEL" desc="The shorter label used for the button in the status tray to toggle Nearby Share high visibility mode, which makes the device visible to all nearby devices for file sharing. [CHAR_LIMIT=14]">
-        Nearby Share
+        Nearby visibility
       </message>
       <message name="IDS_ASH_STATUS_TRAY_NEARBY_SHARE_OFF_STATE" desc="Sub-label for the Nearby Share system tray button." meaning="Nearby Share high visibility mode is currently inactive. [CHAR_LIMIT=14]">
         Off
diff --git a/ash/ash_strings_grd/IDS_ASH_STATUS_TRAY_NEARBY_SHARE_BUTTON_LABEL.png.sha1 b/ash/ash_strings_grd/IDS_ASH_STATUS_TRAY_NEARBY_SHARE_BUTTON_LABEL.png.sha1
index deb30a3..05f34459 100644
--- a/ash/ash_strings_grd/IDS_ASH_STATUS_TRAY_NEARBY_SHARE_BUTTON_LABEL.png.sha1
+++ b/ash/ash_strings_grd/IDS_ASH_STATUS_TRAY_NEARBY_SHARE_BUTTON_LABEL.png.sha1
@@ -1 +1 @@
-8ecad2331b353432d482d6d01a448f1535406806
\ No newline at end of file
+ee7445a67c320e946892856ada9243c0e4d204f8
\ No newline at end of file
diff --git a/base/BUILD.gn b/base/BUILD.gn
index 8c32c2f..b1ed1d7 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -2701,6 +2701,7 @@
       ]
       deps = [
         ":base",
+        "//base/test:test_support",
         "//testing/gtest",
       ]
       public_deps = [ "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.logger" ]
diff --git a/base/allocator/partition_allocator/partition_alloc_features.cc b/base/allocator/partition_allocator/partition_alloc_features.cc
index 68a3fd2..a32aa19 100644
--- a/base/allocator/partition_allocator/partition_alloc_features.cc
+++ b/base/allocator/partition_allocator/partition_alloc_features.cc
@@ -25,5 +25,11 @@
 const Feature kPartitionAllocPCScan{"PartitionAllocPCScan",
                                     FEATURE_DISABLED_BY_DEFAULT};
 
+#if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC)
+// If enabled, PCScan is turned on only for the browser's malloc partition.
+const Feature kPartitionAllocPCScanBrowserOnly{
+    "PartitionAllocPCScanBrowserOnly", FEATURE_DISABLED_BY_DEFAULT};
+#endif
+
 }  // namespace features
 }  // namespace base
diff --git a/base/allocator/partition_allocator/partition_alloc_features.h b/base/allocator/partition_allocator/partition_alloc_features.h
index f0beeece..d4142c2 100644
--- a/base/allocator/partition_allocator/partition_alloc_features.h
+++ b/base/allocator/partition_allocator/partition_alloc_features.h
@@ -27,6 +27,9 @@
 
 extern const BASE_EXPORT Feature kPartitionAllocGigaCage;
 extern const BASE_EXPORT Feature kPartitionAllocPCScan;
+#if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC)
+extern const BASE_EXPORT Feature kPartitionAllocPCScanBrowserOnly;
+#endif
 
 ALWAYS_INLINE bool IsPartitionAllocGigaCageEnabled() {
 #if defined(PA_HAS_64_BITS_POINTERS) && defined(OS_WIN)
@@ -61,12 +64,23 @@
 }
 
 ALWAYS_INLINE bool IsPartitionAllocPCScanEnabled() {
-#if !defined(PA_HAS_64_BITS_POINTERS)
-  return false;
-#endif  // !PA_HAS_64_BITS_POINTERS
+#if defined(PA_HAS_64_BITS_POINTERS)
   return FeatureList::IsEnabled(kPartitionAllocPCScan);
+#else  // PA_HAS_64_BITS_POINTERS
+  return false;
+#endif
 }
 
+#if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC)
+ALWAYS_INLINE bool IsPartitionAllocPCScanBrowserOnlyEnabled() {
+#if defined(PA_HAS_64_BITS_POINTERS)
+  return FeatureList::IsEnabled(kPartitionAllocPCScanBrowserOnly);
+#else  // PA_HAS_64_BITS_POINTERS
+  return false;
+#endif
+}
+#endif
+
 }  // namespace features
 }  // namespace base
 
diff --git a/base/allocator/partition_allocator/partition_root.h b/base/allocator/partition_allocator/partition_root.h
index f7f2552..49ca104 100644
--- a/base/allocator/partition_allocator/partition_root.h
+++ b/base/allocator/partition_allocator/partition_root.h
@@ -1027,9 +1027,8 @@
       tcache = internal::ThreadCache::Create(this);
       with_thread_cache = true;
     }
-    ret = tcache->GetFromCache(bucket_index);
+    ret = tcache->GetFromCache(bucket_index, &utilized_slot_size);
     is_already_zeroed = false;
-    utilized_slot_size = bucket_at(bucket_index).slot_size;
 
 #if DCHECK_IS_ON()
     // Make sure that the allocated pointer comes from the same place it would
diff --git a/base/allocator/partition_allocator/thread_cache.cc b/base/allocator/partition_allocator/thread_cache.cc
index 6203471..cb49d55 100644
--- a/base/allocator/partition_allocator/thread_cache.cc
+++ b/base/allocator/partition_allocator/thread_cache.cc
@@ -228,19 +228,28 @@
 
   for (int index = 0; index < kBucketCount; index++) {
     const auto& root_bucket = root->buckets[index];
+    Bucket* tcache_bucket = &buckets_[index];
     // Invalid bucket.
-    if (!root_bucket.active_slot_spans_head)
+    if (!root_bucket.active_slot_spans_head) {
+      // Explicitly set this, as size computations iterate over all buckets.
+      tcache_bucket->limit = 0;
+      tcache_bucket->count = 0;
+      tcache_bucket->slot_size = 0;
       continue;
+    }
 
     // Smaller allocations are more frequent, and more performance-sensitive.
     // Cache more small objects, and fewer larger ones, to save memory.
-    size_t element_size = root_bucket.slot_size;
-    if (element_size <= 128) {
-      buckets_[index].limit = 128;
-    } else if (element_size <= 256) {
-      buckets_[index].limit = 64;
+    size_t slot_size = root_bucket.slot_size;
+    PA_CHECK(slot_size <= std::numeric_limits<uint16_t>::max());
+    tcache_bucket->slot_size = static_cast<uint16_t>(slot_size);
+
+    if (slot_size <= 128) {
+      tcache_bucket->limit = kMaxCountPerBucket;
+    } else if (slot_size <= 256) {
+      tcache_bucket->limit = kMaxCountPerBucket / 2;
     } else {
-      buckets_[index].limit = 32;
+      tcache_bucket->limit = kMaxCountPerBucket / 4;
     }
   }
 }
@@ -367,7 +376,7 @@
 
   for (size_t i = 0; i < kBucketCount; i++) {
     stats->bucket_total_memory +=
-        buckets_[i].count * root_->buckets[i].slot_size;
+        buckets_[i].count * static_cast<size_t>(buckets_[i].slot_size);
   }
   stats->metadata_overhead += sizeof(*this);
 }
diff --git a/base/allocator/partition_allocator/thread_cache.h b/base/allocator/partition_allocator/thread_cache.h
index 3fc29c9..5bc1943 100644
--- a/base/allocator/partition_allocator/thread_cache.h
+++ b/base/allocator/partition_allocator/thread_cache.h
@@ -184,8 +184,8 @@
   // Returns nullptr for failure.
   //
   // Has the same behavior as RawAlloc(), that is: no cookie nor ref-count
-  // handling.
-  ALWAYS_INLINE void* GetFromCache(size_t bucket_index);
+  // handling. Sets |slot_size| to the allocated size upon success.
+  ALWAYS_INLINE void* GetFromCache(size_t bucket_index, size_t* slot_size);
 
   // Asks this cache to trigger |Purge()| at a later point. Can be called from
   // any thread.
@@ -207,12 +207,15 @@
 
   // TODO(lizeb): Once we have periodic purge, lower the ratio.
   static constexpr uint16_t kBatchFillRatio = 8;
+  static constexpr uint8_t kMaxCountPerBucket = 128;
 
  private:
   struct Bucket {
     PartitionFreelistEntry* freelist_head;
-    uint16_t count;
-    uint16_t limit;
+    // Want to keep sizeof(Bucket) small, using small types.
+    uint8_t count;
+    uint8_t limit;
+    uint16_t slot_size;
   };
   enum class Mode { kNormal, kPurge, kNotifyRegistry };
 
@@ -286,7 +289,8 @@
   return true;
 }
 
-ALWAYS_INLINE void* ThreadCache::GetFromCache(size_t bucket_index) {
+ALWAYS_INLINE void* ThreadCache::GetFromCache(size_t bucket_index,
+                                              size_t* slot_size) {
   PA_REENTRANCY_GUARD(is_in_thread_cache_);
   INCREMENT_COUNTER(stats_.alloc_count);
   // Only handle "small" allocations.
@@ -319,6 +323,7 @@
   bucket.count--;
   PA_DCHECK(bucket.count != 0 || !next);
   bucket.freelist_head = next;
+  *slot_size = bucket.slot_size;
 
   return result;
 }
diff --git a/base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java b/base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java
index 38c5f8f7..3e60b2a 100644
--- a/base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java
+++ b/base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java
@@ -416,7 +416,6 @@
     }
 
     // Helper for loadAlreadyLocked(). Load a native shared library with the Chromium linker.
-    // Records UMA histograms depending on the results of loading.
     private void loadLibraryWithCustomLinker(Linker linker, String library) {
         // Attempt shared RELROs, and if that fails then retry without.
         try {
diff --git a/base/android/java/src/org/chromium/base/library_loader/Linker.java b/base/android/java/src/org/chromium/base/library_loader/Linker.java
index 38565169..c646385 100644
--- a/base/android/java/src/org/chromium/base/library_loader/Linker.java
+++ b/base/android/java/src/org/chromium/base/library_loader/Linker.java
@@ -84,17 +84,9 @@
  *
  *  - Before loading the library, setApkFilePath() must be called when loading from the APK.
  *
- *  - A service process shall call either initServiceProcess() or
- *    disableSharedRelros() early (i.e. before loadLibrary() is called).
- *    Otherwise, the linker considers that it is running inside the browser
- *    process. This is because various Chromium projects have vastly
- *    different initialization paths.
- *
- *    disableSharedRelros() completely disables shared RELRO, and loadLibrary()
- *    will behave exactly like System.loadLibrary().
- *
- *    initServiceProcess(baseLoadAddress) indicates that shared RELRO are to be
- *    used in this process.
+ *  - A service process shall call initServiceProcess() early (i.e. before loadLibrary() is
+ *    called). Otherwise, the linker considers that it is running inside the browser process. This
+ *    is because various Chromium projects have vastly different initialization paths.
  *
  *  - The browser is in charge of deciding where in memory each library should
  *    be loaded. This address must be passed to each service process (see
@@ -169,8 +161,8 @@
      *
      * When relro sharing is not happening:
      * INITIALIZED -> DONE_PROVIDE_RELRO (Browser in case of relro sharing error)
-     * INITIALIZED -> DONE (Other processes, or browser when relro sharing was disabled from the
-     * start, possibly due to a retry after a load failure.)
+     * INITIALIZED -> DONE (Other processes, or browser when relro sharing was disabled, possibly
+     *                      due to a retry after a load failure.)
      */
     @IntDef({State.UNINITIALIZED, State.INITIALIZED, State.DONE_PROVIDE_RELRO, State.DONE})
     @Retention(RetentionPolicy.SOURCE)
@@ -246,19 +238,6 @@
     }
 
     /**
-     * Call this method before loading any libraries to indicate that this
-     * process shall neither create nor reuse shared RELRO sections.
-     */
-    public final void disableSharedRelros() {
-        if (DEBUG) Log.i(TAG, "disableSharedRelros() called");
-        synchronized (sLock) {
-            mInBrowserProcess = false;
-            ensureInitializedLocked();
-            assert mState == State.INITIALIZED;
-        }
-    }
-
-    /**
      * Obtain a random base load address at which to place loaded libraries.
      *
      * @return new base load address
@@ -324,11 +303,11 @@
     }
 
     /**
-     * Call this to retrieve the shared RELRO sections created in this process,
-     * after loading the library.
+     * Call this to retrieve the shared RELRO sections created in this process, after loading the
+     * library.
      *
-     * @return a new Bundle instance, or null if RELRO sharing is disabled on
-     * this system, or if initServiceProcess() was called previously.
+     * @return a new Bundle instance, or null if RELRO sharing is disabled via
+     * |isFixedAddressPermitted=false|, or if initServiceProcess() was called previously.
      */
     public final Bundle getSharedRelros() {
         synchronized (sLock) {
diff --git a/base/fuchsia/test_log_listener_safe.cc b/base/fuchsia/test_log_listener_safe.cc
index c1e991c..ca5a4d1 100644
--- a/base/fuchsia/test_log_listener_safe.cc
+++ b/base/fuchsia/test_log_listener_safe.cc
@@ -4,7 +4,9 @@
 
 #include "base/fuchsia/test_log_listener_safe.h"
 
-#include "base/logging.h"
+#include "base/fuchsia/fuchsia_logging.h"
+#include "base/run_loop.h"
+#include "base/test/bind.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
@@ -13,38 +15,90 @@
 
 TestLogListenerSafe::~TestLogListenerSafe() = default;
 
-void TestLogListenerSafe::set_on_dump_logs_done(
-    base::OnceClosure on_dump_logs_done) {
-  on_dump_logs_done_ = std::move(on_dump_logs_done);
+void TestLogListenerSafe::set_on_log_message(
+    base::RepeatingCallback<void(const fuchsia::logger::LogMessage&)>
+        callback) {
+  on_log_message_ = std::move(callback);
 }
 
-bool TestLogListenerSafe::DidReceiveString(
-    base::StringPiece message,
-    fuchsia::logger::LogMessage* logged_message) {
-  for (const auto& log_message : log_messages_) {
-    if (log_message.msg.find(message.as_string()) != std::string::npos) {
-      *logged_message = log_message;
-      return true;
-    }
-  }
-  return false;
+void TestLogListenerSafe::Log(fuchsia::logger::LogMessage message,
+                              LogCallback callback) {
+  if (on_log_message_)
+    on_log_message_.Run(message);
+  callback();
 }
 
 void TestLogListenerSafe::LogMany(
     std::vector<fuchsia::logger::LogMessage> messages,
     LogManyCallback callback) {
-  log_messages_.insert(log_messages_.end(),
-                       std::make_move_iterator(messages.begin()),
-                       std::make_move_iterator(messages.end()));
+  for (const auto& message : messages)
+    on_log_message_.Run(message);
   callback();
 }
 
-void TestLogListenerSafe::Done() {
-  std::move(on_dump_logs_done_).Run();
-}
+void TestLogListenerSafe::Done() {}
 
 void TestLogListenerSafe::NotImplemented_(const std::string& name) {
   ADD_FAILURE() << "NotImplemented_: " << name;
 }
 
+SimpleTestLogListener::SimpleTestLogListener() : binding_(&listener_) {}
+
+SimpleTestLogListener::~SimpleTestLogListener() = default;
+
+void SimpleTestLogListener::ListenToLog(
+    fuchsia::logger::Log* log,
+    std::unique_ptr<fuchsia::logger::LogFilterOptions> options) {
+  listener_.set_on_log_message(base::BindRepeating(
+      &SimpleTestLogListener::PushLoggedMessage, base::Unretained(this)));
+  log->ListenSafe(binding_.NewBinding(), std::move(options));
+}
+
+base::Optional<fuchsia::logger::LogMessage>
+SimpleTestLogListener::RunUntilMessageReceived(
+    base::StringPiece expected_string) {
+  while (!logged_messages_.empty()) {
+    fuchsia::logger::LogMessage message = logged_messages_.front();
+    logged_messages_.pop_front();
+    if (base::StringPiece(message.msg).find(expected_string) !=
+        std::string::npos) {
+      return message;
+    }
+  }
+
+  base::Optional<fuchsia::logger::LogMessage> logged_message;
+  base::RunLoop loop;
+  binding_.set_error_handler(
+      [quit_loop = loop.QuitClosure()](zx_status_t status) {
+        ZX_LOG(ERROR, status) << "LogListenerSafe disconnected";
+        quit_loop.Run();
+      });
+  on_log_message_ = base::BindLambdaForTesting(
+      [&logged_message, expected_string = expected_string.as_string(),
+       quit_loop =
+           loop.QuitClosure()](const fuchsia::logger::LogMessage& message) {
+        if (message.msg.find(expected_string) == std::string::npos)
+          return;
+        logged_message.emplace(message);
+        quit_loop.Run();
+      });
+
+  loop.Run();
+
+  binding_.set_error_handler({});
+  on_log_message_ = {};
+
+  return logged_message;
+}
+
+void SimpleTestLogListener::PushLoggedMessage(
+    const fuchsia::logger::LogMessage& message) {
+  if (on_log_message_) {
+    DCHECK(logged_messages_.empty());
+    on_log_message_.Run(message);
+  } else {
+    logged_messages_.push_back(std::move(message));
+  }
+}
+
 }  // namespace base
diff --git a/base/fuchsia/test_log_listener_safe.h b/base/fuchsia/test_log_listener_safe.h
index ea58ce0b..7113581 100644
--- a/base/fuchsia/test_log_listener_safe.h
+++ b/base/fuchsia/test_log_listener_safe.h
@@ -7,37 +7,73 @@
 
 #include <fuchsia/logger/cpp/fidl_test_base.h>
 
+#include <lib/fidl/cpp/binding.h>
+#include <memory>
+
 #include "base/callback.h"
-#include "base/fuchsia/process_context.h"
+#include "base/containers/circular_deque.h"
+#include "base/optional.h"
 #include "base/strings/string_piece.h"
 
 namespace base {
 
-// A LogListenerSafe implementation for use in Fuchsia logging tests.
-// For use with fuchsia.logger.Log.DumpLogsSafe().
-// Stores messages received via LogMany() for inspection by tests.
+// LogListenerSafe implementation that invokes a caller-supplied callback for
+// each received message.
 class TestLogListenerSafe
-    : public ::fuchsia::logger::testing::LogListenerSafe_TestBase {
+    : public fuchsia::logger::testing::LogListenerSafe_TestBase {
  public:
+  using OnLogMessageCallback =
+      base::RepeatingCallback<void(const fuchsia::logger::LogMessage&)>;
+
   TestLogListenerSafe();
+  ~TestLogListenerSafe() final;
+
   TestLogListenerSafe(const TestLogListenerSafe&) = delete;
   TestLogListenerSafe& operator=(const TestLogListenerSafe&) = delete;
-  ~TestLogListenerSafe() override;
 
-  void set_on_dump_logs_done(base::OnceClosure on_dump_logs_done);
-
-  bool DidReceiveString(base::StringPiece message,
-                        ::fuchsia::logger::LogMessage* logged_message);
-
-  // LogListenerSafe implementation.
-  void LogMany(std::vector<::fuchsia::logger::LogMessage> messages,
-               LogManyCallback callback) override;
-  void Done() override;
-  void NotImplemented_(const std::string& name) override;
+  // Sets a callback to be invoked with every message received via Log().
+  void set_on_log_message(OnLogMessageCallback callback);
 
  private:
-  std::vector<::fuchsia::logger::LogMessage> log_messages_;
-  base::OnceClosure on_dump_logs_done_;
+  // LogListenerSafe implementation.
+  void Log(fuchsia::logger::LogMessage message, LogCallback callback) final;
+  void LogMany(std::vector<fuchsia::logger::LogMessage> messages,
+               LogManyCallback callback) final;
+  void Done() final;
+  void NotImplemented_(const std::string& name) final;
+
+  OnLogMessageCallback on_log_message_;
+};
+
+// Helper that manages a TestLogListenerSafe to simplify running the message
+// loop until specific messages are received.
+class SimpleTestLogListener {
+ public:
+  SimpleTestLogListener();
+  ~SimpleTestLogListener();
+
+  SimpleTestLogListener(const SimpleTestLogListener&) = delete;
+  SimpleTestLogListener& operator=(const SimpleTestLogListener&) = delete;
+
+  // Attaches this instance to receive data matching |options|, from |log|.
+  void ListenToLog(fuchsia::logger::Log* log,
+                   std::unique_ptr<fuchsia::logger::LogFilterOptions> options);
+
+  // Runs the message loop until a log message containing |expected_string| is
+  // received, and returns it. Returns |base::nullopt| if |binding_| disconnects
+  // without the |expected_string| having been logged.
+  base::Optional<fuchsia::logger::LogMessage> RunUntilMessageReceived(
+      base::StringPiece expected_string);
+
+ private:
+  // Pushes |message| to the |logged_messages_| queue, or to |on_log_message_|.
+  void PushLoggedMessage(const fuchsia::logger::LogMessage& message);
+
+  TestLogListenerSafe listener_;
+  fidl::Binding<fuchsia::logger::LogListenerSafe> binding_;
+
+  base::circular_deque<fuchsia::logger::LogMessage> logged_messages_;
+  TestLogListenerSafe::OnLogMessageCallback on_log_message_;
 };
 
 }  // namespace base
diff --git a/base/logging_unittest.cc b/base/logging_unittest.cc
index 05a07037..5247fa46 100644
--- a/base/logging_unittest.cc
+++ b/base/logging_unittest.cc
@@ -717,56 +717,34 @@
 
 // Verifies that calling the log macro goes to the Fuchsia system logs.
 TEST_F(LoggingTest, FuchsiaSystemLogging) {
-  const char kLogMessage[] = "system log!";
+  constexpr char kLogMessage[] = "system log!";
+
+  base::SimpleTestLogListener listener;
+
+  // Connect the test LogListenerSafe to the Log.
+  std::unique_ptr<fuchsia::logger::LogFilterOptions> options =
+      std::make_unique<fuchsia::logger::LogFilterOptions>();
+  options->tags = {"base_unittests__exec"};
+  fuchsia::logger::LogPtr log = base::ComponentContextForProcess()
+                                    ->svc()
+                                    ->Connect<fuchsia::logger::Log>();
+  listener.ListenToLog(log.get(), std::move(options));
+
+  // Emit the test log message, and spin the loop until it is reported to the
+  // test listener.
   LOG(ERROR) << kLogMessage;
 
-  base::TestLogListenerSafe listener;
-  fidl::Binding<fuchsia::logger::LogListenerSafe> binding(&listener);
+  base::Optional<fuchsia::logger::LogMessage> logged_message =
+      listener.RunUntilMessageReceived(kLogMessage);
 
-  fuchsia::logger::LogMessage logged_message;
-
-  base::RunLoop wait_for_message_loop;
-
-  fuchsia::logger::LogPtr logger = base::ComponentContextForProcess()
-                                       ->svc()
-                                       ->Connect<fuchsia::logger::Log>();
-  logger.set_error_handler([&wait_for_message_loop](zx_status_t status) {
-    ZX_LOG(ERROR, status) << "fuchsia.logger.Log disconnected";
-    ADD_FAILURE();
-    wait_for_message_loop.Quit();
-  });
-
-  // |dump_logs| checks whether the expected log line has been received yet,
-  // and invokes DumpLogsSafe() if not. It passes itself as the completion
-  // callback, so that when the call completes it can check again for the
-  // expected message and re-invoke DumpLogsSafe(), or quit the loop, as
-  // appropriate.
-  base::RepeatingClosure dump_logs = base::BindLambdaForTesting([&]() {
-    if (listener.DidReceiveString(kLogMessage, &logged_message)) {
-      wait_for_message_loop.Quit();
-      return;
-    }
-
-    std::unique_ptr<fuchsia::logger::LogFilterOptions> options =
-        std::make_unique<fuchsia::logger::LogFilterOptions>();
-    options->tags = {"base_unittests__exec"};
-    listener.set_on_dump_logs_done(dump_logs);
-    logger->DumpLogsSafe(binding.NewBinding(), std::move(options));
-  });
-
-  // Start the first DumpLogs() call.
-  dump_logs.Run();
-
-  // Run until kLogMessage is received.
-  wait_for_message_loop.Run();
-
-  EXPECT_EQ(logged_message.severity,
+  ASSERT_TRUE(logged_message.has_value());
+  EXPECT_EQ(logged_message->severity,
             static_cast<int32_t>(fuchsia::logger::LogLevelFilter::ERROR));
-  ASSERT_EQ(logged_message.tags.size(), 1u);
-  EXPECT_EQ(logged_message.tags[0], base::CommandLine::ForCurrentProcess()
-                                        ->GetProgram()
-                                        .BaseName()
-                                        .AsUTF8Unsafe());
+  ASSERT_EQ(logged_message->tags.size(), 1u);
+  EXPECT_EQ(logged_message->tags[0], base::CommandLine::ForCurrentProcess()
+                                         ->GetProgram()
+                                         .BaseName()
+                                         .AsUTF8Unsafe());
 }
 
 TEST_F(LoggingTest, FuchsiaLogging) {
@@ -786,6 +764,7 @@
   ZX_CHECK(true, ZX_ERR_INTERNAL);
   ZX_DCHECK(true, ZX_ERR_INTERNAL);
 }
+
 #endif  // defined(OS_FUCHSIA)
 
 TEST_F(LoggingTest, LogPrefix) {
diff --git a/base/util/memory_pressure/system_memory_pressure_evaluator_linux.cc b/base/util/memory_pressure/system_memory_pressure_evaluator_linux.cc
index 1878d88..5200e47 100644
--- a/base/util/memory_pressure/system_memory_pressure_evaluator_linux.cc
+++ b/base/util/memory_pressure/system_memory_pressure_evaluator_linux.cc
@@ -5,6 +5,7 @@
 #include "base/util/memory_pressure/system_memory_pressure_evaluator_linux.h"
 
 #include "base/bind.h"
+#include "base/numerics/safe_conversions.h"
 #include "base/process/process_metrics.h"
 #include "base/single_thread_task_runner.h"
 #include "base/task/post_task.h"
@@ -127,10 +128,20 @@
   base::SystemMemoryInfoKB mem_info;
   if (!GetSystemMemoryInfo(&mem_info))
     return false;
-  critical_threshold_mb_ =
-      mem_info.total * (100 - kDefaultCriticalThresholdPc) / 100 / kKiBperMiB;
-  moderate_threshold_mb_ =
-      mem_info.total * (100 - kDefaultModerateThresholdPc) / 100 / kKiBperMiB;
+
+  // The computation of the different thresholds assumes that
+  // SystemMemoryInfoKB::total is stored as an integer and so the result of
+  // |static_cast<uint64_t>(mem_info.total) * (100 - kThresholdPc)| won't
+  // overflow.
+  static_assert(
+      std::is_same<decltype(mem_info.total), int>::value,
+      "SystemMemoryInfoKB::total is expected to be stored as an integer.");
+  critical_threshold_mb_ = base::checked_cast<int>(
+      static_cast<uint64_t>(mem_info.total) *
+      (100 - kDefaultCriticalThresholdPc) / 100 / kKiBperMiB);
+  moderate_threshold_mb_ = base::checked_cast<int>(
+      static_cast<uint64_t>(mem_info.total) *
+      (100 - kDefaultModerateThresholdPc) / 100 / kKiBperMiB);
   return true;
 }
 
diff --git a/build/android/gyp/create_java_binary_script.py b/build/android/gyp/create_java_binary_script.py
index 794d57e..888de01 100755
--- a/build/android/gyp/create_java_binary_script.py
+++ b/build/android/gyp/create_java_binary_script.py
@@ -40,7 +40,7 @@
   java_path = fix_path(java_path)
 java_cmd = [java_path]
 # This is a simple argparser for jvm, jar, and classpath arguments.
-parser = argparse.ArgumentParser()
+parser = argparse.ArgumentParser(add_help=False)
 parser.add_argument('--jar-args')
 parser.add_argument('--jvm-args')
 parser.add_argument('--classpath')
diff --git a/buildtools/.gitignore b/buildtools/.gitignore
index 163894f..ca155dd8 100644
--- a/buildtools/.gitignore
+++ b/buildtools/.gitignore
@@ -8,6 +8,7 @@
 mac/.versions
 mac/clang-format
 mac/gn
+reclient
 third_party/libc++/trunk
 third_party/libc++abi/trunk
 third_party/libunwind/trunk
diff --git a/buildtools/DEPS b/buildtools/DEPS
index 98fb257..563d8d24 100644
--- a/buildtools/DEPS
+++ b/buildtools/DEPS
@@ -16,6 +16,12 @@
   # GN CIPD package version.
   'gn_version': 'git_revision:53d92014bf94c3893886470a1c7c1289f8818db0',
 
+  # By default, do not checkout the re-client binaries.
+  'checkout_reclient': False,
+
+  # reclient CIPD package version
+  'reclient_version': 're_client_version:0.17.0.7d283ef',
+
   # When changing these, also update the svn revisions in deps_revisions.gni
   'clang_format_revision': '96636aa0e9f047f17447f2d45a094d0b59ed7917',
   'libcxx_revision':       'd9040c75cfea5928c804ab7c235fed06a63f743a',
@@ -69,4 +75,14 @@
     'dep_type': 'cipd',
     'condition': 'host_os == "win"',
   },
+  'reclient': {
+    'packages': [
+      {
+        'package': 'infra/rbe/client/${{platform}}',
+        'version': Var('reclient_version'),
+      }
+    ],
+    'dep_type': 'cipd',
+    'condition': '(host_os == "linux" or host_os == "windows") and checkout_reclient',
+  },
 }
diff --git a/cc/trees/damage_tracker.cc b/cc/trees/damage_tracker.cc
index b342e26..86c2e18 100644
--- a/cc/trees/damage_tracker.cc
+++ b/cc/trees/damage_tracker.cc
@@ -106,10 +106,11 @@
     render_surface->damage_tracker()->PrepareForUpdate();
   }
 
-  // Surfaces with backdrop blur filter that might be potentially optimized with
-  // caching, paired with each's surface rect in target space.
+  // A vector of surfaces paired with each's surface rect in target space, used
+  // for potential optimization with caching when no damage from under a surface
+  // intersects its rect.
   std::vector<std::pair<RenderSurfaceImpl*, gfx::Rect>>
-      surfaces_with_backdrop_blur_filter;
+      surfaces_with_no_damage_under;
 
   EffectTree& effect_tree = layer_tree_impl->property_trees()->effect_tree;
   int current_target_effect_id = EffectTree::kContentsRootNodeId;
@@ -132,10 +133,10 @@
         RenderSurfaceImpl* current_target =
             effect_tree.GetRenderSurface(current_target_effect_id);
         current_target->damage_tracker()->ComputeSurfaceDamage(
-            current_target, surfaces_with_backdrop_blur_filter);
+            current_target, surfaces_with_no_damage_under);
         RenderSurfaceImpl* parent_target = current_target->render_target();
         parent_target->damage_tracker()->AccumulateDamageFromRenderSurface(
-            current_target, surfaces_with_backdrop_blur_filter);
+            current_target, surfaces_with_no_damage_under);
         current_target_effect_id =
             effect_tree.Node(current_target_effect_id)->target_id;
       }
@@ -157,22 +158,22 @@
       effect_tree.GetRenderSurface(current_target_effect_id);
   while (true) {
     current_target->damage_tracker()->ComputeSurfaceDamage(
-        current_target, surfaces_with_backdrop_blur_filter);
+        current_target, surfaces_with_no_damage_under);
     if (current_target->EffectTreeIndex() == EffectTree::kContentsRootNodeId)
       break;
     RenderSurfaceImpl* next_target = current_target->render_target();
     next_target->damage_tracker()->AccumulateDamageFromRenderSurface(
-        current_target, surfaces_with_backdrop_blur_filter);
+        current_target, surfaces_with_no_damage_under);
     current_target = next_target;
   }
 
-  DCHECK(surfaces_with_backdrop_blur_filter.empty());
+  DCHECK(surfaces_with_no_damage_under.empty());
 }
 
 void DamageTracker::ComputeSurfaceDamage(
     RenderSurfaceImpl* render_surface,
     std::vector<std::pair<RenderSurfaceImpl*, gfx::Rect>>&
-        surfaces_with_backdrop_blur_filter) {
+        surfaces_with_no_damage_under) {
   // All damage from contributing layers and surfaces must already have been
   // added to damage_for_this_update_ through calls to AccumulateDamageFromLayer
   // and AccumulateDamageFromRenderSurface.
@@ -209,17 +210,17 @@
   // frame.
   current_damage_.Union(damage_for_this_update_);
 
-  if (!surfaces_with_backdrop_blur_filter.empty()) {
+  if (!surfaces_with_no_damage_under.empty()) {
     gfx::Rect leftover_damage_rect;
     bool valid = damage_from_leftover_rects.GetAsRect(&leftover_damage_rect);
     std::vector<std::pair<RenderSurfaceImpl*, gfx::Rect>>::iterator it =
-        surfaces_with_backdrop_blur_filter.begin();
-    while (it != surfaces_with_backdrop_blur_filter.end()) {
+        surfaces_with_no_damage_under.begin();
+    while (it != surfaces_with_no_damage_under.end()) {
       RenderSurfaceImpl* surface = it->first;
       if (surface->render_target() == render_surface) {
         surface->set_intersects_damage_under(
             !valid || it->second.Intersects(leftover_damage_rect));
-        it = surfaces_with_backdrop_blur_filter.erase(it);
+        it = surfaces_with_no_damage_under.erase(it);
       } else {
         ++it;
       }
@@ -410,7 +411,7 @@
 void DamageTracker::AccumulateDamageFromRenderSurface(
     RenderSurfaceImpl* render_surface,
     std::vector<std::pair<RenderSurfaceImpl*, gfx::Rect>>&
-        surfaces_with_backdrop_blur_filter) {
+        surfaces_with_no_damage_under) {
   // There are two ways a "descendant surface" can damage regions of the "target
   // surface":
   //   1. Property change:
@@ -447,7 +448,7 @@
     gfx::Rect damage_on_target;
     bool valid = damage_for_this_update_.GetAsRect(&damage_on_target);
     if (valid && !damage_on_target.Intersects(surface_rect_in_target_space)) {
-      surfaces_with_backdrop_blur_filter.emplace_back(
+      surfaces_with_no_damage_under.emplace_back(
           std::make_pair(render_surface, surface_rect_in_target_space));
     } else {
       render_surface->set_intersects_damage_under(true);
diff --git a/cc/trees/damage_tracker.h b/cc/trees/damage_tracker.h
index d5b83be..a0e0f45 100644
--- a/cc/trees/damage_tracker.h
+++ b/cc/trees/damage_tracker.h
@@ -5,7 +5,9 @@
 #ifndef CC_TREES_DAMAGE_TRACKER_H_
 #define CC_TREES_DAMAGE_TRACKER_H_
 
+#include <algorithm>
 #include <memory>
+#include <utility>
 #include <vector>
 
 #include "cc/cc_export.h"
@@ -97,11 +99,11 @@
   void AccumulateDamageFromRenderSurface(
       RenderSurfaceImpl* render_surface,
       std::vector<std::pair<RenderSurfaceImpl*, gfx::Rect>>&
-          surfaces_with_backdrop_blur_filter);
+          surfaces_with_no_damage_under);
   void ComputeSurfaceDamage(
       RenderSurfaceImpl* render_surface,
       std::vector<std::pair<RenderSurfaceImpl*, gfx::Rect>>&
-          surfaces_with_backdrop_blur_filter);
+          surfaces_with_no_damage_under);
   void ExpandDamageInsideRectWithFilters(const gfx::Rect& pre_filter_rect,
                                          const FilterOperations& filters);
 
diff --git a/chrome/android/chrome_public_apk_tmpl.gni b/chrome/android/chrome_public_apk_tmpl.gni
index eff0dd36..c45ff31 100644
--- a/chrome/android/chrome_public_apk_tmpl.gni
+++ b/chrome/android/chrome_public_apk_tmpl.gni
@@ -171,10 +171,6 @@
     # Material design layouts that cause views to be kept that we don't use.
     # Instead of manually filtering, unused resource removal would be better:
     # https://crbug.com/636448
-    resource_exclusion_regex += "|${_material_package}/layout"
-    resource_exclusion_regex += "|${_material_package}/color.*(choice|chip_|card_|calendar_|bottom_nav_|slider_)"
-    resource_exclusion_regex +=
-        "|${_material_package}/drawable.*design_snackbar"
     resource_exclusion_regex += "|${_material_package}/xml.*badge_"
     _material_package = "*com_google_android_material*"
     resource_exclusion_exceptions += [
@@ -190,26 +186,7 @@
     ]
 
     # Remove unneeded entries from material design values.xml files.
-    resource_values_filter_rules = [
-      "${_material_package}:[Bb]adge",
-      "${_material_package}:[Bb]ottomNavigation",
-      "${_material_package}:[Bb]ottomSheet",
-      "${_material_package}:[Bb]uttonToggleGroup",
-      "${_material_package}:[Cc]alendar",
-      "${_material_package}:[Cc]ardView",
-      "${_material_package}:\b[Cc]hip",
-      "${_material_package}:design_snackbar",
-      "${_material_package}:[Ff]loatingActionButton",
-      "${_material_package}:[Mm]aterialAlertDialog",
-      "${_material_package}:mtrl_alert",
-      "${_material_package}:mtrl_navigation",
-      "${_material_package}:mtrl_slider",
-      "${_material_package}:[Nn]avigationView",
-      "${_material_package}:picker",
-      "${_material_package}:[Ss]nackbar",
-      "${_material_package}:[Ss]lider",
-      "${_material_package}:[Tt]oolbarLayout",
-    ]
+    resource_values_filter_rules = [ "${_material_package}:[Tt]oolbarLayout" ]
 
     if (!_is_monochrome) {
       product_config_java_packages = [ "org.chromium.chrome.browser" ]
diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiMediator.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiMediator.java
index d6d630e1..9efff59 100644
--- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiMediator.java
+++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiMediator.java
@@ -51,6 +51,7 @@
 import org.chromium.content_public.browser.LoadUrlParams;
 import org.chromium.ui.base.WindowAndroid;
 import org.chromium.ui.modelutil.PropertyModel;
+import org.chromium.url.GURL;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -268,7 +269,7 @@
 
         mTabModelSelectorTabObserver = new TabModelSelectorTabObserver(mTabModelSelector) {
             @Override
-            public void onPageLoadStarted(Tab tab, String url) {
+            public void onPageLoadStarted(Tab tab, GURL url) {
                 // TODO(crbug.com/1087826) This is a band-aid fix for M84. The root cause is
                 // probably a leaked observer. Remove this when the TabObservers are removed during
                 // tab reparenting.
diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListMediator.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListMediator.java
index 9a580d1d..303bbe5 100644
--- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListMediator.java
+++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListMediator.java
@@ -77,6 +77,7 @@
 import org.chromium.ui.base.PageTransition;
 import org.chromium.ui.modelutil.PropertyModel;
 import org.chromium.ui.modelutil.SimpleRecyclerViewAdapter;
+import org.chromium.url.GURL;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -1612,7 +1613,7 @@
 
         private static TabObserver sLazyNavigateToLastSearchQuery = new EmptyTabObserver() {
             @Override
-            public void onPageLoadStarted(Tab tab, String url) {
+            public void onPageLoadStarted(Tab tab, GURL url) {
                 assert tab.getWebContents() != null;
                 if (tab.getWebContents() == null) return;
 
diff --git a/chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabListMediatorUnitTest.java b/chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabListMediatorUnitTest.java
index ed674b72..74380a1a 100644
--- a/chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabListMediatorUnitTest.java
+++ b/chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabListMediatorUnitTest.java
@@ -132,6 +132,7 @@
 import org.chromium.ui.base.PageTransition;
 import org.chromium.ui.modelutil.PropertyModel;
 import org.chromium.ui.modelutil.SimpleRecyclerViewAdapter;
+import org.chromium.url.JUnitTestGURLs;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -2061,7 +2062,7 @@
     public void searchListener_frozenTab() {
         initAndAssertAllProperties();
 
-        String searchUrl = "https://www.google.com/search?q=test";
+        String searchUrl = JUnitTestGURLs.SEARCH_URL;
         String searchTerm = "test";
         TemplateUrlService service = Mockito.mock(TemplateUrlService.class);
         doReturn(searchTerm).when(service).getSearchQueryForUrl(searchUrl);
@@ -2087,7 +2088,7 @@
         verify(navigationController, never()).goToOffset(0);
 
         doReturn(webContents).when(mTab1).getWebContents();
-        mTabObserverCaptor.getValue().onPageLoadStarted(mTab1, searchUrl);
+        mTabObserverCaptor.getValue().onPageLoadStarted(mTab1, JUnitTestGURLs.getGURL(searchUrl));
         verify(mTab1).loadUrl(
                 refEq(new LoadUrlParams(searchUrl, PageTransition.KEYWORD_GENERATED)));
     }
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/NtpStreamLifecycleManager.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/NtpStreamLifecycleManager.java
index 5a6a55c..cb187b69 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/NtpStreamLifecycleManager.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/NtpStreamLifecycleManager.java
@@ -22,6 +22,7 @@
 import org.chromium.components.user_prefs.UserPrefs;
 import org.chromium.content_public.browser.NavigationController;
 import org.chromium.content_public.browser.NavigationEntry;
+import org.chromium.url.GURL;
 
 /**
  * Manages the lifecycle of a {@link Stream} associated with a Tab in an Activity.
@@ -76,7 +77,7 @@
             }
 
             @Override
-            public void onPageLoadStarted(Tab tab, String url) {
+            public void onPageLoadStarted(Tab tab, GURL url) {
                 saveInstanceState();
             }
         };
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/v2/FeedStreamSurface.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/v2/FeedStreamSurface.java
index 31a5dbd..e5c822a 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/v2/FeedStreamSurface.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/v2/FeedStreamSurface.java
@@ -70,6 +70,7 @@
 import org.chromium.network.mojom.ReferrerPolicy;
 import org.chromium.ui.base.PageTransition;
 import org.chromium.ui.mojom.WindowOpenDisposition;
+import org.chromium.url.GURL;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -311,11 +312,11 @@
         }
 
         @Override
-        public void onPageLoadFinished(Tab tab, String url) {
+        public void onPageLoadFinished(Tab tab, GURL url) {
             // TODO(jianli): onPageLoadFinished is called on successful load, and if a user manually
             // stops the page load. We should only capture successful page loads.
             FeedStreamSurfaceJni.get().reportPageLoaded(
-                    mNativeFeedStreamSurface, FeedStreamSurface.this, url, mInNewTab);
+                    mNativeFeedStreamSurface, FeedStreamSurface.this, mInNewTab);
             tab.removeObserver(this);
         }
 
@@ -1093,8 +1094,8 @@
         void reportSliceViewed(
                 long nativeFeedStreamSurface, FeedStreamSurface caller, String sliceId);
         void reportNavigationStarted(long nativeFeedStreamSurface, FeedStreamSurface caller);
-        void reportPageLoaded(long nativeFeedStreamSurface, FeedStreamSurface caller, String url,
-                boolean inNewTab);
+        void reportPageLoaded(
+                long nativeFeedStreamSurface, FeedStreamSurface caller, boolean inNewTab);
         void reportOpenAction(
                 long nativeFeedStreamSurface, FeedStreamSurface caller, String sliceId);
         void reportOpenInNewTabAction(
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/AppIndexingUtil.java b/chrome/android/java/src/org/chromium/chrome/browser/AppIndexingUtil.java
index 985e1b1..a720378 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/AppIndexingUtil.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/AppIndexingUtil.java
@@ -25,6 +25,7 @@
 import org.chromium.content_public.browser.RenderFrameHost;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.services.service_manager.InterfaceProvider;
+import org.chromium.url.GURL;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -58,7 +59,7 @@
         if (mTabModelSelectorImpl != null && isEnabledForDevice()) {
             mObserver = new TabModelSelectorTabObserver(mTabModelSelectorImpl) {
                 @Override
-                public void onPageLoadFinished(final Tab tab, String url) {
+                public void onPageLoadFinished(final Tab tab, GURL url) {
                     extractDocumentMetadata(tab);
                 }
 
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
index a9702ff..bafd779 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
@@ -134,7 +134,6 @@
 import org.chromium.chrome.browser.share.ShareDelegate;
 import org.chromium.chrome.browser.share.ShareDelegateImpl;
 import org.chromium.chrome.browser.sync.ProfileSyncService;
-import org.chromium.chrome.browser.sync.SyncController;
 import org.chromium.chrome.browser.tab.AccessibilityVisibilityHandler;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tab.TabHidingType;
@@ -202,6 +201,7 @@
 import org.chromium.ui.display.DisplayUtil;
 import org.chromium.ui.modaldialog.ModalDialogManager;
 import org.chromium.ui.widget.Toast;
+import org.chromium.url.GURL;
 import org.chromium.url.Origin;
 import org.chromium.webapk.lib.client.WebApkNavigationClient;
 
@@ -669,7 +669,7 @@
             }
 
             @Override
-            public void onPageLoadFinished(Tab tab, String url) {
+            public void onPageLoadFinished(Tab tab, GURL url) {
                 postDeferredStartupIfNeeded();
                 OfflinePageUtils.showOfflineSnackbarIfNecessary(tab);
             }
@@ -893,11 +893,9 @@
         if (!mStarted) return; // Sync state reporting should work only in started state.
         if (mContextReporter != null || getActivityTab() == null) return;
 
-        final SyncController syncController = SyncController.get();
         final ProfileSyncService syncService = ProfileSyncService.get();
 
-        if (syncController != null && syncController.isSyncingUrlsWithKeystorePassphrase()) {
-            assert syncService != null;
+        if (syncService != null && syncService.isSyncingUrlsWithKeystorePassphrase()) {
             mContextReporter = AppHooks.get().createGsaHelper().getContextReporter(this);
 
             if (mSyncStateChangedListener != null) {
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browserservices/ui/splashscreen/SplashController.java b/chrome/android/java/src/org/chromium/chrome/browser/browserservices/ui/splashscreen/SplashController.java
index f17156e..2d993632 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/browserservices/ui/splashscreen/SplashController.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/browserservices/ui/splashscreen/SplashController.java
@@ -36,6 +36,7 @@
 import org.chromium.chrome.browser.lifecycle.Destroyable;
 import org.chromium.chrome.browser.lifecycle.InflationObserver;
 import org.chromium.chrome.browser.tab.Tab;
+import org.chromium.url.GURL;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -207,7 +208,7 @@
     }
 
     @Override
-    public void onPageLoadFinished(Tab tab, String url) {
+    public void onPageLoadFinished(Tab tab, GURL url) {
         if (canHideSplashScreen()) {
             hideSplash(tab, false /* loadFailed */);
         }
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/StaticLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/StaticLayout.java
index a826729..669a7b8 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/StaticLayout.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/StaticLayout.java
@@ -37,6 +37,7 @@
 import org.chromium.components.embedder_support.util.UrlConstants;
 import org.chromium.ui.modelutil.PropertyModel;
 import org.chromium.ui.resources.ResourceManager;
+import org.chromium.url.GURL;
 
 import java.util.Arrays;
 import java.util.LinkedList;
@@ -172,7 +173,7 @@
 
         mTabModelSelectorTabObserver = new TabModelSelectorTabObserver(tabModelSelector) {
             @Override
-            public void onPageLoadFinished(Tab tab, String url) {
+            public void onPageLoadFinished(Tab tab, GURL url) {
                 if (mIsActive) unstallImmediately(tab.getId());
             }
             @Override
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java
index 0e1f75b..69c0e7e 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java
@@ -43,6 +43,7 @@
 import org.chromium.chrome.browser.tabmodel.TabModelSelectorTabObserver;
 import org.chromium.ui.base.LocalizationUtils;
 import org.chromium.ui.resources.ResourceManager;
+import org.chromium.url.GURL;
 
 import java.util.List;
 
@@ -433,12 +434,12 @@
             }
 
             @Override
-            public void onPageLoadStarted(Tab tab, String url) {
+            public void onPageLoadStarted(Tab tab, GURL url) {
                 getStripLayoutHelper(tab.isIncognito()).tabPageLoadStarted(tab.getId());
             }
 
             @Override
-            public void onPageLoadFinished(Tab tab, String url) {
+            public void onPageLoadFinished(Tab tab, GURL url) {
                 getStripLayoutHelper(tab.isIncognito()).tabPageLoadFinished(tab.getId());
             }
 
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java
index 363371a..d0fb2ec 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java
@@ -68,6 +68,7 @@
 import org.chromium.contextual_search.mojom.OverlayPosition;
 import org.chromium.net.NetworkChangeNotifier;
 import org.chromium.ui.touch_selection.SelectionEventType;
+import org.chromium.url.GURL;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -580,7 +581,7 @@
         };
         mTabModelSelectorTabObserver = new TabModelSelectorTabObserver(selector) {
             @Override
-            public void onPageLoadStarted(Tab tab, String url) {
+            public void onPageLoadStarted(Tab tab, GURL url) {
                 // Detects navigation of the base page for crbug.com/428368 (navigation-detection).
                 hideContextualSearch(StateChangeReason.UNKNOWN);
             }
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchTabHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchTabHelper.java
index abc84e833..08693d8 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchTabHelper.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchTabHelper.java
@@ -27,6 +27,7 @@
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.net.NetworkChangeNotifier;
 import org.chromium.ui.base.WindowAndroid;
+import org.chromium.url.GURL;
 
 /** Manages the enabling and disabling and gesture listeners for ContextualSearch on a given Tab. */
 public class ContextualSearchTabHelper
@@ -95,7 +96,7 @@
     // ============================================================================================
 
     @Override
-    public void onPageLoadStarted(Tab tab, String url) {
+    public void onPageLoadStarted(Tab tab, GURL url) {
         updateHooksForTab(tab);
         ContextualSearchManager manager = getContextualSearchManager(tab);
         if (manager != null) manager.onBasePageLoadStarted();
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabNavigationEventObserver.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabNavigationEventObserver.java
index b520bc6..e65b17008 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabNavigationEventObserver.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabNavigationEventObserver.java
@@ -13,6 +13,7 @@
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tab.TabHidingType;
 import org.chromium.chrome.browser.tab.TabSelectionType;
+import org.chromium.url.GURL;
 
 import javax.inject.Inject;
 
@@ -35,12 +36,12 @@
     }
 
     @Override
-    public void onPageLoadStarted(Tab tab, String url) {
+    public void onPageLoadStarted(Tab tab, GURL url) {
         mConnection.notifyNavigationEvent(mSessionToken, CustomTabsCallback.NAVIGATION_STARTED);
     }
 
     @Override
-    public void onPageLoadFinished(Tab tab, String url) {
+    public void onPageLoadFinished(Tab tab, GURL url) {
         mConnection.notifyNavigationEvent(mSessionToken, CustomTabsCallback.NAVIGATION_FINISHED);
     }
 
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabObserver.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabObserver.java
index f28ee01..ddeedfb6 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabObserver.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabObserver.java
@@ -28,6 +28,7 @@
 import org.chromium.components.browser_ui.share.ShareImageFileUtils;
 import org.chromium.content_public.browser.LoadUrlParams;
 import org.chromium.content_public.browser.NavigationHandle;
+import org.chromium.url.GURL;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -113,7 +114,7 @@
     }
 
     @Override
-    public void onPageLoadStarted(Tab tab, String url) {
+    public void onPageLoadStarted(Tab tab, GURL url) {
         if (mCurrentState == State.WAITING_LOAD_START) {
             mPageLoadStartedTimestamp = SystemClock.elapsedRealtime();
             mCurrentState = State.WAITING_LOAD_FINISH;
@@ -136,7 +137,7 @@
     }
 
     @Override
-    public void onPageLoadFinished(Tab tab, String url) {
+    public void onPageLoadFinished(Tab tab, GURL url) {
         long pageLoadFinishedTimestamp = SystemClock.elapsedRealtime();
 
         if (mCurrentState == State.WAITING_LOAD_FINISH && mIntentReceivedTimestamp > 0) {
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/content/DefaultCustomTabIntentHandlingStrategy.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/content/DefaultCustomTabIntentHandlingStrategy.java
index a5abef8..419c60d 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/content/DefaultCustomTabIntentHandlingStrategy.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/content/DefaultCustomTabIntentHandlingStrategy.java
@@ -6,6 +6,7 @@
 
 import android.text.TextUtils;
 
+import org.chromium.base.annotations.RemovableInRelease;
 import org.chromium.chrome.browser.IntentHandler;
 import org.chromium.chrome.browser.browserservices.BrowserServicesIntentDataProvider;
 import org.chromium.chrome.browser.customtabs.CustomTabNavigationEventObserver;
@@ -14,6 +15,7 @@
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.components.embedder_support.util.UrlUtilities;
 import org.chromium.content_public.browser.LoadUrlParams;
+import org.chromium.url.GURL;
 
 import javax.inject.Inject;
 
@@ -54,6 +56,15 @@
         }
     }
 
+    @RemovableInRelease
+    // TODO(yfriedman): Remove & inline once CustomTabs junit tests can be created from a provided
+    // GURL. This depends on switching *IntentDataProvider over to GURL.
+    // https://crbug.com/783819
+    public GURL getGurlForUrl(String url) {
+        // TODO(mthiesse): As this is user-provided it should be going through UrlFormatter.fixupUrl
+        return new GURL(url);
+    }
+
     // The hidden tab case needs a bit of special treatment.
     private void handleInitialLoadForHiddedTab(@TabCreationMode int initialTabCreationMode,
             BrowserServicesIntentDataProvider intentDataProvider) {
@@ -62,13 +73,14 @@
             throw new IllegalStateException("handleInitialIntent called before Tab created");
         }
         String url = intentDataProvider.getUrlToLoad();
+        GURL gurl = getGurlForUrl(url);
 
         // Manually generating metrics in case the hidden tab has completely finished loading.
         if (!tab.isLoading() && !tab.isShowingErrorPage()) {
-            mCustomTabObserver.get().onPageLoadStarted(tab, url);
-            mCustomTabObserver.get().onPageLoadFinished(tab, url);
-            mNavigationEventObserver.onPageLoadStarted(tab, url);
-            mNavigationEventObserver.onPageLoadFinished(tab, url);
+            mCustomTabObserver.get().onPageLoadStarted(tab, gurl);
+            mCustomTabObserver.get().onPageLoadFinished(tab, gurl);
+            mNavigationEventObserver.onPageLoadStarted(tab, gurl);
+            mNavigationEventObserver.onPageLoadFinished(tab, gurl);
         }
 
         // No actual load to do if the hidden tab already has the exact correct url.
@@ -84,8 +96,8 @@
                 // CustomTabObserver and CustomTabActivityNavigationObserver are attached
                 // as observers in CustomTabActivityTabController, not when the navigation is
                 // initiated in HiddenTabHolder or StartupTabPreloader.
-                mCustomTabObserver.get().onPageLoadStarted(tab, url);
-                mNavigationEventObserver.onPageLoadStarted(tab, url);
+                mCustomTabObserver.get().onPageLoadStarted(tab, gurl);
+                mNavigationEventObserver.onPageLoadStarted(tab, gurl);
             }
             return;
         }
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/features/toolbar/CustomTabToolbarColorController.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/features/toolbar/CustomTabToolbarColorController.java
index 2988e854..566730e 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/features/toolbar/CustomTabToolbarColorController.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/features/toolbar/CustomTabToolbarColorController.java
@@ -22,6 +22,7 @@
 import org.chromium.chrome.browser.webapps.WebDisplayMode;
 import org.chromium.chrome.browser.webapps.WebappExtras;
 import org.chromium.components.browser_ui.styles.ChromeColors;
+import org.chromium.url.GURL;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -107,7 +108,7 @@
     private void observeTabToUpdateColor() {
         mTabObserverRegistrar.registerActivityTabObserver(new CustomTabTabObserver() {
             @Override
-            public void onPageLoadFinished(Tab tab, String url) {
+            public void onPageLoadFinished(Tab tab, GURL url) {
                 // Update the color when the page load finishes.
                 updateColor();
             }
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/explore_sites/ExploreSitesPage.java b/chrome/android/java/src/org/chromium/chrome/browser/explore_sites/ExploreSitesPage.java
index 1ee7046..9ac9953 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/explore_sites/ExploreSitesPage.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/explore_sites/ExploreSitesPage.java
@@ -39,6 +39,7 @@
 import org.chromium.ui.modelutil.ListModel;
 import org.chromium.ui.modelutil.PropertyModel;
 import org.chromium.ui.modelutil.RecyclerViewAdapter;
+import org.chromium.url.GURL;
 import org.chromium.url.URI;
 
 import java.lang.annotation.Retention;
@@ -310,16 +311,12 @@
             // state, for making "back" work correctly.
             mTabObserver = new EmptyTabObserver() {
                 @Override
-                public void onPageLoadStarted(Tab tab, String url) {
-                    try {
-                        URI uri = new URI(url);
-                        if (UrlConstants.CHROME_NATIVE_SCHEME.equals(uri.getScheme())
-                                && UrlConstants.EXPLORE_HOST.equals(uri.getHost())) {
-                            return;
-                        }
-                        savePageState();
-                    } catch (URISyntaxException e) {
+                public void onPageLoadStarted(Tab tab, GURL url) {
+                    if (UrlConstants.CHROME_NATIVE_SCHEME.equals(url.getScheme())
+                            && UrlConstants.EXPLORE_HOST.equals(url.getHost())) {
+                        return;
                     }
+                    savePageState();
                 }
             };
             mTab.addObserver(mTabObserver);
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/findinpage/FindToolbar.java b/chrome/android/java/src/org/chromium/chrome/browser/findinpage/FindToolbar.java
index 568754d..e99e8d29 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/findinpage/FindToolbar.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/findinpage/FindToolbar.java
@@ -53,6 +53,7 @@
 import org.chromium.components.find_in_page.FindNotificationDetails;
 import org.chromium.components.find_in_page.FindResultBar;
 import org.chromium.ui.base.WindowAndroid;
+import org.chromium.url.GURL;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -207,7 +208,7 @@
             }
 
             @Override
-            public void onPageLoadStarted(Tab tab, String url) {
+            public void onPageLoadStarted(Tab tab, GURL url) {
                 deactivate();
             }
 
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/metrics/ActivityTabStartupMetricsTracker.java b/chrome/android/java/src/org/chromium/chrome/browser/metrics/ActivityTabStartupMetricsTracker.java
index b3237a3..1ba4a7f 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/metrics/ActivityTabStartupMetricsTracker.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/metrics/ActivityTabStartupMetricsTracker.java
@@ -14,6 +14,7 @@
 import org.chromium.components.embedder_support.util.UrlUtilities;
 import org.chromium.content_public.browser.NavigationHandle;
 import org.chromium.content_public.browser.WebContents;
+import org.chromium.url.GURL;
 
 /**
  * Tracks the first navigation and first contentful paint events for a tab within an activity during
@@ -45,7 +46,7 @@
                     private boolean mIsFirstPageLoadStart = true;
 
                     @Override
-                    public void onPageLoadStarted(Tab tab, String url) {
+                    public void onPageLoadStarted(Tab tab, GURL url) {
                         // Discard startup navigation measurements when the user interfered and
                         // started the 2nd navigation (in activity lifetime) in parallel.
                         if (!mIsFirstPageLoadStart) {
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/metrics/UmaSessionStats.java b/chrome/android/java/src/org/chromium/chrome/browser/metrics/UmaSessionStats.java
index f1144577..ce77ed7 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/metrics/UmaSessionStats.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/metrics/UmaSessionStats.java
@@ -26,6 +26,7 @@
 import org.chromium.components.embedder_support.util.UrlUtilities;
 import org.chromium.content_public.browser.BrowserStartupController;
 import org.chromium.content_public.browser.WebContents;
+import org.chromium.url.GURL;
 
 /**
  * Mainly sets up session stats for chrome. A session is defined as the duration when the
@@ -110,7 +111,7 @@
                     .keyboard != Configuration.KEYBOARD_NOKEYS;
             mTabModelSelectorTabObserver = new TabModelSelectorTabObserver(mTabModelSelector) {
                 @Override
-                public void onPageLoadFinished(Tab tab, String url) {
+                public void onPageLoadFinished(Tab tab, GURL url) {
                     recordPageLoadStats(tab);
                 }
             };
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/TabModalLifetimeHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/TabModalLifetimeHandler.java
index 41e28df..220f69f 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/TabModalLifetimeHandler.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/TabModalLifetimeHandler.java
@@ -20,6 +20,7 @@
 import org.chromium.ui.modaldialog.ModalDialogManager;
 import org.chromium.ui.modaldialog.ModalDialogManager.ModalDialogType;
 import org.chromium.ui.util.TokenHolder;
+import org.chromium.url.GURL;
 
 /**
  * Class responsible for handling dismissal of a tab modal dialog on user actions outside the tab
@@ -43,7 +44,7 @@
         }
 
         @Override
-        public void onPageLoadStarted(Tab tab, String url) {
+        public void onPageLoadStarted(Tab tab, GURL url) {
             if (mActiveTab == tab) {
                 mManager.dismissDialogsOfType(ModalDialogType.TAB, DialogDismissalCause.NAVIGATE);
             }
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageTabObserver.java b/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageTabObserver.java
index ff9a6f9..aecf0bb 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageTabObserver.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageTabObserver.java
@@ -24,6 +24,7 @@
 import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
 import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager.SnackbarController;
 import org.chromium.net.NetworkChangeNotifier;
+import org.chromium.url.GURL;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -142,7 +143,7 @@
 
     // Methods from EmptyTabObserver
     @Override
-    public void onPageLoadFinished(Tab tab, String url) {
+    public void onPageLoadFinished(Tab tab, GURL url) {
         Log.d(TAG, "onPageLoadFinished");
         if (isObservingTab(tab)) {
             mObservedTabs.get(tab.getId()).isLoaded = true;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageUtils.java
index 5f79267..72be15e 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageUtils.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageUtils.java
@@ -52,6 +52,7 @@
 import org.chromium.net.NetworkChangeNotifier;
 import org.chromium.ui.base.PageTransition;
 import org.chromium.ui.base.WindowAndroid;
+import org.chromium.url.GURL;
 
 import java.io.File;
 import java.lang.annotation.Retention;
@@ -875,7 +876,7 @@
          * contents.
          */
         @Override
-        public void onPageLoadFinished(Tab tab, String url) {
+        public void onPageLoadFinished(Tab tab, GURL url) {
             if (!tab.isBeingRestored()) return;
 
             // We first compute the bitwise tab restore context.
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java
index 447f825e..09aea1c 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java
@@ -49,7 +49,7 @@
 import org.chromium.chrome.browser.tabmodel.TabModel;
 import org.chromium.chrome.browser.tabmodel.TabModelUtils;
 import org.chromium.chrome.browser.tabmodel.TabWindowManager;
-import org.chromium.components.embedder_support.util.UrlConstants;
+import org.chromium.components.embedder_support.util.UrlUtilities;
 import org.chromium.components.omnibox.AutocompleteMatch;
 import org.chromium.components.omnibox.AutocompleteResult;
 import org.chromium.components.query_tiles.QueryTile;
@@ -182,14 +182,14 @@
             mDropdownViewInfoListBuilder.setActivityTabProvider(activityTabProvider);
             mTabObserver = new ActivityTabTabObserver(activityTabProvider) {
                 @Override
-                public void onPageLoadFinished(Tab tab, String url) {
+                public void onPageLoadFinished(Tab tab, GURL url) {
                     maybeTriggerCacheRefresh(url);
                 }
 
                 @Override
                 protected void onObservingDifferentTab(Tab tab, boolean hint) {
                     if (tab == null) return;
-                    maybeTriggerCacheRefresh(tab.getUrlString());
+                    maybeTriggerCacheRefresh(tab.getUrl());
                 }
 
                 /**
@@ -197,9 +197,9 @@
                  * Avoid issuing multiple concurrent server requests for the same event to
                  * reduce server pressure.
                  */
-                private void maybeTriggerCacheRefresh(String url) {
+                private void maybeTriggerCacheRefresh(GURL url) {
                     if (url == null) return;
-                    if (!UrlConstants.NTP_URL.equals(url)) return;
+                    if (!UrlUtilities.isNTPUrl(url)) return;
                     AutocompleteControllerJni.get().prefetchZeroSuggestResults();
                 }
             };
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/survey/ChromeSurveyController.java b/chrome/android/java/src/org/chromium/chrome/browser/survey/ChromeSurveyController.java
index af3ae53..4e4de03 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/survey/ChromeSurveyController.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/survey/ChromeSurveyController.java
@@ -38,6 +38,7 @@
 import org.chromium.components.infobars.InfoBarAnimationListener;
 import org.chromium.components.infobars.InfoBarUiItem;
 import org.chromium.components.variations.VariationsAssociatedData;
+import org.chromium.url.GURL;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -229,7 +230,7 @@
             }
 
             @Override
-            public void onPageLoadFinished(Tab tab, String url) {
+            public void onPageLoadFinished(Tab tab, GURL url) {
                 showInfoBarIfApplicable(tab, siteId, this);
             }
 
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java
index 8d11a42b..2a9e20b 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java
@@ -573,6 +573,15 @@
                 mNativeProfileSyncServiceAndroid, ProfileSyncService.this, keyRetrievalTrigger);
     }
 
+    /**
+     * @return Whether sync is enabled to sync urls or open tabs with a non custom passphrase.
+     */
+    public boolean isSyncingUrlsWithKeystorePassphrase() {
+        return isEngineInitialized() && getPreferredDataTypes().contains(ModelType.TYPED_URLS)
+                && (getPassphraseType() == PassphraseType.KEYSTORE_PASSPHRASE
+                        || getPassphraseType() == PassphraseType.TRUSTED_VAULT_PASSPHRASE);
+    }
+
     @VisibleForTesting
     public long getNativeProfileSyncServiceForTest() {
         return ProfileSyncServiceJni.get().getProfileSyncServiceForTest(
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/SyncController.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/SyncController.java
index 3877084..4f17a33 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/SyncController.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/SyncController.java
@@ -15,8 +15,6 @@
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.uid.UniqueIdentificationGenerator;
 import org.chromium.chrome.browser.uid.UniqueIdentificationGeneratorFactory;
-import org.chromium.components.sync.ModelType;
-import org.chromium.components.sync.PassphraseType;
 import org.chromium.components.sync.StopSource;
 
 /**
@@ -164,11 +162,7 @@
      * @return Whether sync is enabled to sync urls or open tabs with a non custom passphrase.
      */
     public boolean isSyncingUrlsWithKeystorePassphrase() {
-        return mProfileSyncService.isEngineInitialized()
-                && mProfileSyncService.getPreferredDataTypes().contains(ModelType.TYPED_URLS)
-                && (mProfileSyncService.getPassphraseType() == PassphraseType.KEYSTORE_PASSPHRASE
-                        || mProfileSyncService.getPassphraseType()
-                                == PassphraseType.TRUSTED_VAULT_PASSPHRASE);
+        return mProfileSyncService.isSyncingUrlsWithKeystorePassphrase();
     }
 
     /**
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/SadTab.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/SadTab.java
index fb4366f..372d37bd 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/tab/SadTab.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/SadTab.java
@@ -29,6 +29,7 @@
 import org.chromium.ui.text.SpanApplier;
 import org.chromium.ui.text.SpanApplier.SpanInfo;
 import org.chromium.ui.widget.ChromeBulletSpan;
+import org.chromium.url.GURL;
 
 /**
  * Represent the sad tab displayed in place of a crashed renderer. Instantiated on the first
@@ -139,12 +140,12 @@
     }
 
     @Override
-    public void onPageLoadStarted(Tab tab, String url) {
+    public void onPageLoadStarted(Tab tab, GURL url) {
         removeIfPresent();
     }
 
     @Override
-    public void onPageLoadFinished(Tab tab, String url) {
+    public void onPageLoadFinished(Tab tab, GURL url) {
         // Reset the succressiveRefresh counter after successfully loading a page.
         mSadTabSuccessiveRefreshCounter = 0;
         removeIfPresent();
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java
index a4e215b..de128ed 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java
@@ -43,6 +43,7 @@
 import org.chromium.content_public.common.Referrer;
 import org.chromium.ui.base.Clipboard;
 import org.chromium.ui.base.PageTransition;
+import org.chromium.url.GURL;
 import org.chromium.url.URI;
 
 import java.util.Locale;
@@ -74,7 +75,7 @@
 
         mDataReductionProxyContextMenuTabObserver = new EmptyTabObserver() {
             @Override
-            public void onPageLoadStarted(Tab tab, String url) {
+            public void onPageLoadStarted(Tab tab, GURL url) {
                 mLoadOriginalImageRequestedForPageLoad = false;
             }
         };
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.java
index 6bf3dc7..952439b 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.java
@@ -530,7 +530,7 @@
         if (isLoading()) {
             RewindableIterator<TabObserver> observers = getTabObservers();
             while (observers.hasNext()) {
-                observers.next().onPageLoadFinished(this, getUrlString());
+                observers.next().onPageLoadFinished(this, getUrl());
             }
         }
         if (getWebContents() != null) getWebContents().stop();
@@ -996,7 +996,7 @@
         updateTitle();
         if (mIsRendererUnresponsive) handleRendererResponsiveStateChanged(true);
         for (TabObserver observer : mObservers) {
-            observer.onPageLoadStarted(this, validatedUrl.getSpec());
+            observer.onPageLoadStarted(this, validatedUrl);
         }
     }
 
@@ -1004,7 +1004,7 @@
      * Called when a page has finished loading.
      * @param url URL that was loaded.
      */
-    void didFinishPageLoad(String url) {
+    void didFinishPageLoad(GURL url) {
         mIsTabStateDirty = true;
         updateTitle();
 
@@ -1243,7 +1243,7 @@
             didStartPageLoad(getUrl());
 
             // Simulate the PAGE_LOAD_FINISHED notification that we did not get.
-            if (didFinishLoad) didFinishPageLoad(getUrlString());
+            if (didFinishLoad) didFinishPageLoad(getUrl());
         }
 
         for (TabObserver observer : mObservers) {
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabStateBrowserControlsVisibilityDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabStateBrowserControlsVisibilityDelegate.java
index 1d9f49c7..4254678 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabStateBrowserControlsVisibilityDelegate.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabStateBrowserControlsVisibilityDelegate.java
@@ -23,6 +23,7 @@
 import org.chromium.content_public.browser.SelectionPopupController;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.ui.base.WindowAndroid;
+import org.chromium.url.GURL;
 
 /**
  * Determines the desired visibility of the browser controls based on the current state of a given
@@ -103,13 +104,13 @@
             }
 
             @Override
-            public void onPageLoadStarted(Tab tab, String url) {
+            public void onPageLoadStarted(Tab tab, GURL url) {
                 mHandler.removeMessages(MSG_ID_ENABLE_FULLSCREEN_AFTER_LOAD);
                 updateWaitingForLoad(!DomDistillerUrlUtils.isDistilledPage(url));
             }
 
             @Override
-            public void onPageLoadFinished(Tab tab, String url) {
+            public void onPageLoadFinished(Tab tab, GURL url) {
                 // Handle the case where a commit or prerender swap notification failed to arrive
                 // and the enable fullscreen message was never enqueued.
                 scheduleEnableFullscreenLoadDelayIfNecessary();
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabUma.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabUma.java
index 2b20a39..46acb35 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabUma.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabUma.java
@@ -12,6 +12,7 @@
 import org.chromium.chrome.browser.tab.state.CriticalPersistedTabData;
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
 import org.chromium.net.NetError;
+import org.chromium.url.GURL;
 
 /**
  * Centralizes UMA data collection for Tab management.
@@ -260,7 +261,7 @@
 
     /** Called when the corresponding tab completes a page load. */
     @Override
-    public void onPageLoadFinished(Tab tab, String url) {
+    public void onPageLoadFinished(Tab tab, GURL url) {
         // Record only tab restores that the user became aware of. If the restore is triggered
         // speculatively and completes before the user switches to the tab, then this case is
         // reflected in Tab.StatusWhenSwitchedBackToForeground metric.
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabWebContentsObserver.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabWebContentsObserver.java
index 30a792f..ab8dfb3 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabWebContentsObserver.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabWebContentsObserver.java
@@ -230,7 +230,7 @@
             if (mTab.getNativePage() != null) {
                 mTab.pushNativePageStateToNavigationEntry();
             }
-            if (isMainFrame) mTab.didFinishPageLoad(url.getSpec());
+            if (isMainFrame) mTab.didFinishPageLoad(url);
             PolicyAuditor auditor = AppHooks.get().getPolicyAuditor();
             auditor.notifyAuditEvent(ContextUtils.getApplicationContext(),
                     AuditEvent.OPEN_URL_SUCCESS, url.getSpec(), "");
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorImpl.java
index aeab78b..82ad191 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorImpl.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorImpl.java
@@ -22,6 +22,7 @@
 import org.chromium.chrome.browser.tabmodel.NextTabPolicy.NextTabPolicySupplier;
 import org.chromium.chrome.browser.tabmodel.TabPersistentStore.TabPersistentStoreObserver;
 import org.chromium.ui.base.WindowAndroid;
+import org.chromium.url.GURL;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -183,13 +184,13 @@
             }
 
             @Override
-            public void onPageLoadStarted(Tab tab, String url) {
+            public void onPageLoadStarted(Tab tab, GURL url) {
                 String previousUrl = tab.getUrlString();
                 mTabContentManager.invalidateTabThumbnail(tab.getId(), previousUrl);
             }
 
             @Override
-            public void onPageLoadFinished(Tab tab, String url) {
+            public void onPageLoadFinished(Tab tab, GURL url) {
                 tab.getId();
             }
 
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarButtonInProductHelpController.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarButtonInProductHelpController.java
index 646b551..08e8fd1f 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarButtonInProductHelpController.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarButtonInProductHelpController.java
@@ -42,6 +42,7 @@
 import org.chromium.components.feature_engagement.FeatureConstants;
 import org.chromium.components.feature_engagement.Tracker;
 import org.chromium.content_public.browser.UiThreadTaskTraits;
+import org.chromium.url.GURL;
 
 /**
  * A helper class for IPH shown on the toolbar.
@@ -84,13 +85,13 @@
             private long mDataSavedOnStartPageLoad;
 
             @Override
-            public void onPageLoadStarted(Tab tab, String url) {
+            public void onPageLoadStarted(Tab tab, GURL url) {
                 mDataSavedOnStartPageLoad = DataReductionProxySettings.getInstance()
                                                     .getContentLengthSavedInHistorySummary();
             }
 
             @Override
-            public void onPageLoadFinished(Tab tab, String url) {
+            public void onPageLoadFinished(Tab tab, GURL url) {
                 if (tab.isShowingErrorPage()) {
                     handleIPHForErrorPageShown(tab);
                     return;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/HomeButtonCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/HomeButtonCoordinator.java
index e57ec01..50a92d4 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/HomeButtonCoordinator.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/HomeButtonCoordinator.java
@@ -28,6 +28,7 @@
 import org.chromium.components.embedder_support.util.UrlUtilities;
 import org.chromium.components.feature_engagement.FeatureConstants;
 import org.chromium.components.feature_engagement.Tracker;
+import org.chromium.url.GURL;
 
 /**
  * Root component for the home button on the toolbar. Intended to own the {@link HomeButton}, but
@@ -81,7 +82,7 @@
         mIsHomepageNonNtpSupplier = isHomepageNonNtpSupplier;
         mPageLoadObserver = new CurrentTabObserver(tabSupplier, new EmptyTabObserver() {
             @Override
-            public void onPageLoadFinished(Tab tab, String url) {
+            public void onPageLoadFinished(Tab tab, GURL url) {
                 handlePageLoadFinished(url);
             }
         });
@@ -99,7 +100,7 @@
      * @param url The URL of the current page that was just loaded.
      */
     @VisibleForTesting
-    void handlePageLoadFinished(String url) {
+    void handlePageLoadFinished(GURL url) {
         if (mHomeButton == null || !mHomeButton.isShown()) return;
         if (mIsIncognitoSupplier.getAsBoolean()) return;
         if (UrlUtilities.isNTPUrl(url)) return;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToggleTabStackButtonCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToggleTabStackButtonCoordinator.java
index 240745d..e6e985f 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToggleTabStackButtonCoordinator.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToggleTabStackButtonCoordinator.java
@@ -26,6 +26,7 @@
 import org.chromium.chrome.browser.user_education.UserEducationHelper;
 import org.chromium.components.feature_engagement.FeatureConstants;
 import org.chromium.components.feature_engagement.Tracker;
+import org.chromium.url.GURL;
 
 /**
  * Root component for the tab switcher button on the toolbar. Intended to own the
@@ -91,7 +92,7 @@
                 mCallbackController.makeCancelable(this::setLayoutStateProvider));
         mPageLoadObserver = new CurrentTabObserver(activityTabSupplier, new EmptyTabObserver() {
             @Override
-            public void onPageLoadFinished(Tab tab, String url) {
+            public void onPageLoadFinished(Tab tab, GURL url) {
                 handlePageLoadFinished();
             }
         });
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/BottomSheetManager.java b/chrome/android/java/src/org/chromium/chrome/browser/ui/BottomSheetManager.java
index c7b256a..dde323e 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ui/BottomSheetManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/BottomSheetManager.java
@@ -39,6 +39,7 @@
 import org.chromium.ui.modaldialog.ModalDialogManager;
 import org.chromium.ui.util.TokenHolder;
 import org.chromium.ui.vr.VrModeObserver;
+import org.chromium.url.GURL;
 
 /**
  * A class that manages activity-specific interactions with the BottomSheet component that it
@@ -154,7 +155,7 @@
         //                sheet is actually used.
         mTabObserver = new EmptyTabObserver() {
             @Override
-            public void onPageLoadStarted(Tab tab, String url) {
+            public void onPageLoadStarted(Tab tab, GURL url) {
                 controller.clearRequestsAndHide();
             }
 
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/NavigateTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/NavigateTest.java
index c753626..b77188a 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/NavigateTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/NavigateTest.java
@@ -54,6 +54,7 @@
 import org.chromium.net.test.ServerCertificate;
 import org.chromium.net.test.util.TestWebServer;
 import org.chromium.ui.test.util.UiRestriction;
+import org.chromium.url.GURL;
 import org.chromium.url.Origin;
 
 import java.net.URL;
@@ -347,10 +348,10 @@
 
         TabObserver onPageLoadStartedObserver = new EmptyTabObserver() {
             @Override
-            public void onPageLoadStarted(Tab tab, String newUrl) {
+            public void onPageLoadStarted(Tab tab, GURL newUrl) {
                 tab.removeObserver(this);
                 Assert.assertEquals(url1, ChromeTabUtils.getUrlStringOnUiThread(tab));
-                Assert.assertEquals(url2, newUrl);
+                Assert.assertEquals(url2, newUrl.getSpec());
             }
         };
         Tab tab = mActivityTestRule.getActivity().getActivityTab();
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/PopularUrlsTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/PopularUrlsTest.java
index a7c81c7..0bd789c 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/PopularUrlsTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/PopularUrlsTest.java
@@ -26,6 +26,7 @@
 import org.chromium.chrome.test.ChromeTabbedActivityTestRule;
 import org.chromium.content_public.browser.LoadUrlParams;
 import org.chromium.ui.base.PageTransition;
+import org.chromium.url.GURL;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -236,7 +237,7 @@
 
         tab.addObserver(new EmptyTabObserver() {
             @Override
-            public void onPageLoadFinished(Tab tab, String url) {
+            public void onPageLoadFinished(Tab tab, GURL url) {
                 loadedCallback.notifyCalled();
             }
 
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/TabsTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/TabsTest.java
index 1cc638b0..a5918444 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/TabsTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/TabsTest.java
@@ -96,6 +96,7 @@
 import org.chromium.ui.modaldialog.ModalDialogProperties;
 import org.chromium.ui.modelutil.PropertyModel;
 import org.chromium.ui.test.util.UiRestriction;
+import org.chromium.url.GURL;
 
 import java.io.File;
 import java.util.Locale;
@@ -1845,7 +1846,7 @@
                     pageLoadedCallbacks[index] = pageLoadCallback;
                     currentTab.addObserver(new EmptyTabObserver() {
                         @Override
-                        public void onPageLoadFinished(Tab tab, String url) {
+                        public void onPageLoadFinished(Tab tab, GURL url) {
                             pageLoadCallback.notifyCalled();
                             tab.removeObserver(this);
                         }
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkPersonalizedSigninPromoTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkPersonalizedSigninPromoTest.java
index 5860865..24a11483 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkPersonalizedSigninPromoTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkPersonalizedSigninPromoTest.java
@@ -25,17 +25,20 @@
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.RuleChain;
 import org.junit.runner.RunWith;
 
+import org.chromium.base.test.util.Batch;
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.flags.ChromeSwitches;
 import org.chromium.chrome.browser.signin.SigninActivityLauncherImpl;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.chrome.test.ChromeTabbedActivityTestRule;
+import org.chromium.chrome.test.batch.BlankCTATabInitialStateRule;
 import org.chromium.chrome.test.util.BookmarkTestRule;
 import org.chromium.chrome.test.util.browser.signin.AccountManagerTestRule;
 import org.chromium.components.signin.base.CoreAccountInfo;
@@ -46,15 +49,20 @@
  */
 @RunWith(ChromeJUnit4ClassRunner.class)
 @CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE})
+@Batch(Batch.PER_CLASS)
 public class BookmarkPersonalizedSigninPromoTest {
     private final AccountManagerTestRule mAccountManagerTestRule = new AccountManagerTestRule();
 
     private final BookmarkTestRule mBookmarkTestRule = new BookmarkTestRule();
 
-    @Rule
-    public final ChromeTabbedActivityTestRule mActivityTestRule =
+    @ClassRule
+    public static final ChromeTabbedActivityTestRule sActivityTestRule =
             new ChromeTabbedActivityTestRule();
 
+    @Rule
+    public final BlankCTATabInitialStateRule mInitialStateRule =
+            new BlankCTATabInitialStateRule(sActivityTestRule, false);
+
     // As bookmarks need the fake AccountManagerFacade in AccountManagerTestRule,
     // BookmarkTestRule should be initialized after and destroyed before the
     // AccountManagerTestRule.
@@ -67,7 +75,6 @@
 
     @Before
     public void setUp() {
-        mActivityTestRule.startMainActivityOnBlankPage();
         BookmarkPromoHeader.forcePromoStateForTests(
                 BookmarkPromoHeader.PromoState.PROMO_SIGNIN_PERSONALIZED);
         SigninActivityLauncherImpl.setLauncherForTest(mMockSigninActivityLauncherImpl);
@@ -123,7 +130,7 @@
     }
 
     private void showBookmarkManagerAndCheckSigninPromoIsDisplayed() {
-        mBookmarkTestRule.showBookmarkManager(mActivityTestRule.getActivity());
+        mBookmarkTestRule.showBookmarkManager(sActivityTestRule.getActivity());
         onView(withId(R.id.signin_promo_view_container)).check(matches(isDisplayed()));
     }
 }
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java
index ed3a40b..781e8042 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java
@@ -147,6 +147,7 @@
 import org.chromium.ui.mojom.WindowOpenDisposition;
 import org.chromium.ui.test.util.UiRestriction;
 import org.chromium.ui.util.ColorUtils;
+import org.chromium.url.GURL;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -1070,7 +1071,7 @@
         final CallbackHelper pageLoadFinishedHelper = new CallbackHelper();
         tab.addObserver(new EmptyTabObserver() {
             @Override
-            public void onPageLoadFinished(Tab tab, String url) {
+            public void onPageLoadFinished(Tab tab, GURL url) {
                 pageLoadFinishedHelper.notifyCalled();
             }
         });
@@ -1142,7 +1143,7 @@
             }
 
             @Override
-            public void onPageLoadFinished(Tab tab, String url) {
+            public void onPageLoadFinished(Tab tab, GURL url) {
                 pageLoadFinishedHelper.notifyCalled();
             }
         });
@@ -1182,7 +1183,7 @@
             }
 
             @Override
-            public void onPageLoadFinished(Tab tab, String url) {
+            public void onPageLoadFinished(Tab tab, GURL url) {
                 pageLoadFinishedHelper.notifyCalled();
             }
         });
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabDeferredStartupTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabDeferredStartupTest.java
index e5b3f7b9..b063b35 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabDeferredStartupTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabDeferredStartupTest.java
@@ -39,6 +39,7 @@
 import org.chromium.chrome.test.ChromeActivityTestRule;
 import org.chromium.chrome.test.ChromeJUnit4RunnerDelegate;
 import org.chromium.chrome.test.util.browser.Features.DisableFeatures;
+import org.chromium.url.GURL;
 
 import java.util.Arrays;
 import java.util.List;
@@ -55,7 +56,7 @@
         private boolean mIsPageLoadFinished;
 
         @Override
-        public void onPageLoadFinished(Tab tab, String url) {
+        public void onPageLoadFinished(Tab tab, GURL url) {
             mIsPageLoadFinished = true;
         }
 
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/externalnav/UrlOverridingTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/externalnav/UrlOverridingTest.java
index 815649f..53599d74 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/externalnav/UrlOverridingTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/externalnav/UrlOverridingTest.java
@@ -56,6 +56,7 @@
 import org.chromium.content_public.browser.test.util.TouchCommon;
 import org.chromium.net.test.EmbeddedTestServer;
 import org.chromium.ui.base.PageTransition;
+import org.chromium.url.GURL;
 
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
@@ -125,7 +126,7 @@
         }
 
         @Override
-        public void onPageLoadFinished(Tab tab, String url) {
+        public void onPageLoadFinished(Tab tab, GURL url) {
             mFinishCallback.notifyCalled();
         }
 
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/ntp/NewTabPageTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/ntp/NewTabPageTest.java
index d6c314c..765500c 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/ntp/NewTabPageTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/ntp/NewTabPageTest.java
@@ -78,6 +78,7 @@
 import org.chromium.net.test.util.TestWebServer;
 import org.chromium.ui.base.PageTransition;
 import org.chromium.ui.test.util.UiDisableIf;
+import org.chromium.url.GURL;
 
 import java.io.IOException;
 import java.lang.ref.WeakReference;
@@ -200,6 +201,7 @@
     @SmallTest
     @Feature({"NewTabPage", "FeedNewTabPage", "RenderTest"})
     @Features.EnableFeatures(ChromeFeatureList.MOBILE_IDENTITY_CONSISTENCY)
+    @FlakyTest(message = "https://crbug.com/1155107")
     public void testRender_SignInPromoWithAccount() throws Exception {
         mAccountManagerTestRule.addAccount(mAccountManagerTestRule.createProfileDataFromName(
                 AccountManagerTestRule.TEST_ACCOUNT_EMAIL));
@@ -417,7 +419,7 @@
             final CallbackHelper loadedCallback = new CallbackHelper();
             mTab.addObserver(new EmptyTabObserver() {
                 @Override
-                public void onPageLoadFinished(Tab tab, String url) {
+                public void onPageLoadFinished(Tab tab, GURL url) {
                     loadedCallback.notifyCalled();
                     tab.removeObserver(this);
                 }
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/page_info/PageInfoViewTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/page_info/PageInfoViewTest.java
index 634acb25..4d6c56b 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/page_info/PageInfoViewTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/page_info/PageInfoViewTest.java
@@ -358,6 +358,9 @@
         mActivityTestRule.startMainActivityOnBlankPage();
         loadUrlAndOpenPageInfo(mTestServerRule.getServer().getURL(sSimpleHtml));
         onView(withId(R.id.page_info_connection_row)).perform(click());
+        onViewWaiting(
+                allOf(withText(containsString("Test Root CA issued this website's certificate.")),
+                        isDisplayed()));
         mRenderTestRule.render(getPageInfoView(), "PageInfo_ConnectionInfoSubpage");
     }
 
@@ -373,6 +376,7 @@
         addSomePermissions(mTestServerRule.getServer().getURL("/"));
         loadUrlAndOpenPageInfo(mTestServerRule.getServer().getURL(sSimpleHtml));
         onView(withId(R.id.page_info_permissions_row)).perform(click());
+        onViewWaiting(allOf(withText("Control this site's access to your device"), isDisplayed()));
         mRenderTestRule.render(getPageInfoView(), "PageInfo_PermissionsSubpage");
     }
 
@@ -383,12 +387,13 @@
     @MediumTest
     @Feature({"RenderTest"})
     @Features.EnableFeatures(PageInfoFeatureList.PAGE_INFO_V2)
-    @FlakyTest(message = "https://crbug.com/1156285")
     public void testShowCookiesSubpage() throws IOException {
         mActivityTestRule.startMainActivityOnBlankPage();
         setThirdPartyCookieBlocking(CookieControlsMode.BLOCK_THIRD_PARTY);
         loadUrlAndOpenPageInfo(mTestServerRule.getServer().getURL(sSimpleHtml));
         onView(withId(R.id.page_info_cookies_row)).perform(click());
+        onViewWaiting(allOf(
+                withText(containsString("Cookies and other site data are used")), isDisplayed()));
         mRenderTestRule.render(getPageInfoView(), "PageInfo_CookiesSubpage");
     }
 
@@ -402,7 +407,6 @@
     public void testNoPermissionsSubpage() throws IOException {
         mActivityTestRule.startMainActivityOnBlankPage();
         loadUrlAndOpenPageInfo(mTestServerRule.getServer().getURL(sSimpleHtml));
-        View dialog = (View) getPageInfoView().getParent();
         onView(withId(R.id.page_info_permissions_row))
                 .check(matches(withEffectiveVisibility(GONE)));
     }
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/toolbar/ToolbarDataProviderTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/toolbar/ToolbarDataProviderTest.java
index 7013dbf..e70191b 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/toolbar/ToolbarDataProviderTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/toolbar/ToolbarDataProviderTest.java
@@ -21,6 +21,7 @@
 
 import org.chromium.base.test.util.Batch;
 import org.chromium.base.test.util.CommandLineFlags;
+import org.chromium.base.test.util.FlakyTest;
 import org.chromium.base.test.util.Restriction;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.customtabs.CustomTabsTestUtils;
@@ -87,6 +88,7 @@
 
     @Test
     @MediumTest
+    @FlakyTest(message = "https://crbug.com/1154445")
     public void testNonPrimaryOTRProfileUsedForIncognitoCCT() throws TimeoutException {
         Intent intent = CustomTabsTestUtils.createMinimalIncognitoCustomTabIntent(
                 InstrumentationRegistry.getContext(), "about:blank");
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheetControllerTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheetControllerTest.java
index d8ca18af..ba90f46 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheetControllerTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheetControllerTest.java
@@ -49,6 +49,7 @@
 import org.chromium.content_public.browser.LoadUrlParams;
 import org.chromium.content_public.browser.test.util.TestThreadUtils;
 import org.chromium.ui.test.util.UiRestriction;
+import org.chromium.url.GURL;
 
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeoutException;
@@ -352,7 +353,7 @@
         Tab tab = mActivity.getActivityTab();
         tab.addObserver(new EmptyTabObserver() {
             @Override
-            public void onPageLoadStarted(Tab tab, String url) {
+            public void onPageLoadStarted(Tab tab, GURL url) {
                 pageLoadStartedHelper.notifyCalled();
             }
         });
diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/compositor/layouts/StaticLayoutUnitTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/compositor/layouts/StaticLayoutUnitTest.java
index 566be21d..544be2f 100644
--- a/chrome/android/junit/src/org/chromium/chrome/browser/compositor/layouts/StaticLayoutUnitTest.java
+++ b/chrome/android/junit/src/org/chromium/chrome/browser/compositor/layouts/StaticLayoutUnitTest.java
@@ -51,6 +51,7 @@
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.ui.modelutil.PropertyModel;
+import org.chromium.url.JUnitTestGURLs;
 
 import java.util.Arrays;
 import java.util.LinkedList;
@@ -65,8 +66,8 @@
     private static final int TAB2_ID = 789;
     private static final int POSITION1 = 0;
     private static final int POSITION2 = 1;
-    private static final String TAB1_URL = "https://tab1.com";
-    private static final String TAB2_URL = "https://tab2.com";
+    private static final String TAB1_URL = JUnitTestGURLs.URL_1;
+    private static final String TAB2_URL = JUnitTestGURLs.URL_2;
 
     private static final int BACKGROUND_COLOR = Color.WHITE;
     private static final int TOOLBAR_BACKGROUND_COLOR = Color.BLUE;
@@ -290,7 +291,8 @@
         assertEquals(0.0f, mModel.get(LayoutTab.SATURATION), 0);
 
         // Index 1 is the TabObserver for mTab2.
-        mTabObserverCaptor.getAllValues().get(1).onPageLoadFinished(mTab2, TAB2_URL);
+        mTabObserverCaptor.getAllValues().get(1).onPageLoadFinished(
+                mTab2, JUnitTestGURLs.getGURL(TAB2_URL));
 
         assertFalse(mModel.get(LayoutTab.SHOULD_STALL));
         assertEquals(0.0f, mModel.get(LayoutTab.STATIC_TO_VIEW_BLEND), 0);
diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/customtabs/content/CustomTabActivityContentTestEnvironment.java b/chrome/android/junit/src/org/chromium/chrome/browser/customtabs/content/CustomTabActivityContentTestEnvironment.java
index ea207d2..84b7f5a 100644
--- a/chrome/android/junit/src/org/chromium/chrome/browser/customtabs/content/CustomTabActivityContentTestEnvironment.java
+++ b/chrome/android/junit/src/org/chromium/chrome/browser/customtabs/content/CustomTabActivityContentTestEnvironment.java
@@ -59,15 +59,17 @@
 import org.chromium.content_public.browser.LoadUrlParams;
 import org.chromium.content_public.browser.NavigationController;
 import org.chromium.content_public.browser.WebContents;
+import org.chromium.url.GURL;
+import org.chromium.url.JUnitTestGURLs;
 
 /**
  * A TestRule that sets up the mocks and contains helper methods for JUnit/Robolectric tests scoped
  * to the content layer of Custom Tabs code.
  */
 public class CustomTabActivityContentTestEnvironment extends TestWatcher {
-    public static final String INITIAL_URL = "https://initial.com";
-    public static final String SPECULATED_URL = "https://speculated.com";
-    public static final String OTHER_URL = "https://other.com";
+    public static final String INITIAL_URL = JUnitTestGURLs.INITIAL_URL;
+    public static final String SPECULATED_URL = JUnitTestGURLs.SPECULATED_URL;
+    public static final String OTHER_URL = JUnitTestGURLs.EXAMPLE_URL;
 
     public final Intent intent = new Intent();
 
@@ -172,9 +174,14 @@
 
     public CustomTabIntentHandler createIntentHandler(
             CustomTabActivityNavigationController navigationController) {
-        CustomTabIntentHandlingStrategy strategy = new DefaultCustomTabIntentHandlingStrategy(
-                tabProvider, navigationController, navigationEventObserver,
-                () -> customTabObserver);
+        CustomTabIntentHandlingStrategy strategy =
+                new DefaultCustomTabIntentHandlingStrategy(tabProvider, navigationController,
+                        navigationEventObserver, () -> customTabObserver) {
+                    @Override
+                    public GURL getGurlForUrl(String url) {
+                        return JUnitTestGURLs.getGURL(url);
+                    }
+                };
         return new CustomTabIntentHandler(tabProvider,
                 intentDataProvider, strategy, (intent) -> false, activity);
     }
diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/offlinepages/OfflinePageTabObserverTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/offlinepages/OfflinePageTabObserverTest.java
index 63c153f7..4261a01 100644
--- a/chrome/android/junit/src/org/chromium/chrome/browser/offlinepages/OfflinePageTabObserverTest.java
+++ b/chrome/android/junit/src/org/chromium/chrome/browser/offlinepages/OfflinePageTabObserverTest.java
@@ -38,6 +38,8 @@
 import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
 import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager.SnackbarController;
 import org.chromium.ui.base.WindowAndroid;
+import org.chromium.url.GURL;
+import org.chromium.url.JUnitTestGURLs;
 
 import java.lang.ref.WeakReference;
 
@@ -49,8 +51,7 @@
 public class OfflinePageTabObserverTest {
     // Using a null tab, as it cannot be mocked. TabHelper will help return proper mocked responses.
     private static final int TAB_ID = 77;
-    private static final String TAB_URL = "mock.com";
-
+    private static final GURL TAB_URL = JUnitTestGURLs.getGURL(JUnitTestGURLs.EXAMPLE_URL);
     @Mock
     private ChromeActivity mActivity;
     @Mock
@@ -87,7 +88,7 @@
         // Setting up a mock tab. These are the values common to most tests, but individual
         // tests might easily overwrite them.
         doReturn(TAB_ID).when(mTab).getId();
-        doReturn(TAB_URL).when(mTab).getUrlString();
+        doReturn(TAB_URL).when(mTab).getUrl();
         doReturn(false).when(mTab).isFrozen();
         doReturn(false).when(mTab).isHidden();
         doReturn(mWindowAndroid).when(mTab).getWindowAndroid();
diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/toolbar/top/HomeButtonCoordinatorTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/toolbar/top/HomeButtonCoordinatorTest.java
index 2716810..5841275 100644
--- a/chrome/android/junit/src/org/chromium/chrome/browser/toolbar/top/HomeButtonCoordinatorTest.java
+++ b/chrome/android/junit/src/org/chromium/chrome/browser/toolbar/top/HomeButtonCoordinatorTest.java
@@ -40,10 +40,10 @@
 import org.chromium.chrome.browser.toolbar.HomeButton;
 import org.chromium.chrome.browser.user_education.IPHCommand;
 import org.chromium.chrome.browser.user_education.UserEducationHelper;
-import org.chromium.components.embedder_support.util.UrlConstants;
-import org.chromium.components.embedder_support.util.UrlUtilities;
 import org.chromium.components.feature_engagement.FeatureConstants;
 import org.chromium.components.feature_engagement.Tracker;
+import org.chromium.url.GURL;
+import org.chromium.url.JUnitTestGURLs;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -51,13 +51,12 @@
 
 /** Unit tests for HomeButtonCoordinator. */
 @RunWith(BaseRobolectricTestRunner.class)
-@Config(shadows = {HomeButtonCoordinatorTest.ShadowUrlUtilities.class,
-                HomeButtonCoordinatorTest.ShadowHomepageManager.class,
+@Config(shadows = {HomeButtonCoordinatorTest.ShadowHomepageManager.class,
                 HomeButtonCoordinatorTest.ShadowFeedFeatures.class,
                 HomeButtonCoordinatorTest.ShadowChromeFeatureList.class})
 public class HomeButtonCoordinatorTest {
-    private static final String NTP_URL = UrlConstants.NTP_NON_NATIVE_URL;
-    private static final String NOT_NTP_URL = "http://www.foo.com/";
+    private static final GURL NTP_URL = JUnitTestGURLs.getGURL(JUnitTestGURLs.NTP_URL);
+    private static final GURL NOT_NTP_URL = JUnitTestGURLs.getGURL(JUnitTestGURLs.EXAMPLE_URL);
 
     private static final ImmutableMap<Integer, String> ID_TO_STRING_MAP = ImmutableMap.of(
             R.string.iph_ntp_with_feed_text, "feed", R.string.iph_ntp_without_feed_text, "no_feed",
@@ -67,14 +66,6 @@
     private static final IntentMetadata DEFAULT_INTENT_METADATA =
             new IntentMetadata(/*isMainIntent*/ true, /*isIntentWithEffect*/ false);
 
-    @Implements(UrlUtilities.class)
-    static class ShadowUrlUtilities {
-        @Implementation
-        public static boolean isNTPUrl(String url) {
-            return NTP_URL.equals(url);
-        }
-    }
-
     @Implements(HomepageManager.class)
     static class ShadowHomepageManager {
         static boolean sIsHomepageNonNtp;
diff --git a/chrome/app/DIR_METADATA b/chrome/app/DIR_METADATA
new file mode 100644
index 0000000..87a0c4f
--- /dev/null
+++ b/chrome/app/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "Internals>PlatformIntegration"
+}
diff --git a/chrome/app/OWNERS b/chrome/app/OWNERS
index 32f4a84..6671e0f7 100644
--- a/chrome/app/OWNERS
+++ b/chrome/app/OWNERS
@@ -1,4 +1,3 @@
-# COMPONENT: Internals>PlatformIntegration
 #
 # For .grd and .grdp changes, TBR an OWNER below. If you are not
 # a google employee then you also need to file a bug in which the
diff --git a/chrome/app/generated_resources_grd/DIR_METADATA b/chrome/app/generated_resources_grd/DIR_METADATA
new file mode 100644
index 0000000..87a0c4f
--- /dev/null
+++ b/chrome/app/generated_resources_grd/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "Internals>PlatformIntegration"
+}
diff --git a/chrome/app/generated_resources_grd/OWNERS b/chrome/app/generated_resources_grd/OWNERS
index 208d27bbd..8a38948 100644
--- a/chrome/app/generated_resources_grd/OWNERS
+++ b/chrome/app/generated_resources_grd/OWNERS
@@ -1,4 +1,3 @@
-# COMPONENT: Internals>PlatformIntegration
 #
 # Any Chromium committer can approve changes to generated_resources.grd,
 # so they are also allowed to approve the corresponding sha1 hashes
diff --git a/chrome/app/media_router_strings_grdp/DIR_METADATA b/chrome/app/media_router_strings_grdp/DIR_METADATA
new file mode 100644
index 0000000..aa4ac5f
--- /dev/null
+++ b/chrome/app/media_router_strings_grdp/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "Internals>Cast>UI"
+}
diff --git a/chrome/app/media_router_strings_grdp/OWNERS b/chrome/app/media_router_strings_grdp/OWNERS
index fda51ea..dd66178 100644
--- a/chrome/app/media_router_strings_grdp/OWNERS
+++ b/chrome/app/media_router_strings_grdp/OWNERS
@@ -1,3 +1 @@
 file://chrome/browser/media/router/OWNERS
-
-# COMPONENT: Internals>Cast>UI
diff --git a/chrome/app/nearby_share_strings_grdp/DIR_METADATA b/chrome/app/nearby_share_strings_grdp/DIR_METADATA
new file mode 100644
index 0000000..ac713319
--- /dev/null
+++ b/chrome/app/nearby_share_strings_grdp/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "UI>Browser>Sharing>Nearby"
+}
diff --git a/chrome/app/nearby_share_strings_grdp/OWNERS b/chrome/app/nearby_share_strings_grdp/OWNERS
index 72feb28..46b5a73 100644
--- a/chrome/app/nearby_share_strings_grdp/OWNERS
+++ b/chrome/app/nearby_share_strings_grdp/OWNERS
@@ -1,3 +1 @@
 file://chrome/browser/nearby_sharing/OWNERS
-
-# COMPONENT: UI>Browser>Sharing>Nearby
diff --git a/chrome/app/printing_strings_grdp/DIR_METADATA b/chrome/app/printing_strings_grdp/DIR_METADATA
new file mode 100644
index 0000000..d446a59
--- /dev/null
+++ b/chrome/app/printing_strings_grdp/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "Internals>Printing"
+}
diff --git a/chrome/app/printing_strings_grdp/OWNERS b/chrome/app/printing_strings_grdp/OWNERS
index 01ea38e..9b08c66 100644
--- a/chrome/app/printing_strings_grdp/OWNERS
+++ b/chrome/app/printing_strings_grdp/OWNERS
@@ -1,2 +1 @@
 file://printing/OWNERS
-# COMPONENT: Internals>Printing
diff --git a/chrome/app/sharesheet_strings_grdp/DIR_METADATA b/chrome/app/sharesheet_strings_grdp/DIR_METADATA
new file mode 100644
index 0000000..03315ae5
--- /dev/null
+++ b/chrome/app/sharesheet_strings_grdp/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "Platform>Apps>Foundation"
+}
diff --git a/chrome/app/sharesheet_strings_grdp/OWNERS b/chrome/app/sharesheet_strings_grdp/OWNERS
index dd8fc87..d1aabab 100644
--- a/chrome/app/sharesheet_strings_grdp/OWNERS
+++ b/chrome/app/sharesheet_strings_grdp/OWNERS
@@ -1,3 +1 @@
 file://chrome/browser/sharesheet/OWNERS
-
-# COMPONENT: Platform>Apps>Foundation
diff --git a/chrome/app/vector_icons/webauthn/DIR_METADATA b/chrome/app/vector_icons/webauthn/DIR_METADATA
new file mode 100644
index 0000000..5f27205
--- /dev/null
+++ b/chrome/app/vector_icons/webauthn/DIR_METADATA
@@ -0,0 +1 @@
+team_email:  "identity-dev@chromium.org"
diff --git a/chrome/app/vector_icons/webauthn/OWNERS b/chrome/app/vector_icons/webauthn/OWNERS
index 35ab472..10f503c 100644
--- a/chrome/app/vector_icons/webauthn/OWNERS
+++ b/chrome/app/vector_icons/webauthn/OWNERS
@@ -1,4 +1,3 @@
 file://device/fido/OWNERS
 
 # Component: Blink>WebAuthentication
-# TEAM: identity-dev@chromium.org
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 40b4701..b564df8 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -599,17 +599,6 @@
     "infobars/infobar_service.cc",
     "infobars/infobar_service.h",
     "installable/installable_ambient_badge_infobar_delegate.h",
-    "installable/installable_data.cc",
-    "installable/installable_data.h",
-    "installable/installable_logging.cc",
-    "installable/installable_logging.h",
-    "installable/installable_manager.cc",
-    "installable/installable_manager.h",
-    "installable/installable_metrics.cc",
-    "installable/installable_metrics.h",
-    "installable/installable_params.h",
-    "installable/installable_task_queue.cc",
-    "installable/installable_task_queue.h",
     "installable/installable_utils.cc",
     "installable/installable_utils.h",
     "internal_auth.cc",
@@ -1408,8 +1397,6 @@
     "previews/previews_ui_tab_helper.h",
     "previews/resource_loading_hints/resource_loading_hints_web_contents_observer.cc",
     "previews/resource_loading_hints/resource_loading_hints_web_contents_observer.h",
-    "privacy_sandbox/privacy_sandbox_prefs.cc",
-    "privacy_sandbox/privacy_sandbox_prefs.h",
     "privacy_sandbox/privacy_sandbox_settings.cc",
     "privacy_sandbox/privacy_sandbox_settings.h",
     "privacy_sandbox/privacy_sandbox_settings_factory.cc",
@@ -2153,6 +2140,7 @@
     "//components/previews/content",
     "//components/previews/core",
     "//components/printing/browser",
+    "//components/privacy_sandbox:privacy_sandbox_prefs",
     "//components/profile_metrics",
     "//components/proxy_config",
     "//components/query_parser",
@@ -6617,8 +6605,6 @@
     "download/download_test_file_activity_observer.h",
     "history/history_test_utils.cc",
     "history/history_test_utils.h",
-    "installable/fake_installable_manager.cc",
-    "installable/fake_installable_manager.h",
     "interstitials/security_interstitial_page_test_utils.cc",
     "interstitials/security_interstitial_page_test_utils.h",
     "media/history/media_history_test_utils.cc",
diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS
index 9833ca0..082dc67 100644
--- a/chrome/browser/DEPS
+++ b/chrome/browser/DEPS
@@ -227,6 +227,7 @@
   "+components/previews/core",
   "+components/printing/browser",
   "+components/printing/common",
+  "+components/privacy_sandbox",
   "+components/profile_metrics",
   "+components/proxy_config",
   "+components/query_parser",
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 116dfa90..ce811db 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -4017,6 +4017,10 @@
      flag_descriptions::kOmniboxMostVisitedTilesName,
      flag_descriptions::kOmniboxMostVisitedTilesDescription, kOsAndroid,
      FEATURE_VALUE_TYPE(omnibox::kMostVisitedTiles)},
+    {"omnibox-native-voice-suggestions-provider",
+     flag_descriptions::kOmniboxNativeVoiceSuggestProviderName,
+     flag_descriptions::kOmniboxNativeVoiceSuggestProviderDescription,
+     kOsAndroid, FEATURE_VALUE_TYPE(omnibox::kNativeVoiceSuggestProvider)},
     {"omnibox-search-engine-logo",
      flag_descriptions::kOmniboxSearchEngineLogoName,
      flag_descriptions::kOmniboxSearchEngineLogoDescription, kOsAndroid,
diff --git a/chrome/browser/android/feed/v2/feed_stream_surface.cc b/chrome/browser/android/feed/v2/feed_stream_surface.cc
index bb12431ae..78851b5 100644
--- a/chrome/browser/android/feed/v2/feed_stream_surface.cc
+++ b/chrome/browser/android/feed/v2/feed_stream_surface.cc
@@ -258,7 +258,6 @@
 
 void FeedStreamSurface::ReportPageLoaded(JNIEnv* env,
                                          const JavaParamRef<jobject>& obj,
-                                         const JavaParamRef<jstring>& url,
                                          jboolean in_new_tab) {
   if (!feed_stream_api_)
     return;
diff --git a/chrome/browser/android/feed/v2/feed_stream_surface.h b/chrome/browser/android/feed/v2/feed_stream_surface.h
index 89583fb..55c89d18 100644
--- a/chrome/browser/android/feed/v2/feed_stream_surface.h
+++ b/chrome/browser/android/feed/v2/feed_stream_surface.h
@@ -104,7 +104,6 @@
                                const base::android::JavaParamRef<jobject>& obj);
   void ReportPageLoaded(JNIEnv* env,
                         const base::android::JavaParamRef<jobject>& obj,
-                        const base::android::JavaParamRef<jstring>& url,
                         jboolean in_new_tab);
   void ReportRemoveAction(JNIEnv* env,
                           const base::android::JavaParamRef<jobject>& obj);
diff --git a/chrome/browser/android/instantapps/instant_apps_settings.cc b/chrome/browser/android/instantapps/instant_apps_settings.cc
index b3a0cbc..905dd4a 100644
--- a/chrome/browser/android/instantapps/instant_apps_settings.cc
+++ b/chrome/browser/android/instantapps/instant_apps_settings.cc
@@ -11,7 +11,7 @@
 #include "base/values.h"
 #include "chrome/android/chrome_jni_headers/InstantAppsSettings_jni.h"
 #include "chrome/browser/banners/app_banner_settings_helper.h"
-#include "chrome/browser/installable/installable_logging.h"
+#include "components/webapps/installable/installable_logging.h"
 #include "content/public/browser/web_contents.h"
 #include "url/gurl.h"
 
diff --git a/chrome/browser/android/webapk/webapk_install_service.cc b/chrome/browser/android/webapk/webapk_install_service.cc
index df5815f..d51005e 100644
--- a/chrome/browser/android/webapk/webapk_install_service.cc
+++ b/chrome/browser/android/webapk/webapk_install_service.cc
@@ -38,14 +38,14 @@
     const webapps::ShortcutInfo& shortcut_info,
     const SkBitmap& primary_icon,
     bool is_primary_icon_maskable,
-    WebappInstallSource install_source) {
+    webapps::WebappInstallSource install_source) {
   if (IsInstallInProgress(shortcut_info.manifest_url)) {
     ShortcutHelper::ShowWebApkInstallInProgressToast();
     return;
   }
 
   installs_.insert(shortcut_info.manifest_url);
-  InstallableMetrics::TrackInstallEvent(install_source);
+  webapps::InstallableMetrics::TrackInstallEvent(install_source);
 
   ShowInstallInProgressNotification(shortcut_info, primary_icon,
                                     is_primary_icon_maskable);
diff --git a/chrome/browser/android/webapk/webapk_install_service.h b/chrome/browser/android/webapk/webapk_install_service.h
index b9213ae..4788821 100644
--- a/chrome/browser/android/webapk/webapk_install_service.h
+++ b/chrome/browser/android/webapk/webapk_install_service.h
@@ -15,8 +15,8 @@
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
-#include "chrome/browser/installable/installable_metrics.h"
 #include "components/keyed_service/core/keyed_service.h"
+#include "components/webapps/installable/installable_metrics.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "url/gurl.h"
 
@@ -74,7 +74,7 @@
                     const webapps::ShortcutInfo& shortcut_info,
                     const SkBitmap& primary_icon,
                     bool is_primary_icon_maskable,
-                    WebappInstallSource install_source);
+                    webapps::WebappInstallSource install_source);
 
   // Talks to the Chrome WebAPK server to update a WebAPK on the server and to
   // the Google Play server to install the downloaded WebAPK.
diff --git a/chrome/browser/android/webapk/webapk_update_data_fetcher.cc b/chrome/browser/android/webapk/webapk_update_data_fetcher.cc
index 38546c58..2884fbb 100644
--- a/chrome/browser/android/webapk/webapk_update_data_fetcher.cc
+++ b/chrome/browser/android/webapk/webapk_update_data_fetcher.cc
@@ -18,9 +18,9 @@
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/android/chrome_jni_headers/WebApkUpdateDataFetcher_jni.h"
 #include "chrome/browser/android/webapk/webapk_web_manifest_checker.h"
-#include "chrome/browser/installable/installable_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "components/webapps/android/webapps_icon_utils.h"
+#include "components/webapps/installable/installable_manager.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/web_contents.h"
@@ -112,7 +112,7 @@
   if (!IsInScope(url, scope_))
     return;
 
-  InstallableParams params;
+  webapps::InstallableParams params;
   params.valid_manifest = true;
   params.prefer_maskable_icon =
       webapps::WebappsIconUtils::DoesAndroidSupportMaskableIcons();
@@ -120,15 +120,15 @@
   params.valid_primary_icon = true;
   params.valid_splash_icon = true;
   params.wait_for_worker = true;
-  InstallableManager* installable_manager =
-      InstallableManager::FromWebContents(web_contents());
+  webapps::InstallableManager* installable_manager =
+      webapps::InstallableManager::FromWebContents(web_contents());
   installable_manager->GetData(
       params, base::BindOnce(&WebApkUpdateDataFetcher::OnDidGetInstallableData,
                              weak_ptr_factory_.GetWeakPtr()));
 }
 
 void WebApkUpdateDataFetcher::OnDidGetInstallableData(
-    const InstallableData& data) {
+    const webapps::InstallableData& data) {
   // Determine whether or not the manifest is WebAPK-compatible. There are 3
   // cases:
   // 1. the site isn't installable.
diff --git a/chrome/browser/android/webapk/webapk_update_data_fetcher.h b/chrome/browser/android/webapk/webapk_update_data_fetcher.h
index 7ed7f59..29d5e7e 100644
--- a/chrome/browser/android/webapk/webapk_update_data_fetcher.h
+++ b/chrome/browser/android/webapk/webapk_update_data_fetcher.h
@@ -20,7 +20,10 @@
 }
 
 class GURL;
+
+namespace webapps {
 struct InstallableData;
+}
 
 // WebApkUpdateDataFetcher is the C++ counterpart of
 // org.chromium.chrome.browser's WebApkUpdateDataFetcher in Java. It is created
@@ -56,7 +59,8 @@
   void FetchInstallableData();
 
   // Called once the installable data has been fetched.
-  void OnDidGetInstallableData(const InstallableData& installable_data);
+  void OnDidGetInstallableData(
+      const webapps::InstallableData& installable_data);
 
   // Called with the computed Murmur2 hashes for the icons.
   void OnGotIconMurmur2Hashes(
diff --git a/chrome/browser/android/webapps/add_to_homescreen_data_fetcher.cc b/chrome/browser/android/webapps/add_to_homescreen_data_fetcher.cc
index 63151df..1c8f32c 100644
--- a/chrome/browser/android/webapps/add_to_homescreen_data_fetcher.cc
+++ b/chrome/browser/android/webapps/add_to_homescreen_data_fetcher.cc
@@ -22,13 +22,13 @@
 #include "chrome/browser/android/shortcut_helper.h"
 #include "chrome/browser/android/webapk/webapk_web_manifest_checker.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
-#include "chrome/browser/installable/installable_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_constants.h"
 #include "components/dom_distiller/core/url_utils.h"
 #include "components/favicon/core/favicon_service.h"
 #include "components/favicon_base/favicon_types.h"
 #include "components/webapps/android/webapps_icon_utils.h"
+#include "components/webapps/installable/installable_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
@@ -49,8 +49,8 @@
       web_contents->GetVisibleURL());
 }
 
-InstallableParams ParamsToPerformManifestAndIconFetch() {
-  InstallableParams params;
+webapps::InstallableParams ParamsToPerformManifestAndIconFetch() {
+  webapps::InstallableParams params;
   params.valid_primary_icon = true;
   params.prefer_maskable_icon =
       webapps::WebappsIconUtils::DoesAndroidSupportMaskableIcons();
@@ -58,8 +58,8 @@
   return params;
 }
 
-InstallableParams ParamsToPerformInstallableCheck() {
-  InstallableParams params;
+webapps::InstallableParams ParamsToPerformInstallableCheck() {
+  webapps::InstallableParams params;
   params.check_eligibility = true;
   params.valid_manifest = true;
   params.has_worker = true;
@@ -120,7 +120,8 @@
     int data_timeout_ms,
     Observer* observer)
     : content::WebContentsObserver(web_contents),
-      installable_manager_(InstallableManager::FromWebContents(web_contents)),
+      installable_manager_(
+          webapps::InstallableManager::FromWebContents(web_contents)),
       observer_(observer),
       shortcut_info_(GetShortcutUrl(web_contents)),
       has_maskable_primary_icon_(false),
@@ -224,7 +225,7 @@
 }
 
 void AddToHomescreenDataFetcher::OnDidGetManifestAndIcons(
-    const InstallableData& data) {
+    const webapps::InstallableData& data) {
   if (!web_contents())
     return;
 
@@ -269,7 +270,7 @@
 }
 
 void AddToHomescreenDataFetcher::OnDidPerformInstallableCheck(
-    const InstallableData& data) {
+    const webapps::InstallableData& data) {
   StopTimer();
 
   if (!web_contents())
diff --git a/chrome/browser/android/webapps/add_to_homescreen_data_fetcher.h b/chrome/browser/android/webapps/add_to_homescreen_data_fetcher.h
index 415cc1c..b08ab17 100644
--- a/chrome/browser/android/webapps/add_to_homescreen_data_fetcher.h
+++ b/chrome/browser/android/webapps/add_to_homescreen_data_fetcher.h
@@ -20,8 +20,10 @@
 struct FaviconRawBitmapResult;
 }
 
+namespace webapps {
 class InstallableManager;
 struct InstallableData;
+}  // namespace webapps
 
 // Aysnchronously fetches and processes data needed to create a shortcut for an
 // Android Home screen launcher.
@@ -73,10 +75,10 @@
   void OnDataTimedout();
 
   // Called when InstallableManager finishes looking for a manifest and icon.
-  void OnDidGetManifestAndIcons(const InstallableData& data);
+  void OnDidGetManifestAndIcons(const webapps::InstallableData& data);
 
   // Called when InstallableManager finishes checking for installability.
-  void OnDidPerformInstallableCheck(const InstallableData& data);
+  void OnDidPerformInstallableCheck(const webapps::InstallableData& data);
 
   // Grabs the favicon for the current URL.
   void FetchFavicon();
@@ -93,7 +95,7 @@
                      const SkBitmap& icon_for_view,
                      bool is_icon_generated);
 
-  InstallableManager* installable_manager_;
+  webapps::InstallableManager* installable_manager_;
   Observer* observer_;
 
   // The icons must only be set on the UI thread for thread safety.
diff --git a/chrome/browser/android/webapps/add_to_homescreen_data_fetcher_unittest.cc b/chrome/browser/android/webapps/add_to_homescreen_data_fetcher_unittest.cc
index 7c8366c..5b2e247 100644
--- a/chrome/browser/android/webapps/add_to_homescreen_data_fetcher_unittest.cc
+++ b/chrome/browser/android/webapps/add_to_homescreen_data_fetcher_unittest.cc
@@ -22,17 +22,19 @@
 #include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/flags/android/chrome_feature_list.h"
 #include "chrome/browser/history/history_service_factory.h"
-#include "chrome/browser/installable/installable_manager.h"
-#include "chrome/browser/installable/installable_metrics.h"
 #include "chrome/browser/web_applications/components/web_application_info.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
+#include "components/webapps/installable/installable_manager.h"
+#include "components/webapps/installable/installable_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "third_party/blink/public/common/manifest/manifest.h"
 #include "third_party/blink/public/mojom/manifest/display_mode.mojom.h"
 #include "ui/gfx/image/image_unittest_util.h"
 #include "url/gurl.h"
 
+namespace webapps {
+
 namespace {
 
 const char* kWebApplicationInfoTitle = "Meta Title";
@@ -76,7 +78,7 @@
     is_webapk_compatible_ = is_webapk_compatible;
   }
 
-  void OnDataAvailable(const webapps::ShortcutInfo& info,
+  void OnDataAvailable(const ShortcutInfo& info,
                        const SkBitmap& primary_icon) override {
     // This should only be called once.
     EXPECT_FALSE(data_available_);
@@ -564,3 +566,5 @@
   EXPECT_EQ(fetcher->shortcut_info().best_primary_icon_url,
             GURL(kDefaultIconUrl));
 }
+
+}  // namespace webapps
diff --git a/chrome/browser/android/webapps/add_to_homescreen_mediator.cc b/chrome/browser/android/webapps/add_to_homescreen_mediator.cc
index 89a84f7..8503d6db 100644
--- a/chrome/browser/android/webapps/add_to_homescreen_mediator.cc
+++ b/chrome/browser/android/webapps/add_to_homescreen_mediator.cc
@@ -17,10 +17,10 @@
 #include "chrome/browser/banners/app_banner_metrics.h"
 #include "chrome/browser/banners/app_banner_settings_helper.h"
 #include "chrome/browser/feature_engagement/tracker_factory.h"
-#include "chrome/browser/installable/installable_metrics.h"
 #include "components/feature_engagement/public/event_constants.h"
 #include "components/feature_engagement/public/tracker.h"
 #include "components/url_formatter/elide_url.h"
+#include "components/webapps/installable/installable_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/gfx/android/java_bitmap.h"
 
@@ -182,8 +182,8 @@
   params_->primary_icon = data_fetcher_->primary_icon();
   params_->has_maskable_primary_icon =
       data_fetcher_->has_maskable_primary_icon();
-  params_->install_source = InstallableMetrics::GetInstallSource(
-      data_fetcher_->web_contents(), InstallTrigger::MENU);
+  params_->install_source = webapps::InstallableMetrics::GetInstallSource(
+      data_fetcher_->web_contents(), webapps::InstallTrigger::MENU);
 
   // AddToHomescreenMediator::OnDataAvailable() is called in the code path
   // to show A2HS dialog from app menu. In this code path, display_icon is
diff --git a/chrome/browser/android/webapps/add_to_homescreen_params.h b/chrome/browser/android/webapps/add_to_homescreen_params.h
index 9b1dd4e..0c217dd 100644
--- a/chrome/browser/android/webapps/add_to_homescreen_params.h
+++ b/chrome/browser/android/webapps/add_to_homescreen_params.h
@@ -9,7 +9,7 @@
 #include <string>
 
 #include "base/android/scoped_java_ref.h"
-#include "chrome/browser/installable/installable_metrics.h"
+#include "components/webapps/installable/installable_metrics.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 namespace webapps {
@@ -30,7 +30,7 @@
   SkBitmap primary_icon;
   bool has_maskable_primary_icon = false;
   std::unique_ptr<webapps::ShortcutInfo> shortcut_info;
-  WebappInstallSource install_source;
+  webapps::WebappInstallSource install_source;
   std::string native_app_package_name;
   base::android::ScopedJavaGlobalRef<jobject> native_app_data;
 
diff --git a/chrome/browser/apps/app_service/app_icon_factory_unittest.cc b/chrome/browser/apps/app_service/app_icon_factory_unittest.cc
index 4e89b767..cc6c58f6 100644
--- a/chrome/browser/apps/app_service/app_icon_factory_unittest.cc
+++ b/chrome/browser/apps/app_service/app_icon_factory_unittest.cc
@@ -17,7 +17,6 @@
 #include "cc/test/pixel_test_utils.h"
 #include "chrome/browser/apps/app_service/app_icon_factory.h"
 #include "chrome/browser/extensions/chrome_app_icon.h"
-#include "chrome/browser/installable/installable_manager.h"
 #include "chrome/browser/web_applications/components/app_icon_manager.h"
 #include "chrome/browser/web_applications/components/app_registry_controller.h"
 #include "chrome/browser/web_applications/components/web_app_constants.h"
diff --git a/chrome/browser/apps/app_service/app_service_metrics.cc b/chrome/browser/apps/app_service/app_service_metrics.cc
index ff011e9..cd8f3e2 100644
--- a/chrome/browser/apps/app_service/app_service_metrics.cc
+++ b/chrome/browser/apps/app_service/app_service_metrics.cc
@@ -25,6 +25,8 @@
 // The default app's histogram name. This is used for logging so do
 // not change the order of this enum.
 // https://docs.google.com/document/d/1WJ-BjlVOM87ygIsdDBCyXxdKw3iS5EtNGm1fWiWhfIs
+// If you're adding to this enum with the intention that it will be logged,
+// update the DefaultAppName enum listing in tools/metrics/histograms/enums.xml.
 enum class DefaultAppName {
   kCalculator = 10,
   kText = 11,
@@ -58,10 +60,11 @@
   // This is our test SWA. It's only installed in tests.
   kMockSystemApp = 39,
   kStadia = 40,
+  kScanningApp = 41,
 
   // Add any new values above this one, and update kMaxValue to the highest
   // enumerator value.
-  kMaxValue = kStadia,
+  kMaxValue = kScanningApp,
 };
 
 void RecordDefaultAppLaunch(DefaultAppName default_app_name,
@@ -255,6 +258,10 @@
     RecordDefaultAppLaunch(DefaultAppName::kYouTubeMusic, launch_source);
   else if (app_id == web_app::kStadiaAppId)
     RecordDefaultAppLaunch(DefaultAppName::kStadia, launch_source);
+#if BUILDFLAG(IS_CHROMEOS_ASH)
+  else if (app_id == web_app::kScanningAppId)
+    RecordDefaultAppLaunch(DefaultAppName::kScanningApp, launch_source);
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH)
 
   // Above are default apps; below are built-in apps.
 
diff --git a/chrome/browser/banners/app_banner_manager.cc b/chrome/browser/banners/app_banner_manager.cc
index d5f1e39..6264b4a 100644
--- a/chrome/browser/banners/app_banner_manager.cc
+++ b/chrome/browser/banners/app_banner_manager.cc
@@ -19,9 +19,11 @@
 #include "chrome/browser/banners/app_banner_metrics.h"
 #include "chrome/browser/banners/app_banner_settings_helper.h"
 #include "chrome/browser/engagement/site_engagement_service.h"
-#include "chrome/browser/installable/installable_metrics.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_switches.h"
+#include "components/webapps/installable/installable_data.h"
+#include "components/webapps/installable/installable_manager.h"
+#include "components/webapps/installable/installable_metrics.h"
 #include "content/public/browser/back_forward_cache.h"
 #include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/render_frame_host.h"
@@ -36,8 +38,8 @@
 
 int gTimeDeltaInDaysForTesting = 0;
 
-InstallableParams ParamsToGetManifest() {
-  InstallableParams params;
+webapps::InstallableParams ParamsToGetManifest() {
+  webapps::InstallableParams params;
   params.check_eligibility = true;
   return params;
 }
@@ -67,12 +69,12 @@
   virtual ~StatusReporter() {}
 
   // Reports |code| (via a mechanism which depends on the implementation).
-  virtual void ReportStatus(InstallableStatusCode code) = 0;
+  virtual void ReportStatus(webapps::InstallableStatusCode code) = 0;
 
-  // Returns the WebappInstallSource to be used for this installation.
-  virtual WebappInstallSource GetInstallSource(
+  // Returns the webapps::WebappInstallSource to be used for this installation.
+  virtual webapps::WebappInstallSource GetInstallSource(
       content::WebContents* web_contents,
-      InstallTrigger trigger) = 0;
+      webapps::InstallTrigger trigger) = 0;
 };
 
 }  // namespace banners
@@ -88,14 +90,15 @@
       : web_contents_(web_contents) {}
 
   // Logs an error message corresponding to |code| to the devtools console.
-  void ReportStatus(InstallableStatusCode code) override {
+  void ReportStatus(webapps::InstallableStatusCode code) override {
     LogToConsole(web_contents_, code,
                  blink::mojom::ConsoleMessageLevel::kError);
   }
 
-  WebappInstallSource GetInstallSource(content::WebContents* web_contents,
-                                       InstallTrigger trigger) override {
-    return WebappInstallSource::DEVTOOLS;
+  webapps::WebappInstallSource GetInstallSource(
+      content::WebContents* web_contents,
+      webapps::InstallTrigger trigger) override {
+    return webapps::WebappInstallSource::DEVTOOLS;
   }
 
  private:
@@ -110,18 +113,19 @@
   ~TrackingStatusReporter() override {}
 
   // Records code via an UMA histogram.
-  void ReportStatus(InstallableStatusCode code) override {
+  void ReportStatus(webapps::InstallableStatusCode code) override {
     // We only increment the histogram once per page load (and only if the
     // banner pipeline is triggered).
-    if (!done_ && code != NO_ERROR_DETECTED)
+    if (!done_ && code != webapps::NO_ERROR_DETECTED)
       banners::TrackInstallableStatusCode(code);
 
     done_ = true;
   }
 
-  WebappInstallSource GetInstallSource(content::WebContents* web_contents,
-                                       InstallTrigger trigger) override {
-    return InstallableMetrics::GetInstallSource(web_contents, trigger);
+  webapps::WebappInstallSource GetInstallSource(
+      content::WebContents* web_contents,
+      webapps::InstallTrigger trigger) override {
+    return webapps::InstallableMetrics::GetInstallSource(web_contents, trigger);
   }
 
  private:
@@ -130,18 +134,20 @@
 
 class NullStatusReporter : public banners::AppBannerManager::StatusReporter {
  public:
-  void ReportStatus(InstallableStatusCode code) override {
+  void ReportStatus(webapps::InstallableStatusCode code) override {
     // In general, NullStatusReporter::ReportStatus should not be called.
     // However, it may be called in cases where Stop is called without a
     // preceding call to RequestAppBanner e.g. because the WebContents is being
-    // destroyed. In that case, code should always be NO_ERROR_DETECTED.
-    DCHECK(code == NO_ERROR_DETECTED);
+    // destroyed. In that case, code should always be
+    // webapps::NO_ERROR_DETECTED.
+    DCHECK(code == webapps::NO_ERROR_DETECTED);
   }
 
-  WebappInstallSource GetInstallSource(content::WebContents* web_contents,
-                                       InstallTrigger trigger) override {
+  webapps::WebappInstallSource GetInstallSource(
+      content::WebContents* web_contents,
+      webapps::InstallTrigger trigger) override {
     NOTREACHED();
-    return WebappInstallSource::COUNT;
+    return webapps::WebappInstallSource::COUNT;
   }
 };
 
@@ -216,7 +222,7 @@
       SiteEngagementObserver(SiteEngagementService::Get(
           Profile::FromBrowserContext(web_contents->GetBrowserContext()))),
       state_(State::INACTIVE),
-      manager_(InstallableManager::FromWebContents(web_contents)),
+      manager_(webapps::InstallableManager::FromWebContents(web_contents)),
       has_sufficient_engagement_(false),
       load_finished_(false),
       status_reporter_(std::make_unique<NullStatusReporter>()),
@@ -234,17 +240,17 @@
   if (ShouldBypassEngagementChecks())
     return true;
 
-  InstallableStatusCode code = ShouldShowBannerCode();
+  webapps::InstallableStatusCode code = ShouldShowBannerCode();
   switch (code) {
-    case NO_ERROR_DETECTED:
+    case webapps::NO_ERROR_DETECTED:
       return true;
-    case PREVIOUSLY_BLOCKED:
+    case webapps::PREVIOUSLY_BLOCKED:
       banners::TrackDisplayEvent(banners::DISPLAY_EVENT_BLOCKED_PREVIOUSLY);
       break;
-    case PREVIOUSLY_IGNORED:
+    case webapps::PREVIOUSLY_IGNORED:
       banners::TrackDisplayEvent(banners::DISPLAY_EVENT_IGNORED_PREVIOUSLY);
       break;
-    case PACKAGE_NAME_OR_START_URL_EMPTY:
+    case webapps::PACKAGE_NAME_OR_START_URL_EMPTY:
       break;
     default:
       NOTREACHED();
@@ -297,12 +303,12 @@
 }
 
 bool AppBannerManager::DidRetryInstallableManagerRequest(
-    const InstallableData& result) {
+    const webapps::InstallableData& result) {
   if (result.errors.empty())
     return false;
-  if (result.errors[0] != MANIFEST_URL_CHANGED)
+  if (result.errors[0] != webapps::MANIFEST_URL_CHANGED)
     return false;
-  ReportStatus(MANIFEST_URL_CHANGED);
+  ReportStatus(webapps::MANIFEST_URL_CHANGED);
   switch (state_) {
     case State::FETCHING_MANIFEST:
     case State::PENDING_INSTALLABLE_CHECK:
@@ -322,7 +328,7 @@
   }
 }
 
-void AppBannerManager::OnDidGetManifest(const InstallableData& data) {
+void AppBannerManager::OnDidGetManifest(const webapps::InstallableData& data) {
   if (DidRetryInstallableManagerRequest(data))
     return;
   UpdateState(State::ACTIVE);
@@ -340,8 +346,9 @@
   PerformInstallableChecks();
 }
 
-InstallableParams AppBannerManager::ParamsToPerformInstallableWebAppCheck() {
-  InstallableParams params;
+webapps::InstallableParams
+AppBannerManager::ParamsToPerformInstallableWebAppCheck() {
+  webapps::InstallableParams params;
   params.valid_primary_icon = true;
   params.valid_manifest = true;
   params.has_worker = true;
@@ -367,16 +374,17 @@
 }
 
 void AppBannerManager::OnDidPerformInstallableWebAppCheck(
-    const InstallableData& data) {
+    const webapps::InstallableData& data) {
   if (DidRetryInstallableManagerRequest(data))
     return;
   UpdateState(State::ACTIVE);
   if (data.has_worker && data.valid_manifest)
     TrackDisplayEvent(DISPLAY_EVENT_WEB_APP_BANNER_REQUESTED);
 
-  auto error = data.errors.empty() ? NO_ERROR_DETECTED : data.errors[0];
-  if (error != NO_ERROR_DETECTED) {
-    if (error == NO_MATCHING_SERVICE_WORKER)
+  auto error =
+      data.errors.empty() ? webapps::NO_ERROR_DETECTED : data.errors[0];
+  if (error != webapps::NO_ERROR_DETECTED) {
+    if (error == webapps::NO_MATCHING_SERVICE_WORKER)
       TrackDisplayEvent(DISPLAY_EVENT_LACKS_SERVICE_WORKER);
 
     SetInstallableWebAppCheckResult(InstallableWebAppCheckResult::kNo);
@@ -388,14 +396,14 @@
     banners::TrackDisplayEvent(banners::DISPLAY_EVENT_INSTALLED_PREVIOUSLY);
     SetInstallableWebAppCheckResult(
         InstallableWebAppCheckResult::kNoAlreadyInstalled);
-    Stop(ALREADY_INSTALLED);
+    Stop(webapps::ALREADY_INSTALLED);
     return;
   }
 
   if (ShouldDeferToRelatedNonWebApp()) {
     SetInstallableWebAppCheckResult(
         InstallableWebAppCheckResult::kByUserRequest);
-    Stop(PREFER_RELATED_APPLICATIONS);
+    Stop(webapps::PREFER_RELATED_APPLICATIONS);
     return;
   }
 
@@ -431,7 +439,7 @@
       GetCurrentTime());
 }
 
-void AppBannerManager::ReportStatus(InstallableStatusCode code) {
+void AppBannerManager::ReportStatus(webapps::InstallableStatusCode code) {
   DCHECK(status_reporter_);
   status_reporter_->ReportStatus(code);
 }
@@ -464,19 +472,19 @@
   Stop(TerminationCode());
 }
 
-InstallableStatusCode AppBannerManager::TerminationCode() const {
+webapps::InstallableStatusCode AppBannerManager::TerminationCode() const {
   switch (state_) {
     case State::PENDING_PROMPT:
-      return RENDERER_CANCELLED;
+      return webapps::RENDERER_CANCELLED;
     case State::PENDING_ENGAGEMENT:
-      return has_sufficient_engagement_ ? NO_ERROR_DETECTED
-                                        : INSUFFICIENT_ENGAGEMENT;
+      return has_sufficient_engagement_ ? webapps::NO_ERROR_DETECTED
+                                        : webapps::INSUFFICIENT_ENGAGEMENT;
     case State::FETCHING_MANIFEST:
-      return WAITING_FOR_MANIFEST;
+      return webapps::WAITING_FOR_MANIFEST;
     case State::FETCHING_NATIVE_DATA:
-      return WAITING_FOR_NATIVE_DATA;
+      return webapps::WAITING_FOR_NATIVE_DATA;
     case State::PENDING_INSTALLABLE_CHECK:
-      return WAITING_FOR_INSTALLABLE_CHECK;
+      return webapps::WAITING_FOR_INSTALLABLE_CHECK;
     case State::ACTIVE:
     case State::SENDING_EVENT:
     case State::SENDING_EVENT_GOT_EARLY_PROMPT:
@@ -484,7 +492,7 @@
     case State::COMPLETE:
       break;
   }
-  return NO_ERROR_DETECTED;
+  return webapps::NO_ERROR_DETECTED;
 }
 
 void AppBannerManager::SetInstallableWebAppCheckResult(
@@ -523,7 +531,7 @@
     observer.OnInstallableWebAppStatusUpdated();
 }
 
-void AppBannerManager::Stop(InstallableStatusCode code) {
+void AppBannerManager::Stop(webapps::InstallableStatusCode code) {
   ReportStatus(code);
 
   if (installable_web_app_check_result_ ==
@@ -797,10 +805,10 @@
       AppBannerSettingsHelper::APP_BANNER_EVENT_COULD_SHOW, GetCurrentTime());
 }
 
-InstallableStatusCode AppBannerManager::ShouldShowBannerCode() {
+webapps::InstallableStatusCode AppBannerManager::ShouldShowBannerCode() {
   if (GetAppIdentifier().empty())
-    return PACKAGE_NAME_OR_START_URL_EMPTY;
-  return NO_ERROR_DETECTED;
+    return webapps::PACKAGE_NAME_OR_START_URL_EMPTY;
+  return webapps::NO_ERROR_DETECTED;
 }
 
 void AppBannerManager::OnBannerPromptReply(
@@ -847,12 +855,12 @@
   DCHECK_NE(State::SENDING_EVENT, state_);
 
   content::WebContents* contents = web_contents();
-  WebappInstallSource install_source;
+  webapps::WebappInstallSource install_source;
 
   TrackBeforeInstallEvent(
       BEFORE_INSTALL_EVENT_PROMPT_CALLED_AFTER_PREVENT_DEFAULT);
-  install_source =
-      status_reporter_->GetInstallSource(contents, InstallTrigger::API);
+  install_source = status_reporter_->GetInstallSource(
+      contents, webapps::InstallTrigger::API);
 
   // If this is the first time that we are showing the banner for this site,
   // record how long it's been since the first visit.
diff --git a/chrome/browser/banners/app_banner_manager.h b/chrome/browser/banners/app_banner_manager.h
index a30c925..ff76fa3d 100644
--- a/chrome/browser/banners/app_banner_manager.h
+++ b/chrome/browser/banners/app_banner_manager.h
@@ -14,18 +14,17 @@
 #include "base/observer_list.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/engagement/site_engagement_observer.h"
-#include "chrome/browser/installable/installable_logging.h"
-#include "chrome/browser/installable/installable_manager.h"
+#include "components/webapps/installable/installable_logging.h"
+#include "components/webapps/installable/installable_params.h"
 #include "content/public/browser/media_player_id.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "mojo/public/cpp/bindings/receiver.h"
 #include "mojo/public/cpp/bindings/remote.h"
+#include "third_party/blink/public/common/manifest/manifest.h"
 #include "third_party/blink/public/mojom/app_banner/app_banner.mojom.h"
 #include "third_party/blink/public/mojom/manifest/display_mode.mojom-forward.h"
 #include "url/gurl.h"
 
-enum class WebappInstallSource;
-class InstallableManager;
 class SkBitmap;
 
 namespace content {
@@ -33,6 +32,12 @@
 class WebContents;
 }  // namespace content
 
+namespace webapps {
+class InstallableManager;
+enum class WebappInstallSource;
+struct InstallableData;
+}  // namespace webapps
+
 namespace banners {
 
 // Coordinates the creation of an app banner, from detecting eligibility to
@@ -243,15 +248,16 @@
   // Possibly retries the installable manager request given the current state
   // and the result. Returns |true| if the request was restarted.
   // Currently only called during requests to InstallationManager
-  bool DidRetryInstallableManagerRequest(const InstallableData& result);
+  bool DidRetryInstallableManagerRequest(
+      const webapps::InstallableData& result);
 
   // Callback invoked by the InstallableManager once it has fetched the page's
   // manifest.
-  virtual void OnDidGetManifest(const InstallableData& result);
+  virtual void OnDidGetManifest(const webapps::InstallableData& result);
 
-  // Returns an InstallableParams object that requests all checks necessary for
-  // a web app banner.
-  virtual InstallableParams ParamsToPerformInstallableWebAppCheck();
+  // Returns an webapps::InstallableParams object that requests all checks
+  // necessary for a web app banner.
+  virtual webapps::InstallableParams ParamsToPerformInstallableWebAppCheck();
 
   // Run at the conclusion of OnDidGetManifest. For web app banners, this calls
   // back to the InstallableManager to continue checking criteria. For native
@@ -265,13 +271,13 @@
   // Callback invoked by the InstallableManager once it has finished checking
   // all other installable properties.
   virtual void OnDidPerformInstallableWebAppCheck(
-      const InstallableData& result);
+      const webapps::InstallableData& result);
 
   // Records that a banner was shown.
   void RecordDidShowBanner();
 
   // Reports |code| via a UMA histogram or logs it to the console.
-  void ReportStatus(InstallableStatusCode code);
+  void ReportStatus(webapps::InstallableStatusCode code);
 
   // Voids all outstanding service pointers.
   void ResetBindings();
@@ -285,7 +291,7 @@
   // Stops the banner pipeline, preventing any outstanding callbacks from
   // running and resetting the manager state. This method is virtual to allow
   // tests to intercept it and verify correct behaviour.
-  virtual void Stop(InstallableStatusCode code);
+  virtual void Stop(webapps::InstallableStatusCode code);
 
   // Sends a message to the renderer that the page has met the requirements to
   // show a banner. The page can respond to cancel the banner (and possibly
@@ -325,7 +331,7 @@
 
   // Subclass accessors for private fields which should not be changed outside
   // this class.
-  InstallableManager* manager() const { return manager_; }
+  webapps::InstallableManager* manager() const { return manager_; }
   State state() const { return state_; }
   bool IsRunning() const;
 
@@ -361,7 +367,7 @@
 
   // Creates the app banner UI. Overridden by subclasses as the infobar is
   // platform-specific.
-  virtual void ShowBannerUi(WebappInstallSource install_source) = 0;
+  virtual void ShowBannerUi(webapps::WebappInstallSource install_source) = 0;
 
   // Called after the manager sends a message to the renderer regarding its
   // intention to show a prompt. The renderer will send a message back with the
@@ -378,15 +384,14 @@
   // requesting that it be shown later.
   void DisplayAppBanner() override;
 
-  // Returns an InstallableStatusCode indicating whether a banner should be
-  // shown.
-  InstallableStatusCode ShouldShowBannerCode();
+  // Returns a status code indicating whether a banner should be shown.
+  webapps::InstallableStatusCode ShouldShowBannerCode();
 
   // Returns a status code based on the current state, to log when terminating.
-  InstallableStatusCode TerminationCode() const;
+  webapps::InstallableStatusCode TerminationCode() const;
 
   // Fetches the data required to display a banner for the current page.
-  InstallableManager* manager_;
+  webapps::InstallableManager* manager_;
 
   // We do not want to trigger a banner when the manager is attached to
   // a WebContents that is playing video. Banners triggering on a site in the
diff --git a/chrome/browser/banners/app_banner_manager_android.cc b/chrome/browser/banners/app_banner_manager_android.cc
index 095ebde..b3a919d 100644
--- a/chrome/browser/banners/app_banner_manager_android.cc
+++ b/chrome/browser/banners/app_banner_manager_android.cc
@@ -27,7 +27,6 @@
 #include "chrome/browser/banners/app_banner_metrics.h"
 #include "chrome/browser/banners/app_banner_settings_helper.h"
 #include "chrome/browser/infobars/infobar_service.h"
-#include "chrome/browser/installable/installable_metrics.h"
 #include "chrome/common/channel_info.h"
 #include "chrome/common/chrome_features.h"
 #include "components/feature_engagement/public/feature_constants.h"
@@ -38,6 +37,8 @@
 #include "components/webapps/android/shortcut_info.h"
 #include "components/webapps/android/webapps_icon_utils.h"
 #include "components/webapps/android/webapps_utils.h"
+#include "components/webapps/installable/installable_data.h"
+#include "components/webapps/installable/installable_metrics.h"
 #include "content/public/browser/manifest_icon_downloader.h"
 #include "content/public/browser/web_contents.h"
 #include "net/base/url_util.h"
@@ -149,8 +150,8 @@
 }
 
 void AppBannerManagerAndroid::AddToHomescreenFromBadge() {
-  ShowBannerUi(InstallableMetrics::GetInstallSource(
-      web_contents(), InstallTrigger::AMBIENT_BADGE));
+  ShowBannerUi(webapps::InstallableMetrics::GetInstallSource(
+      web_contents(), webapps::InstallTrigger::AMBIENT_BADGE));
 
   // Close our bindings to ensure that any existing beforeinstallprompt events
   // cannot trigger add to home screen (which would cause a crash). If the
@@ -176,9 +177,9 @@
                                     : "play";
 }
 
-InstallableParams
+webapps::InstallableParams
 AppBannerManagerAndroid::ParamsToPerformInstallableWebAppCheck() {
-  InstallableParams params =
+  webapps::InstallableParams params =
       AppBannerManager::ParamsToPerformInstallableWebAppCheck();
   params.prefer_maskable_icon =
       webapps::WebappsIconUtils::DoesAndroidSupportMaskableIcons();
@@ -195,14 +196,14 @@
 
 void AppBannerManagerAndroid::PerformInstallableWebAppCheck() {
   if (!AreWebManifestUrlsWebApkCompatible(manifest_)) {
-    Stop(URL_NOT_SUPPORTED_FOR_WEBAPK);
+    Stop(webapps::URL_NOT_SUPPORTED_FOR_WEBAPK);
     return;
   }
   AppBannerManager::PerformInstallableWebAppCheck();
 }
 
 void AppBannerManagerAndroid::OnDidPerformInstallableWebAppCheck(
-    const InstallableData& data) {
+    const webapps::InstallableData& data) {
   if (data.errors.empty())
     WebApkUkmRecorder::RecordWebApkableVisit(data.manifest_url);
 
@@ -215,7 +216,8 @@
   native_app_package_ = "";
 }
 
-void AppBannerManagerAndroid::ShowBannerUi(WebappInstallSource install_source) {
+void AppBannerManagerAndroid::ShowBannerUi(
+    webapps::WebappInstallSource install_source) {
   content::WebContents* contents = web_contents();
   DCHECK(contents);
 
@@ -239,19 +241,21 @@
                           weak_factory_.GetWeakPtr()));
 
   // If we are installing from the ambient badge, it will remove itself.
-  if (install_source != WebappInstallSource::AMBIENT_BADGE_CUSTOM_TAB &&
-      install_source != WebappInstallSource::AMBIENT_BADGE_BROWSER_TAB) {
+  if (install_source !=
+          webapps::WebappInstallSource::AMBIENT_BADGE_CUSTOM_TAB &&
+      install_source !=
+          webapps::WebappInstallSource::AMBIENT_BADGE_BROWSER_TAB) {
     HideAmbientBadge();
   }
 
   if (was_shown) {
     if (native_app_data_.is_null()) {
-      ReportStatus(SHOWING_WEB_APP_BANNER);
+      ReportStatus(webapps::SHOWING_WEB_APP_BANNER);
     } else {
-      ReportStatus(SHOWING_NATIVE_APP_BANNER);
+      ReportStatus(webapps::SHOWING_NATIVE_APP_BANNER);
     }
   } else {
-    ReportStatus(FAILED_TO_CREATE_BANNER);
+    ReportStatus(webapps::FAILED_TO_CREATE_BANNER);
   }
 }
 
@@ -367,13 +371,13 @@
 
 void AppBannerManagerAndroid::PerformInstallableNativeAppCheck() {
   DCHECK(ShouldPerformInstallableNativeAppCheck());
-  InstallableStatusCode code = NO_ERROR_DETECTED;
+  webapps::InstallableStatusCode code = webapps::NO_ERROR_DETECTED;
   for (const auto& application : manifest_.related_applications) {
     std::string id =
         base::UTF16ToUTF8(application.id.value_or(base::string16()));
     code = QueryNativeApp(application.platform.value_or(base::string16()),
                           application.url, id);
-    if (code == NO_ERROR_DETECTED)
+    if (code == webapps::NO_ERROR_DETECTED)
       return;
   }
 
@@ -381,15 +385,15 @@
   Stop(code);
 }
 
-InstallableStatusCode AppBannerManagerAndroid::QueryNativeApp(
+webapps::InstallableStatusCode AppBannerManagerAndroid::QueryNativeApp(
     const base::string16& platform,
     const GURL& url,
     const std::string& id) {
   if (!base::EqualsASCII(platform, kPlatformPlay))
-    return PLATFORM_NOT_SUPPORTED_ON_ANDROID;
+    return webapps::PLATFORM_NOT_SUPPORTED_ON_ANDROID;
 
   if (id.empty())
-    return NO_ID_SPECIFIED;
+    return webapps::NO_ID_SPECIFIED;
 
   // AppBannerManager#fetchAppDetails() only works on Beta and Stable because
   // the called Google Play API uses an old way of checking whether the Chrome
@@ -398,14 +402,14 @@
   if (!gIgnoreChromeChannelForTesting &&
       !(channel == version_info::Channel::BETA ||
         channel == version_info::Channel::STABLE)) {
-    return PREFER_RELATED_APPLICATIONS_SUPPORTED_ONLY_BETA_STABLE;
+    return webapps::PREFER_RELATED_APPLICATIONS_SUPPORTED_ONLY_BETA_STABLE;
   }
 
   banners::TrackDisplayEvent(DISPLAY_EVENT_NATIVE_APP_BANNER_REQUESTED);
 
   std::string id_from_app_url = ExtractQueryValueForName(url, "id");
   if (id_from_app_url.size() && id != id_from_app_url)
-    return IDS_DO_NOT_MATCH;
+    return webapps::IDS_DO_NOT_MATCH;
 
   // Attach the chrome_inline referrer value, prefixed with "&" if the
   // referrer is non empty.
@@ -428,12 +432,12 @@
   Java_AppBannerManager_fetchAppDetails(
       env, java_banner_manager_, jurl, jpackage, jreferrer,
       webapps::WebappsIconUtils::GetIdealHomescreenIconSizeInPx());
-  return NO_ERROR_DETECTED;
+  return webapps::NO_ERROR_DETECTED;
 }
 
 void AppBannerManagerAndroid::OnNativeAppIconFetched(const SkBitmap& bitmap) {
   if (bitmap.drawsNothing()) {
-    Stop(NO_ICON_AVAILABLE);
+    Stop(webapps::NO_ICON_AVAILABLE);
     return;
   }
 
diff --git a/chrome/browser/banners/app_banner_manager_android.h b/chrome/browser/banners/app_banner_manager_android.h
index efd5dce..9d6fe96 100644
--- a/chrome/browser/banners/app_banner_manager_android.h
+++ b/chrome/browser/banners/app_banner_manager_android.h
@@ -87,12 +87,12 @@
   std::string GetAppIdentifier() override;
   std::string GetBannerType() override;
   void PerformInstallableChecks() override;
-  InstallableParams ParamsToPerformInstallableWebAppCheck() override;
+  webapps::InstallableParams ParamsToPerformInstallableWebAppCheck() override;
   void PerformInstallableWebAppCheck() override;
   void OnDidPerformInstallableWebAppCheck(
-      const InstallableData& result) override;
+      const webapps::InstallableData& result) override;
   void ResetCurrentPageData() override;
-  void ShowBannerUi(WebappInstallSource install_source) override;
+  void ShowBannerUi(webapps::WebappInstallSource install_source) override;
   void MaybeShowAmbientBadge() override;
   base::WeakPtr<AppBannerManager> GetWeakPtr() override;
   void InvalidateWeakPtrs() override;
@@ -115,15 +115,15 @@
   bool ShouldPerformInstallableNativeAppCheck();
   void PerformInstallableNativeAppCheck();
 
-  // Returns NO_ERROR_DETECTED if |platform|, |url|, and |id| are consistent and
-  // can be used to query the Play Store for a native app. Otherwise returns the
-  // error which prevents querying from taking place. The query may not
-  // necessarily succeed (e.g. |id| doesn't map to anything), but if this method
-  // returns NO_ERROR_DETECTED, only a native app banner may be shown, and the
-  // web app banner flow will not be run.
-  InstallableStatusCode QueryNativeApp(const base::string16& platform,
-                                       const GURL& url,
-                                       const std::string& id);
+  // Returns webapps::NO_ERROR_DETECTED if |platform|, |url|, and |id| are
+  // consistent and can be used to query the Play Store for a native app.
+  // Otherwise returns the error which prevents querying from taking place. The
+  // query may not necessarily succeed (e.g. |id| doesn't map to anything), but
+  // if this method returns webapps::NO_ERROR_DETECTED, only a native app banner
+  // may be shown, and the web app banner flow will not be run.
+  webapps::InstallableStatusCode QueryNativeApp(const base::string16& platform,
+                                                const GURL& url,
+                                                const std::string& id);
 
   // Called when the download of a native app's icon is complete, as native
   // banners use an icon provided from the Play Store rather than the web
diff --git a/chrome/browser/banners/app_banner_manager_browsertest.cc b/chrome/browser/banners/app_banner_manager_browsertest.cc
index 540e1bf..97bb53ba0 100644
--- a/chrome/browser/banners/app_banner_manager_browsertest.cc
+++ b/chrome/browser/banners/app_banner_manager_browsertest.cc
@@ -21,13 +21,13 @@
 #include "chrome/browser/banners/app_banner_settings_helper.h"
 #include "chrome/browser/engagement/site_engagement_score.h"
 #include "chrome/browser/engagement/site_engagement_service.h"
-#include "chrome/browser/installable/installable_logging.h"
-#include "chrome/browser/installable/installable_manager.h"
-#include "chrome/browser/installable/installable_metrics.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/ui_test_utils.h"
+#include "components/webapps/installable/installable_logging.h"
+#include "components/webapps/installable/installable_manager.h"
+#include "components/webapps/installable/installable_metrics.h"
 #include "content/public/test/browser_test.h"
 #include "content/public/test/browser_test_utils.h"
 
@@ -56,11 +56,11 @@
 
   bool banner_shown() { return banner_shown_.get() && *banner_shown_; }
 
-  WebappInstallSource install_source() {
+  webapps::WebappInstallSource install_source() {
     if (install_source_.get())
       return *install_source_;
 
-    return WebappInstallSource::COUNT;
+    return webapps::WebappInstallSource::COUNT;
   }
 
   void clear_will_show() { banner_shown_.reset(); }
@@ -80,24 +80,25 @@
   // showing banner), UpdateState(State::PENDING_ENGAGEMENT) (waiting for
   // sufficient engagement), or ShowBannerUi(). Override these methods to
   // capture test status.
-  void Stop(InstallableStatusCode code) override {
+  void Stop(webapps::InstallableStatusCode code) override {
     AppBannerManager::Stop(code);
     ASSERT_FALSE(banner_shown_.get());
     banner_shown_.reset(new bool(false));
-    install_source_.reset(new WebappInstallSource(WebappInstallSource::COUNT));
+    install_source_.reset(
+        new webapps::WebappInstallSource(webapps::WebappInstallSource::COUNT));
     base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
                                                   std::move(on_done_));
   }
 
-  void ShowBannerUi(WebappInstallSource install_source) override {
+  void ShowBannerUi(webapps::WebappInstallSource install_source) override {
     // Fake the call to ReportStatus here - this is usually called in
     // platform-specific code which is not exposed here.
-    ReportStatus(SHOWING_WEB_APP_BANNER);
+    ReportStatus(webapps::SHOWING_WEB_APP_BANNER);
     RecordDidShowBanner();
 
     ASSERT_FALSE(banner_shown_.get());
     banner_shown_.reset(new bool(true));
-    install_source_.reset(new WebappInstallSource(install_source));
+    install_source_.reset(new webapps::WebappInstallSource(install_source));
     base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
                                                   std::move(on_done_));
   }
@@ -152,7 +153,7 @@
   base::OnceClosure on_banner_prompt_reply_;
 
   std::unique_ptr<bool> banner_shown_;
-  std::unique_ptr<WebappInstallSource> install_source_;
+  std::unique_ptr<webapps::WebappInstallSource> install_source_;
 
   base::WeakPtrFactory<AppBannerManagerTest> weak_factory_{this};
 
@@ -181,11 +182,11 @@
     return std::make_unique<AppBannerManagerTest>(web_contents);
   }
 
-  void RunBannerTest(
-      Browser* browser,
-      AppBannerManagerTest* manager,
-      const GURL& url,
-      base::Optional<InstallableStatusCode> expected_code_for_histogram) {
+  void RunBannerTest(Browser* browser,
+                     AppBannerManagerTest* manager,
+                     const GURL& url,
+                     base::Optional<webapps::InstallableStatusCode>
+                         expected_code_for_histogram) {
     base::HistogramTester histograms;
 
     SiteEngagementService* service =
@@ -200,10 +201,10 @@
     ui_test_utils::NavigateToURL(&nav_params);
     run_loop.Run();
 
-    EXPECT_EQ(expected_code_for_histogram.value_or(MAX_ERROR_CODE) ==
-                  SHOWING_WEB_APP_BANNER,
+    EXPECT_EQ(expected_code_for_histogram.value_or(webapps::MAX_ERROR_CODE) ==
+                  webapps::SHOWING_WEB_APP_BANNER,
               manager->banner_shown());
-    EXPECT_EQ(WebappInstallSource::COUNT, manager->install_source());
+    EXPECT_EQ(webapps::WebappInstallSource::COUNT, manager->install_source());
 
     // Generally the manager will be in the complete state, however some test
     // cases navigate the page, causing the state to go back to INACTIVE.
@@ -298,7 +299,7 @@
   RunBannerTest(
       browser(), manager.get(),
       embedded_test_server()->GetURL("/banners/no_manifest_test_page.html"),
-      NO_MANIFEST);
+      webapps::NO_MANIFEST);
 
   // Dynamically add the manifest.
   base::HistogramTester histograms;
@@ -331,7 +332,7 @@
                     false, AppBannerManager::State::COMPLETE);
   histograms.ExpectTotalCount(banners::kInstallableStatusCodeHistogram, 1);
   histograms.ExpectUniqueSample(banners::kInstallableStatusCodeHistogram,
-                                RENDERER_CANCELLED, 1);
+                                webapps::RENDERER_CANCELLED, 1);
 }
 
 IN_PROC_BROWSER_TEST_F(AppBannerManagerBrowserTest,
@@ -362,7 +363,7 @@
         false, base::nullopt);
     histograms.ExpectTotalCount(banners::kInstallableStatusCodeHistogram, 1);
     histograms.ExpectUniqueSample(banners::kInstallableStatusCodeHistogram,
-                                  RENDERER_CANCELLED, 1);
+                                  webapps::RENDERER_CANCELLED, 1);
   }
   // The pipeline should either have completed, or it is scheduled in the
   // background. Wait for the next prompt request if so.
@@ -382,7 +383,7 @@
   RunBannerTest(
       browser(), manager.get(),
       embedded_test_server()->GetURL("/banners/no_manifest_test_page.html"),
-      NO_MANIFEST);
+      webapps::NO_MANIFEST);
 }
 
 // TODO(crbug.com/1146526): Test is flaky on Mac.
@@ -396,7 +397,7 @@
       CreateAppBannerManager(browser()));
   RunBannerTest(browser(), manager.get(),
                 GetBannerURLWithManifest("/banners/manifest_missing.json"),
-                MANIFEST_EMPTY);
+                webapps::MANIFEST_EMPTY);
 }
 
 IN_PROC_BROWSER_TEST_F(AppBannerManagerBrowserTest, WebAppBannerInIFrame) {
@@ -405,7 +406,7 @@
   RunBannerTest(
       browser(), manager.get(),
       embedded_test_server()->GetURL("/banners/iframe_test_page.html"),
-      NO_MANIFEST);
+      webapps::NO_MANIFEST);
 }
 
 IN_PROC_BROWSER_TEST_F(AppBannerManagerBrowserTest, DoesNotShowInIncognito) {
@@ -413,7 +414,8 @@
       OpenURLOffTheRecord(browser()->profile(), GURL("about:blank"));
   std::unique_ptr<AppBannerManagerTest> manager(
       CreateAppBannerManager(incognito_browser));
-  RunBannerTest(incognito_browser, manager.get(), GetBannerURL(), IN_INCOGNITO);
+  RunBannerTest(incognito_browser, manager.get(), GetBannerURL(),
+                webapps::IN_INCOGNITO);
 }
 
 IN_PROC_BROWSER_TEST_F(AppBannerManagerBrowserTest,
@@ -437,7 +439,7 @@
 
   histograms.ExpectTotalCount(banners::kMinutesHistogram, 0);
   histograms.ExpectUniqueSample(banners::kInstallableStatusCodeHistogram,
-                                INSUFFICIENT_ENGAGEMENT, 1);
+                                webapps::INSUFFICIENT_ENGAGEMENT, 1);
 }
 
 IN_PROC_BROWSER_TEST_F(AppBannerManagerBrowserTest, WebAppBannerNotCreated) {
@@ -462,7 +464,7 @@
 
   histograms.ExpectTotalCount(banners::kMinutesHistogram, 0);
   histograms.ExpectUniqueSample(banners::kInstallableStatusCodeHistogram,
-                                RENDERER_CANCELLED, 1);
+                                webapps::RENDERER_CANCELLED, 1);
 }
 
 IN_PROC_BROWSER_TEST_F(AppBannerManagerBrowserTest, WebAppBannerCancelled) {
@@ -490,7 +492,7 @@
 
   histograms.ExpectTotalCount(banners::kMinutesHistogram, 0);
   histograms.ExpectUniqueSample(banners::kInstallableStatusCodeHistogram,
-                                RENDERER_CANCELLED, 1);
+                                webapps::RENDERER_CANCELLED, 1);
 }
 
 IN_PROC_BROWSER_TEST_F(AppBannerManagerBrowserTest,
@@ -518,7 +520,7 @@
 
   histograms.ExpectTotalCount(banners::kMinutesHistogram, 1);
   histograms.ExpectUniqueSample(banners::kInstallableStatusCodeHistogram,
-                                SHOWING_WEB_APP_BANNER, 1);
+                                webapps::SHOWING_WEB_APP_BANNER, 1);
 }
 
 IN_PROC_BROWSER_TEST_F(AppBannerManagerBrowserTest,
@@ -558,7 +560,7 @@
 
   histograms.ExpectTotalCount(banners::kMinutesHistogram, 1);
   histograms.ExpectUniqueSample(banners::kInstallableStatusCodeHistogram,
-                                SHOWING_WEB_APP_BANNER, 1);
+                                webapps::SHOWING_WEB_APP_BANNER, 1);
 }
 
 IN_PROC_BROWSER_TEST_F(AppBannerManagerBrowserTest, WebAppBannerReprompt) {
@@ -600,7 +602,7 @@
 
   histograms.ExpectTotalCount(banners::kMinutesHistogram, 1);
   histograms.ExpectUniqueSample(banners::kInstallableStatusCodeHistogram,
-                                SHOWING_WEB_APP_BANNER, 1);
+                                webapps::SHOWING_WEB_APP_BANNER, 1);
 }
 
 IN_PROC_BROWSER_TEST_F(AppBannerManagerBrowserTest, PreferRelatedAppUnknown) {
@@ -627,7 +629,7 @@
                                   false /* expected_will_show */,
                                   State::COMPLETE);
   histograms.ExpectUniqueSample(banners::kInstallableStatusCodeHistogram,
-                                PREFER_RELATED_APPLICATIONS, 1);
+                                webapps::PREFER_RELATED_APPLICATIONS, 1);
 }
 
 IN_PROC_BROWSER_TEST_F(AppBannerManagerBrowserTest,
@@ -643,31 +645,31 @@
                                   false /* expected_will_show */,
                                   State::COMPLETE);
   histograms.ExpectUniqueSample(banners::kInstallableStatusCodeHistogram,
-                                PREFER_RELATED_APPLICATIONS, 1);
+                                webapps::PREFER_RELATED_APPLICATIONS, 1);
 }
 
 namespace {
-class FailingInstallableManager : public InstallableManager {
+class FailingInstallableManager : public webapps::InstallableManager {
  public:
   explicit FailingInstallableManager(content::WebContents* web_contents)
       : InstallableManager(web_contents) {}
 
-  void FailNext(std::unique_ptr<InstallableData> installable_data) {
+  void FailNext(std::unique_ptr<webapps::InstallableData> installable_data) {
     failure_data_ = std::move(installable_data);
   }
 
-  void GetData(const InstallableParams& params,
-               InstallableCallback callback) override {
+  void GetData(const webapps::InstallableParams& params,
+               webapps::InstallableCallback callback) override {
     if (failure_data_) {
       auto temp_data = std::move(failure_data_);
       std::move(callback).Run(*temp_data);
       return;
     }
-    InstallableManager::GetData(params, std::move(callback));
+    webapps::InstallableManager::GetData(params, std::move(callback));
   }
 
  private:
-  std::unique_ptr<InstallableData> failure_data_;
+  std::unique_ptr<webapps::InstallableData> failure_data_;
 };
 
 class AppBannerManagerBrowserTestWithFailableInstallableManager
@@ -708,14 +710,15 @@
   GURL test_url = GetBannerURLWithAction("stash_event");
   service->ResetBaseScoreForURL(test_url, 10);
 
-  installable_manager_->FailNext(base::WrapUnique(
-      new InstallableData({MANIFEST_URL_CHANGED}, GURL(), nullptr, GURL(),
-                          nullptr, false, GURL(), nullptr, false, false)));
+  installable_manager_->FailNext(base::WrapUnique(new webapps::InstallableData(
+      {webapps::MANIFEST_URL_CHANGED}, GURL(), nullptr, GURL(), nullptr, false,
+      GURL(), nullptr, false, false)));
 
   // The page should record one failure of MANIFEST_URL_CHANGED, but it should
   // still successfully get to the PENDING_PROMPT state of the pipeline, as it
   // should retry the call to GetData on the InstallableManager.
-  RunBannerTest(browser(), manager.get(), test_url, MANIFEST_URL_CHANGED);
+  RunBannerTest(browser(), manager.get(), test_url,
+                webapps::MANIFEST_URL_CHANGED);
   EXPECT_EQ(manager->state(), AppBannerManager::State::PENDING_PROMPT);
 
   {
@@ -729,7 +732,7 @@
 
     histograms.ExpectTotalCount(banners::kMinutesHistogram, 1);
     histograms.ExpectUniqueSample(banners::kInstallableStatusCodeHistogram,
-                                  SHOWING_WEB_APP_BANNER, 1);
+                                  webapps::SHOWING_WEB_APP_BANNER, 1);
   }
 }
 
diff --git a/chrome/browser/banners/app_banner_manager_desktop.cc b/chrome/browser/banners/app_banner_manager_desktop.cc
index fdfa0cc..b1abba2 100644
--- a/chrome/browser/banners/app_banner_manager_desktop.cc
+++ b/chrome/browser/banners/app_banner_manager_desktop.cc
@@ -200,10 +200,11 @@
   return display_mode == blink::mojom::DisplayMode::kBrowser;
 }
 
-void AppBannerManagerDesktop::ShowBannerUi(WebappInstallSource install_source) {
+void AppBannerManagerDesktop::ShowBannerUi(
+    webapps::WebappInstallSource install_source) {
   RecordDidShowBanner();
   TrackDisplayEvent(DISPLAY_EVENT_WEB_APP_BANNER_CREATED);
-  ReportStatus(SHOWING_APP_INSTALLATION_DIALOG);
+  ReportStatus(webapps::SHOWING_APP_INSTALLATION_DIALOG);
   CreateWebApp(install_source);
 }
 
@@ -243,7 +244,8 @@
   registrar_observer_.RemoveAll();
 }
 
-void AppBannerManagerDesktop::CreateWebApp(WebappInstallSource install_source) {
+void AppBannerManagerDesktop::CreateWebApp(
+    webapps::WebappInstallSource install_source) {
   content::WebContents* contents = web_contents();
   DCHECK(contents);
 
diff --git a/chrome/browser/banners/app_banner_manager_desktop.h b/chrome/browser/banners/app_banner_manager_desktop.h
index 6d865f5..d18976d 100644
--- a/chrome/browser/banners/app_banner_manager_desktop.h
+++ b/chrome/browser/banners/app_banner_manager_desktop.h
@@ -76,7 +76,7 @@
 
   // AppBannerManager overrides.
   bool ShouldAllowWebAppReplacementInstall() override;
-  void ShowBannerUi(WebappInstallSource install_source) override;
+  void ShowBannerUi(webapps::WebappInstallSource install_source) override;
 
   // content::WebContentsObserver override.
   void DidFinishLoad(content::RenderFrameHost* render_frame_host,
@@ -92,7 +92,7 @@
   void OnWebAppInstalled(const web_app::AppId& app_id) override;
   void OnAppRegistrarDestroyed() override;
 
-  void CreateWebApp(WebappInstallSource install_source);
+  void CreateWebApp(webapps::WebappInstallSource install_source);
 
   extensions::ExtensionRegistry* extension_registry_;
 
diff --git a/chrome/browser/banners/app_banner_metrics.cc b/chrome/browser/banners/app_banner_metrics.cc
index d0e2fea..64658ce 100644
--- a/chrome/browser/banners/app_banner_metrics.cc
+++ b/chrome/browser/banners/app_banner_metrics.cc
@@ -6,7 +6,7 @@
 
 #include "base/metrics/histogram_functions.h"
 #include "base/metrics/histogram_macros.h"
-#include "chrome/browser/installable/installable_logging.h"
+#include "components/webapps/installable/installable_logging.h"
 #include "third_party/blink/public/mojom/manifest/display_mode.mojom.h"
 
 namespace banners {
@@ -60,10 +60,10 @@
   base::UmaHistogramSparse(kBeforeInstallEventHistogram, event);
 }
 
-void TrackInstallableStatusCode(InstallableStatusCode code) {
-  DCHECK_LE(NO_ERROR_DETECTED, code);
-  DCHECK_LT(code, MAX_ERROR_CODE);
-  if (code != IN_INCOGNITO) {
+void TrackInstallableStatusCode(webapps::InstallableStatusCode code) {
+  DCHECK_LE(webapps::NO_ERROR_DETECTED, code);
+  DCHECK_LT(code, webapps::MAX_ERROR_CODE);
+  if (code != webapps::IN_INCOGNITO) {
     // Do not log that we are in incognito to UMA.
     base::UmaHistogramSparse(kInstallableStatusCodeHistogram, code);
   }
diff --git a/chrome/browser/banners/app_banner_metrics.h b/chrome/browser/banners/app_banner_metrics.h
index 5cba718..2315e6b4 100644
--- a/chrome/browser/banners/app_banner_metrics.h
+++ b/chrome/browser/banners/app_banner_metrics.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_BANNERS_APP_BANNER_METRICS_H_
 #define CHROME_BROWSER_BANNERS_APP_BANNER_METRICS_H_
 
-#include "chrome/browser/installable/installable_logging.h"
+#include "components/webapps/installable/installable_logging.h"
 #include "third_party/blink/public/mojom/manifest/display_mode.mojom-forward.h"
 
 namespace banners {
@@ -91,7 +91,7 @@
 void TrackMinutesFromFirstVisitToBannerShown(int minutes);
 void TrackUserResponse(int event);
 void TrackBeforeInstallEvent(int event);
-void TrackInstallableStatusCode(InstallableStatusCode code);
+void TrackInstallableStatusCode(webapps::InstallableStatusCode code);
 void TrackInstallDisplayMode(blink::mojom::DisplayMode display);
 
 }  // namespace banners
diff --git a/chrome/browser/banners/app_banner_settings_helper.cc b/chrome/browser/banners/app_banner_settings_helper.cc
index 150b432..7068274c 100644
--- a/chrome/browser/banners/app_banner_settings_helper.cc
+++ b/chrome/browser/banners/app_banner_settings_helper.cc
@@ -17,7 +17,6 @@
 #include "chrome/browser/banners/app_banner_manager.h"
 #include "chrome/browser/banners/app_banner_metrics.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
-#include "chrome/browser/installable/installable_logging.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_switches.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
diff --git a/chrome/browser/banners/app_banner_settings_helper.h b/chrome/browser/banners/app_banner_settings_helper.h
index 9eeb302..1397a71 100644
--- a/chrome/browser/banners/app_banner_settings_helper.h
+++ b/chrome/browser/banners/app_banner_settings_helper.h
@@ -11,7 +11,6 @@
 #include "base/macros.h"
 #include "base/optional.h"
 #include "base/time/time.h"
-#include "chrome/browser/installable/installable_logging.h"
 
 namespace content {
 class WebContents;
diff --git a/chrome/browser/banners/app_banner_settings_helper_unittest.cc b/chrome/browser/banners/app_banner_settings_helper_unittest.cc
index 9aa729a..7eb55576 100644
--- a/chrome/browser/banners/app_banner_settings_helper_unittest.cc
+++ b/chrome/browser/banners/app_banner_settings_helper_unittest.cc
@@ -2,10 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/banners/app_banner_metrics.h"
 #include "chrome/browser/banners/app_banner_settings_helper.h"
+#include "chrome/browser/banners/app_banner_metrics.h"
 #include "chrome/browser/engagement/site_engagement_service.h"
-#include "chrome/browser/installable/installable_logging.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
 
diff --git a/chrome/browser/banners/test_app_banner_manager_desktop.cc b/chrome/browser/banners/test_app_banner_manager_desktop.cc
index 67cf7fc..971ecf7 100644
--- a/chrome/browser/banners/test_app_banner_manager_desktop.cc
+++ b/chrome/browser/banners/test_app_banner_manager_desktop.cc
@@ -9,7 +9,7 @@
 
 #include "base/run_loop.h"
 #include "base/threading/thread_task_runner_handle.h"
-#include "chrome/browser/installable/installable_logging.h"
+#include "components/webapps/installable/installable_data.h"
 #include "content/public/browser/web_contents.h"
 
 namespace banners {
@@ -77,7 +77,7 @@
 }
 
 void TestAppBannerManagerDesktop::OnDidGetManifest(
-    const InstallableData& result) {
+    const webapps::InstallableData& result) {
   AppBannerManagerDesktop::OnDidGetManifest(result);
 
   // AppBannerManagerDesktop does not call |OnDidPerformInstallableCheck| to
@@ -87,7 +87,7 @@
     SetInstallable(false);
 }
 void TestAppBannerManagerDesktop::OnDidPerformInstallableWebAppCheck(
-    const InstallableData& result) {
+    const webapps::InstallableData& result) {
   AppBannerManagerDesktop::OnDidPerformInstallableWebAppCheck(result);
   SetInstallable(result.errors.empty());
 }
diff --git a/chrome/browser/banners/test_app_banner_manager_desktop.h b/chrome/browser/banners/test_app_banner_manager_desktop.h
index 1013ea5..a05de0a 100644
--- a/chrome/browser/banners/test_app_banner_manager_desktop.h
+++ b/chrome/browser/banners/test_app_banner_manager_desktop.h
@@ -47,9 +47,9 @@
   void AwaitAppInstall();
 
   // AppBannerManager:
-  void OnDidGetManifest(const InstallableData& result) override;
+  void OnDidGetManifest(const webapps::InstallableData& result) override;
   void OnDidPerformInstallableWebAppCheck(
-      const InstallableData& result) override;
+      const webapps::InstallableData& result) override;
   void ResetCurrentPageData() override;
 
   // AppBannerManagerDesktop:
diff --git a/chrome/browser/chromeos/BUILD.gn b/chrome/browser/chromeos/BUILD.gn
index e9ae697..a48d68b 100644
--- a/chrome/browser/chromeos/BUILD.gn
+++ b/chrome/browser/chromeos/BUILD.gn
@@ -348,6 +348,7 @@
 
     # TODO: care about enable_basic_printing and enable_print_preview.
     "//ash/keyboard/ui",
+    "//components/webapps",
     "//printing",
     "//printing/mojom",
     "//remoting/host/it2me:chrome_os_host",
@@ -1106,8 +1107,6 @@
     "crostini/crostini_shelf_utils.cc",
     "crostini/crostini_shelf_utils.h",
     "crostini/crostini_simple_types.h",
-    "crostini/crostini_stability_monitor.cc",
-    "crostini/crostini_stability_monitor.h",
     "crostini/crostini_terminal.cc",
     "crostini/crostini_terminal.h",
     "crostini/crostini_unsupported_action_notifier.cc",
@@ -1453,6 +1452,8 @@
     "guest_os/guest_os_share_path.h",
     "guest_os/guest_os_share_path_factory.cc",
     "guest_os/guest_os_share_path_factory.h",
+    "guest_os/guest_os_stability_monitor.cc",
+    "guest_os/guest_os_stability_monitor.h",
     "hats/hats_dialog.cc",
     "hats/hats_dialog.h",
     "hats/hats_finch_helper.cc",
@@ -2867,6 +2868,8 @@
     "usb/cros_usb_detector.h",
     "virtual_machines/virtual_machines_util.cc",
     "virtual_machines/virtual_machines_util.h",
+    "vm_shutdown_observer.h",
+    "vm_starting_observer.h",
     "web_applications/camera_system_web_app_info.cc",
     "web_applications/camera_system_web_app_info.h",
     "web_applications/chrome_camera_app_ui_delegate.cc",
@@ -3461,7 +3464,6 @@
     "crostini/crostini_port_forwarder_unittest.cc",
     "crostini/crostini_reporting_util_unittest.cc",
     "crostini/crostini_shelf_utils_unittest.cc",
-    "crostini/crostini_stability_monitor_unittest.cc",
     "crostini/crostini_unsupported_action_notifier_unittest.cc",
     "crostini/crostini_upgrade_available_notification_unittest.cc",
     "crostini/crostini_util_unittest.cc",
@@ -3571,6 +3573,7 @@
     "guest_os/guest_os_external_protocol_handler_unittest.cc",
     "guest_os/guest_os_registry_service_unittest.cc",
     "guest_os/guest_os_share_path_unittest.cc",
+    "guest_os/guest_os_stability_monitor_unittest.cc",
     "hats/hats_finch_helper_unittest.cc",
     "hats/hats_notification_controller_unittest.cc",
     "input_method/assistive_suggester_unittest.cc",
diff --git a/chrome/browser/chromeos/apps/apk_web_app_installer.cc b/chrome/browser/chromeos/apps/apk_web_app_installer.cc
index f5293ea..e6366bfa 100644
--- a/chrome/browser/chromeos/apps/apk_web_app_installer.cc
+++ b/chrome/browser/chromeos/apps/apk_web_app_installer.cc
@@ -9,13 +9,13 @@
 
 #include "base/bind.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/installable/installable_metrics.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/web_applications/components/externally_installed_web_app_prefs.h"
 #include "chrome/browser/web_applications/components/install_manager.h"
 #include "chrome/browser/web_applications/components/web_app_constants.h"
 #include "chrome/browser/web_applications/components/web_app_install_utils.h"
 #include "chrome/browser/web_applications/web_app_provider.h"
+#include "components/webapps/installable/installable_metrics.h"
 #include "content/public/browser/browser_thread.h"
 #include "services/data_decoder/public/cpp/decode_image.h"
 #include "third_party/blink/public/mojom/manifest/display_mode.mojom.h"
@@ -165,7 +165,7 @@
 
   provider->install_manager().InstallWebAppFromInfo(
       std::move(web_app_info_), web_app::ForInstallableSite::kYes,
-      WebappInstallSource::ARC,
+      webapps::WebappInstallSource::ARC,
       base::BindOnce(&ApkWebAppInstaller::OnWebAppCreated,
                      base::Unretained(this), std::move(start_url)));
 }
diff --git a/chrome/browser/chromeos/arc/arc_optin_uma.cc b/chrome/browser/chromeos/arc/arc_optin_uma.cc
index 0f82375..7b0b5ce 100644
--- a/chrome/browser/chromeos/arc/arc_optin_uma.cc
+++ b/chrome/browser/chromeos/arc/arc_optin_uma.cc
@@ -222,31 +222,30 @@
 
 ProvisioningStatus GetProvisioningStatus(
     const ArcProvisioningResult& provisioning_result) {
-  if (provisioning_result.is_stopped())
+  if (provisioning_result.stop_reason())
     return ProvisioningStatus::ARC_STOPPED;
 
   if (provisioning_result.is_timedout())
     return ProvisioningStatus::CHROME_PROVISIONING_TIMEOUT;
 
-  const mojom::ArcSignInResult* result = provisioning_result.sign_in_result();
-  if (result->is_success())
+  if (provisioning_result.is_success())
     return ProvisioningStatus::SUCCESS;
 
-  if (result->get_error()->is_cloud_provision_flow_error())
+  if (provisioning_result.cloud_provision_flow_error())
     return ProvisioningStatus::CLOUD_PROVISION_FLOW_ERROR;
 
-  if (result->get_error()->is_check_in_error())
+  if (provisioning_result.gms_check_in_error())
     return ProvisioningStatus::GMS_CHECK_IN_ERROR;
 
-  if (result->get_error()->is_sign_in_error())
+  if (provisioning_result.gms_sign_in_error())
     return ProvisioningStatus::GMS_SIGN_IN_ERROR;
 
-  if (result->get_error()->is_general_error()) {
+  if (provisioning_result.general_error()) {
 #define MAP_GENERAL_ERROR(name)         \
   case mojom::GeneralSignInError::name: \
     return ProvisioningStatus::name
 
-    switch (result->get_error()->get_general_error()) {
+    switch (provisioning_result.general_error().value()) {
       MAP_GENERAL_ERROR(UNKNOWN_ERROR);
       MAP_GENERAL_ERROR(MOJO_VERSION_MISMATCH);
       MAP_GENERAL_ERROR(GENERIC_PROVISIONING_TIMEOUT);
diff --git a/chrome/browser/chromeos/arc/session/arc_provisioning_result.cc b/chrome/browser/chromeos/arc/session/arc_provisioning_result.cc
index 74e21c9..6dae6ad 100644
--- a/chrome/browser/chromeos/arc/session/arc_provisioning_result.cc
+++ b/chrome/browser/chromeos/arc/session/arc_provisioning_result.cc
@@ -19,40 +19,53 @@
     default;
 ArcProvisioningResult::~ArcProvisioningResult() = default;
 
-bool ArcProvisioningResult::has_sign_in_result() const {
-  return absl::holds_alternative<mojom::ArcSignInResultPtr>(result_);
+base::Optional<mojom::GMSSignInError> ArcProvisioningResult::gms_sign_in_error()
+    const {
+  if (!sign_in_error() || !sign_in_error()->is_sign_in_error())
+    return base::nullopt;
+
+  return sign_in_error()->get_sign_in_error();
 }
 
-const mojom::ArcSignInResult* ArcProvisioningResult::sign_in_result() const {
-  DCHECK(has_sign_in_result());
-  return absl::get<mojom::ArcSignInResultPtr>(result_).get();
+base::Optional<mojom::GMSCheckInError>
+ArcProvisioningResult::gms_check_in_error() const {
+  if (!sign_in_error() || !sign_in_error()->is_check_in_error())
+    return base::nullopt;
+
+  return sign_in_error()->get_check_in_error();
 }
 
-bool ArcProvisioningResult::has_sign_in_error() const {
-  return has_sign_in_result() && sign_in_result()->is_error();
+base::Optional<mojom::CloudProvisionFlowError>
+ArcProvisioningResult::cloud_provision_flow_error() const {
+  if (!sign_in_error() || !sign_in_error()->is_cloud_provision_flow_error())
+    return base::nullopt;
+
+  return sign_in_error()->get_cloud_provision_flow_error();
 }
 
 const mojom::ArcSignInError* ArcProvisioningResult::sign_in_error() const {
-  DCHECK(has_sign_in_error());
+  if (!sign_in_result() || !sign_in_result()->is_error())
+    return nullptr;
+
   return sign_in_result()->get_error().get();
 }
 
+base::Optional<mojom::GeneralSignInError> ArcProvisioningResult::general_error()
+    const {
+  if (!sign_in_error() || !sign_in_error()->is_general_error())
+    return base::nullopt;
+
+  return sign_in_error()->get_general_error();
+}
+
 bool ArcProvisioningResult::is_success() const {
-  return has_sign_in_result() && sign_in_result()->is_success();
+  return sign_in_result() && sign_in_result()->is_success();
 }
 
-bool ArcProvisioningResult::has_general_error(
-    mojom::GeneralSignInError error) const {
-  return has_sign_in_error() && sign_in_error()->is_general_error() &&
-         sign_in_error()->get_general_error() == error;
-}
+base::Optional<ArcStopReason> ArcProvisioningResult::stop_reason() const {
+  if (!absl::holds_alternative<ArcStopReason>(result_))
+    return base::nullopt;
 
-bool ArcProvisioningResult::is_stopped() const {
-  return absl::holds_alternative<ArcStopReason>(result_);
-}
-
-ArcStopReason ArcProvisioningResult::stop_reason() const {
-  DCHECK(is_stopped());
   return absl::get<ArcStopReason>(result_);
 }
 
@@ -60,6 +73,13 @@
   return absl::holds_alternative<ChromeProvisioningTimeout>(result_);
 }
 
+const mojom::ArcSignInResult* ArcProvisioningResult::sign_in_result() const {
+  if (!absl::holds_alternative<mojom::ArcSignInResultPtr>(result_))
+    return nullptr;
+
+  return absl::get<mojom::ArcSignInResultPtr>(result_).get();
+}
+
 std::ostream& operator<<(std::ostream& os,
                          const ArcProvisioningResult& result) {
   return os << GetProvisioningStatus(result);
diff --git a/chrome/browser/chromeos/arc/session/arc_provisioning_result.h b/chrome/browser/chromeos/arc/session/arc_provisioning_result.h
index 2a1d02a4..87f495e 100644
--- a/chrome/browser/chromeos/arc/session/arc_provisioning_result.h
+++ b/chrome/browser/chromeos/arc/session/arc_provisioning_result.h
@@ -7,6 +7,7 @@
 
 #include <ostream>
 
+#include "base/optional.h"
 #include "components/arc/mojom/auth.mojom.h"
 #include "components/arc/session/arc_stop_reason.h"
 #include "third_party/abseil-cpp/absl/types/variant.h"
@@ -27,34 +28,35 @@
   ArcProvisioningResult(ArcProvisioningResult&& other);
   ~ArcProvisioningResult();
 
-  // Returns true if signin_result from ARC is present.
-  bool has_sign_in_result() const;
+  // Returns gms sign-in error if sign-in result has it.
+  base::Optional<mojom::GMSSignInError> gms_sign_in_error() const;
 
-  // Returns the result of provisioning from inside ARC.
-  const mojom::ArcSignInResult* sign_in_result() const;
+  // Returns gms check-in error if sign-in result has it.
+  base::Optional<mojom::GMSCheckInError> gms_check_in_error() const;
 
-  // Returns true if signin_result is present with an error.
-  bool has_sign_in_error() const;
+  // Returns cloud provision flow error if sign-in result has it.
+  base::Optional<mojom::CloudProvisionFlowError> cloud_provision_flow_error()
+      const;
 
   // Returns the error of signin_result coming from ARC.
   const mojom::ArcSignInError* sign_in_error() const;
 
-  // Returns true if result has given general sign-in error.
-  bool has_general_error(mojom::GeneralSignInError error) const;
+  // Returns general sign-in error if result has it.
+  base::Optional<mojom::GeneralSignInError> general_error() const;
 
   // Returns true if provisioning was successful.
   bool is_success() const;
 
-  // Returns true if ARC provisioning was stopped pre-maturely.
-  bool is_stopped() const;
-
-  // Returns the reason for ARC stopped event.
-  ArcStopReason stop_reason() const;
+  // Returns the reason for ARC stopped event if it exists.
+  base::Optional<ArcStopReason> stop_reason() const;
 
   // Returns true if ARC provisioning timed out in Chrome.
   bool is_timedout() const;
 
  private:
+  // Returns the result of provisioning from inside ARC.
+  const mojom::ArcSignInResult* sign_in_result() const;
+
   absl::variant<mojom::ArcSignInResultPtr,
                 ArcStopReason,
                 ChromeProvisioningTimeout>
diff --git a/chrome/browser/chromeos/arc/session/arc_provisioning_result_unittest.cc b/chrome/browser/chromeos/arc/session/arc_provisioning_result_unittest.cc
index c1840e0..c0548d4 100644
--- a/chrome/browser/chromeos/arc/session/arc_provisioning_result_unittest.cc
+++ b/chrome/browser/chromeos/arc/session/arc_provisioning_result_unittest.cc
@@ -9,23 +9,55 @@
 
 namespace arc {
 
-TEST(ArcProvisioningResultTest, HasSignInResult) {
+TEST(ArcProvisioningResultTest, SignInError) {
   ArcProvisioningResult result1(ArcStopReason::CRASH);
-  EXPECT_FALSE(result1.has_sign_in_result());
-
-  ArcProvisioningResult result2(arc::mojom::ArcSignInResult::NewSuccess(
-      arc::mojom::ArcSignInSuccess::SUCCESS));
-  EXPECT_TRUE(result2.has_sign_in_result());
-}
-
-TEST(ArcProvisioningResultTest, HasSignInError) {
-  ArcProvisioningResult result1(ArcStopReason::CRASH);
-  EXPECT_FALSE(result1.has_sign_in_error());
+  EXPECT_FALSE(result1.sign_in_error());
 
   ArcProvisioningResult result2(arc::mojom::ArcSignInResult::NewError(
       arc::mojom::ArcSignInError::NewGeneralError(
           arc::mojom::GeneralSignInError::CHROME_SERVER_COMMUNICATION_ERROR)));
-  EXPECT_TRUE(result2.has_sign_in_error());
+  EXPECT_TRUE(result2.sign_in_error());
+}
+
+TEST(ArcProvisioningResultTest, GmsSignInError) {
+  ArcProvisioningResult result1(ArcStopReason::CRASH);
+  EXPECT_FALSE(result1.gms_sign_in_error());
+
+  ArcProvisioningResult result2(arc::mojom::ArcSignInResult::NewError(
+      arc::mojom::ArcSignInError::NewGeneralError(
+          arc::mojom::GeneralSignInError::CHROME_SERVER_COMMUNICATION_ERROR)));
+  EXPECT_FALSE(result2.gms_sign_in_error());
+
+  ArcProvisioningResult result3(arc::mojom::ArcSignInResult::NewError(
+      arc::mojom::ArcSignInError::NewSignInError(
+          arc::mojom::GMSSignInError::GMS_SIGN_IN_TIMEOUT)));
+
+  EXPECT_EQ(result3.gms_sign_in_error(),
+            arc::mojom::GMSSignInError::GMS_SIGN_IN_TIMEOUT);
+}
+
+TEST(ArcProvisioningResultTest, GmsCheckInError) {
+  ArcProvisioningResult result1(ArcStopReason::CRASH);
+  EXPECT_FALSE(result1.gms_check_in_error());
+
+  ArcProvisioningResult result2(arc::mojom::ArcSignInResult::NewError(
+      arc::mojom::ArcSignInError::NewCheckInError(
+          arc::mojom::GMSCheckInError::GMS_CHECK_IN_INTERNAL_ERROR)));
+
+  EXPECT_EQ(result2.gms_check_in_error(),
+            arc::mojom::GMSCheckInError::GMS_CHECK_IN_INTERNAL_ERROR);
+}
+
+TEST(ArcProvisioningResultTest, CloudProvisionFlowError) {
+  ArcProvisioningResult result1(ArcStopReason::CRASH);
+  EXPECT_FALSE(result1.cloud_provision_flow_error());
+
+  ArcProvisioningResult result2(arc::mojom::ArcSignInResult::NewError(
+      arc::mojom::ArcSignInError::NewCloudProvisionFlowError(
+          arc::mojom::CloudProvisionFlowError::ERROR_ACCOUNT_NOT_ALLOWLISTED)));
+
+  EXPECT_EQ(result2.cloud_provision_flow_error(),
+            arc::mojom::CloudProvisionFlowError::ERROR_ACCOUNT_NOT_ALLOWLISTED);
 }
 
 TEST(ArcProvisioningResultTest, Success) {
@@ -41,22 +73,22 @@
   EXPECT_TRUE(result3.is_success());
 }
 
-TEST(ArcProvisioningResultTest, Stopped) {
+TEST(ArcProvisioningResultTest, StopReason) {
   ArcProvisioningResult result1(arc::mojom::ArcSignInResult::NewSuccess(
       arc::mojom::ArcSignInSuccess::SUCCESS));
-  EXPECT_FALSE(result1.is_stopped());
+  EXPECT_FALSE(result1.stop_reason());
 
   ArcProvisioningResult result2(ArcStopReason::CRASH);
-  EXPECT_TRUE(result2.is_stopped());
+  EXPECT_EQ(ArcStopReason::CRASH, result2.stop_reason());
 
   ArcProvisioningResult result3(ArcStopReason::SHUTDOWN);
-  EXPECT_TRUE(result3.is_stopped());
+  EXPECT_EQ(ArcStopReason::SHUTDOWN, result3.stop_reason());
 
   ArcProvisioningResult result4(ArcStopReason::GENERIC_BOOT_FAILURE);
-  EXPECT_TRUE(result4.is_stopped());
+  EXPECT_EQ(ArcStopReason::GENERIC_BOOT_FAILURE, result4.stop_reason());
 
   ArcProvisioningResult result5(ArcStopReason::LOW_DISK_SPACE);
-  EXPECT_TRUE(result5.is_stopped());
+  EXPECT_EQ(ArcStopReason::LOW_DISK_SPACE, result5.stop_reason());
 }
 
 TEST(ArcProvisioningResultTest, Timedout) {
@@ -67,30 +99,16 @@
   EXPECT_TRUE(result2.is_timedout());
 }
 
-TEST(ArcProvisioningResultTest, HasGeneralError) {
+TEST(ArcProvisioningResultTest, GeneralError) {
   ArcProvisioningResult result1(ArcStopReason::CRASH);
-  EXPECT_FALSE(result1.has_general_error(
-      arc::mojom::GeneralSignInError::CHROME_SERVER_COMMUNICATION_ERROR));
+  EXPECT_FALSE(result1.general_error());
 
   ArcProvisioningResult result2(arc::mojom::ArcSignInResult::NewError(
       arc::mojom::ArcSignInError::NewGeneralError(
           arc::mojom::GeneralSignInError::CHROME_SERVER_COMMUNICATION_ERROR)));
-  EXPECT_TRUE(result2.has_general_error(
-      arc::mojom::GeneralSignInError::CHROME_SERVER_COMMUNICATION_ERROR));
-}
 
-TEST(ArcProvisioningResultTest, StopReason) {
-  ArcProvisioningResult result1(ArcStopReason::CRASH);
-  EXPECT_EQ(ArcStopReason::CRASH, result1.stop_reason());
-
-  ArcProvisioningResult result2(ArcStopReason::SHUTDOWN);
-  EXPECT_EQ(ArcStopReason::SHUTDOWN, result2.stop_reason());
-
-  ArcProvisioningResult result3(ArcStopReason::GENERIC_BOOT_FAILURE);
-  EXPECT_EQ(ArcStopReason::GENERIC_BOOT_FAILURE, result3.stop_reason());
-
-  ArcProvisioningResult result4(ArcStopReason::LOW_DISK_SPACE);
-  EXPECT_EQ(ArcStopReason::LOW_DISK_SPACE, result4.stop_reason());
+  EXPECT_EQ(result2.general_error(),
+            arc::mojom::GeneralSignInError::CHROME_SERVER_COMMUNICATION_ERROR);
 }
 
 }  // namespace arc
diff --git a/chrome/browser/chromeos/arc/session/arc_session_manager.cc b/chrome/browser/chromeos/arc/session/arc_session_manager.cc
index 14d013e..74cdb6781 100644
--- a/chrome/browser/chromeos/arc/session/arc_session_manager.cc
+++ b/chrome/browser/chromeos/arc/session/arc_session_manager.cc
@@ -371,6 +371,47 @@
   }
 }
 
+ArcSupportHost::Error GetSupportHostError(const ArcProvisioningResult& result) {
+  if (result.gms_sign_in_error() ==
+      mojom::GMSSignInError::GMS_SIGN_IN_NETWORK_ERROR) {
+    return ArcSupportHost::Error::SIGN_IN_NETWORK_ERROR;
+  }
+
+  if (result.gms_sign_in_error() ==
+      mojom::GMSSignInError::GMS_SIGN_IN_BAD_AUTHENTICATION) {
+    return ArcSupportHost::Error::SIGN_IN_BAD_AUTHENTICATION_ERROR;
+  }
+
+  if (result.gms_sign_in_error())
+    return ArcSupportHost::Error::SIGN_IN_SERVICE_UNAVAILABLE_ERROR;
+
+  if (result.gms_check_in_error())
+    return ArcSupportHost::Error::SIGN_IN_GMS_NOT_AVAILABLE_ERROR;
+
+  if (result.cloud_provision_flow_error()) {
+    return GetCloudProvisionFlowError(
+        result.cloud_provision_flow_error().value());
+  }
+
+  if (result.general_error() ==
+      mojom::GeneralSignInError::CHROME_SERVER_COMMUNICATION_ERROR) {
+    return ArcSupportHost::Error::SERVER_COMMUNICATION_ERROR;
+  }
+
+  if (result.general_error() ==
+      mojom::GeneralSignInError::NO_NETWORK_CONNECTION) {
+    return ArcSupportHost::Error::NETWORK_UNAVAILABLE_ERROR;
+  }
+
+  if (result.general_error() == mojom::GeneralSignInError::ARC_DISABLED)
+    return ArcSupportHost::Error::ANDROID_MANAGEMENT_REQUIRED_ERROR;
+
+  if (result.stop_reason() == ArcStopReason::LOW_DISK_SPACE)
+    return ArcSupportHost::Error::LOW_DISK_SPACE_ERROR;
+
+  return ArcSupportHost::Error::SIGN_IN_UNKNOWN_ERROR;
+}
+
 ArcSessionManager::ExpansionResult ExpandPropertyFilesAndReadSaltInternal(
     const base::FilePath& source_path,
     const base::FilePath& dest_path,
@@ -578,9 +619,6 @@
     return;
   }
 
-  const mojom::ArcSignInError* sign_in_error =
-      result.has_sign_in_error() ? result.sign_in_error() : nullptr;
-
   // Due asynchronous nature of stopping the ARC instance,
   // OnProvisioningFinished may arrive after setting the |State::STOPPED| state
   // and |State::Active| is not guaranteed to be set here.
@@ -601,8 +639,8 @@
   if (scoped_opt_in_tracker_ && !provisioning_successful)
     scoped_opt_in_tracker_->TrackError();
 
-  if (result.has_general_error(
-          mojom::GeneralSignInError::CHROME_SERVER_COMMUNICATION_ERROR)) {
+  if (result.general_error() ==
+      mojom::GeneralSignInError::CHROME_SERVER_COMMUNICATION_ERROR) {
     // TODO(poromov): Consider ARC PublicSession offline mode.
     // Currently ARC session will be exited below, while the main user session
     // will be kept alive without Android apps.
@@ -626,15 +664,13 @@
                              provisioning_successful, profile_);
     UpdateProvisioningStatusUMA(GetProvisioningStatus(result), profile_);
 
-    if (sign_in_error) {
-      if (sign_in_error->is_cloud_provision_flow_error()) {
-        UpdateCloudProvisionFlowErrorUMA(
-            sign_in_error->get_cloud_provision_flow_error(), profile_);
-      } else if (sign_in_error->is_sign_in_error()) {
-        UpdateGMSSignInErrorUMA(sign_in_error->get_sign_in_error(), profile_);
-      } else if (sign_in_error->is_check_in_error()) {
-        UpdateGMSCheckInErrorUMA(sign_in_error->get_check_in_error(), profile_);
-      }
+    if (result.gms_sign_in_error()) {
+      UpdateGMSSignInErrorUMA(result.gms_sign_in_error().value(), profile_);
+    } else if (result.gms_check_in_error()) {
+      UpdateGMSCheckInErrorUMA(result.gms_check_in_error().value(), profile_);
+    } else if (result.cloud_provision_flow_error()) {
+      UpdateCloudProvisionFlowErrorUMA(
+          result.cloud_provision_flow_error().value(), profile_);
     }
 
     if (!provisioning_successful)
@@ -675,69 +711,38 @@
     return;
   }
 
-  ArcSupportHost::Error support_error;
   VLOG(1) << "ARC provisioning failed: " << result << ".";
-  if (sign_in_error && sign_in_error->is_sign_in_error() &&
-      sign_in_error->get_sign_in_error() ==
-          mojom::GMSSignInError::GMS_SIGN_IN_NETWORK_ERROR) {
-    support_error = ArcSupportHost::Error::SIGN_IN_NETWORK_ERROR;
-  } else if (sign_in_error && sign_in_error->is_sign_in_error() &&
-             sign_in_error->get_sign_in_error() ==
-                 mojom::GMSSignInError::GMS_SIGN_IN_BAD_AUTHENTICATION) {
-    support_error = ArcSupportHost::Error::SIGN_IN_BAD_AUTHENTICATION_ERROR;
-  } else if (sign_in_error && sign_in_error->is_sign_in_error()) {
-    support_error = ArcSupportHost::Error::SIGN_IN_SERVICE_UNAVAILABLE_ERROR;
-  } else if (sign_in_error && sign_in_error->is_check_in_error()) {
-    support_error = ArcSupportHost::Error::SIGN_IN_GMS_NOT_AVAILABLE_ERROR;
-  } else if (sign_in_error && sign_in_error->is_cloud_provision_flow_error()) {
-    support_error = GetCloudProvisionFlowError(
-        sign_in_error->get_cloud_provision_flow_error());
-  } else if (result.has_general_error(mojom::GeneralSignInError::
-                                          CHROME_SERVER_COMMUNICATION_ERROR)) {
-    support_error = ArcSupportHost::Error::SERVER_COMMUNICATION_ERROR;
-  } else if (result.has_general_error(
-                 mojom::GeneralSignInError::NO_NETWORK_CONNECTION)) {
-    support_error = ArcSupportHost::Error::NETWORK_UNAVAILABLE_ERROR;
-  } else if (result.has_general_error(
-                 mojom::GeneralSignInError::ARC_DISABLED)) {
-    support_error = ArcSupportHost::Error::ANDROID_MANAGEMENT_REQUIRED_ERROR;
-  } else if (result.is_stopped()) {
-    support_error = result.stop_reason() == ArcStopReason::LOW_DISK_SPACE
-                        ? ArcSupportHost::Error::LOW_DISK_SPACE_ERROR
-                        : ArcSupportHost::Error::SIGN_IN_UNKNOWN_ERROR;
-  } else {
-    support_error = ArcSupportHost::Error::SIGN_IN_UNKNOWN_ERROR;
-  }
 
   // When ARC provisioning fails due to Chrome failing to talk to server, we
   // don't need to keep the ARC session running as the logs necessary to
   // investigate are already present. ARC session will not provide any useful
   // context.
-  if (result.is_stopped() ||
-      result.has_general_error(
-          mojom::GeneralSignInError::CHROME_SERVER_COMMUNICATION_ERROR)) {
+  if (result.stop_reason() ||
+      result.general_error() ==
+          mojom::GeneralSignInError::CHROME_SERVER_COMMUNICATION_ERROR) {
     if (profile_->GetPrefs()->HasPrefPath(prefs::kArcSignedIn))
       profile_->GetPrefs()->SetBoolean(prefs::kArcSignedIn, false);
     VLOG(1) << "Stopping ARC due to provisioning failure";
     ShutdownSession();
   }
 
-  if ((sign_in_error && sign_in_error->is_cloud_provision_flow_error()) ||
+  if (result.cloud_provision_flow_error() ||
       // OVERALL_SIGN_IN_TIMEOUT might be an indication that ARC believes it is
       // fully setup, but Chrome does not.
       result.is_timedout() ||
       // Just to be safe, remove data if we don't know the cause.
-      result.has_general_error(mojom::GeneralSignInError::UNKNOWN_ERROR)) {
+      result.general_error() == mojom::GeneralSignInError::UNKNOWN_ERROR) {
     VLOG(1) << "ARC provisioning failed permanently. Removing user data";
     RequestArcDataRemoval();
   }
 
   base::Optional<int> error_code;
+  ArcSupportHost::Error support_error = GetSupportHostError(result);
   if (support_error == ArcSupportHost::Error::SIGN_IN_UNKNOWN_ERROR) {
     error_code = static_cast<std::underlying_type_t<ProvisioningStatus>>(
         GetProvisioningStatus(result));
-  } else if (sign_in_error) {
-    error_code = GetSignInErrorCode(sign_in_error);
+  } else if (result.sign_in_error()) {
+    error_code = GetSignInErrorCode(result.sign_in_error());
   }
   ShowArcSupportHostError({support_error, error_code} /* error_info */,
                           true /* should_show_send_feedback */);
diff --git a/chrome/browser/chromeos/arc/session/arc_session_manager.h b/chrome/browser/chromeos/arc/session/arc_session_manager.h
index 5a64db6..e823aa8 100644
--- a/chrome/browser/chromeos/arc/session/arc_session_manager.h
+++ b/chrome/browser/chromeos/arc/session/arc_session_manager.h
@@ -213,7 +213,7 @@
   // On provisioning completion (regardless of whether successfully done or
   // not), this is called with its status. On success, is_success() of
   // |result| returns true, otherwise ArcSignInResult can be retrieved from
-  // get() if sign-in result came from ARC or is_stopped()
+  // get() if sign-in result came from ARC or stop_reason()
   // will indicate that ARC stopped prematurely and provisioning could
   // not finish successfully. is_timedout() indicates that operation timed
   // out.
diff --git a/chrome/browser/chromeos/child_accounts/time_limits/app_service_wrapper_unittest.cc b/chrome/browser/chromeos/child_accounts/time_limits/app_service_wrapper_unittest.cc
index 3a98408..4f60d72f 100644
--- a/chrome/browser/chromeos/child_accounts/time_limits/app_service_wrapper_unittest.cc
+++ b/chrome/browser/chromeos/child_accounts/time_limits/app_service_wrapper_unittest.cc
@@ -24,7 +24,6 @@
 #include "chrome/browser/chromeos/child_accounts/time_limits/app_types.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/test_extension_system.h"
-#include "chrome/browser/installable/installable_metrics.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_test.h"
 #include "chrome/browser/web_applications/components/app_registry_controller.h"
 #include "chrome/browser/web_applications/components/install_finalizer.h"
@@ -41,6 +40,7 @@
 #include "components/arc/test/fake_app_instance.h"
 #include "components/services/app_service/public/cpp/app_update.h"
 #include "components/services/app_service/public/mojom/types.mojom.h"
+#include "components/webapps/installable/installable_metrics.h"
 #include "content/public/test/browser_task_environment.h"
 #include "extensions/common/constants.h"
 #include "testing/gmock/include/gmock/gmock.h"
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index 3b8ff48..b7755e7 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -1256,6 +1256,12 @@
     }
   }
 
+#if BUILDFLAG(PLATFORM_CFM)
+  // Cleanly shutdown all Chromebox For Meetings services before DBus and other
+  // critical services are destroyed
+  chromeos::cfm::ShutdownCfmServices();
+#endif  // BUILDFLAG(PLATFORM_CFM)
+
   // Cleans up dbus services depending on ash.
   dbus_services_->PreAshShutdown();
 
diff --git a/chrome/browser/chromeos/chromebox_for_meetings/browser/cfm_browser_service.cc b/chrome/browser/chromeos/chromebox_for_meetings/browser/cfm_browser_service.cc
index 066a83c..16cb5ae6 100644
--- a/chrome/browser/chromeos/chromebox_for_meetings/browser/cfm_browser_service.cc
+++ b/chrome/browser/chromeos/chromebox_for_meetings/browser/cfm_browser_service.cc
@@ -6,21 +6,44 @@
 
 #include "base/bind.h"
 #include "base/macros.h"
+#include "chromeos/dbus/chromebox_for_meetings/cfm_hotline_client.h"
 #include "mojo/public/cpp/bindings/receiver_set.h"
 
 namespace chromeos {
 namespace cfm {
 
-CfmBrowserService::CfmBrowserService()
-    : service_adaptor_(mojom::CfmBrowser::Name_, this) {
-  receivers_.set_disconnect_handler(base::BindRepeating(
-      &CfmBrowserService::OnMojoDisconnect, base::Unretained(this)));
+namespace {
+static CfmBrowserService* g_browser_service = nullptr;
+}  // namespace
+
+// static
+void CfmBrowserService::Initialize() {
+  CHECK(!g_browser_service);
+  g_browser_service = new CfmBrowserService();
 }
 
-CfmBrowserService::~CfmBrowserService() = default;
+// static
+void CfmBrowserService::Shutdown() {
+  CHECK(g_browser_service);
+  delete g_browser_service;
+  g_browser_service = nullptr;
+}
 
-bool CfmBrowserService::ServiceRequestReceived(const std::string& service_id) {
-  if (service_id != mojom::CfmBrowser::Name_) {
+// static
+CfmBrowserService* CfmBrowserService::Get() {
+  CHECK(g_browser_service)
+      << "CfmBrowserService::Get() called before Initialize()";
+  return g_browser_service;
+}
+
+// static
+bool CfmBrowserService::IsInitialized() {
+  return g_browser_service;
+}
+
+bool CfmBrowserService::ServiceRequestReceived(
+    const std::string& interface_name) {
+  if (interface_name != mojom::CfmBrowser::Name_) {
     return false;
   }
   service_adaptor_.BindServiceAdaptor();
@@ -43,10 +66,18 @@
   VLOG(3) << "mojom::CfmBrowser disconnected";
 }
 
-CfmBrowserService* CfmBrowserService::GetInstance() {
-  static base::NoDestructor<CfmBrowserService> cfm_browser_service;
+// Private methods
 
-  return cfm_browser_service.get();
+CfmBrowserService::CfmBrowserService()
+    : service_adaptor_(mojom::CfmBrowser::Name_, this) {
+  CfmHotlineClient::Get()->AddObserver(this);
+
+  receivers_.set_disconnect_handler(base::BindRepeating(
+      &CfmBrowserService::OnMojoDisconnect, base::Unretained(this)));
+}
+
+CfmBrowserService::~CfmBrowserService() {
+  CfmHotlineClient::Get()->RemoveObserver(this);
 }
 
 }  // namespace cfm
diff --git a/chrome/browser/chromeos/chromebox_for_meetings/browser/cfm_browser_service.h b/chrome/browser/chromeos/chromebox_for_meetings/browser/cfm_browser_service.h
index c7d81bf..f8469b5 100644
--- a/chrome/browser/chromeos/chromebox_for_meetings/browser/cfm_browser_service.h
+++ b/chrome/browser/chromeos/chromebox_for_meetings/browser/cfm_browser_service.h
@@ -6,7 +6,6 @@
 #define CHROME_BROWSER_CHROMEOS_CHROMEBOX_FOR_MEETINGS_BROWSER_CFM_BROWSER_SERVICE_H_
 
 #include "base/memory/weak_ptr.h"
-#include "base/no_destructor.h"
 #include "chrome/browser/chromeos/chromebox_for_meetings/service_adaptor.h"
 #include "chromeos/dbus/chromebox_for_meetings/cfm_observer.h"
 #include "chromeos/services/chromebox_for_meetings/public/mojom/cfm_browser.mojom.h"
@@ -24,15 +23,14 @@
  public:
   CfmBrowserService(const CfmBrowserService&) = delete;
   CfmBrowserService& operator=(const CfmBrowserService&) = delete;
-  ~CfmBrowserService() override;
 
-  // Returns the global instance
-  static CfmBrowserService* GetInstance();
+  // Manage singleton instance.
+  static void Initialize();
+  static void Shutdown();
+  static CfmBrowserService* Get();
+  static bool IsInitialized();
 
  protected:
-  friend class base::NoDestructor<CfmBrowserService>;
-  CfmBrowserService();
-
   // Forward |CfmObserver| implementation
   bool ServiceRequestReceived(const std::string& interface_name) override;
 
@@ -46,6 +44,9 @@
   virtual void OnMojoDisconnect();
 
  private:
+  CfmBrowserService();
+  ~CfmBrowserService() override;
+
   ServiceAdaptor service_adaptor_;
   mojo::ReceiverSet<mojom::CfmBrowser> receivers_;
 };
diff --git a/chrome/browser/chromeos/chromebox_for_meetings/cfm_chrome_services.cc b/chrome/browser/chromeos/chromebox_for_meetings/cfm_chrome_services.cc
index 8e0c3db..e696567f 100644
--- a/chrome/browser/chromeos/chromebox_for_meetings/cfm_chrome_services.cc
+++ b/chrome/browser/chromeos/chromebox_for_meetings/cfm_chrome_services.cc
@@ -16,7 +16,15 @@
     return;
   }
 
-  CfmHotlineClient::Get()->AddObserver(CfmBrowserService::GetInstance());
+  CfmBrowserService::Initialize();
+}
+
+void ShutdownCfmServices() {
+  if (!features::IsCfmMojoEnabled() || !CfmHotlineClient::Get()) {
+    return;
+  }
+
+  CfmBrowserService::Shutdown();
 }
 
 }  // namespace cfm
diff --git a/chrome/browser/chromeos/chromebox_for_meetings/cfm_chrome_services.h b/chrome/browser/chromeos/chromebox_for_meetings/cfm_chrome_services.h
index ae8a39a..4adb055 100644
--- a/chrome/browser/chromeos/chromebox_for_meetings/cfm_chrome_services.h
+++ b/chrome/browser/chromeos/chromebox_for_meetings/cfm_chrome_services.h
@@ -17,6 +17,10 @@
 // |CfmServiceContext| granting hotline access to services.
 void InitializeCfmServices();
 
+// Removes the observers for service interface requests by the
+// |CfmServiceContext| removing hotline access to services.
+void ShutdownCfmServices();
+
 }  // namespace cfm
 }  // namespace chromeos
 
diff --git a/chrome/browser/chromeos/crostini/crostini_manager.cc b/chrome/browser/chromeos/crostini/crostini_manager.cc
index e4e6023..8002ab0 100644
--- a/chrome/browser/chromeos/crostini/crostini_manager.cc
+++ b/chrome/browser/chromeos/crostini/crostini_manager.cc
@@ -31,13 +31,13 @@
 #include "chrome/browser/chromeos/crostini/crostini_pref_names.h"
 #include "chrome/browser/chromeos/crostini/crostini_remover.h"
 #include "chrome/browser/chromeos/crostini/crostini_reporting_util.h"
-#include "chrome/browser/chromeos/crostini/crostini_stability_monitor.h"
 #include "chrome/browser/chromeos/crostini/crostini_types.mojom.h"
 #include "chrome/browser/chromeos/crostini/crostini_upgrade_available_notification.h"
 #include "chrome/browser/chromeos/crostini/throttle/crostini_throttle.h"
 #include "chrome/browser/chromeos/file_manager/path_util.h"
 #include "chrome/browser/chromeos/file_manager/volume_manager.h"
 #include "chrome/browser/chromeos/guest_os/guest_os_share_path.h"
+#include "chrome/browser/chromeos/guest_os/guest_os_stability_monitor.h"
 #include "chrome/browser/chromeos/policy/powerwash_requirements_checker.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/chromeos/scheduler_configuration_manager.h"
@@ -152,7 +152,7 @@
     RestartOptions&&) = default;
 
 class CrostiniManager::CrostiniRestarter
-    : public crostini::VmShutdownObserver,
+    : public chromeos::VmShutdownObserver,
       public chromeos::disks::DiskMountManager::Observer,
       public chromeos::SchedulerConfigurationManagerBase::Observer {
  public:
@@ -208,7 +208,7 @@
     }
   }
 
-  // crostini::VmShutdownObserver
+  // chromeos::VmShutdownObserver
   void OnVmShutdown(const std::string& vm_name) override {
     if (ReturnEarlyIfAborted()) {
       return;
@@ -922,8 +922,8 @@
     chromeos::PowerManagerClient::Get()->AddObserver(this);
   }
   CrostiniThrottle::GetForBrowserContext(profile_);
-  crostini_stability_monitor_ =
-      std::make_unique<CrostiniStabilityMonitor>(this);
+  guest_os_stability_monitor_ =
+      std::make_unique<guest_os::GuestOsStabilityMonitor>(this);
 }
 
 CrostiniManager::~CrostiniManager() {
@@ -949,9 +949,9 @@
   if (chromeos::PowerManagerClient::Get()) {
     chromeos::PowerManagerClient::Get()->RemoveObserver(this);
   }
-  // CrostiniStabilityMonitor needs to be destructed here so it can unregister
+  // GuestOsStabilityMonitor needs to be destructed here so it can unregister
   // itself from the DBus clients that may no longer exist later.
-  crostini_stability_monitor_.reset();
+  guest_os_stability_monitor_.reset();
 }
 
 // static
@@ -2150,10 +2150,12 @@
   upgrade_container_progress_observers_.RemoveObserver(observer);
 }
 
-void CrostiniManager::AddVmShutdownObserver(VmShutdownObserver* observer) {
+void CrostiniManager::AddVmShutdownObserver(
+    chromeos::VmShutdownObserver* observer) {
   vm_shutdown_observers_.AddObserver(observer);
 }
-void CrostiniManager::RemoveVmShutdownObserver(VmShutdownObserver* observer) {
+void CrostiniManager::RemoveVmShutdownObserver(
+    chromeos::VmShutdownObserver* observer) {
   vm_shutdown_observers_.RemoveObserver(observer);
 }
 
diff --git a/chrome/browser/chromeos/crostini/crostini_manager.h b/chrome/browser/chromeos/crostini/crostini_manager.h
index ccbeacd..95c214c 100644
--- a/chrome/browser/chromeos/crostini/crostini_manager.h
+++ b/chrome/browser/chromeos/crostini/crostini_manager.h
@@ -20,6 +20,7 @@
 #include "chrome/browser/chromeos/crostini/crostini_types.mojom-forward.h"
 #include "chrome/browser/chromeos/crostini/crostini_util.h"
 #include "chrome/browser/chromeos/crostini/termina_installer.h"
+#include "chrome/browser/chromeos/vm_shutdown_observer.h"
 #include "chrome/browser/chromeos/vm_starting_observer.h"
 #include "chrome/browser/component_updater/cros_component_installer_chromeos.h"
 #include "chrome/browser/ui/browser.h"
@@ -38,9 +39,12 @@
 
 class Profile;
 
+namespace guest_os {
+class GuestOsStabilityMonitor;
+}
+
 namespace crostini {
 
-class CrostiniStabilityMonitor;
 class CrostiniUpgradeAvailableNotification;
 
 class LinuxPackageOperationProgressObserver {
@@ -126,12 +130,6 @@
                                            bool can_upgrade) = 0;
 };
 
-class VmShutdownObserver : public base::CheckedObserver {
- public:
-  // Called when the given VM has shutdown.
-  virtual void OnVmShutdown(const std::string& vm_name) = 0;
-};
-
 class ContainerStartedObserver : public base::CheckedObserver {
  public:
   // Called when the container has started.
@@ -503,8 +501,8 @@
       UpgradeContainerProgressObserver* observer);
 
   // Add/remove vm shutdown observers.
-  void AddVmShutdownObserver(VmShutdownObserver* observer);
-  void RemoveVmShutdownObserver(VmShutdownObserver* observer);
+  void AddVmShutdownObserver(chromeos::VmShutdownObserver* observer);
+  void RemoveVmShutdownObserver(chromeos::VmShutdownObserver* observer);
 
   // Add/remove vm starting observers.
   void AddVmStartingObserver(chromeos::VmStartingObserver* observer);
@@ -887,7 +885,7 @@
   base::ObserverList<UpgradeContainerProgressObserver>::Unchecked
       upgrade_container_progress_observers_;
 
-  base::ObserverList<VmShutdownObserver> vm_shutdown_observers_;
+  base::ObserverList<chromeos::VmShutdownObserver> vm_shutdown_observers_;
   base::ObserverList<chromeos::VmStartingObserver> vm_starting_observers_;
 
   // Only one restarter flow is actually running for a given container, other
@@ -924,7 +922,8 @@
 
   base::Time time_of_last_disk_type_metric_;
 
-  std::unique_ptr<CrostiniStabilityMonitor> crostini_stability_monitor_;
+  std::unique_ptr<guest_os::GuestOsStabilityMonitor>
+      guest_os_stability_monitor_;
 
   std::unique_ptr<CrostiniUpgradeAvailableNotification>
       upgrade_available_notification_;
diff --git a/chrome/browser/chromeos/crostini/crostini_package_service.h b/chrome/browser/chromeos/crostini/crostini_package_service.h
index 3de0e34..3fe8690 100644
--- a/chrome/browser/chromeos/crostini/crostini_package_service.h
+++ b/chrome/browser/chromeos/crostini/crostini_package_service.h
@@ -29,7 +29,7 @@
 class CrostiniPackageService : public KeyedService,
                                public LinuxPackageOperationProgressObserver,
                                public PendingAppListUpdatesObserver,
-                               public VmShutdownObserver {
+                               public chromeos::VmShutdownObserver {
  public:
   using StateChangeCallback =
       base::RepeatingCallback<void(PackageOperationStatus)>;
@@ -68,7 +68,7 @@
   void OnPendingAppListUpdates(const ContainerId& container_id,
                                int count) override;
 
-  // VmShutdownObserver
+  // chromeos::VmShutdownObserver
   void OnVmShutdown(const std::string& vm_name) override;
 
   // (Eventually) install a Linux package. If successfully started, a system
diff --git a/chrome/browser/chromeos/crostini/crostini_stability_monitor.h b/chrome/browser/chromeos/crostini/crostini_stability_monitor.h
deleted file mode 100644
index 090a243..0000000
--- a/chrome/browser/chromeos/crostini/crostini_stability_monitor.h
+++ /dev/null
@@ -1,105 +0,0 @@
-// Copyright 2020 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CHROME_BROWSER_CHROMEOS_CROSTINI_CROSTINI_STABILITY_MONITOR_H_
-#define CHROME_BROWSER_CHROMEOS_CROSTINI_CROSTINI_STABILITY_MONITOR_H_
-
-#include "base/memory/weak_ptr.h"
-#include "base/scoped_observer.h"
-#include "chrome/browser/chromeos/crostini/crostini_manager.h"
-#include "chromeos/dbus/chunneld_client.h"
-#include "chromeos/dbus/cicerone_client.h"
-#include "chromeos/dbus/concierge_client.h"
-#include "chromeos/dbus/seneschal_client.h"
-
-namespace crostini {
-
-extern const char kCrostiniStabilityHistogram[];
-
-// These values are logged to UMA. Entries should not be renumbered and numeric
-// values should never be reused. Please keep in sync with
-// CrostiniFailureClasses in src/tools/metrics/histograms/enums.xml and the copy
-// in src/platform2/vm_tools/cicerone/crash_listener_impl.cc
-enum class FailureClasses {
-  ConciergeStopped = 0,
-  CiceroneStopped = 1,
-  SeneschalStopped = 2,
-  ChunneldStopped = 3,
-  VmStopped = 4,
-  VmSyslogStopped = 5,
-  VshdStopped = 6,
-  LxcFsStopped = 7,
-  TremplinStopped = 8,
-  NdproxydStopped = 9,
-  McastdStopped = 10,
-  LxdStopped = 11,
-  GarconStopped = 12,
-  SommelierStopped = 13,
-  SommelierXStopped = 14,
-  CrosSftpStopped = 15,
-  CrosNotificationdStopped = 16,
-  kMaxValue = CrosNotificationdStopped,
-};
-
-class CrostiniStabilityMonitor : chromeos::ConciergeClient::Observer,
-                                 chromeos::CiceroneClient::Observer,
-                                 chromeos::SeneschalClient::Observer,
-                                 chromeos::ChunneldClient::Observer,
-                                 VmShutdownObserver {
- public:
-  explicit CrostiniStabilityMonitor(CrostiniManager* crostini_manager);
-  ~CrostiniStabilityMonitor() override;
-
-  CrostiniStabilityMonitor(const CrostiniStabilityMonitor&) = delete;
-  CrostiniStabilityMonitor& operator=(const CrostiniStabilityMonitor&) = delete;
-
-  void ConciergeStarted(bool is_available);
-  void CiceroneStarted(bool is_available);
-  void SeneschalStarted(bool is_available);
-  void ChunneldStarted(bool is_available);
-
-  //  chromeos::ConciergeClient::Observer::
-  void ConciergeServiceStopped() override;
-  void ConciergeServiceStarted() override;
-
-  //  chromeos::CiceroneClient::Observer::
-  void CiceroneServiceStopped() override;
-  void CiceroneServiceStarted() override;
-
-  //  chromeos::SeneschalClient::Observer::
-  void SeneschalServiceStopped() override;
-  void SeneschalServiceStarted() override;
-
-  //  chromeos::ChunneldClient::Observer::
-  void ChunneldServiceStopped() override;
-  void ChunneldServiceStarted() override;
-
-  //  VmShutdownObserver::
-  void OnVmShutdown(const std::string& vm_name) override;
-
- private:
-  ScopedObserver<chromeos::ConciergeClient, chromeos::ConciergeClient::Observer>
-      concierge_observer_;
-  ScopedObserver<chromeos::CiceroneClient, chromeos::CiceroneClient::Observer>
-      cicerone_observer_;
-  ScopedObserver<chromeos::SeneschalClient, chromeos::SeneschalClient::Observer>
-      seneschal_observer_;
-  ScopedObserver<chromeos::ChunneldClient, chromeos::ChunneldClient::Observer>
-      chunneld_observer_;
-  ScopedObserver<CrostiniManager,
-                 VmShutdownObserver,
-                 &CrostiniManager::AddVmShutdownObserver,
-                 &CrostiniManager::RemoveVmShutdownObserver>
-      vm_stopped_observer_;
-
-  base::WeakPtr<CrostiniManager> crostini_manager_;
-
-  // Note: This should remain the last member so it'll be destroyed and
-  // invalidate its weak pointers before any other members are destroyed.
-  base::WeakPtrFactory<CrostiniStabilityMonitor> weak_ptr_factory_{this};
-};
-
-}  // namespace crostini
-
-#endif  // CHROME_BROWSER_CHROMEOS_CROSTINI_CROSTINI_STABILITY_MONITOR_H_
diff --git a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
index fb25712f..3b63aebc 100644
--- a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
+++ b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
@@ -647,10 +647,15 @@
 WRAPPED_INSTANTIATE_TEST_SUITE_P(
     HoldingSpace, /* holding_space.js */
     FilesAppBrowserTest,
-    ::testing::Values(TestCase("holdingSpaceWelcomeBannerWithFeatureDisabled")
-                          .EnableHoldingSpace(false),
-                      TestCase("holdingSpaceWelcomeBannerWithFeatureEnabled")
-                          .EnableHoldingSpace(true)));
+    ::testing::Values(
+        TestCase("holdingSpaceWelcomeBannerWithFeatureDisabled")
+            .EnableHoldingSpace(false),
+        TestCase("holdingSpaceWelcomeBannerWithFeatureEnabled")
+            .EnableHoldingSpace(true),
+        TestCase("holdingSpaceWelcomeBannerWontShowAfterBeingDismissed")
+            .EnableHoldingSpace(true),
+        TestCase("holdingSpaceWelcomeBannerWontShowAfterReachingLimit")
+            .EnableHoldingSpace(true)));
 
 WRAPPED_INSTANTIATE_TEST_SUITE_P(
     Transfer, /* transfer.js */
diff --git a/chrome/browser/chromeos/crostini/crostini_stability_monitor.cc b/chrome/browser/chromeos/guest_os/guest_os_stability_monitor.cc
similarity index 67%
rename from chrome/browser/chromeos/crostini/crostini_stability_monitor.cc
rename to chrome/browser/chromeos/guest_os/guest_os_stability_monitor.cc
index 8702c9a..61fb283 100644
--- a/chrome/browser/chromeos/crostini/crostini_stability_monitor.cc
+++ b/chrome/browser/chromeos/guest_os/guest_os_stability_monitor.cc
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/crostini/crostini_stability_monitor.h"
+#include "chrome/browser/chromeos/guest_os/guest_os_stability_monitor.h"
 
 #include "base/metrics/histogram_functions.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 
-namespace crostini {
+namespace guest_os {
 
 const char kCrostiniStabilityHistogram[] = "Crostini.Stability";
 
-CrostiniStabilityMonitor::CrostiniStabilityMonitor(
-    CrostiniManager* crostini_manager)
+GuestOsStabilityMonitor::GuestOsStabilityMonitor(
+    crostini::CrostiniManager* crostini_manager)
     : concierge_observer_(this),
       cicerone_observer_(this),
       seneschal_observer_(this),
@@ -23,96 +23,96 @@
       chromeos::DBusThreadManager::Get()->GetConciergeClient();
   DCHECK(concierge_client);
   concierge_client->WaitForServiceToBeAvailable(
-      base::BindOnce(&CrostiniStabilityMonitor::ConciergeStarted,
+      base::BindOnce(&GuestOsStabilityMonitor::ConciergeStarted,
                      weak_ptr_factory_.GetWeakPtr()));
 
   auto* cicerone_client =
       chromeos::DBusThreadManager::Get()->GetCiceroneClient();
   DCHECK(cicerone_client);
   cicerone_client->WaitForServiceToBeAvailable(
-      base::BindOnce(&CrostiniStabilityMonitor::CiceroneStarted,
+      base::BindOnce(&GuestOsStabilityMonitor::CiceroneStarted,
                      weak_ptr_factory_.GetWeakPtr()));
 
   auto* seneschal_client =
       chromeos::DBusThreadManager::Get()->GetSeneschalClient();
   DCHECK(seneschal_client);
   seneschal_client->WaitForServiceToBeAvailable(
-      base::BindOnce(&CrostiniStabilityMonitor::SeneschalStarted,
+      base::BindOnce(&GuestOsStabilityMonitor::SeneschalStarted,
                      weak_ptr_factory_.GetWeakPtr()));
 
   auto* chunneld_client =
       chromeos::DBusThreadManager::Get()->GetChunneldClient();
   DCHECK(chunneld_client);
   chunneld_client->WaitForServiceToBeAvailable(
-      base::BindOnce(&CrostiniStabilityMonitor::ChunneldStarted,
+      base::BindOnce(&GuestOsStabilityMonitor::ChunneldStarted,
                      weak_ptr_factory_.GetWeakPtr()));
 
-  vm_stopped_observer_.Add(crostini_manager);
+  vm_stopped_observer_.Observe(crostini_manager);
 }
 
-CrostiniStabilityMonitor::~CrostiniStabilityMonitor() {}
+GuestOsStabilityMonitor::~GuestOsStabilityMonitor() {}
 
-void CrostiniStabilityMonitor::ConciergeStarted(bool is_available) {
+void GuestOsStabilityMonitor::ConciergeStarted(bool is_available) {
   DCHECK(is_available);
 
   auto* concierge_client =
       chromeos::DBusThreadManager::Get()->GetConciergeClient();
   DCHECK(concierge_client);
-  concierge_observer_.Add(concierge_client);
+  concierge_observer_.Observe(concierge_client);
 }
 
-void CrostiniStabilityMonitor::CiceroneStarted(bool is_available) {
+void GuestOsStabilityMonitor::CiceroneStarted(bool is_available) {
   DCHECK(is_available);
 
   auto* cicerone_client =
       chromeos::DBusThreadManager::Get()->GetCiceroneClient();
   DCHECK(cicerone_client);
-  cicerone_observer_.Add(cicerone_client);
+  cicerone_observer_.Observe(cicerone_client);
 }
 
-void CrostiniStabilityMonitor::SeneschalStarted(bool is_available) {
+void GuestOsStabilityMonitor::SeneschalStarted(bool is_available) {
   DCHECK(is_available);
 
   auto* seneschal_client =
       chromeos::DBusThreadManager::Get()->GetSeneschalClient();
   DCHECK(seneschal_client);
-  seneschal_observer_.Add(seneschal_client);
+  seneschal_observer_.Observe(seneschal_client);
 }
 
-void CrostiniStabilityMonitor::ChunneldStarted(bool is_available) {
+void GuestOsStabilityMonitor::ChunneldStarted(bool is_available) {
   DCHECK(is_available);
 
   auto* chunneld_client =
       chromeos::DBusThreadManager::Get()->GetChunneldClient();
   DCHECK(chunneld_client);
-  chunneld_observer_.Add(chunneld_client);
+  chunneld_observer_.Observe(chunneld_client);
 }
 
-void CrostiniStabilityMonitor::ConciergeServiceStopped() {
+void GuestOsStabilityMonitor::ConciergeServiceStopped() {
   base::UmaHistogramEnumeration(kCrostiniStabilityHistogram,
                                 FailureClasses::ConciergeStopped);
 }
-void CrostiniStabilityMonitor::ConciergeServiceStarted() {}
+void GuestOsStabilityMonitor::ConciergeServiceStarted() {}
 
-void CrostiniStabilityMonitor::CiceroneServiceStopped() {
+void GuestOsStabilityMonitor::CiceroneServiceStopped() {
   base::UmaHistogramEnumeration(kCrostiniStabilityHistogram,
                                 FailureClasses::CiceroneStopped);
 }
-void CrostiniStabilityMonitor::CiceroneServiceStarted() {}
+void GuestOsStabilityMonitor::CiceroneServiceStarted() {}
 
-void CrostiniStabilityMonitor::SeneschalServiceStopped() {
+void GuestOsStabilityMonitor::SeneschalServiceStopped() {
   base::UmaHistogramEnumeration(kCrostiniStabilityHistogram,
                                 FailureClasses::SeneschalStopped);
 }
-void CrostiniStabilityMonitor::SeneschalServiceStarted() {}
+void GuestOsStabilityMonitor::SeneschalServiceStarted() {}
 
-void CrostiniStabilityMonitor::ChunneldServiceStopped() {
+void GuestOsStabilityMonitor::ChunneldServiceStopped() {
   base::UmaHistogramEnumeration(kCrostiniStabilityHistogram,
                                 FailureClasses::ChunneldStopped);
 }
-void CrostiniStabilityMonitor::ChunneldServiceStarted() {}
+void GuestOsStabilityMonitor::ChunneldServiceStarted() {}
 
-void CrostiniStabilityMonitor::OnVmShutdown(const std::string& vm_name) {
+void GuestOsStabilityMonitor::OnVmShutdown(const std::string& vm_name) {
   // CrostiniManager calls this observer method before removing the VM from its
   // tracking list, so this list will tell us what state the VM was believed to
   // be in before the stop signal was received.
@@ -128,4 +128,4 @@
   }
 }
 
-}  // namespace crostini
+}  // namespace guest_os
diff --git a/chrome/browser/chromeos/guest_os/guest_os_stability_monitor.h b/chrome/browser/chromeos/guest_os/guest_os_stability_monitor.h
new file mode 100644
index 0000000..ea9dba1
--- /dev/null
+++ b/chrome/browser/chromeos/guest_os/guest_os_stability_monitor.h
@@ -0,0 +1,110 @@
+// Copyright 2020 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CHROME_BROWSER_CHROMEOS_GUEST_OS_GUEST_OS_STABILITY_MONITOR_H_
+#define CHROME_BROWSER_CHROMEOS_GUEST_OS_GUEST_OS_STABILITY_MONITOR_H_
+
+#include "base/memory/weak_ptr.h"
+#include "base/scoped_observation.h"
+#include "chrome/browser/chromeos/crostini/crostini_manager.h"
+#include "chrome/browser/chromeos/vm_shutdown_observer.h"
+#include "chromeos/dbus/chunneld_client.h"
+#include "chromeos/dbus/cicerone_client.h"
+#include "chromeos/dbus/concierge_client.h"
+#include "chromeos/dbus/seneschal_client.h"
+
+namespace guest_os {
+
+extern const char kCrostiniStabilityHistogram[];
+
+// These values are logged to UMA. Entries should not be renumbered and numeric
+// values should never be reused. Please keep in sync with
+// GuestOsFailureClasses in src/tools/metrics/histograms/enums.xml and the copy
+// in src/platform2/vm_tools/cicerone/crash_listener_impl.cc
+enum class FailureClasses {
+  ConciergeStopped = 0,
+  CiceroneStopped = 1,
+  SeneschalStopped = 2,
+  ChunneldStopped = 3,
+  VmStopped = 4,
+  VmSyslogStopped = 5,
+  VshdStopped = 6,
+  LxcFsStopped = 7,
+  TremplinStopped = 8,
+  NdproxydStopped = 9,
+  McastdStopped = 10,
+  LxdStopped = 11,
+  GarconStopped = 12,
+  SommelierStopped = 13,
+  SommelierXStopped = 14,
+  CrosSftpStopped = 15,
+  CrosNotificationdStopped = 16,
+  kMaxValue = CrosNotificationdStopped,
+};
+
+class GuestOsStabilityMonitor : chromeos::ConciergeClient::Observer,
+                                chromeos::CiceroneClient::Observer,
+                                chromeos::SeneschalClient::Observer,
+                                chromeos::ChunneldClient::Observer,
+                                chromeos::VmShutdownObserver {
+ public:
+  explicit GuestOsStabilityMonitor(crostini::CrostiniManager* crostini_manager);
+  ~GuestOsStabilityMonitor() override;
+
+  GuestOsStabilityMonitor(const GuestOsStabilityMonitor&) = delete;
+  GuestOsStabilityMonitor& operator=(const GuestOsStabilityMonitor&) = delete;
+
+  void ConciergeStarted(bool is_available);
+  void CiceroneStarted(bool is_available);
+  void SeneschalStarted(bool is_available);
+  void ChunneldStarted(bool is_available);
+
+  //  chromeos::ConciergeClient::Observer::
+  void ConciergeServiceStopped() override;
+  void ConciergeServiceStarted() override;
+
+  //  chromeos::CiceroneClient::Observer::
+  void CiceroneServiceStopped() override;
+  void CiceroneServiceStarted() override;
+
+  //  chromeos::SeneschalClient::Observer::
+  void SeneschalServiceStopped() override;
+  void SeneschalServiceStarted() override;
+
+  //  chromeos::ChunneldClient::Observer::
+  void ChunneldServiceStopped() override;
+  void ChunneldServiceStarted() override;
+
+  //  chromeos::VmShutdownObserver::
+  void OnVmShutdown(const std::string& vm_name) override;
+
+ private:
+  base::ScopedObservation<chromeos::ConciergeClient,
+                          chromeos::ConciergeClient::Observer>
+      concierge_observer_;
+  base::ScopedObservation<chromeos::CiceroneClient,
+                          chromeos::CiceroneClient::Observer>
+      cicerone_observer_;
+  base::ScopedObservation<chromeos::SeneschalClient,
+                          chromeos::SeneschalClient::Observer>
+      seneschal_observer_;
+  base::ScopedObservation<chromeos::ChunneldClient,
+                          chromeos::ChunneldClient::Observer>
+      chunneld_observer_;
+  base::ScopedObservation<crostini::CrostiniManager,
+                          chromeos::VmShutdownObserver,
+                          &crostini::CrostiniManager::AddVmShutdownObserver,
+                          &crostini::CrostiniManager::RemoveVmShutdownObserver>
+      vm_stopped_observer_;
+
+  base::WeakPtr<crostini::CrostiniManager> crostini_manager_;
+
+  // Note: This should remain the last member so it'll be destroyed and
+  // invalidate its weak pointers before any other members are destroyed.
+  base::WeakPtrFactory<GuestOsStabilityMonitor> weak_ptr_factory_{this};
+};
+
+}  // namespace guest_os
+
+#endif  // CHROME_BROWSER_CHROMEOS_GUEST_OS_GUEST_OS_STABILITY_MONITOR_H_
diff --git a/chrome/browser/chromeos/crostini/crostini_stability_monitor_unittest.cc b/chrome/browser/chromeos/guest_os/guest_os_stability_monitor_unittest.cc
similarity index 81%
rename from chrome/browser/chromeos/crostini/crostini_stability_monitor_unittest.cc
rename to chrome/browser/chromeos/guest_os/guest_os_stability_monitor_unittest.cc
index 0b101c8..c51f3b7a 100644
--- a/chrome/browser/chromeos/crostini/crostini_stability_monitor_unittest.cc
+++ b/chrome/browser/chromeos/guest_os/guest_os_stability_monitor_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/crostini/crostini_stability_monitor.h"
+#include "chrome/browser/chromeos/guest_os/guest_os_stability_monitor.h"
 
 #include <memory>
 
@@ -22,17 +22,18 @@
 #include "content/public/test/browser_task_environment.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-namespace crostini {
+namespace guest_os {
 
-class CrostiniStabilityMonitorTest : public testing::Test {
+class GuestOsStabilityMonitorTest : public testing::Test {
  public:
-  CrostiniStabilityMonitorTest() : task_env_() {
+  GuestOsStabilityMonitorTest() : task_env_() {
     chromeos::DBusThreadManager::Initialize();
 
-    // CrostiniManager will create a CrostiniStabilityMonitor for us.
+    // CrostiniManager will create a GuestOsStabilityMonitor for us.
     profile_ = std::make_unique<TestingProfile>();
-    crostini_manager_ = std::make_unique<CrostiniManager>(profile_.get());
-    CrostiniTestHelper::EnableCrostini(profile_.get());
+    crostini_manager_ =
+        std::make_unique<crostini::CrostiniManager>(profile_.get());
+    crostini::CrostiniTestHelper::EnableCrostini(profile_.get());
 
     // When CrostiniStabilityMonitor is initialized, it waits for the DBus
     // services to become available before monitoring them. In tests this
@@ -43,8 +44,8 @@
     histogram_tester_.ExpectTotalCount(kCrostiniStabilityHistogram, 0);
   }
 
-  ~CrostiniStabilityMonitorTest() override {
-    CrostiniTestHelper::DisableCrostini(profile_.get());
+  ~GuestOsStabilityMonitorTest() override {
+    crostini::CrostiniTestHelper::DisableCrostini(profile_.get());
     crostini_manager_->OnDBusShuttingDownForTesting();
     chromeos::DBusThreadManager::Shutdown();
   }
@@ -66,7 +67,7 @@
 
     vm_tools::concierge::VmStoppedSignal signal;
     signal.set_name("termina");
-    signal.set_owner_id(CryptohomeIdForProfile(profile_.get()));
+    signal.set_owner_id(crostini::CryptohomeIdForProfile(profile_.get()));
     concierge_client->NotifyVmStopped(signal);
   }
 
@@ -74,11 +75,11 @@
   // CrostiniManager requires a full browser task environment to run.
   content::BrowserTaskEnvironment task_env_;
   std::unique_ptr<TestingProfile> profile_;
-  std::unique_ptr<CrostiniManager> crostini_manager_;
+  std::unique_ptr<crostini::CrostiniManager> crostini_manager_;
   base::HistogramTester histogram_tester_;
 };
 
-TEST_F(CrostiniStabilityMonitorTest, ConciergeFailure) {
+TEST_F(GuestOsStabilityMonitorTest, ConciergeFailure) {
   auto* concierge_client = static_cast<chromeos::FakeConciergeClient*>(
       chromeos::DBusThreadManager::Get()->GetConciergeClient());
 
@@ -91,7 +92,7 @@
                                        FailureClasses::ConciergeStopped, 1);
 }
 
-TEST_F(CrostiniStabilityMonitorTest, CiceroneFailure) {
+TEST_F(GuestOsStabilityMonitorTest, CiceroneFailure) {
   auto* cicerone_client = static_cast<chromeos::FakeCiceroneClient*>(
       chromeos::DBusThreadManager::Get()->GetCiceroneClient());
 
@@ -104,7 +105,7 @@
                                        FailureClasses::CiceroneStopped, 1);
 }
 
-TEST_F(CrostiniStabilityMonitorTest, SeneschalFailure) {
+TEST_F(GuestOsStabilityMonitorTest, SeneschalFailure) {
   auto* seneschal_client = static_cast<chromeos::FakeSeneschalClient*>(
       chromeos::DBusThreadManager::Get()->GetSeneschalClient());
 
@@ -117,7 +118,7 @@
                                        FailureClasses::SeneschalStopped, 1);
 }
 
-TEST_F(CrostiniStabilityMonitorTest, ChunneldFailure) {
+TEST_F(GuestOsStabilityMonitorTest, ChunneldFailure) {
   auto* chunneld_client = static_cast<chromeos::FakeChunneldClient*>(
       chromeos::DBusThreadManager::Get()->GetChunneldClient());
 
@@ -130,22 +131,22 @@
                                        FailureClasses::ChunneldStopped, 1);
 }
 
-TEST_F(CrostiniStabilityMonitorTest, UnknownVmStopped) {
+TEST_F(GuestOsStabilityMonitorTest, UnknownVmStopped) {
   SendVmStoppedSignal();
   histogram_tester_.ExpectUniqueSample(kCrostiniStabilityHistogram,
                                        FailureClasses::VmStopped, 0);
 }
 
-TEST_F(CrostiniStabilityMonitorTest, VmStoppedDuringStartup) {
+TEST_F(GuestOsStabilityMonitorTest, VmStoppedDuringStartup) {
   crostini_manager_->AddRunningVmForTesting("termina");
-  crostini_manager_->UpdateVmState("termina", VmState::STARTING);
+  crostini_manager_->UpdateVmState("termina", crostini::VmState::STARTING);
 
   SendVmStoppedSignal();
   histogram_tester_.ExpectUniqueSample(kCrostiniStabilityHistogram,
                                        FailureClasses::VmStopped, 0);
 }
 
-TEST_F(CrostiniStabilityMonitorTest, ExpectedVmStopped) {
+TEST_F(GuestOsStabilityMonitorTest, ExpectedVmStopped) {
   crostini_manager_->AddStoppingVmForTesting("termina");
 
   SendVmStoppedSignal();
@@ -153,7 +154,7 @@
                                        FailureClasses::VmStopped, 0);
 }
 
-TEST_F(CrostiniStabilityMonitorTest, UnexpectedVmStopped) {
+TEST_F(GuestOsStabilityMonitorTest, UnexpectedVmStopped) {
   crostini_manager_->AddRunningVmForTesting("termina");
 
   SendVmStoppedSignal();
@@ -161,4 +162,4 @@
                                        FailureClasses::VmStopped, 1);
 }
 
-}  // namespace crostini
+}  // namespace guest_os
diff --git a/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper_impl.cc b/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper_impl.cc
index c1f7af96..eb8f16bd 100644
--- a/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper_impl.cc
+++ b/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper_impl.cc
@@ -234,29 +234,27 @@
         (new TokenRevoker())->Start(oauth_fetcher_->OAuth2RefreshToken());
 
       oauth_fetcher_.reset();
-    } else if (auth_data_ && auth_data_->has_oauth_token()) {
+    } else if (auth_data_.has_oauth_token()) {
       // EnrollUsingToken was called.
-      (new TokenRevoker())->Start(auth_data_->oauth_token());
+      (new TokenRevoker())->Start(auth_data_.oauth_token());
     }
   }
-  auth_data_.reset();
+  auth_data_ = policy::DMAuth::NoAuth();
   chromeos::ProfileHelper::Get()->ClearSigninProfile(
       base::AdaptCallbackForRepeating(base::BindOnce(
           &EnterpriseEnrollmentHelperImpl::OnSigninProfileCleared,
           weak_ptr_factory_.GetWeakPtr(), std::move(callback))));
 }
 
-void EnterpriseEnrollmentHelperImpl::DoEnroll(
-    std::unique_ptr<policy::DMAuth> auth_data) {
-  CHECK(auth_data);
-  DCHECK(!auth_data_ || auth_data_->Equals(*auth_data));
+void EnterpriseEnrollmentHelperImpl::DoEnroll(policy::DMAuth auth_data) {
+  DCHECK(auth_data_.empty() || auth_data_ == auth_data);
   DCHECK(enrollment_config_.is_mode_attestation() ||
          enrollment_config_.mode ==
              policy::EnrollmentConfig::MODE_OFFLINE_DEMO ||
          oauth_status_ == OAUTH_STARTED_WITH_AUTH_CODE ||
          oauth_status_ == OAUTH_STARTED_WITH_TOKEN);
   VLOG(1) << "Enroll with token type: "
-          << static_cast<int>(auth_data->token_type());
+          << static_cast<int>(auth_data.token_type());
   auth_data_ = std::move(auth_data);
   policy::BrowserPolicyConnectorChromeOS* connector =
       g_browser_process->platform_part()->browser_policy_connector_chromeos();
@@ -278,15 +276,14 @@
   CHECK(dcp_initializer);
   dcp_initializer->PrepareEnrollment(
       connector->device_management_service(), ad_join_delegate_,
-      enrollment_config_, auth_data_->Clone(),
+      enrollment_config_, auth_data_.Clone(),
       base::Bind(&EnterpriseEnrollmentHelperImpl::OnEnrollmentFinished,
                  weak_ptr_factory_.GetWeakPtr()));
   dcp_initializer->StartEnrollment();
 }
 
 void EnterpriseEnrollmentHelperImpl::GetDeviceAttributeUpdatePermission() {
-  DCHECK(auth_data_);
-  if (!auth_data_->has_oauth_token()) {
+  if (!auth_data_.has_oauth_token()) {
     // Checking whether the device attributes can be updated requires knowning
     // which user is performing enterprise enrollment, because the permission is
     // tied to a user.
@@ -311,7 +308,7 @@
   policy::CloudPolicyClient* client = policy_manager->core()->client();
 
   client->GetDeviceAttributeUpdatePermission(
-      auth_data_->Clone(),
+      auth_data_.Clone(),
       base::BindOnce(
           &EnterpriseEnrollmentHelperImpl::OnDeviceAttributeUpdatePermission,
           weak_ptr_factory_.GetWeakPtr()));
@@ -320,7 +317,7 @@
 void EnterpriseEnrollmentHelperImpl::UpdateDeviceAttributes(
     const std::string& asset_id,
     const std::string& location) {
-  DCHECK(auth_data_);
+  DCHECK(!auth_data_.empty());
   policy::BrowserPolicyConnectorChromeOS* connector =
       g_browser_process->platform_part()->browser_policy_connector_chromeos();
   policy::DeviceCloudPolicyManagerChromeOS* policy_manager =
@@ -328,7 +325,7 @@
   policy::CloudPolicyClient* client = policy_manager->core()->client();
 
   client->UpdateDeviceAttributes(
-      auth_data_->Clone(), asset_id, location,
+      auth_data_.Clone(), asset_id, location,
       base::BindOnce(
           &EnterpriseEnrollmentHelperImpl::OnDeviceAttributeUploadCompleted,
           weak_ptr_factory_.GetWeakPtr()));
diff --git a/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper_impl.h b/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper_impl.h
index d489888..ae8e862 100644
--- a/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper_impl.h
+++ b/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper_impl.h
@@ -16,11 +16,11 @@
 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
 #include "chrome/browser/chromeos/policy/enrollment_config.h"
 #include "chrome/browser/policy/device_account_initializer.h"
+#include "components/policy/core/common/cloud/dm_auth.h"
 #include "components/policy/core/common/cloud/enterprise_metrics.h"
 #include "google_apis/gaia/google_service_auth_error.h"
 
 namespace policy {
-class DMAuth;
 class PolicyOAuth2TokenFetcher;
 }  // namespace policy
 
@@ -71,7 +71,7 @@
                            TestAttributePromptPageGetsLoaded);
 
   // Attempt enrollment using `auth_data` for authentication.
-  void DoEnroll(std::unique_ptr<policy::DMAuth> auth_data);
+  void DoEnroll(policy::DMAuth auth_data);
 
   // Handles completion of the OAuth2 token fetch attempt.
   void OnTokenFetched(const std::string& token,
@@ -110,7 +110,7 @@
     OAUTH_FINISHED
   } oauth_status_ = OAUTH_NOT_STARTED;
   bool oauth_data_cleared_ = false;
-  std::unique_ptr<policy::DMAuth> auth_data_;
+  policy::DMAuth auth_data_;
   bool success_ = false;
   ActiveDirectoryJoinDelegate* ad_join_delegate_ = nullptr;
 
diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_initializer.cc b/chrome/browser/chromeos/policy/device_cloud_policy_initializer.cc
index c2df87c8..d5eb53f 100644
--- a/chrome/browser/chromeos/policy/device_cloud_policy_initializer.cc
+++ b/chrome/browser/chromeos/policy/device_cloud_policy_initializer.cc
@@ -38,7 +38,6 @@
 #include "chromeos/tpm/install_attributes.h"
 #include "components/policy/core/common/cloud/cloud_policy_core.h"
 #include "components/policy/core/common/cloud/device_management_service.h"
-#include "components/policy/core/common/cloud/dm_auth.h"
 #include "components/prefs/pref_service.h"
 
 namespace chromeos {
@@ -122,7 +121,7 @@
     DeviceManagementService* device_management_service,
     chromeos::ActiveDirectoryJoinDelegate* ad_join_delegate,
     const EnrollmentConfig& enrollment_config,
-    std::unique_ptr<DMAuth> dm_auth,
+    DMAuth dm_auth,
     const EnrollmentCallback& enrollment_callback) {
   DCHECK(is_initialized_);
   DCHECK(!enrollment_handler_);
diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_initializer.h b/chrome/browser/chromeos/policy/device_cloud_policy_initializer.h
index 3fcdd62..a3ff4c8 100644
--- a/chrome/browser/chromeos/policy/device_cloud_policy_initializer.h
+++ b/chrome/browser/chromeos/policy/device_cloud_policy_initializer.h
@@ -19,6 +19,7 @@
 #include "components/policy/core/common/cloud/cloud_policy_client.h"
 #include "components/policy/core/common/cloud/cloud_policy_constants.h"
 #include "components/policy/core/common/cloud/cloud_policy_store.h"
+#include "components/policy/core/common/cloud/dm_auth.h"
 #include "components/policy/core/common/cloud/signing_service.h"
 #include "services/network/public/cpp/shared_url_loader_factory.h"
 
@@ -47,7 +48,6 @@
 class DeviceCloudPolicyManagerChromeOS;
 class DeviceCloudPolicyStoreChromeOS;
 class DeviceManagementService;
-class DMAuth;
 struct EnrollmentConfig;
 class EnrollmentHandlerChromeOS;
 class EnrollmentStatus;
@@ -84,7 +84,7 @@
       DeviceManagementService* device_management_service,
       chromeos::ActiveDirectoryJoinDelegate* ad_join_delegate,
       const EnrollmentConfig& enrollment_config,
-      std::unique_ptr<DMAuth> dm_auth,
+      DMAuth dm_auth,
       const EnrollmentCallback& enrollment_callback);
 
   // Starts enrollment.
diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc
index 9aba2f0..35f9a1ac 100644
--- a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc
+++ b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc
@@ -563,7 +563,7 @@
         EnrollmentConfig::AUTH_MECHANISM_BEST_AVAILABLE;
     enrollment_config.mode = with_cert ? EnrollmentConfig::MODE_ATTESTATION
                                        : EnrollmentConfig::MODE_MANUAL;
-    std::unique_ptr<DMAuth> auth =
+    DMAuth auth =
         with_cert ? DMAuth::NoAuth() : DMAuth::FromOAuthToken("auth token");
     initializer_->PrepareEnrollment(
         &device_management_service_, nullptr, enrollment_config,
diff --git a/chrome/browser/chromeos/policy/enrollment_handler_chromeos.cc b/chrome/browser/chromeos/policy/enrollment_handler_chromeos.cc
index 8e94ef4..711c0671 100644
--- a/chrome/browser/chromeos/policy/enrollment_handler_chromeos.cc
+++ b/chrome/browser/chromeos/policy/enrollment_handler_chromeos.cc
@@ -174,7 +174,7 @@
     scoped_refptr<base::SequencedTaskRunner> background_task_runner,
     chromeos::ActiveDirectoryJoinDelegate* ad_join_delegate,
     const EnrollmentConfig& enrollment_config,
-    std::unique_ptr<DMAuth> dm_auth,
+    DMAuth dm_auth,
     const std::string& client_id,
     const std::string& requisition,
     const std::string& sub_organization,
@@ -195,11 +195,11 @@
   CHECK(!client_->is_registered());
   CHECK_EQ(DM_STATUS_SUCCESS, client_->status());
   if (enrollment_config_.is_mode_attestation()) {
-    CHECK(dm_auth_->empty() || dm_auth_->has_enrollment_token());
+    CHECK(dm_auth_.empty() || dm_auth_.has_enrollment_token());
   } else if (enrollment_config.mode == EnrollmentConfig::MODE_OFFLINE_DEMO) {
-    CHECK(dm_auth_->empty());
+    CHECK(dm_auth_.empty());
   } else {
-    CHECK(!dm_auth_->empty());
+    CHECK(!dm_auth_.empty());
   }
   CHECK_NE(enrollment_config.mode == EnrollmentConfig::MODE_OFFLINE_DEMO,
            enrollment_config.offline_policy_path.empty());
@@ -410,7 +410,7 @@
   } else if (enrollment_config_.mode == EnrollmentConfig::MODE_OFFLINE_DEMO) {
     StartOfflineDemoEnrollmentFlow();
   } else {
-    client_->Register(*register_params_, client_id_, dm_auth_->oauth_token());
+    client_->Register(*register_params_, client_id_, dm_auth_.oauth_token());
   }
 }
 
@@ -431,7 +431,7 @@
     const std::string& pem_certificate_chain) {
   if (status == chromeos::attestation::ATTESTATION_SUCCESS) {
     client_->RegisterWithCertificate(*register_params_, client_id_,
-                                     dm_auth_->Clone(), pem_certificate_chain,
+                                     dm_auth_.Clone(), pem_certificate_chain,
                                      sub_organization_);
   } else {
     ReportResult(EnrollmentStatus::ForStatus(
diff --git a/chrome/browser/chromeos/policy/enrollment_handler_chromeos.h b/chrome/browser/chromeos/policy/enrollment_handler_chromeos.h
index 8284419..5a7fee4 100644
--- a/chrome/browser/chromeos/policy/enrollment_handler_chromeos.h
+++ b/chrome/browser/chromeos/policy/enrollment_handler_chromeos.h
@@ -23,6 +23,7 @@
 #include "components/policy/core/common/cloud/cloud_policy_client.h"
 #include "components/policy/core/common/cloud/cloud_policy_constants.h"
 #include "components/policy/core/common/cloud/cloud_policy_store.h"
+#include "components/policy/core/common/cloud/dm_auth.h"
 #include "components/policy/proto/device_management_backend.pb.h"
 #include "google_apis/gaia/gaia_oauth_client.h"
 
@@ -42,7 +43,6 @@
 namespace policy {
 
 class DeviceCloudPolicyStoreChromeOS;
-class DMAuth;
 class DMTokenStorage;
 class ServerBackedStateKeysBroker;
 
@@ -74,7 +74,7 @@
       scoped_refptr<base::SequencedTaskRunner> background_task_runner,
       chromeos::ActiveDirectoryJoinDelegate* ad_join_delegate,
       const EnrollmentConfig& enrollment_config,
-      std::unique_ptr<DMAuth> dm_auth,
+      DMAuth dm_auth,
       const std::string& client_id,
       const std::string& requisition,
       const std::string& sub_organization,
@@ -222,7 +222,7 @@
   std::unique_ptr<policy::DMTokenStorage> dm_token_storage_;
 
   EnrollmentConfig enrollment_config_;
-  std::unique_ptr<policy::DMAuth> dm_auth_;
+  policy::DMAuth dm_auth_;
   std::string client_id_;
   std::string sub_organization_;
   std::unique_ptr<CloudPolicyClient::RegistrationParameters> register_params_;
diff --git a/chrome/browser/chromeos/policy/fake_device_cloud_policy_initializer.cc b/chrome/browser/chromeos/policy/fake_device_cloud_policy_initializer.cc
index 6ff9b98..ac95c307 100644
--- a/chrome/browser/chromeos/policy/fake_device_cloud_policy_initializer.cc
+++ b/chrome/browser/chromeos/policy/fake_device_cloud_policy_initializer.cc
@@ -10,6 +10,7 @@
 #include "base/sequenced_task_runner.h"
 #include "chromeos/attestation/mock_attestation_flow.h"
 #include "components/policy/core/common/cloud/device_management_service.h"
+#include "components/policy/core/common/cloud/dm_auth.h"
 
 namespace policy {
 
@@ -41,7 +42,7 @@
     DeviceManagementService* device_management_service,
     chromeos::ActiveDirectoryJoinDelegate* ad_join_delegate,
     const EnrollmentConfig& enrollment_config,
-    std::unique_ptr<DMAuth> auth,
+    DMAuth auth,
     const EnrollmentCallback& enrollment_callback) {
   enrollment_callback_ = enrollment_callback;
 }
diff --git a/chrome/browser/chromeos/policy/fake_device_cloud_policy_initializer.h b/chrome/browser/chromeos/policy/fake_device_cloud_policy_initializer.h
index 8798ac5..f40b18b 100644
--- a/chrome/browser/chromeos/policy/fake_device_cloud_policy_initializer.h
+++ b/chrome/browser/chromeos/policy/fake_device_cloud_policy_initializer.h
@@ -12,6 +12,7 @@
 #include "chrome/browser/chromeos/policy/device_cloud_policy_initializer.h"
 #include "chrome/browser/policy/enrollment_status.h"
 #include "components/policy/core/common/cloud/cloud_policy_constants.h"
+#include "components/policy/core/common/cloud/dm_auth.h"
 
 namespace policy {
 
@@ -29,7 +30,7 @@
       DeviceManagementService* device_management_service,
       chromeos::ActiveDirectoryJoinDelegate* ad_join_delegate,
       const EnrollmentConfig& enrollment_config,
-      std::unique_ptr<DMAuth> auth,
+      DMAuth auth,
       const EnrollmentCallback& enrollment_callback) override;
 
   void StartEnrollment() override;
diff --git a/chrome/browser/chromeos/vm_shutdown_observer.h b/chrome/browser/chromeos/vm_shutdown_observer.h
new file mode 100644
index 0000000..222d2c94
--- /dev/null
+++ b/chrome/browser/chromeos/vm_shutdown_observer.h
@@ -0,0 +1,18 @@
+// Copyright 2020 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CHROME_BROWSER_CHROMEOS_VM_SHUTDOWN_OBSERVER_H_
+#define CHROME_BROWSER_CHROMEOS_VM_SHUTDOWN_OBSERVER_H_
+
+#include "base/observer_list_types.h"
+
+namespace chromeos {
+class VmShutdownObserver : public base::CheckedObserver {
+ public:
+  // Called when the given VM has shutdown.
+  virtual void OnVmShutdown(const std::string& vm_name) = 0;
+};
+}  // namespace chromeos
+
+#endif  // CHROME_BROWSER_CHROMEOS_VM_SHUTDOWN_OBSERVER_H_
diff --git a/chrome/browser/chromeos/web_applications/help_app_integration_browsertest.cc b/chrome/browser/chromeos/web_applications/help_app_integration_browsertest.cc
index d8180bd43..7e9bf33 100644
--- a/chrome/browser/chromeos/web_applications/help_app_integration_browsertest.cc
+++ b/chrome/browser/chromeos/web_applications/help_app_integration_browsertest.cc
@@ -357,8 +357,9 @@
 }
 
 // Test that the Help App delegate uses the local search service methods.
+// Flaky on CrOS, see crbug.com/1156713
 IN_PROC_BROWSER_TEST_P(HelpAppIntegrationTest,
-                       HelpAppV2UsesLocalSearchServiceMethods) {
+                       DISABLED_HelpAppV2UsesLocalSearchServiceMethods) {
   WaitForTestSystemAppInstall();
   content::WebContents* web_contents = LaunchApp(web_app::SystemAppType::HELP);
 
diff --git a/chrome/browser/content_settings/host_content_settings_map_unittest.cc b/chrome/browser/content_settings/host_content_settings_map_unittest.cc
index f4c6b1e..0a1fb94 100644
--- a/chrome/browser/content_settings/host_content_settings_map_unittest.cc
+++ b/chrome/browser/content_settings/host_content_settings_map_unittest.cc
@@ -1838,105 +1838,6 @@
       HostContentSettingsMap::EPHEMERAL_PROVIDER);
 }
 
-// Tests that restarting only removes ephemeral permissions.
-TEST_F(HostContentSettingsMapTest, MixedEphemeralAndPersistentPermissions) {
-  TestingProfile profile;
-  HostContentSettingsMap* map =
-      HostContentSettingsMapFactory::GetForProfile(&profile);
-
-  content_settings::ContentSettingsRegistry::GetInstance()->ResetForTest();
-  ReloadProviders(profile.GetPrefs(), map);
-
-  // The following two types are used as samples of ephemeral and persistent
-  // permission types. They can be replaced with any other type if required.
-  const ContentSettingsType ephemeral_type =
-      ContentSettingsType::PERIODIC_BACKGROUND_SYNC;
-  const ContentSettingsType persistent_type = ContentSettingsType::GEOLOCATION;
-
-  EXPECT_EQ(content_settings::ContentSettingsInfo::EPHEMERAL,
-            content_settings::ContentSettingsRegistry::GetInstance()
-                ->Get(ephemeral_type)
-                ->storage_behavior());
-  EXPECT_EQ(content_settings::ContentSettingsInfo::PERSISTENT,
-            content_settings::ContentSettingsRegistry::GetInstance()
-                ->Get(persistent_type)
-                ->storage_behavior());
-
-  const GURL url("https://example.com");
-
-  // |PERIODIC_BACKGROUND_SYNC| does not support ASK, set to ALLOW.
-  map->SetDefaultContentSetting(ephemeral_type, CONTENT_SETTING_ALLOW);
-  map->SetDefaultContentSetting(persistent_type, CONTENT_SETTING_ASK);
-
-  EXPECT_EQ(CONTENT_SETTING_ALLOW,
-            map->GetContentSetting(url, url, ephemeral_type));
-  EXPECT_EQ(CONTENT_SETTING_ASK,
-            map->GetContentSetting(url, url, persistent_type));
-
-  // Set permission for both types and expect receiving it correctly.
-  map->SetContentSettingDefaultScope(url, url, ephemeral_type,
-                                     CONTENT_SETTING_BLOCK);
-  map->SetContentSettingDefaultScope(url, url, persistent_type,
-                                     CONTENT_SETTING_BLOCK);
-
-  EXPECT_EQ(CONTENT_SETTING_BLOCK,
-            map->GetContentSetting(url, url, ephemeral_type));
-  EXPECT_EQ(CONTENT_SETTING_BLOCK,
-            map->GetContentSetting(url, url, persistent_type));
-
-  // Restart and expect reset of ephemeral permission to |ALLOW|, while keeping
-  // the permission of persistent type.
-  ReloadProviders(profile.GetPrefs(), map);
-
-  EXPECT_EQ(CONTENT_SETTING_ALLOW,
-            map->GetContentSetting(url, url, ephemeral_type));
-  EXPECT_EQ(CONTENT_SETTING_BLOCK,
-            map->GetContentSetting(url, url, persistent_type));
-}
-
-// Test that directly writing a value to PrefProvider doesn't affect ephmeral
-// types.
-TEST_F(HostContentSettingsMapTest, EphemeralTypeDoesntReadFromPrefProvider) {
-  TestingProfile profile;
-  HostContentSettingsMap* map =
-      HostContentSettingsMapFactory::GetForProfile(&profile);
-
-  content_settings::ContentSettingsRegistry::GetInstance()->ResetForTest();
-  ReloadProviders(profile.GetPrefs(), map);
-
-  // ContentSettingsType::PERIODIC_BACKGROUND_SYNC is used as a sample of
-  // ephemeral permission type. It can be replaced with any other type if
-  // required.
-  const ContentSettingsType ephemeral_type =
-      ContentSettingsType::PERIODIC_BACKGROUND_SYNC;
-
-  EXPECT_EQ(content_settings::ContentSettingsInfo::EPHEMERAL,
-            content_settings::ContentSettingsRegistry::GetInstance()
-                ->Get(ephemeral_type)
-                ->storage_behavior());
-
-  const GURL url("https://example.com");
-  const ContentSettingsPattern pattern = ContentSettingsPattern::FromURL(url);
-
-  map->SetDefaultContentSetting(ephemeral_type, CONTENT_SETTING_ALLOW);
-
-  content_settings::PrefProvider pref_provider(profile.GetPrefs(), true, true,
-                                               false);
-  pref_provider.SetWebsiteSetting(
-      pattern, pattern, ephemeral_type,
-      std::make_unique<base::Value>(CONTENT_SETTING_BLOCK), {});
-
-  EXPECT_EQ(CONTENT_SETTING_ALLOW,
-            map->GetContentSetting(url, url, ephemeral_type));
-
-  ReloadProviders(profile.GetPrefs(), map);
-
-  EXPECT_EQ(CONTENT_SETTING_ALLOW,
-            map->GetContentSetting(url, url, ephemeral_type));
-
-  pref_provider.ShutdownOnUIThread();
-}
-
 TEST_F(HostContentSettingsMapTest, GetPatternsFromScopingType) {
   const GURL primary_url("http://a.b.example1.com:8080");
   const GURL secondary_url("http://a.b.example2.com:8080");
diff --git a/chrome/browser/continuous_search/internal/android/java/src/org/chromium/chrome/browser/continuous_search/ContinuousSearchTabObserver.java b/chrome/browser/continuous_search/internal/android/java/src/org/chromium/chrome/browser/continuous_search/ContinuousSearchTabObserver.java
index e81bfa11..9b1a0a9 100644
--- a/chrome/browser/continuous_search/internal/android/java/src/org/chromium/chrome/browser/continuous_search/ContinuousSearchTabObserver.java
+++ b/chrome/browser/continuous_search/internal/android/java/src/org/chromium/chrome/browser/continuous_search/ContinuousSearchTabObserver.java
@@ -25,15 +25,14 @@
     }
 
     @Override
-    public void onPageLoadFinished(Tab tab, String url) {
+    public void onPageLoadFinished(Tab tab, GURL url) {
         SearchResultUserData searchResultUserData = getSearchResultUserData();
-        searchResultUserData.updateCurrentUrl(new GURL(url));
+        searchResultUserData.updateCurrentUrl(url);
 
         // Cancel any existing requests.
         resetProducer();
 
-        GURL gurl = new GURL(url);
-        String query = SearchUrlHelper.getQueryIfSrpUrl(gurl);
+        String query = SearchUrlHelper.getQueryIfSrpUrl(url);
         if (query == null) return;
 
         mProducer = SearchResultProducerFactory.create(mTab, this);
@@ -41,7 +40,7 @@
         // TODO: Remove this once mProducer is always created.
         if (mProducer == null) return;
 
-        mProducer.fetchResults(gurl, query);
+        mProducer.fetchResults(url, query);
     }
 
     @Override
diff --git a/chrome/browser/devtools/protocol/page_handler.cc b/chrome/browser/devtools/protocol/page_handler.cc
index edbb2de..ed48b48 100644
--- a/chrome/browser/devtools/protocol/page_handler.cc
+++ b/chrome/browser/devtools/protocol/page_handler.cc
@@ -4,8 +4,8 @@
 
 #include "chrome/browser/devtools/protocol/page_handler.h"
 
-#include "chrome/browser/installable/installable_manager.h"
 #include "chrome/browser/subresource_filter/chrome_subresource_filter_client.h"
+#include "components/webapps/installable/installable_manager.h"
 #include "ui/gfx/image/image.h"
 
 PageHandler::PageHandler(content::WebContents* web_contents,
@@ -53,9 +53,10 @@
 void PageHandler::GetInstallabilityErrors(
     std::unique_ptr<GetInstallabilityErrorsCallback> callback) {
   auto errors = std::make_unique<protocol::Array<std::string>>();
-  InstallableManager* manager =
-      web_contents() ? InstallableManager::FromWebContents(web_contents())
-                     : nullptr;
+  webapps::InstallableManager* manager =
+      web_contents()
+          ? webapps::InstallableManager::FromWebContents(web_contents())
+          : nullptr;
   if (!manager) {
     callback->sendFailure(
         protocol::Response::ServerError("Unable to fetch errors for target"));
@@ -94,9 +95,10 @@
 
 void PageHandler::GetManifestIcons(
     std::unique_ptr<GetManifestIconsCallback> callback) {
-  InstallableManager* manager =
-      web_contents() ? InstallableManager::FromWebContents(web_contents())
-                     : nullptr;
+  webapps::InstallableManager* manager =
+      web_contents()
+          ? webapps::InstallableManager::FromWebContents(web_contents())
+          : nullptr;
 
   if (!manager) {
     callback->sendFailure(
diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn
index b45e51e..4138d2b6 100644
--- a/chrome/browser/extensions/BUILD.gn
+++ b/chrome/browser/extensions/BUILD.gn
@@ -785,6 +785,7 @@
     "//chrome/browser/web_applications",
     "//chrome/browser/web_applications/components",
     "//components/site_engagement/core/mojom:mojo_bindings",
+    "//components/webapps",
 
     # TODO(crbug.com/1065748): Remove this dependency:
     "//chrome/browser/web_applications/extensions",
diff --git a/chrome/browser/extensions/api/declarative_net_request/declarative_net_request_unittest.cc b/chrome/browser/extensions/api/declarative_net_request/declarative_net_request_unittest.cc
index e22cf27..1c3cf69c 100644
--- a/chrome/browser/extensions/api/declarative_net_request/declarative_net_request_unittest.cc
+++ b/chrome/browser/extensions/api/declarative_net_request/declarative_net_request_unittest.cc
@@ -195,8 +195,6 @@
     tester.ExpectTotalCount(kManifestRulesCountHistogram, 0u);
   }
 
-  // void Update
-
   enum class RulesetScope { kDynamic, kSession };
 
   // Runs the updateDynamicRules/updateSessionRules extension function based on
diff --git a/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc b/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc
index ab37bc0..eedbab1 100644
--- a/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc
+++ b/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc
@@ -21,9 +21,6 @@
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/launch_util.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
-#include "chrome/browser/installable/installable_manager.h"
-#include "chrome/browser/installable/installable_metrics.h"
-#include "chrome/browser/installable/installable_params.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ssl/security_state_tab_helper.h"
 #include "chrome/browser/ui/browser_dialogs.h"
@@ -45,6 +42,8 @@
 #include "chrome/common/extensions/extension_metrics.h"
 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
 #include "components/favicon/core/favicon_service.h"
+#include "components/webapps/installable/installable_manager.h"
+#include "components/webapps/installable/installable_metrics.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/api/management/management_api.h"
@@ -252,7 +251,7 @@
 
     provider->install_manager().InstallWebAppFromInfo(
         std::move(web_app_info), web_app::ForInstallableSite::kNo,
-        WebappInstallSource::MANAGEMENT_API,
+        webapps::WebappInstallSource::MANAGEMENT_API,
         base::BindOnce(OnGenerateAppForLinkCompleted,
                        base::RetainedRef(function)));
   }
@@ -373,7 +372,7 @@
           WindowOpenDisposition::NEW_FOREGROUND_TAB, gfx::Rect());
       web_app::CreateWebAppFromManifest(
           containing_contents, /*bypass_service_worker_check=*/true,
-          WebappInstallSource::MANAGEMENT_API,
+          webapps::WebappInstallSource::MANAGEMENT_API,
           base::BindOnce(&OnWebAppInstallCompleted, std::move(callback)));
       return;
   }
@@ -526,7 +525,7 @@
   }
 
   provider->install_manager().LoadWebAppAndCheckManifest(
-      web_app_url, WebappInstallSource::MANAGEMENT_API,
+      web_app_url, webapps::WebappInstallSource::MANAGEMENT_API,
       base::BindOnce(&OnWebAppInstallabilityChecked, profile,
                      std::move(callback)));
 }
diff --git a/chrome/browser/extensions/api/passwords_private/password_check_delegate.cc b/chrome/browser/extensions/api/passwords_private/password_check_delegate.cc
index f373950..2089900 100644
--- a/chrome/browser/extensions/api/passwords_private/password_check_delegate.cc
+++ b/chrome/browser/extensions/api/passwords_private/password_check_delegate.cc
@@ -34,7 +34,7 @@
 #include "components/keyed_service/core/service_access_type.h"
 #include "components/password_manager/core/browser/android_affiliation/affiliation_utils.h"
 #include "components/password_manager/core/browser/bulk_leak_check_service.h"
-#include "components/password_manager/core/browser/compromised_credentials_table.h"
+#include "components/password_manager/core/browser/insecure_credentials_table.h"
 #include "components/password_manager/core/browser/leak_detection/bulk_leak_check.h"
 #include "components/password_manager/core/browser/leak_detection/encryption_utils.h"
 #include "components/password_manager/core/browser/password_form.h"
diff --git a/chrome/browser/extensions/api/passwords_private/password_check_delegate_unittest.cc b/chrome/browser/extensions/api/passwords_private/password_check_delegate_unittest.cc
index 2c0f3ed..301a133c 100644
--- a/chrome/browser/extensions/api/passwords_private/password_check_delegate_unittest.cc
+++ b/chrome/browser/extensions/api/passwords_private/password_check_delegate_unittest.cc
@@ -30,7 +30,7 @@
 #include "chrome/test/base/testing_profile.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "components/password_manager/core/browser/bulk_leak_check_service.h"
-#include "components/password_manager/core/browser/compromised_credentials_table.h"
+#include "components/password_manager/core/browser/insecure_credentials_table.h"
 #include "components/password_manager/core/browser/leak_detection/bulk_leak_check.h"
 #include "components/password_manager/core/browser/leak_detection/leak_detection_delegate_interface.h"
 #include "components/password_manager/core/browser/password_manager_test_utils.h"
@@ -141,12 +141,10 @@
     base::StringPiece username,
     base::TimeDelta time_since_creation = base::TimeDelta(),
     CompromiseType compromise_type = CompromiseType::kLeaked) {
-  return {
-      std::string(signon_realm),
-      base::ASCIIToUTF16(username),
-      base::Time::Now() - time_since_creation,
-      compromise_type,
-  };
+  return CompromisedCredentials(
+      std::string(signon_realm), base::ASCIIToUTF16(username),
+      base::Time::Now() - time_since_creation, compromise_type,
+      /*is_muted=*/false);
 }
 
 PasswordForm MakeSavedPassword(base::StringPiece signon_realm,
@@ -814,13 +812,11 @@
       IsLeaked(true));
   RunUntilIdle();
 
-  EXPECT_THAT(store().compromised_credentials(),
-              ElementsAre(CompromisedCredentials{
-                  .signon_realm = kExampleCom,
-                  .username = base::ASCIIToUTF16(kUsername1),
-                  .create_time = base::Time::Now(),
-                  .compromise_type = CompromiseType::kLeaked,
-              }));
+  EXPECT_THAT(
+      store().compromised_credentials(),
+      ElementsAre(CompromisedCredentials(
+          kExampleCom, base::ASCIIToUTF16(kUsername1), base::Time::Now(),
+          CompromiseType::kLeaked, /*is_muted=*/false)));
 }
 
 // Test that a found leak creates a compromised credential in the password
@@ -847,32 +843,21 @@
       IsLeaked(true));
   RunUntilIdle();
 
-  EXPECT_THAT(store().compromised_credentials(),
-              UnorderedElementsAre(
-                  CompromisedCredentials{
-                      .signon_realm = kExampleCom,
-                      .username = base::ASCIIToUTF16(kUsername1),
-                      .create_time = base::Time::Now(),
-                      .compromise_type = CompromiseType::kLeaked,
-                  },
-                  CompromisedCredentials{
-                      .signon_realm = kExampleOrg,
-                      .username = base::ASCIIToUTF16(kUsername1),
-                      .create_time = base::Time::Now(),
-                      .compromise_type = CompromiseType::kLeaked,
-                  },
-                  CompromisedCredentials{
-                      .signon_realm = kExampleCom,
-                      .username = base::ASCIIToUTF16(kUsername2Upper),
-                      .create_time = base::Time::Now(),
-                      .compromise_type = CompromiseType::kLeaked,
-                  },
-                  CompromisedCredentials{
-                      .signon_realm = kExampleOrg,
-                      .username = base::ASCIIToUTF16(kUsername2Email),
-                      .create_time = base::Time::Now(),
-                      .compromise_type = CompromiseType::kLeaked,
-                  }));
+  EXPECT_THAT(
+      store().compromised_credentials(),
+      UnorderedElementsAre(
+          CompromisedCredentials(kExampleCom, base::ASCIIToUTF16(kUsername1),
+                                 base::Time::Now(), CompromiseType::kLeaked,
+                                 /*is_muted=*/false),
+          CompromisedCredentials(kExampleOrg, base::ASCIIToUTF16(kUsername1),
+                                 base::Time::Now(), CompromiseType::kLeaked,
+                                 /*is_muted=*/false),
+          CompromisedCredentials(
+              kExampleCom, base::ASCIIToUTF16(kUsername2Upper),
+              base::Time::Now(), CompromiseType::kLeaked, /*is_muted=*/false),
+          CompromisedCredentials(
+              kExampleOrg, base::ASCIIToUTF16(kUsername2Email),
+              base::Time::Now(), CompromiseType::kLeaked, /*is_muted=*/false)));
 }
 
 // Verifies that the case where the user has no saved passwords is reported
diff --git a/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl_unittest.cc b/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl_unittest.cc
index 8b75183..85696ed 100644
--- a/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl_unittest.cc
+++ b/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl_unittest.cc
@@ -29,7 +29,7 @@
 #include "chrome/common/extensions/api/passwords_private.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/password_manager/content/browser/password_manager_log_router_factory.h"
-#include "components/password_manager/core/browser/compromised_credentials_table.h"
+#include "components/password_manager/core/browser/insecure_credentials_table.h"
 #include "components/password_manager/core/browser/mock_password_feature_manager.h"
 #include "components/password_manager/core/browser/password_form.h"
 #include "components/password_manager/core/browser/password_list_sorter.h"
diff --git a/chrome/browser/extensions/browsertest_util.cc b/chrome/browser/extensions/browsertest_util.cc
index c75c638..62372c9 100644
--- a/chrome/browser/extensions/browsertest_util.cc
+++ b/chrome/browser/extensions/browsertest_util.cc
@@ -17,7 +17,6 @@
 #include "chrome/browser/apps/app_service/app_service_proxy_factory.h"
 #include "chrome/browser/apps/app_service/browser_app_launcher.h"
 #include "chrome/browser/extensions/launch_util.h"
-#include "chrome/browser/installable/installable_metrics.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
diff --git a/chrome/browser/extensions/tab_helper.cc b/chrome/browser/extensions/tab_helper.cc
index daa3057d..a7504ba 100644
--- a/chrome/browser/extensions/tab_helper.cc
+++ b/chrome/browser/extensions/tab_helper.cc
@@ -19,7 +19,6 @@
 #include "chrome/browser/extensions/install_observer.h"
 #include "chrome/browser/extensions/install_tracker.h"
 #include "chrome/browser/extensions/install_tracker_factory.h"
-#include "chrome/browser/installable/installable_metrics.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_tab_helper_factory.h"
 #include "chrome/browser/shell_integration.h"
diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
index cd61609..58a2af1f 100644
--- a/chrome/browser/flag-metadata.json
+++ b/chrome/browser/flag-metadata.json
@@ -3624,6 +3624,11 @@
     "expiry_milestone": 92
   },
   {
+    "name": "omnibox-native-voice-suggestions-provider",
+    "owners": [ "ender", "chrome-omnibox-team@google.com" ],
+    "expiry_milestone": 93
+  },
+  {
     "name": "omnibox-on-device-head-suggestions-incognito",
     "owners": [ "cechen", "suggest-2g@google.com" ],
     "expiry_milestone": 90
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
index 723e824..dba90f6 100644
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -1555,6 +1555,12 @@
     "Display a list of frquently visited pages from history as a single row "
     "with a carousel instead of one URL per line.";
 
+const char kOmniboxNativeVoiceSuggestProviderName[] =
+    "Native Voice Suggest Provider";
+const char kOmniboxNativeVoiceSuggestProviderDescription[] =
+    "When selected, collects voice suggestions with the help of native (c++) "
+    "voice suggestions provider.";
+
 const char kOmniboxTrendingZeroPrefixSuggestionsOnNTPName[] =
     "Omnibox Trending Zero Prefix Suggestions";
 const char kOmniboxTrendingZeroPrefixSuggestionsOnNTPDescription[] =
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
index 6cc5eb6..c3d1477 100644
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
@@ -916,6 +916,9 @@
 extern const char kOmniboxMostVisitedTilesName[];
 extern const char kOmniboxMostVisitedTilesDescription[];
 
+extern const char kOmniboxNativeVoiceSuggestProviderName[];
+extern const char kOmniboxNativeVoiceSuggestProviderDescription[];
+
 extern const char kOmniboxRichAutocompletionName[];
 extern const char kOmniboxRichAutocompletionDescription[];
 extern const char kOmniboxRichAutocompletionMinCharName[];
diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
index 23685a01..a64eac4a 100644
--- a/chrome/browser/flags/android/chrome_feature_list.cc
+++ b/chrome/browser/flags/android/chrome_feature_list.cc
@@ -269,6 +269,7 @@
     &omnibox::kCompactSuggestions,
     &omnibox::kHideVisitsFromCct,
     &omnibox::kMostVisitedTiles,
+    &omnibox::kNativeVoiceSuggestProvider,
     &omnibox::kOmniboxAssistantVoiceSearch,
     &omnibox::kOmniboxSearchEngineLogo,
     &omnibox::kOmniboxSearchReadyIncognito,
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 ffa63605..233c442e 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
@@ -364,6 +364,8 @@
             "OmniboxEnableClipboardProviderImageSuggestions";
     public static final String OMNIBOX_HIDE_VISITS_FROM_CCT = "OmniboxHideVisitsFromCct";
     public static final String OMNIBOX_MOST_VISITED_TILES = "OmniboxMostVisitedTiles";
+    public static final String OMNIBOX_NATIVE_VOICE_SUGGEST_PROVIDER =
+            "OmniboxNativeVoiceSuggestProvider";
     public static final String OMNIBOX_SEARCH_ENGINE_LOGO = "OmniboxSearchEngineLogo";
     public static final String OMNIBOX_SEARCH_READY_INCOGNITO = "OmniboxSearchReadyIncognito";
     public static final String OMNIBOX_SPARE_RENDERER = "OmniboxSpareRenderer";
diff --git a/chrome/browser/infobars/infobars_browsertest.cc b/chrome/browser/infobars/infobars_browsertest.cc
index 98351eb..b9a43c8 100644
--- a/chrome/browser/infobars/infobars_browsertest.cc
+++ b/chrome/browser/infobars/infobars_browsertest.cc
@@ -21,7 +21,6 @@
 #include "chrome/browser/extensions/theme_installed_infobar_delegate.h"
 #include "chrome/browser/infobars/infobar_observer.h"
 #include "chrome/browser/infobars/infobar_service.h"
-#include "chrome/browser/installable/installable_metrics.h"
 #include "chrome/browser/pepper_broker_infobar_delegate.h"
 #include "chrome/browser/plugins/hung_plugin_infobar_delegate.h"
 #include "chrome/browser/plugins/plugin_infobar_delegates.h"
diff --git a/chrome/browser/installable/installable_manager_browsertest.cc b/chrome/browser/installable/installable_manager_browsertest.cc
index 47b95ee..54a3acb 100644
--- a/chrome/browser/installable/installable_manager_browsertest.cc
+++ b/chrome/browser/installable/installable_manager_browsertest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/installable/installable_manager.h"
+#include "components/webapps/installable/installable_manager.h"
 
 #include <tuple>
 
@@ -17,21 +17,23 @@
 #include "base/test/scoped_feature_list.h"
 #include "base/threading/sequenced_task_runner_handle.h"
 #include "chrome/browser/banners/app_banner_manager_desktop.h"
-#include "chrome/browser/installable/installable_logging.h"
-#include "chrome/browser/installable/installable_manager.h"
-#include "chrome/browser/installable/installable_metrics.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/web_applications/test/service_worker_registration_waiter.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
+#include "components/webapps/installable/installable_logging.h"
+#include "components/webapps/installable/installable_manager.h"
+#include "components/webapps/installable/installable_metrics.h"
 #include "content/public/common/content_features.h"
 #include "content/public/test/browser_test.h"
 #include "content/public/test/browser_test_utils.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "third_party/blink/public/common/features.h"
 
+namespace webapps {
+
 namespace {
 
 const char kInsecureOrigin[] = "http://www.google.com";
@@ -1945,3 +1947,5 @@
   EXPECT_EQ(nullptr, tester->splash_icon());
   EXPECT_EQ(std::vector<InstallableStatusCode>{}, tester->errors());
 }
+
+}  // namespace webapps
diff --git a/chrome/browser/lacros/immersive_context_lacros.cc b/chrome/browser/lacros/immersive_context_lacros.cc
index 8a8973e..26ee258 100644
--- a/chrome/browser/lacros/immersive_context_lacros.cc
+++ b/chrome/browser/lacros/immersive_context_lacros.cc
@@ -5,8 +5,11 @@
 #include "chrome/browser/lacros/immersive_context_lacros.h"
 
 #include "chromeos/ui/frame/immersive/immersive_fullscreen_controller.h"
+#include "ui/aura/window.h"
+#include "ui/aura/window_tree_host_platform.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
+#include "ui/platform_window/extensions/wayland_extension.h"
 #include "ui/views/widget/widget.h"
 
 ImmersiveContextLacros::ImmersiveContextLacros() = default;
@@ -16,7 +19,17 @@
 void ImmersiveContextLacros::OnEnteringOrExitingImmersive(
     chromeos::ImmersiveFullscreenController* controller,
     bool entering) {
-  NOTIMPLEMENTED_LOG_ONCE();
+  aura::Window* window = controller->widget()->GetNativeWindow();
+  // Lacros is based on Ozone/Wayland, which uses ui::PlatformWindow and
+  // aura::WindowTreeHostPlatform.
+  auto* wth_platform =
+      static_cast<aura::WindowTreeHostPlatform*>(window->GetHost());
+  ui::PlatformWindow* platform_window = wth_platform->platform_window();
+
+  auto* wayland_extension = ui::GetWaylandExtension(*platform_window);
+  DCHECK(wayland_extension)
+      << "Exo Wayland extensions are always present in Lacros.";
+  wayland_extension->SetImmersiveFullscreenStatus(entering);
 }
 
 gfx::Rect ImmersiveContextLacros::GetDisplayBoundsInScreen(
diff --git a/chrome/browser/media/kaleidoscope/kaleidoscope_internal_resources.grd b/chrome/browser/media/kaleidoscope/kaleidoscope_internal_resources.grd
index d69b7e5..f607bca 100644
--- a/chrome/browser/media/kaleidoscope/kaleidoscope_internal_resources.grd
+++ b/chrome/browser/media/kaleidoscope/kaleidoscope_internal_resources.grd
@@ -22,9 +22,8 @@
       <include name="IDR_KALEIDOSCOPE_CONTENT_WORKER_JS" file="${root_gen_dir}/chrome/browser/media/kaleidoscope/internal/resources/ks-content-worker.js" use_base_dir="false" type="BINDATA" />
       <include name="IDR_KALEIDOSCOPE_HTML" file="internal/resources/kaleidoscope.html" type="BINDATA" />
       <include name="IDR_KALEIDOSCOPE_ICONS_JS" file="${root_gen_dir}/chrome/browser/media/kaleidoscope/internal/resources/icons.js" use_base_dir="false" type="BINDATA" />
-      <include name="IDR_KALEIDOSCOPE_JS" file="internal/resources/kaleidoscope.js" type="BINDATA" />
+      <include name="IDR_KALEIDOSCOPE_JS" file="${root_gen_dir}/chrome/browser/media/kaleidoscope/internal/resources/ks-kaleidoscope.js" use_base_dir="false" type="BINDATA" />
       <include name="IDR_KALEIDOSCOPE_MESSAGES_JS" file="internal/resources/messages.js" type="BINDATA" />
-      <include name="IDR_KALEIDOSCOPE_UTILS_JS" file="internal/resources/utils.js" type="BINDATA" />
       <include name="IDR_GEOMETRY_MOJOM_LITE_JS" file="${root_gen_dir}/ui/gfx/geometry/mojom/geometry.mojom-lite.js" use_base_dir="false" type="BINDATA" />
       <include name="IDR_KALEIDOSCOPE_MOJOM_LITE_JS" file="${root_gen_dir}/chrome/browser/media/kaleidoscope/mojom/kaleidoscope.mojom-lite.js" use_base_dir="false" type="BINDATA" />
       <include name="IDR_KALEIDOSCOPE_NTP_MODULE_JS" file="${root_gen_dir}/chrome/browser/media/kaleidoscope/internal/resources/module/module.js" use_base_dir="false" type="BINDATA" />
diff --git a/chrome/browser/media/kaleidoscope/kaleidoscope_ui.cc b/chrome/browser/media/kaleidoscope/kaleidoscope_ui.cc
index 58426ef..b21d170 100644
--- a/chrome/browser/media/kaleidoscope/kaleidoscope_ui.cc
+++ b/chrome/browser/media/kaleidoscope/kaleidoscope_ui.cc
@@ -224,8 +224,6 @@
   html_source->AddResourcePath("kaleidoscope.js", IDR_KALEIDOSCOPE_JS);
   html_source->AddResourcePath("messages.js", IDR_KALEIDOSCOPE_MESSAGES_JS);
 
-  // TODO(beccahughes): Remove
-  html_source->AddResourcePath("utils.js", IDR_KALEIDOSCOPE_UTILS_JS);
   html_source->AddResourcePath("content-worker.js",
                                IDR_KALEIDOSCOPE_CONTENT_WORKER_JS);
 
diff --git a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc b/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
index 2635827..713fed2 100644
--- a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
+++ b/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
@@ -7,6 +7,7 @@
 #include <cmath>
 #include <string>
 
+#include "base/allocator/partition_allocator/partition_alloc_features.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/cpu.h"
@@ -546,11 +547,14 @@
 
 #endif  // defined(OS_WIN)
 
-  // Records whether or not PartitionAlloc is used as the default allocator.
+  // Records whether or not PartitionAlloc is used as the default allocator,
+  // plus whether or not PCScan is enabled.
   ChromeMetricsServiceAccessor::RegisterSyntheticFieldTrial(
-      "PartitionAllocEverywhere",
+      "PartitionAllocEverywhereAndPCScan",
 #if BUILDFLAG(USE_PARTITION_ALLOC_EVERYWHERE)
-      "Enabled"
+      base::features::IsPartitionAllocPCScanBrowserOnlyEnabled()
+          ? "EnabledWithPCScan"
+          : "EnabledWithoutPCScan"
 #else
       "Disabled"
 #endif
diff --git a/chrome/browser/metrics/perf/process_type_collector.cc b/chrome/browser/metrics/perf/process_type_collector.cc
index 2f0654f..6e670fa 100644
--- a/chrome/browser/metrics/perf/process_type_collector.cc
+++ b/chrome/browser/metrics/perf/process_type_collector.cc
@@ -177,6 +177,18 @@
     } else if (base::StartsWith(cmd, "GpuMemory",
                                 base::CompareCase::SENSITIVE)) {
       thread = Thread::GPU_MEMORY_THREAD;
+    } else if (cmd == "MemoryInfra") {
+      thread = Thread::MEMORY_INFRA_THREAD;
+    } else if (cmd == "Media") {
+      thread = Thread::MEDIA_THREAD;
+    } else if (base::StartsWith(cmd, "DedicatedWorker",
+                                base::CompareCase::SENSITIVE)) {
+      thread = Thread::DEDICATED_WORKER_THREAD;
+    } else if (base::StartsWith(cmd, "ServiceWorker",
+                                base::CompareCase::SENSITIVE)) {
+      thread = Thread::SERVICE_WORKER_THREAD;
+    } else if (base::StartsWith(cmd, "WebRTC", base::CompareCase::SENSITIVE)) {
+      thread = Thread::WEBRTC_THREAD;
     }
 
     thread_types.emplace(tid, thread);
diff --git a/chrome/browser/metrics/perf/process_type_collector_unittest.cc b/chrome/browser/metrics/perf/process_type_collector_unittest.cc
index 79ba9f8..00f59e5 100644
--- a/chrome/browser/metrics/perf/process_type_collector_unittest.cc
+++ b/chrome/browser/metrics/perf/process_type_collector_unittest.cc
@@ -62,6 +62,11 @@
   13001 13521 GpuMemoryThread   /opt/google/chrome/chrome --type=renderer
   15000 15112 ThreadPoolForeg   /opt/google/chrome/chrome --type=renderer
   16000 16112 CompositorTileW   /opt/google/chrome/chrome --type=renderer
+  17001 17021 MemoryInfra       /opt/google/chrome/chrome --type=renderer
+  18020 18211 Media             /opt/google/chrome/chrome --type=renderer
+  19001 19008 DedicatedWorker   /opt/google/chrome/chrome --type=renderer
+  19123 19234 ServiceWorker     /opt/google/chrome/chrome --type=renderer
+  19321 19335 WebRTC_Signalin   /opt/google/chrome/chrome --type=renderer
   12345 12456 OtherThread       /opt/google/chrome/chrome --ppapi-flash-path=...
   13456 13566 Compositor/6      non_chrome_exec --some-flag=foo)text";
   thread_types->insert(
@@ -82,6 +87,16 @@
       13521, Thread::GPU_MEMORY_THREAD));
   thread_types->insert(google::protobuf::MapPair<uint32_t, Thread>(
       16112, Thread::COMPOSITOR_TILE_WORKER_THREAD));
+  thread_types->insert(google::protobuf::MapPair<uint32_t, Thread>(
+      17021, Thread::MEMORY_INFRA_THREAD));
+  thread_types->insert(
+      google::protobuf::MapPair<uint32_t, Thread>(18211, Thread::MEDIA_THREAD));
+  thread_types->insert(google::protobuf::MapPair<uint32_t, Thread>(
+      19008, Thread::DEDICATED_WORKER_THREAD));
+  thread_types->insert(google::protobuf::MapPair<uint32_t, Thread>(
+      19234, Thread::SERVICE_WORKER_THREAD));
+  thread_types->insert(google::protobuf::MapPair<uint32_t, Thread>(
+      19335, Thread::WEBRTC_THREAD));
   thread_types->insert(
       google::protobuf::MapPair<uint32_t, Thread>(12456, Thread::OTHER_THREAD));
 }
diff --git a/chrome/browser/paint_preview/android/java/src/org/chromium/chrome/browser/paint_preview/StartupPaintPreview.java b/chrome/browser/paint_preview/android/java/src/org/chromium/chrome/browser/paint_preview/StartupPaintPreview.java
index d166500..afe8f2d6 100644
--- a/chrome/browser/paint_preview/android/java/src/org/chromium/chrome/browser/paint_preview/StartupPaintPreview.java
+++ b/chrome/browser/paint_preview/android/java/src/org/chromium/chrome/browser/paint_preview/StartupPaintPreview.java
@@ -238,7 +238,7 @@
 
     private class StartupPaintPreviewTabObserver extends EmptyTabObserver {
         @Override
-        public void onPageLoadFinished(Tab tab, String url) {
+        public void onPageLoadFinished(Tab tab, GURL url) {
             // onWebContentsFirstMeaningfulPaint won't be called if we're loading an offline page,
             // hence the preview won't get removed.
             // We need to listen to onPageLoadFinished and remove the preview if an offline page is
diff --git a/chrome/browser/password_check/android/password_check_manager_unittest.cc b/chrome/browser/password_check/android/password_check_manager_unittest.cc
index 2ddec13..70751fc 100644
--- a/chrome/browser/password_check/android/password_check_manager_unittest.cc
+++ b/chrome/browser/password_check/android/password_check_manager_unittest.cc
@@ -168,12 +168,9 @@
     base::StringPiece username,
     base::TimeDelta time_since_creation = base::TimeDelta(),
     CompromiseType compromise_type = CompromiseType::kLeaked) {
-  return {
-      std::string(signon_realm),
-      base::ASCIIToUTF16(username),
-      base::Time::Now() - time_since_creation,
-      compromise_type,
-  };
+  return CompromisedCredentials(
+      std::string(signon_realm), base::ASCIIToUTF16(username),
+      base::Time::Now() - time_since_creation, compromise_type, false);
 }
 
 // Creates matcher for a given compromised credential
diff --git a/chrome/browser/password_manager/android/credential_leak_controller_android_unittest.cc b/chrome/browser/password_manager/android/credential_leak_controller_android_unittest.cc
index 0d66ef5..0762fd3 100644
--- a/chrome/browser/password_manager/android/credential_leak_controller_android_unittest.cc
+++ b/chrome/browser/password_manager/android/credential_leak_controller_android_unittest.cc
@@ -7,7 +7,7 @@
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/metrics/histogram_tester.h"
-#include "components/password_manager/core/browser/compromised_credentials_table.h"
+#include "components/password_manager/core/browser/insecure_credentials_table.h"
 #include "components/password_manager/core/browser/leak_detection_dialog_utils.h"
 #include "components/password_manager/core/browser/password_manager_metrics_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b/chrome/browser/password_manager/chrome_password_manager_client.cc
index eba45bd..58f0603 100644
--- a/chrome/browser/password_manager/chrome_password_manager_client.cc
+++ b/chrome/browser/password_manager/chrome_password_manager_client.cc
@@ -311,9 +311,10 @@
 
 bool ChromePasswordManagerClient::IsFillingFallbackEnabled(
     const GURL& url) const {
-  return IsFillingEnabled(url) &&
-         !Profile::FromBrowserContext(web_contents()->GetBrowserContext())
-              ->IsGuestSession();
+  const Profile* profile =
+      Profile::FromBrowserContext(web_contents()->GetBrowserContext());
+  return IsFillingEnabled(url) && !profile->IsGuestSession() &&
+         !profile->IsEphemeralGuestProfile();
 }
 
 bool ChromePasswordManagerClient::PromptUserToSaveOrUpdatePassword(
@@ -714,7 +715,13 @@
 }
 
 bool ChromePasswordManagerClient::IsIncognito() const {
-  return web_contents()->GetBrowserContext()->IsOffTheRecord();
+  // TODO(https://crbug.com/1125474): After deprecating off-the-record Guest
+  // profile, update this function for better readability.
+  content::BrowserContext* browser_context =
+      web_contents()->GetBrowserContext();
+  const Profile* profile = Profile::FromBrowserContext(browser_context);
+  return browser_context->IsOffTheRecord() ||
+         profile->IsEphemeralGuestProfile();
 }
 
 const password_manager::PasswordManager*
diff --git a/chrome/browser/password_manager/chrome_password_manager_client_unittest.cc b/chrome/browser/password_manager/chrome_password_manager_client_unittest.cc
index 061060f..7ee2084 100644
--- a/chrome/browser/password_manager/chrome_password_manager_client_unittest.cc
+++ b/chrome/browser/password_manager/chrome_password_manager_client_unittest.cc
@@ -399,7 +399,7 @@
 }
 
 TEST_F(ChromePasswordManagerClientTest,
-       SavingAndFillingDisabledConditionsInIncognito) {
+       SavingAndFillingDisabledConditionsInOffTheRecord) {
   std::unique_ptr<WebContents> incognito_web_contents(
       content::WebContentsTester::CreateTestWebContents(
           profile()->GetPrimaryOTRProfile(), nullptr));
@@ -423,6 +423,9 @@
 
   // In guest mode saving is disabled, filling is enabled but there is in fact
   // nothing to fill, manual filling is disabled.
+  base::test::ScopedFeatureList scoped_feature_list;
+  TestingProfile::SetScopedFeatureListForEphemeralGuestProfiles(
+      scoped_feature_list, /*enabled=*/false);
   profile()->SetGuestSession(true);
   profile()->GetPrimaryOTRProfile()->AsTestingProfile()->SetGuestSession(true);
   EXPECT_FALSE(client->IsSavingAndFillingEnabled(kUrlOn));
@@ -430,6 +433,30 @@
   EXPECT_FALSE(client->IsFillingFallbackEnabled(kUrlOn));
 }
 
+TEST_F(ChromePasswordManagerClientTest,
+       SavingAndFillingDisabledConditionsInEphemeralGuest) {
+  base::test::ScopedFeatureList scoped_feature_list;
+  if (!TestingProfile::SetScopedFeatureListForEphemeralGuestProfiles(
+          scoped_feature_list, /*enabled=*/true)) {
+    return;
+  }
+
+  std::unique_ptr<WebContents> web_contents =
+      content::WebContentsTester::CreateTestWebContents(profile(), nullptr);
+  auto client =
+      std::make_unique<MockChromePasswordManagerClient>(web_contents.get());
+  EXPECT_CALL(*client, GetMainFrameCertStatus()).WillRepeatedly(Return(0));
+
+  // In guest mode saving is disabled, filling is enabled but there is in fact
+  // nothing to fill, manual filling is disabled.
+  const GURL kUrlOn("https://accounts.google.com");
+  profile()->SetGuestSession(true);
+  profile()->AsTestingProfile()->SetGuestSession(true);
+  EXPECT_FALSE(client->IsSavingAndFillingEnabled(kUrlOn));
+  EXPECT_TRUE(client->IsFillingEnabled(kUrlOn));
+  EXPECT_FALSE(client->IsFillingFallbackEnabled(kUrlOn));
+}
+
 TEST_F(ChromePasswordManagerClientTest, SavingDependsOnAutomation) {
   // Test that saving passwords UI is disabled for automated tests.
   ChromePasswordManagerClient* client = GetClient();
diff --git a/chrome/browser/password_manager/generated_password_leak_detection_pref.cc b/chrome/browser/password_manager/generated_password_leak_detection_pref.cc
index c4a11fc..a016c56f 100644
--- a/chrome/browser/password_manager/generated_password_leak_detection_pref.cc
+++ b/chrome/browser/password_manager/generated_password_leak_detection_pref.cc
@@ -20,7 +20,7 @@
 
 // Returns whether a primary account is present and syncing successfully.
 bool IsUserSignedInAndSyncing(Profile* profile) {
-  if (profile->IsGuestSession())
+  if (profile->IsGuestSession() || profile->IsEphemeralGuestProfile())
     return false;
 
   auto* identity_manager =
diff --git a/chrome/browser/pdf/pdf_extension_test.cc b/chrome/browser/pdf/pdf_extension_test.cc
index 5e75a7c9..557c0a4 100644
--- a/chrome/browser/pdf/pdf_extension_test.cc
+++ b/chrome/browser/pdf/pdf_extension_test.cc
@@ -3185,10 +3185,10 @@
     std::unique_ptr<AXTreeFormatter> formatter =
         AXInspectFactory::CreateFormatter(GetParam().second);
     std::vector<AXPropertyFilter> property_filters;
-    formatter->AddDefaultFilters(&property_filters);
     AddDefaultFilters(&property_filters);
     ParsePdfForExtraDirectives(pdf_contents, &property_filters);
-    formatter->SetPropertyFilters(property_filters);
+    formatter->SetPropertyFilters(property_filters,
+                                  AXTreeFormatter::kFiltersDefaultSet);
 
     // Exit without running the test if we can't find an expectation file or if
     // the expectation file contains a skip marker.
diff --git a/chrome/browser/policy/cloud/device_management_service_browsertest.cc b/chrome/browser/policy/cloud/device_management_service_browsertest.cc
index 8a808ae..8216f87a 100644
--- a/chrome/browser/policy/cloud/device_management_service_browsertest.cc
+++ b/chrome/browser/policy/cloud/device_management_service_browsertest.cc
@@ -130,7 +130,7 @@
   std::unique_ptr<DeviceManagementService::Job> StartJob(
       DeviceManagementService::JobConfiguration::JobType type,
       bool critical,
-      std::unique_ptr<DMAuth> auth_data,
+      DMAuth auth_data,
       base::Optional<std::string> oauth_token,
       const em::DeviceManagementRequest request) {
     std::string payload;
diff --git a/chrome/browser/policy/extension_policy_browsertest.cc b/chrome/browser/policy/extension_policy_browsertest.cc
index baae437..cb879a47 100644
--- a/chrome/browser/policy/extension_policy_browsertest.cc
+++ b/chrome/browser/policy/extension_policy_browsertest.cc
@@ -25,7 +25,6 @@
 #include "chrome/browser/extensions/shared_module_service.h"
 #include "chrome/browser/extensions/unpacked_installer.h"
 #include "chrome/browser/extensions/updater/extension_updater.h"
-#include "chrome/browser/installable/installable_metrics.h"
 #include "chrome/browser/policy/policy_test_utils.h"
 #include "chrome/browser/policy/profile_policy_connector_builder.h"
 #include "chrome/browser/profiles/profile.h"
@@ -41,6 +40,7 @@
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/policy/policy_constants.h"
 #include "components/version_info/channel.h"
+#include "components/webapps/installable/installable_metrics.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/common/result_codes.h"
 #include "content/public/test/browser_test.h"
@@ -278,7 +278,7 @@
     web_app::AppId return_app_id;
     web_app_provider_base()->install_manager().InstallWebAppFromInfo(
         std::move(web_application), web_app::ForInstallableSite::kYes,
-        WebappInstallSource::SYNC,
+        webapps::WebappInstallSource::SYNC,
         base::BindLambdaForTesting(
             [&](const web_app::AppId& app_id, web_app::InstallResultCode code) {
               EXPECT_EQ(code, web_app::InstallResultCode::kSuccessNewInstall);
diff --git a/chrome/browser/prefetch/search_prefetch/base_search_prefetch_request.cc b/chrome/browser/prefetch/search_prefetch/base_search_prefetch_request.cc
index eb9995aa..5d4882fa 100644
--- a/chrome/browser/prefetch/search_prefetch/base_search_prefetch_request.cc
+++ b/chrome/browser/prefetch/search_prefetch/base_search_prefetch_request.cc
@@ -4,18 +4,80 @@
 
 #include "chrome/browser/prefetch/search_prefetch/base_search_prefetch_request.h"
 
+#include <vector>
+
+#include "chrome/browser/chrome_content_browser_client.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
 #include "components/prefs/pref_service.h"
 #include "components/variations/net/variations_http_headers.h"
 #include "content/public/browser/client_hints.h"
 #include "content/public/browser/frame_accept_header.h"
+#include "content/public/browser/render_frame_host.h"
+#include "content/public/browser/url_loader_throttles.h"
+#include "content/public/browser/web_contents.h"
 #include "content/public/common/content_constants.h"
 #include "net/base/load_flags.h"
+#include "net/cookies/site_for_cookies.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_status_code.h"
 #include "net/traffic_annotation/network_traffic_annotation.h"
 #include "services/network/public/cpp/resource_request.h"
+#include "services/network/public/mojom/fetch_api.mojom.h"
+#include "third_party/blink/public/common/loader/url_loader_throttle.h"
+#include "third_party/blink/public/mojom/loader/resource_load_info.mojom-shared.h"
+#include "url/origin.h"
+
+namespace {
+
+// A custom URLLoaderThrottle delegate that is very sensitive. Anything that
+// would delay or cancel the request is treated the same, which would prevent
+// the prefetch request.
+class CheckForCancelledOrPausedDelegate
+    : public blink::URLLoaderThrottle::Delegate {
+ public:
+  CheckForCancelledOrPausedDelegate() = default;
+  ~CheckForCancelledOrPausedDelegate() override = default;
+
+  CheckForCancelledOrPausedDelegate(const CheckForCancelledOrPausedDelegate&) =
+      delete;
+  CheckForCancelledOrPausedDelegate& operator=(
+      const CheckForCancelledOrPausedDelegate&) = delete;
+
+  // URLLoaderThrottle::Delegate:
+  void CancelWithError(int error_code,
+                       base::StringPiece custom_reason) override {
+    cancelled_or_paused_ = true;
+  }
+
+  void Resume() override {}
+
+  void PauseReadingBodyFromNet() override { cancelled_or_paused_ = true; }
+
+  void RestartWithFlags(int additional_load_flags) override {
+    cancelled_or_paused_ = true;
+  }
+
+  void RestartWithURLResetAndFlags(int additional_load_flags) override {
+    cancelled_or_paused_ = true;
+  }
+
+  void RestartWithURLResetAndFlagsNow(int additional_load_flags) override {
+    cancelled_or_paused_ = true;
+  }
+
+  void RestartWithModifiedHeadersNow(
+      const net::HttpRequestHeaders& modified_headers) override {
+    cancelled_or_paused_ = true;
+  }
+
+  bool cancelled_or_paused() const { return cancelled_or_paused_; }
+
+ private:
+  bool cancelled_or_paused_ = false;
+};
+
+}  // namespace
 
 BaseSearchPrefetchRequest::BaseSearchPrefetchRequest(
     const GURL& prefetch_url,
@@ -25,7 +87,7 @@
 
 BaseSearchPrefetchRequest::~BaseSearchPrefetchRequest() = default;
 
-void BaseSearchPrefetchRequest::StartPrefetchRequest(Profile* profile) {
+bool BaseSearchPrefetchRequest::StartPrefetchRequest(Profile* profile) {
   net::NetworkTrafficAnnotationTag network_traffic_annotation =
       net::DefineNetworkTrafficAnnotation("search_prefetch_service", R"(
         semantics {
@@ -61,6 +123,8 @@
           }
         })");
 
+  url::Origin prefetch_origin = url::Origin::Create(prefetch_url_);
+
   auto resource_request = std::make_unique<network::ResourceRequest>();
   resource_request->load_flags |= net::LOAD_PREFETCH;
   resource_request->url = prefetch_url_;
@@ -70,8 +134,26 @@
   resource_request->report_raw_headers = true;
   resource_request->credentials_mode =
       network::mojom::CredentialsMode::kInclude;
-  variations::AppendVariationsHeaderUnknownSignedIn(
-      prefetch_url_, variations::InIncognito::kNo, resource_request.get());
+  resource_request->method = "GET";
+  resource_request->mode = network::mojom::RequestMode::kNavigate;
+  resource_request->site_for_cookies =
+      net::SiteForCookies::FromUrl(prefetch_url_);
+  resource_request->destination = network::mojom::RequestDestination::kDocument;
+  resource_request->resource_type =
+      static_cast<int>(blink::mojom::ResourceType::kMainFrame);
+  resource_request->trusted_params = network::ResourceRequest::TrustedParams();
+  // We don't handle redirects, so |kOther| makes sense here.
+  resource_request->trusted_params->isolation_info = net::IsolationInfo::Create(
+      net::IsolationInfo::RequestType::kOther, prefetch_origin, prefetch_origin,
+      resource_request->site_for_cookies);
+  resource_request->referrer_policy = net::ReferrerPolicy::NO_REFERRER;
+
+  // Tack an 'Upgrade-Insecure-Requests' header to outgoing navigational
+  // requests, as described in
+  // https://w3c.github.io/webappsec/specs/upgrade/#feature-detect
+  resource_request->headers.SetHeader("Upgrade-Insecure-Requests", "1");
+  resource_request->headers.SetHeader(net::HttpRequestHeaders::kUserAgent,
+                                      GetUserAgent());
   resource_request->headers.SetHeader(content::kCorsExemptPurposeHeaderName,
                                       "prefetch");
   resource_request->headers.SetHeader(
@@ -86,13 +168,37 @@
       profile->GetClientHintsControllerDelegate(),
       /*is_ua_override_on=*/false, js_enabled);
 
-  // TODO(ryansturm): Find other headers that may need to be set.
-  // https://crbug.com/1138648
+  // Before sending out the request, allow throttles to modify the request (not
+  // the URL). The rest of the URL Loader throttle calls are captured in the
+  // navigation stack. Headers can be added by throttles at this point, which we
+  // want to capture.
+  auto wc_getter =
+      base::BindRepeating([]() -> content::WebContents* { return nullptr; });
+  std::vector<std::unique_ptr<blink::URLLoaderThrottle>> throttles =
+      content::CreateContentBrowserURLLoaderThrottles(
+          *resource_request, profile, std::move(wc_getter),
+          /*navigation_ui_data=*/nullptr,
+          content::RenderFrameHost::kNoFrameTreeNodeId);
+
+  bool should_defer = false;
+  for (auto& throttle : throttles) {
+    CheckForCancelledOrPausedDelegate cancel_or_pause_delegate;
+    throttle->set_delegate(&cancel_or_pause_delegate);
+    throttle->WillStartRequest(resource_request.get(), &should_defer);
+    // Make sure throttles are deleted before |cancel_or_pause_delegate| in case
+    // they call into the delegate in the destructor.
+    throttle.reset();
+    if (should_defer || resource_request->url != prefetch_url_ ||
+        cancel_or_pause_delegate.cancelled_or_paused()) {
+      return false;
+    }
+  }
 
   current_status_ = SearchPrefetchStatus::kInFlight;
 
   StartPrefetchRequestInternal(profile, std::move(resource_request),
                                network_traffic_annotation);
+  return true;
 }
 
 void BaseSearchPrefetchRequest::CancelPrefetch() {
diff --git a/chrome/browser/prefetch/search_prefetch/base_search_prefetch_request.h b/chrome/browser/prefetch/search_prefetch/base_search_prefetch_request.h
index 3316725..8abc563c 100644
--- a/chrome/browser/prefetch/search_prefetch/base_search_prefetch_request.h
+++ b/chrome/browser/prefetch/search_prefetch/base_search_prefetch_request.h
@@ -49,8 +49,10 @@
       delete;
 
   // Starts the network request to prefetch |prefetch_url_|. Sets various fields
-  // on a resource request and calls |StartPrefetchRequestInternal()|.
-  void StartPrefetchRequest(Profile* profile);
+  // on a resource request and calls |StartPrefetchRequestInternal()|. Returns
+  // |false| if the request is not started (i.e., it would be deferred by
+  // throttles).
+  bool StartPrefetchRequest(Profile* profile);
 
   // Marks a prefetch as canceled and stops any ongoing fetch.
   void CancelPrefetch();
diff --git a/chrome/browser/prefetch/search_prefetch/search_prefetch_service.cc b/chrome/browser/prefetch/search_prefetch/search_prefetch_service.cc
index f018dca..41ff95b0 100644
--- a/chrome/browser/prefetch/search_prefetch/search_prefetch_service.cc
+++ b/chrome/browser/prefetch/search_prefetch/search_prefetch_service.cc
@@ -127,9 +127,11 @@
   }
 
   DCHECK(prefetch_request);
+  if (!prefetch_request->StartPrefetchRequest(profile_)) {
+    return false;
+  }
 
   prefetches_.emplace(search_terms, std::move(prefetch_request));
-  prefetches_[search_terms]->StartPrefetchRequest(profile_);
   prefetch_expiry_timers_.emplace(search_terms,
                                   std::make_unique<base::OneShotTimer>());
   prefetch_expiry_timers_[search_terms]->Start(
diff --git a/chrome/browser/prefetch/search_prefetch/search_prefetch_service_browsertest.cc b/chrome/browser/prefetch/search_prefetch/search_prefetch_service_browsertest.cc
index 2203c62..bd81b3d 100644
--- a/chrome/browser/prefetch/search_prefetch/search_prefetch_service_browsertest.cc
+++ b/chrome/browser/prefetch/search_prefetch/search_prefetch_service_browsertest.cc
@@ -59,6 +59,8 @@
 constexpr char kOmniboxSuggestNonPrefetchQuery[] = "puffins";
 constexpr char kLoadInSubframe[] = "/load_in_subframe";
 constexpr char kClientHintsURL[] = "/accept_ch_with_lifetime.html";
+constexpr char kThrottleHeader[] = "porgs-header";
+constexpr char kThrottleHeaderValue[] = "porgs-header-value";
 }  // namespace
 
 // A response that hangs after serving the start of the response.
@@ -73,6 +75,99 @@
   }
 };
 
+// A delegate to cancel prefetch requests by setting |defer| to true.
+class DeferringThrottle : public blink::URLLoaderThrottle {
+ public:
+  DeferringThrottle() = default;
+  ~DeferringThrottle() override = default;
+
+  void WillStartRequest(network::ResourceRequest* request,
+                        bool* defer) override {
+    *defer = true;
+  }
+};
+
+class ThrottleAllContentBrowserClient : public ChromeContentBrowserClient {
+ public:
+  ThrottleAllContentBrowserClient() = default;
+  ~ThrottleAllContentBrowserClient() override = default;
+
+  // ContentBrowserClient overrides:
+  std::vector<std::unique_ptr<blink::URLLoaderThrottle>>
+  CreateURLLoaderThrottles(
+      const network::ResourceRequest& request,
+      content::BrowserContext* browser_context,
+      const base::RepeatingCallback<content::WebContents*()>& wc_getter,
+      content::NavigationUIData* navigation_ui_data,
+      int frame_tree_node_id) override {
+    std::vector<std::unique_ptr<blink::URLLoaderThrottle>> throttles;
+    throttles.push_back(std::make_unique<DeferringThrottle>());
+    return throttles;
+  }
+};
+
+// A delegate to cancel prefetch requests by calling cancel on |delegate_|.
+class CancellingThrottle : public blink::URLLoaderThrottle {
+ public:
+  CancellingThrottle() = default;
+  ~CancellingThrottle() override = default;
+
+  void WillStartRequest(network::ResourceRequest* request,
+                        bool* defer) override {
+    delegate_->CancelWithError(net::ERR_ABORTED);
+  }
+};
+
+class CancelAllContentBrowserClient : public ChromeContentBrowserClient {
+ public:
+  CancelAllContentBrowserClient() = default;
+  ~CancelAllContentBrowserClient() override = default;
+
+  // ContentBrowserClient overrides:
+  std::vector<std::unique_ptr<blink::URLLoaderThrottle>>
+  CreateURLLoaderThrottles(
+      const network::ResourceRequest& request,
+      content::BrowserContext* browser_context,
+      const base::RepeatingCallback<content::WebContents*()>& wc_getter,
+      content::NavigationUIData* navigation_ui_data,
+      int frame_tree_node_id) override {
+    std::vector<std::unique_ptr<blink::URLLoaderThrottle>> throttles;
+    throttles.push_back(std::make_unique<CancellingThrottle>());
+    return throttles;
+  }
+};
+
+// A delegate to add a custom header to prefetches.
+class AddHeaderModifyingThrottle : public blink::URLLoaderThrottle {
+ public:
+  AddHeaderModifyingThrottle() = default;
+  ~AddHeaderModifyingThrottle() override = default;
+
+  void WillStartRequest(network::ResourceRequest* request,
+                        bool* defer) override {
+    request->headers.SetHeader(kThrottleHeader, kThrottleHeaderValue);
+  }
+};
+
+class AddHeaderContentBrowserClient : public ChromeContentBrowserClient {
+ public:
+  AddHeaderContentBrowserClient() = default;
+  ~AddHeaderContentBrowserClient() override = default;
+
+  // ContentBrowserClient overrides:
+  std::vector<std::unique_ptr<blink::URLLoaderThrottle>>
+  CreateURLLoaderThrottles(
+      const network::ResourceRequest& request,
+      content::BrowserContext* browser_context,
+      const base::RepeatingCallback<content::WebContents*()>& wc_getter,
+      content::NavigationUIData* navigation_ui_data,
+      int frame_tree_node_id) override {
+    std::vector<std::unique_ptr<blink::URLLoaderThrottle>> throttles;
+    throttles.push_back(std::make_unique<AddHeaderModifyingThrottle>());
+    return throttles;
+  }
+};
+
 class SearchPrefetchBaseBrowserTest : public InProcessBrowserTest {
  public:
   SearchPrefetchBaseBrowserTest() {
@@ -538,6 +633,9 @@
   EXPECT_EQ(1u, search_server_prefetch_request_count());
   // Make sure we don't get client hints headers by default.
   EXPECT_FALSE(base::Contains(headers, "viewport-width"));
+  EXPECT_TRUE(base::Contains(headers, "User-Agent"));
+  ASSERT_TRUE(base::Contains(headers, "Upgrade-Insecure-Requests"));
+  EXPECT_TRUE(base::Contains(headers["Upgrade-Insecure-Requests"], "1"));
 
   prefetch_status = search_prefetch_service->GetSearchPrefetchStatusForTesting(
       base::ASCIIToUTF16(search_terms));
@@ -545,6 +643,79 @@
   EXPECT_EQ(SearchPrefetchStatus::kCanBeServed, prefetch_status.value());
 }
 
+IN_PROC_BROWSER_TEST_P(SearchPrefetchServiceEnabledBrowserTest,
+                       PrefetchThrottled) {
+  ThrottleAllContentBrowserClient browser_client;
+  auto* old_client = content::SetBrowserClientForTesting(&browser_client);
+  auto* search_prefetch_service =
+      SearchPrefetchServiceFactory::GetForProfile(browser()->profile());
+  EXPECT_NE(nullptr, search_prefetch_service);
+
+  std::string search_terms = "prefetch_content";
+
+  GURL prefetch_url = GetSearchServerQueryURL(search_terms);
+
+  EXPECT_FALSE(search_prefetch_service->MaybePrefetchURL(prefetch_url));
+  auto prefetch_status =
+      search_prefetch_service->GetSearchPrefetchStatusForTesting(
+          base::ASCIIToUTF16(search_terms));
+  EXPECT_FALSE(prefetch_status.has_value());
+  content::SetBrowserClientForTesting(old_client);
+}
+
+IN_PROC_BROWSER_TEST_P(SearchPrefetchServiceEnabledBrowserTest,
+                       PrefetchCancelledByThrottle) {
+  CancelAllContentBrowserClient browser_client;
+  auto* old_client = content::SetBrowserClientForTesting(&browser_client);
+  auto* search_prefetch_service =
+      SearchPrefetchServiceFactory::GetForProfile(browser()->profile());
+  EXPECT_NE(nullptr, search_prefetch_service);
+
+  std::string search_terms = "prefetch_content";
+
+  GURL prefetch_url = GetSearchServerQueryURL(search_terms);
+
+  EXPECT_FALSE(search_prefetch_service->MaybePrefetchURL(prefetch_url));
+  auto prefetch_status =
+      search_prefetch_service->GetSearchPrefetchStatusForTesting(
+          base::ASCIIToUTF16(search_terms));
+  EXPECT_FALSE(prefetch_status.has_value());
+  content::SetBrowserClientForTesting(old_client);
+}
+
+IN_PROC_BROWSER_TEST_P(SearchPrefetchServiceEnabledBrowserTest,
+                       PrefetchThrottleAddsHeader) {
+  AddHeaderContentBrowserClient browser_client;
+  auto* old_client = content::SetBrowserClientForTesting(&browser_client);
+  auto* search_prefetch_service =
+      SearchPrefetchServiceFactory::GetForProfile(browser()->profile());
+  EXPECT_NE(nullptr, search_prefetch_service);
+
+  std::string search_terms = "prefetch_content";
+
+  GURL prefetch_url = GetSearchServerQueryURL(search_terms);
+
+  EXPECT_TRUE(search_prefetch_service->MaybePrefetchURL(prefetch_url));
+  auto prefetch_status =
+      search_prefetch_service->GetSearchPrefetchStatusForTesting(
+          base::ASCIIToUTF16(search_terms));
+  ASSERT_TRUE(prefetch_status.has_value());
+  EXPECT_EQ(SearchPrefetchStatus::kInFlight, prefetch_status.value());
+
+  WaitUntilStatusChanges(base::ASCIIToUTF16(search_terms));
+
+  auto headers = search_server_requests()[0].headers;
+  EXPECT_EQ(1u, search_server_requests().size());
+  ASSERT_TRUE(base::Contains(headers, kThrottleHeader));
+  EXPECT_TRUE(base::Contains(headers[kThrottleHeader], kThrottleHeaderValue));
+
+  prefetch_status = search_prefetch_service->GetSearchPrefetchStatusForTesting(
+      base::ASCIIToUTF16(search_terms));
+  ASSERT_TRUE(prefetch_status.has_value());
+  EXPECT_EQ(SearchPrefetchStatus::kCanBeServed, prefetch_status.value());
+  content::SetBrowserClientForTesting(old_client);
+}
+
 class HeaderObserverContentBrowserClient : public ChromeContentBrowserClient {
  public:
   HeaderObserverContentBrowserClient() = default;
diff --git a/chrome/browser/prefs/DIR_METADATA b/chrome/browser/prefs/DIR_METADATA
new file mode 100644
index 0000000..c08cafb
--- /dev/null
+++ b/chrome/browser/prefs/DIR_METADATA
@@ -0,0 +1,4 @@
+monorail:  {
+  component:  "UI>Browser>Preferences"
+}
+team_email:  "chromium-dev@chromium.org"
diff --git a/chrome/browser/prefs/OWNERS b/chrome/browser/prefs/OWNERS
index 9a8b24b..e8d91ff 100644
--- a/chrome/browser/prefs/OWNERS
+++ b/chrome/browser/prefs/OWNERS
@@ -2,6 +2,3 @@
 gab@chromium.org
 
 per-file pref_service_incognito_allowlist.cc=rhalavati@chromium.org
-
-# COMPONENT: UI>Browser>Preferences
-# TEAM: chromium-dev@chromium.org
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 0c083f7..fd15cbf3a 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -59,7 +59,6 @@
 #include "chrome/browser/prefs/session_startup_pref.h"
 #include "chrome/browser/previews/previews_https_notification_infobar_decider.h"
 #include "chrome/browser/printing/print_preview_sticky_settings.h"
-#include "chrome/browser/privacy_sandbox/privacy_sandbox_prefs.h"
 #include "chrome/browser/profiles/chrome_version_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_attributes_entry.h"
@@ -132,6 +131,7 @@
 #include "components/prefs/pref_registry.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/pref_service.h"
+#include "components/privacy_sandbox/privacy_sandbox_prefs.h"
 #include "components/proxy_config/pref_proxy_config_tracker_impl.h"
 #include "components/rappor/rappor_service_impl.h"
 #include "components/safe_browsing/core/common/safe_browsing_prefs.h"
diff --git a/chrome/browser/previews/DIR_METADATA b/chrome/browser/previews/DIR_METADATA
new file mode 100644
index 0000000..a3eb23b
--- /dev/null
+++ b/chrome/browser/previews/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "Blink>Previews"
+}
diff --git a/chrome/browser/previews/OWNERS b/chrome/browser/previews/OWNERS
index fd70f95..52c14e4 100644
--- a/chrome/browser/previews/OWNERS
+++ b/chrome/browser/previews/OWNERS
@@ -1,3 +1 @@
 file://components/previews/OWNERS
-
-# COMPONENT: Blink>Previews
diff --git a/chrome/browser/printing/DIR_METADATA b/chrome/browser/printing/DIR_METADATA
new file mode 100644
index 0000000..d446a59
--- /dev/null
+++ b/chrome/browser/printing/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "Internals>Printing"
+}
diff --git a/chrome/browser/printing/OWNERS b/chrome/browser/printing/OWNERS
index 01ea38e..9b08c66 100644
--- a/chrome/browser/printing/OWNERS
+++ b/chrome/browser/printing/OWNERS
@@ -1,2 +1 @@
 file://printing/OWNERS
-# COMPONENT: Internals>Printing
diff --git a/chrome/browser/printing/cloud_print/DIR_METADATA b/chrome/browser/printing/cloud_print/DIR_METADATA
new file mode 100644
index 0000000..7619ec17e
--- /dev/null
+++ b/chrome/browser/printing/cloud_print/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "Services>CloudPrint"
+}
diff --git a/chrome/browser/printing/cloud_print/OWNERS b/chrome/browser/printing/cloud_print/OWNERS
index 3b8d2d0..be0f423b 100644
--- a/chrome/browser/printing/cloud_print/OWNERS
+++ b/chrome/browser/printing/cloud_print/OWNERS
@@ -1,3 +1 @@
 file://cloud_print/OWNERS
-
-# COMPONENT: Services>CloudPrint
diff --git a/chrome/browser/privacy/settings/DIR_METADATA b/chrome/browser/privacy/settings/DIR_METADATA
new file mode 100644
index 0000000..0917002
--- /dev/null
+++ b/chrome/browser/privacy/settings/DIR_METADATA
@@ -0,0 +1,4 @@
+monorail:  {
+  component:  "UI>Settings>Privacy"
+}
+team_email:  "chrome-friendly-settings@google.com"
diff --git a/chrome/browser/privacy/settings/OWNERS b/chrome/browser/privacy/settings/OWNERS
index d1b3ad8..07dff5b 100644
--- a/chrome/browser/privacy/settings/OWNERS
+++ b/chrome/browser/privacy/settings/OWNERS
@@ -2,6 +2,3 @@
 andzaytsev@google.com
 msramek@chromium.org
 dullweber@chromium.org
-
-# TEAM: chrome-friendly-settings@google.com
-# COMPONENT: UI>Settings>Privacy
diff --git a/chrome/browser/privacy_budget/DIR_METADATA b/chrome/browser/privacy_budget/DIR_METADATA
new file mode 100644
index 0000000..108597dc
--- /dev/null
+++ b/chrome/browser/privacy_budget/DIR_METADATA
@@ -0,0 +1,4 @@
+monorail:  {
+  component:  "Privacy>Fingerprinting"
+}
+team_email:  "privacy-sandbox-dev@chromium.org"
diff --git a/chrome/browser/privacy_budget/OWNERS b/chrome/browser/privacy_budget/OWNERS
index cfc756a1..dc54869 100644
--- a/chrome/browser/privacy_budget/OWNERS
+++ b/chrome/browser/privacy_budget/OWNERS
@@ -1,4 +1 @@
 file://third_party/blink/public/common/privacy_budget/OWNERS
-
-# TEAM: privacy-sandbox-dev@chromium.org
-# COMPONENT: Privacy>Fingerprinting
diff --git a/chrome/browser/privacy_sandbox/DIR_METADATA b/chrome/browser/privacy_sandbox/DIR_METADATA
new file mode 100644
index 0000000..0917002
--- /dev/null
+++ b/chrome/browser/privacy_sandbox/DIR_METADATA
@@ -0,0 +1,4 @@
+monorail:  {
+  component:  "UI>Settings>Privacy"
+}
+team_email:  "chrome-friendly-settings@google.com"
diff --git a/chrome/browser/privacy_sandbox/OWNERS b/chrome/browser/privacy_sandbox/OWNERS
index 6143a2f..4ef0333e 100644
--- a/chrome/browser/privacy_sandbox/OWNERS
+++ b/chrome/browser/privacy_sandbox/OWNERS
@@ -2,6 +2,3 @@
 harrisonsean@chromium.org
 msramek@chromium.org
 sauski@google.com
-
-# COMPONENT: UI>Settings>Privacy
-# TEAM: chrome-friendly-settings@google.com
diff --git a/chrome/browser/privacy_sandbox/privacy_sandbox_settings.cc b/chrome/browser/privacy_sandbox/privacy_sandbox_settings.cc
index 669642d2..f87594ea9 100644
--- a/chrome/browser/privacy_sandbox/privacy_sandbox_settings.cc
+++ b/chrome/browser/privacy_sandbox/privacy_sandbox_settings.cc
@@ -6,10 +6,10 @@
 
 #include "base/feature_list.h"
 #include "base/time/time.h"
-#include "chrome/browser/privacy_sandbox/privacy_sandbox_prefs.h"
 #include "chrome/common/chrome_features.h"
 #include "components/content_settings/core/browser/cookie_settings.h"
 #include "components/prefs/pref_service.h"
+#include "components/privacy_sandbox/privacy_sandbox_prefs.h"
 #include "url/gurl.h"
 #include "url/origin.h"
 
diff --git a/chrome/browser/privacy_sandbox/privacy_sandbox_settings_unittest.cc b/chrome/browser/privacy_sandbox/privacy_sandbox_settings_unittest.cc
index 10cbad4..87fb819 100644
--- a/chrome/browser/privacy_sandbox/privacy_sandbox_settings_unittest.cc
+++ b/chrome/browser/privacy_sandbox/privacy_sandbox_settings_unittest.cc
@@ -8,7 +8,6 @@
 #include "base/test/scoped_feature_list.h"
 #include "chrome/browser/content_settings/cookie_settings_factory.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
-#include "chrome/browser/privacy_sandbox/privacy_sandbox_prefs.h"
 #include "chrome/common/chrome_features.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/content_settings/core/browser/cookie_settings.h"
@@ -16,6 +15,7 @@
 #include "components/content_settings/core/common/pref_names.h"
 #include "components/content_settings/core/test/content_settings_mock_provider.h"
 #include "components/content_settings/core/test/content_settings_test_utils.h"
+#include "components/privacy_sandbox/privacy_sandbox_prefs.h"
 #include "components/sync_preferences/testing_pref_service_syncable.h"
 #include "content/public/test/browser_task_environment.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/profile_resetter/DIR_METADATA b/chrome/browser/profile_resetter/DIR_METADATA
new file mode 100644
index 0000000..c08cafb
--- /dev/null
+++ b/chrome/browser/profile_resetter/DIR_METADATA
@@ -0,0 +1,4 @@
+monorail:  {
+  component:  "UI>Browser>Preferences"
+}
+team_email:  "chromium-dev@chromium.org"
diff --git a/chrome/browser/profile_resetter/OWNERS b/chrome/browser/profile_resetter/OWNERS
index 123f39a..bf6227b8 100644
--- a/chrome/browser/profile_resetter/OWNERS
+++ b/chrome/browser/profile_resetter/OWNERS
@@ -1,5 +1,3 @@
 battre@chromium.org
 engedy@chromium.org
 vasilii@chromium.org
-# COMPONENT: UI>Browser>Preferences
-# TEAM: chromium-dev@chromium.org
diff --git a/chrome/browser/profiles/DIR_METADATA b/chrome/browser/profiles/DIR_METADATA
new file mode 100644
index 0000000..4ab9953
--- /dev/null
+++ b/chrome/browser/profiles/DIR_METADATA
@@ -0,0 +1,4 @@
+monorail:  {
+  component:  "UI>Browser>Profiles"
+}
+team_email:  "chrome-signin@chromium.org"
diff --git a/chrome/browser/profiles/OWNERS b/chrome/browser/profiles/OWNERS
index fb58e9ed1..e867c4c5 100644
--- a/chrome/browser/profiles/OWNERS
+++ b/chrome/browser/profiles/OWNERS
@@ -15,6 +15,3 @@
 per-file gaia_info_update_service*=msalama@chromium.org
 per-file profile_attributes*=msalama@chromium.org
 per-file profile_info*=msalama@chromium.org
-
-# COMPONENT: UI>Browser>Profiles
-# TEAM: chrome-signin@chromium.org
diff --git a/chrome/browser/profiles/android/DIR_METADATA b/chrome/browser/profiles/android/DIR_METADATA
new file mode 100644
index 0000000..da841c6
--- /dev/null
+++ b/chrome/browser/profiles/android/DIR_METADATA
@@ -0,0 +1,4 @@
+monorail:  {
+  component:  "UI>Browser>Mobile"
+}
+os:  ANDROID
diff --git a/chrome/browser/profiles/android/OWNERS b/chrome/browser/profiles/android/OWNERS
index 3d2d8355..697c69ed 100644
--- a/chrome/browser/profiles/android/OWNERS
+++ b/chrome/browser/profiles/android/OWNERS
@@ -1,4 +1 @@
 file://chrome/android/OWNERS
-
-# COMPONENT: UI>Browser>Mobile
-# OS: Android
diff --git a/chrome/browser/profiles/profile_browsertest.cc b/chrome/browser/profiles/profile_browsertest.cc
index 1fea7cf..5b3808a 100644
--- a/chrome/browser/profiles/profile_browsertest.cc
+++ b/chrome/browser/profiles/profile_browsertest.cc
@@ -26,6 +26,7 @@
 #include "base/task/post_task.h"
 #include "base/task/thread_pool/thread_pool_instance.h"
 #include "base/test/bind.h"
+#include "base/test/metrics/histogram_tester.h"
 #include "base/test/scoped_feature_list.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/values.h"
@@ -40,6 +41,7 @@
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profile_observer.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_features.h"
@@ -223,6 +225,28 @@
   base::ThreadPoolInstance::Get()->FlushForTesting();
 }
 
+class BrowserCloseObserver : public BrowserListObserver {
+ public:
+  explicit BrowserCloseObserver(Browser* browser) : browser_(browser) {
+    BrowserList::AddObserver(this);
+  }
+  ~BrowserCloseObserver() override { BrowserList::RemoveObserver(this); }
+
+  void Wait() { run_loop_.Run(); }
+
+  // BrowserListObserver implementation.
+  void OnBrowserRemoved(Browser* browser) override {
+    if (browser == browser_)
+      run_loop_.Quit();
+  }
+
+ private:
+  Browser* browser_;
+  base::RunLoop run_loop_;
+
+  DISALLOW_COPY_AND_ASSIGN(BrowserCloseObserver);
+};
+
 }  // namespace
 
 class ProfileBrowserTest : public InProcessBrowserTest {
@@ -921,6 +945,30 @@
 }
 
 #if !defined(OS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH)
+
+// TODO(https://crbug.com/1125474): Expand to cover ChromeOS.
+IN_PROC_BROWSER_TEST_F(ProfileBrowserTest, ProfileLifetimeTestUnderOneMinute) {
+  base::HistogramTester tester;
+  Browser* browser = CreateGuestBrowser();
+  BrowserCloseObserver close_observer(browser);
+
+  BrowserList::CloseAllBrowsersWithProfile(browser->profile());
+  close_observer.Wait();
+  tester.ExpectUniqueSample("Profile.Guest.OTR.Lifetime", 0, 1);
+}
+
+IN_PROC_BROWSER_TEST_F(ProfileBrowserTest, ProfileLifetimeTestOneHour) {
+  base::HistogramTester tester;
+  Browser* browser = CreateGuestBrowser();
+  BrowserCloseObserver close_observer(browser);
+
+  browser->profile()->SetCreationTimeForTesting(
+      base::Time::Now() - base::TimeDelta::FromSeconds(60) * 60);
+  BrowserList::CloseAllBrowsersWithProfile(browser->profile());
+  close_observer.Wait();
+  tester.ExpectUniqueSample("Profile.Guest.OTR.Lifetime", 60, 1);
+}
+
 class EphemeralGuestProfileBrowserTest : public ProfileBrowserTest {
  public:
   EphemeralGuestProfileBrowserTest() {
@@ -942,6 +990,30 @@
   EXPECT_TRUE(guest_profile->IsEphemeralGuestProfile());
 }
 
+IN_PROC_BROWSER_TEST_F(EphemeralGuestProfileBrowserTest,
+                       ProfileLifetimeTestUnderOneMinute) {
+  base::HistogramTester tester;
+  Browser* browser = CreateGuestBrowser();
+  BrowserCloseObserver close_observer(browser);
+
+  BrowserList::CloseAllBrowsersWithProfile(browser->profile());
+  close_observer.Wait();
+  tester.ExpectUniqueSample("Profile.Guest.Ephemeral.Lifetime", 0, 1);
+}
+
+IN_PROC_BROWSER_TEST_F(EphemeralGuestProfileBrowserTest,
+                       ProfileLifetimeTestOneHour) {
+  base::HistogramTester tester;
+  Browser* browser = CreateGuestBrowser();
+  BrowserCloseObserver close_observer(browser);
+
+  browser->profile()->SetCreationTimeForTesting(
+      base::Time::Now() - base::TimeDelta::FromSeconds(60) * 60);
+  BrowserList::CloseAllBrowsersWithProfile(browser->profile());
+  close_observer.Wait();
+  tester.ExpectUniqueSample("Profile.Guest.Ephemeral.Lifetime", 60, 1);
+}
+
 // Tests if ephemeral Guest profile paths are persistent as long as one does not
 // close all Guest browsers.
 IN_PROC_BROWSER_TEST_F(EphemeralGuestProfileBrowserTest,
diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc
index 76841e4..237aa29 100644
--- a/chrome/browser/profiles/profile_manager.cc
+++ b/chrome/browser/profiles/profile_manager.cc
@@ -19,6 +19,7 @@
 #include "base/files/file_enumerator.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
+#include "base/metrics/histogram_functions.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/user_metrics.h"
 #include "base/no_destructor.h"
@@ -1994,8 +1995,20 @@
       return;
   }
 
-  if (profile->IsGuestSession() || profile->IsEphemeralGuestProfile())
+  if (profile->IsGuestSession() || profile->IsEphemeralGuestProfile()) {
+    auto duration = base::Time::Now() - profile->GetCreationTime();
+    if (profile->IsEphemeralGuestProfile()) {
+      base::UmaHistogramCustomCounts(
+          "Profile.Guest.Ephemeral.Lifetime", duration.InMinutes(), 1,
+          base::TimeDelta::FromDays(28).InMinutes(), 100);
+    } else {
+      base::UmaHistogramCustomCounts(
+          "Profile.Guest.OTR.Lifetime", duration.InMinutes(), 1,
+          base::TimeDelta::FromDays(28).InMinutes(), 100);
+    }
+
     CleanUpGuestProfile();
+  }
 
 #if !BUILDFLAG(IS_CHROMEOS_ASH)
   ProfileAttributesEntry* entry;
diff --git a/chrome/browser/profiles/profile_metrics.cc b/chrome/browser/profiles/profile_metrics.cc
index 5bdf752f..3c0a4f53 100644
--- a/chrome/browser/profiles/profile_metrics.cc
+++ b/chrome/browser/profiles/profile_metrics.cc
@@ -212,8 +212,10 @@
     Profile* profile) {
   if (profile->IsSystemProfile())
     return profile_metrics::BrowserProfileType::kSystem;
-  if (profile->IsGuestSession() || profile->IsEphemeralGuestProfile())
+  if (profile->IsGuestSession())
     return profile_metrics::BrowserProfileType::kGuest;
+  if (profile->IsEphemeralGuestProfile())
+    return profile_metrics::BrowserProfileType::kEphemeralGuest;
   // A regular profile can be in a guest session or a system profile. Hence it
   // should be checked after them.
   if (profile->IsRegularProfile())
diff --git a/chrome/browser/profiling_host/DIR_METADATA b/chrome/browser/profiling_host/DIR_METADATA
new file mode 100644
index 0000000..56d470a
--- /dev/null
+++ b/chrome/browser/profiling_host/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "Privacy"
+}
diff --git a/chrome/browser/profiling_host/OWNERS b/chrome/browser/profiling_host/OWNERS
index 6d9fc0d..68612fd 100644
--- a/chrome/browser/profiling_host/OWNERS
+++ b/chrome/browser/profiling_host/OWNERS
@@ -1,4 +1,3 @@
 ajwong@chromium.org
 alph@chromium.org
 erikchen@chromium.org
-# COMPONENT: Privacy
diff --git a/chrome/browser/promo_browser_command/DIR_METADATA b/chrome/browser/promo_browser_command/DIR_METADATA
new file mode 100644
index 0000000..467ac9b4
--- /dev/null
+++ b/chrome/browser/promo_browser_command/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "UI>Browser>NewTabPage"
+}
diff --git a/chrome/browser/promo_browser_command/OWNERS b/chrome/browser/promo_browser_command/OWNERS
index cdadf0ef..f4bffc1 100644
--- a/chrome/browser/promo_browser_command/OWNERS
+++ b/chrome/browser/promo_browser_command/OWNERS
@@ -2,5 +2,3 @@
 
 per-file *.mojom=set noparent
 per-file *.mojom=file://ipc/SECURITY_OWNERS
-
-# COMPONENT: UI>Browser>NewTabPage
diff --git a/chrome/browser/push_messaging/DIR_METADATA b/chrome/browser/push_messaging/DIR_METADATA
new file mode 100644
index 0000000..5b2f15e
--- /dev/null
+++ b/chrome/browser/push_messaging/DIR_METADATA
@@ -0,0 +1,4 @@
+monorail:  {
+  component:  "Blink>PushAPI"
+}
+team_email:  "platform-capabilities@chromium.org"
diff --git a/chrome/browser/push_messaging/OWNERS b/chrome/browser/push_messaging/OWNERS
index b948d98..d09ffef 100644
--- a/chrome/browser/push_messaging/OWNERS
+++ b/chrome/browser/push_messaging/OWNERS
@@ -1,4 +1 @@
 file://content/browser/push_messaging/OWNERS
-
-# TEAM: platform-capabilities@chromium.org 
-# COMPONENT: Blink>PushAPI
diff --git a/chrome/browser/reading_list/DIR_METADATA b/chrome/browser/reading_list/DIR_METADATA
new file mode 100644
index 0000000..ee70959
--- /dev/null
+++ b/chrome/browser/reading_list/DIR_METADATA
@@ -0,0 +1,4 @@
+monorail:  {
+  component:  "UI>Browser>ReadLater"
+}
+os:  ANDROID
diff --git a/chrome/browser/reading_list/OWNERS b/chrome/browser/reading_list/OWNERS
index 63dbf55a3..dab7642 100644
--- a/chrome/browser/reading_list/OWNERS
+++ b/chrome/browser/reading_list/OWNERS
@@ -5,6 +5,3 @@
 # Backup reviewers:
 twellington@chromium.org
 wylieb@chromium.org
-
-# COMPONENT: UI>Browser>ReadLater
-# OS: Android
diff --git a/chrome/browser/recovery/DIR_METADATA b/chrome/browser/recovery/DIR_METADATA
new file mode 100644
index 0000000..f364a8b8
--- /dev/null
+++ b/chrome/browser/recovery/DIR_METADATA
@@ -0,0 +1,4 @@
+monorail:  {
+  component:  "Internals"
+}
+team_email:  "chrome-updates-dev@chromium.org"
diff --git a/chrome/browser/recovery/OWNERS b/chrome/browser/recovery/OWNERS
index f90340d8..ee2a587 100644
--- a/chrome/browser/recovery/OWNERS
+++ b/chrome/browser/recovery/OWNERS
@@ -1,3 +1 @@
 xiaolingbao@chromium.org
-# COMPONENT: Internals
-# TEAM: chrome-updates-dev@chromium.org
diff --git a/chrome/browser/renderer_context_menu/DIR_METADATA b/chrome/browser/renderer_context_menu/DIR_METADATA
new file mode 100644
index 0000000..3d8600bf
--- /dev/null
+++ b/chrome/browser/renderer_context_menu/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "UI>Browser"
+}
diff --git a/chrome/browser/renderer_context_menu/OWNERS b/chrome/browser/renderer_context_menu/OWNERS
index f5b00e8..42e1ec7 100644
--- a/chrome/browser/renderer_context_menu/OWNERS
+++ b/chrome/browser/renderer_context_menu/OWNERS
@@ -1,4 +1,2 @@
 avi@chromium.org
 lazyboy@chromium.org
-
-# COMPONENT: UI>Browser
diff --git a/chrome/browser/renderer_host/DIR_METADATA b/chrome/browser/renderer_host/DIR_METADATA
new file mode 100644
index 0000000..66c4b945
--- /dev/null
+++ b/chrome/browser/renderer_host/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "Content>Core"
+}
diff --git a/chrome/browser/renderer_host/OWNERS b/chrome/browser/renderer_host/OWNERS
index a6d4ea44..dc5e302 100644
--- a/chrome/browser/renderer_host/OWNERS
+++ b/chrome/browser/renderer_host/OWNERS
@@ -14,6 +14,3 @@
 per-file *_mac.h=mark@chromium.org
 per-file *_mac.h=rsesek@chromium.org
 per-file *_mac.h=thakis@chromium.org
-
-
-# COMPONENT: Content>Core
diff --git a/chrome/browser/renderer_host/pepper/DIR_METADATA b/chrome/browser/renderer_host/pepper/DIR_METADATA
new file mode 100644
index 0000000..4c77ce2
--- /dev/null
+++ b/chrome/browser/renderer_host/pepper/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "Internals>Plugins>Pepper"
+}
diff --git a/chrome/browser/renderer_host/pepper/OWNERS b/chrome/browser/renderer_host/pepper/OWNERS
index c1e2e404..f129781 100644
--- a/chrome/browser/renderer_host/pepper/OWNERS
+++ b/chrome/browser/renderer_host/pepper/OWNERS
@@ -1,4 +1,2 @@
 bbudge@chromium.org
 raymes@chromium.org
-
-# COMPONENT: Internals>Plugins>Pepper
diff --git a/chrome/browser/resource_coordinator/DIR_METADATA b/chrome/browser/resource_coordinator/DIR_METADATA
new file mode 100644
index 0000000..887c99ef
--- /dev/null
+++ b/chrome/browser/resource_coordinator/DIR_METADATA
@@ -0,0 +1,4 @@
+monorail:  {
+  component:  "Internals>ResourceCoordinator"
+}
+team_email:  "catan-team@chromium.org"
diff --git a/chrome/browser/resource_coordinator/OWNERS b/chrome/browser/resource_coordinator/OWNERS
index e31d861..cf20492 100644
--- a/chrome/browser/resource_coordinator/OWNERS
+++ b/chrome/browser/resource_coordinator/OWNERS
@@ -7,5 +7,3 @@
 
 per-file *.mojom=set noparent
 per-file *.mojom=file://ipc/SECURITY_OWNERS
-# COMPONENT: Internals>ResourceCoordinator
-# TEAM: catan-team@chromium.org
diff --git a/chrome/browser/resources/chromeos/login/components/multi_step_behavior.js b/chrome/browser/resources/chromeos/login/components/multi_step_behavior.js
index 21d4a704..830a410 100644
--- a/chrome/browser/resources/chromeos/login/components/multi_step_behavior.js
+++ b/chrome/browser/resources/chromeos/login/components/multi_step_behavior.js
@@ -90,9 +90,16 @@
     // Only set uiStep to defaultUIStep if it is not set yet.
     if (!this.uiStep) {
       this.setUIStep(this.defaultUIStep());
+    } else {
+      this.showUIStep_(this.uiStep);
     }
   },
 
+  onBeforeHide() {
+    if (this.uiStep)
+      this.hideUIStep_(this.uiStep);
+  },
+
   /**
    * Returns default event target element.
    * @type {Object}
@@ -105,13 +112,14 @@
     if (this.uiStep) {
       if (this.uiStep == step)
         return;
-      for (let element of this.stepElements_[this.uiStep] || []) {
-        cr.ui.login.invokePolymerMethod(element, 'onBeforeHide');
-        element.hidden = true;
-      }
+      this.hideUIStep_(this.uiStep);
     }
     this.uiStep = step;
-    for (let element of this.stepElements_[this.uiStep] || []) {
+    this.showUIStep_(this.uiStep);
+  },
+
+  showUIStep_(step) {
+    for (let element of this.stepElements_[step] || []) {
       cr.ui.login.invokePolymerMethod(element, 'onBeforeShow');
       element.hidden = false;
       // Trigger show() if element is an oobe-dialog
@@ -121,6 +129,13 @@
     }
   },
 
+  hideUIStep_(step) {
+    for (let element of this.stepElements_[step] || []) {
+      cr.ui.login.invokePolymerMethod(element, 'onBeforeHide');
+      element.hidden = true;
+    }
+  },
+
   /*
    * Fills stepElements_ map by looking up child elements with for-step
    * attribute
@@ -148,6 +163,7 @@
  * @typedef {{
  *   setUIStep: function(string),
  *   onBeforeShow: function(),
+ *   onBeforeHide: function(),
  * }}
  */
 MultiStepBehavior.Proto;
diff --git a/chrome/browser/resources/chromeos/login/oobe_welcome.html b/chrome/browser/resources/chromeos/login/oobe_welcome.html
index 3eb53dac..c73a771 100644
--- a/chrome/browser/resources/chromeos/login/oobe_welcome.html
+++ b/chrome/browser/resources/chromeos/login/oobe_welcome.html
@@ -61,7 +61,7 @@
   <template>
     <style include="oobe-dialog-host"></style>
     <link rel="stylesheet" href="oobe_welcome.css">
-    <oobe-welcome-dialog id="welcomeScreen" role="dialog"
+    <oobe-welcome-dialog id="welcomeScreen" role="dialog" for-step="greeting"
         aria-label$="[[i18nDynamic(locale, 'welcomeScreenGreeting')]]"
         current-language="[[currentLanguage]]"
         on-language-button-clicked="onWelcomeSelectLanguageButtonClicked_"
@@ -76,8 +76,8 @@
             "[[isTimezoneButtonVisible_(highlightStrength)]]"
         debugging-link-visible="[[debuggingLinkVisible_]]">
     </oobe-welcome-dialog>
-    <oobe-dialog id="languageScreen" role="dialog" hidden has-buttons
-        title-key="languageSectionTitle"
+    <oobe-dialog id="languageScreen" role="dialog" for-step="language"
+        has-buttons title-key="languageSectionTitle"
         aria-label$="[[i18nDynamic(locale, 'languageSectionTitle')]]">
       <hd-iron-icon slot="oobe-icon"
           icon1x="oobe-welcome-32:language" icon2x="oobe-welcome-64:language">
@@ -115,8 +115,8 @@
             inverse on-click="closeLanguageSection_"></oobe-text-button>
       </div>
     </oobe-dialog>
-    <oobe-dialog id="accessibilityScreen" role="dialog" hidden has-buttons
-        title-key="accessibilitySectionTitle"
+    <oobe-dialog id="accessibilityScreen" role="dialog" for-step="accessibility"
+        has-buttons title-key="accessibilitySectionTitle"
         subtitle-key="accessibilitySectionHint"
         aria-label$="[[i18nDynamic(locale, 'accessibilitySectionTitle')]]">
       <hd-iron-icon slot="oobe-icon"
@@ -231,8 +231,8 @@
             on-click="closeAccessibilitySection_"></oobe-text-button>
       </div>
     </oobe-dialog>
-    <oobe-dialog id="timezoneScreen" role="dialog" hidden has-buttons
-        title-key="timezoneSectionTitle"
+    <oobe-dialog id="timezoneScreen" role="dialog" for-step="timezone"
+        has-buttons title-key="timezoneSectionTitle"
         aria-label$="[[i18nDynamic(locale, 'timezoneSectionTitle')]]">
       <hd-iron-icon slot="oobe-icon"
           icon1x="oobe-welcome-32:timezone" icon2x="oobe-welcome-64:timezone">
@@ -256,7 +256,8 @@
             inverse on-click="closeTimezoneSection_"></oobe-text-button>
       </div>
     </oobe-dialog>
-    <oobe-dialog id="oobeAdvancedOptionsScreen" role="dialog" hidden has-buttons
+    <oobe-dialog id="oobeAdvancedOptionsScreen" role="dialog"
+        for-step="advanced-options" has-buttons
         title-key="advancedOptionsSectionTitle"
         aria-label$="[[i18nDynamic(locale, 'advancedOptionsSectionTitle')]]">
       <hd-iron-icon slot="oobe-icon"
diff --git a/chrome/browser/resources/chromeos/login/oobe_welcome.js b/chrome/browser/resources/chromeos/login/oobe_welcome.js
index 5f98ce9..084f1f6 100644
--- a/chrome/browser/resources/chromeos/login/oobe_welcome.js
+++ b/chrome/browser/resources/chromeos/login/oobe_welcome.js
@@ -6,6 +6,10 @@
  * @fileoverview Polymer element for displaying material design OOBE.
  */
 
+'use strict';
+
+(function() {
+
 /** @const {string} */
 const DEFAULT_CHROMEVOX_HINT_LOCALE = 'en-US';
 
@@ -17,10 +21,27 @@
 const DEFAULT_CHROMEVOX_HINT_VOICE_EXTENSION_ID =
     'gjjabgpgjpampikjhjpfhneeoapjbjaf';
 
+/**
+ * UI mode for the dialog.
+ * @enum {string}
+ */
+const UIState = {
+  GREETING: 'greeting',
+  LANGUAGE: 'language',
+  ACCESSIBILITY: 'accessibility',
+  TIMEZONE: 'timezone',
+  ADVANCED_OPTIONS: 'advanced-options',
+};
+
 Polymer({
   is: 'oobe-welcome-element',
 
-  behaviors: [OobeI18nBehavior, OobeDialogHostBehavior, LoginScreenBehavior],
+  behaviors: [
+    OobeI18nBehavior,
+    OobeDialogHostBehavior,
+    LoginScreenBehavior,
+    MultiStepBehavior,
+  ],
 
   properties: {
     /**
@@ -127,6 +148,12 @@
    */
   configuration_applied_: false,
 
+  defaultUIStep() {
+    return UIState.GREETING;
+  },
+
+  UI_STEPS: UIState,
+
   /** @override */
   ready() {
     this.initializeLoginScreen('WelcomeScreen', {
@@ -144,13 +171,6 @@
     this.debuggingLinkVisible_ =
         data && 'isDeveloperMode' in data && data['isDeveloperMode'];
 
-    cr.ui.login.invokePolymerMethod(this.$.welcomeScreen, 'onBeforeShow');
-
-    let activeScreen = this.getActiveScreen_();
-    activeScreen.hidden = false;
-    if (activeScreen.show)
-      activeScreen.show();
-
     window.setTimeout(this.applyOobeConfiguration_.bind(this), 0);
   },
 
@@ -158,7 +178,6 @@
    * Event handler that is invoked just before the screen is hidden.
    */
   onBeforeHide() {
-    this.hideAllScreens_();
     this.cleanupChromeVoxHint_();
   },
 
@@ -252,59 +271,6 @@
   },
 
   /**
-   * Hides all screens to help switching from one screen to another.
-   * @private
-   */
-  hideAllScreens_() {
-    this.$.welcomeScreen.hidden = true;
-
-    var screens = Polymer.dom(this.root).querySelectorAll('oobe-dialog');
-    for (var i = 0; i < screens.length; ++i) {
-      screens[i].hidden = true;
-    }
-  },
-
-  /**
-   * Shows given screen.
-   * @param id String Screen ID.
-   * @private
-   */
-  showScreen_(id) {
-    this.hideAllScreens_();
-
-    var screen = this.$[id];
-    assert(screen);
-    screen.hidden = false;
-    if (screen.show)
-      screen.show();
-  },
-
-  /**
-   * Returns active screen object.
-   * @private
-   */
-  getActiveScreen_() {
-    var screens = Polymer.dom(this.root).querySelectorAll('oobe-dialog');
-    for (var i = 0; i < screens.length; ++i) {
-      if (!screens[i].hidden)
-        return screens[i];
-    }
-    return this.$.welcomeScreen;
-  },
-
-  focus() {
-    this.getActiveScreen_().focus();
-  },
-
-  /**
-   * Handles "visible" event.
-   * @private
-   */
-  onAnimationFinish_() {
-    this.focus();
-  },
-
-  /**
    * Returns true if timezone button should be visible.
    * @private
    */
@@ -337,7 +303,7 @@
    */
   onWelcomeLaunchAdvancedOptions_() {
     this.cancelChromeVoxHint_();
-    this.showScreen_('oobeAdvancedOptionsScreen');
+    this.setUIStep(UIState.ADVANCED_OPTIONS);
   },
 
   /**
@@ -347,7 +313,7 @@
    */
   onWelcomeSelectLanguageButtonClicked_() {
     this.cancelChromeVoxHint_();
-    this.showScreen_('languageScreen');
+    this.setUIStep(UIState.LANGUAGE);
   },
 
   /**
@@ -357,7 +323,7 @@
    */
   onWelcomeAccessibilityButtonClicked_() {
     this.cancelChromeVoxHint_();
-    this.showScreen_('accessibilityScreen');
+    this.setUIStep(UIState.ACCESSIBILITY);
   },
 
   /**
@@ -367,7 +333,7 @@
    */
   onWelcomeTimezoneButtonClicked_() {
     this.cancelChromeVoxHint_();
-    this.showScreen_('timezoneScreen');
+    this.setUIStep(UIState.TIMEZONE);
   },
 
   /**
@@ -532,7 +498,7 @@
    * @private
    */
   closeLanguageSection_() {
-    this.showScreen_('welcomeScreen');
+    this.setUIStep(UIState.GREETING);
   },
 
   /** ******************** Accessibility section ******************* */
@@ -543,7 +509,7 @@
    * @private
    */
   closeAccessibilitySection_() {
-    this.showScreen_('welcomeScreen');
+    this.setUIStep(UIState.GREETING);
   },
 
   /**
@@ -572,7 +538,7 @@
    * @private
    */
   closeTimezoneSection_() {
-    this.showScreen_('welcomeScreen');
+    this.setUIStep(UIState.GREETING);
   },
 
   /**
@@ -597,7 +563,7 @@
    * @private
    */
   closeAdvancedOptionsSection_() {
-    this.showScreen_('welcomeScreen');
+    this.setUIStep(UIState.GREETING);
   },
 
   /**
@@ -766,3 +732,4 @@
     this.voicesChangedListenerMaybeGiveChromeVoxHint_ = null;
   }
 });
+})();
diff --git a/chrome/browser/resources/kaleidoscope/DIR_METADATA b/chrome/browser/resources/kaleidoscope/DIR_METADATA
new file mode 100644
index 0000000..da324fd
--- /dev/null
+++ b/chrome/browser/resources/kaleidoscope/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "Internals>Media>UI>Kaleidoscope"
+}
diff --git a/chrome/browser/resources/kaleidoscope/OWNERS b/chrome/browser/resources/kaleidoscope/OWNERS
index d91fac21..111c788 100644
--- a/chrome/browser/resources/kaleidoscope/OWNERS
+++ b/chrome/browser/resources/kaleidoscope/OWNERS
@@ -1,3 +1 @@
 file://chrome/browser/media/kaleidoscope/OWNERS
-
-# COMPONENT: Internals>Media>UI>Kaleidoscope
diff --git a/chrome/browser/resources/local_ntp/DIR_METADATA b/chrome/browser/resources/local_ntp/DIR_METADATA
new file mode 100644
index 0000000..ef0d697
--- /dev/null
+++ b/chrome/browser/resources/local_ntp/DIR_METADATA
@@ -0,0 +1,4 @@
+monorail:  {
+  component:  "UI>Browser>NewTabPage"
+}
+team_email:  "ntp-dev@chromium.org"
diff --git a/chrome/browser/resources/local_ntp/OWNERS b/chrome/browser/resources/local_ntp/OWNERS
index a07a69b..802b327 100644
--- a/chrome/browser/resources/local_ntp/OWNERS
+++ b/chrome/browser/resources/local_ntp/OWNERS
@@ -1,5 +1,2 @@
 file://components/search/OWNERS
 fserb@chromium.org
-
-# TEAM: ntp-dev@chromium.org
-# COMPONENT: UI>Browser>NewTabPage
diff --git a/chrome/browser/resources/management/DIR_METADATA b/chrome/browser/resources/management/DIR_METADATA
new file mode 100644
index 0000000..4c21d96
--- /dev/null
+++ b/chrome/browser/resources/management/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "Enterprise"
+}
diff --git a/chrome/browser/resources/management/OWNERS b/chrome/browser/resources/management/OWNERS
index b25c73fd..f22fa36 100644
--- a/chrome/browser/resources/management/OWNERS
+++ b/chrome/browser/resources/management/OWNERS
@@ -1,3 +1 @@
 file://components/policy/OWNERS
-
-# COMPONENT: Enterprise
diff --git a/chrome/browser/resources/media/DIR_METADATA b/chrome/browser/resources/media/DIR_METADATA
new file mode 100644
index 0000000..692424ee
--- /dev/null
+++ b/chrome/browser/resources/media/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "Internals>Media>UI"
+}
diff --git a/chrome/browser/resources/media/OWNERS b/chrome/browser/resources/media/OWNERS
index 77384f3..3ed4896 100644
--- a/chrome/browser/resources/media/OWNERS
+++ b/chrome/browser/resources/media/OWNERS
@@ -4,5 +4,3 @@
 
 # For WebRTC
 per-file webrtc_*=file://third_party/webrtc_overrides/OWNERS
-
-# COMPONENT: Internals>Media>UI
diff --git a/chrome/browser/resources/media_router/DIR_METADATA b/chrome/browser/resources/media_router/DIR_METADATA
new file mode 100644
index 0000000..aa4ac5f
--- /dev/null
+++ b/chrome/browser/resources/media_router/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "Internals>Cast>UI"
+}
diff --git a/chrome/browser/resources/media_router/OWNERS b/chrome/browser/resources/media_router/OWNERS
index fda51ea..dd66178 100644
--- a/chrome/browser/resources/media_router/OWNERS
+++ b/chrome/browser/resources/media_router/OWNERS
@@ -1,3 +1 @@
 file://chrome/browser/media/router/OWNERS
-
-# COMPONENT: Internals>Cast>UI
diff --git a/chrome/browser/resources/nearby_internals/DIR_METADATA b/chrome/browser/resources/nearby_internals/DIR_METADATA
new file mode 100644
index 0000000..049571c
--- /dev/null
+++ b/chrome/browser/resources/nearby_internals/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "OS>Systems>Multidevice>Nearby"
+}
diff --git a/chrome/browser/resources/nearby_internals/OWNERS b/chrome/browser/resources/nearby_internals/OWNERS
index 19414dc..b76a3f6 100644
--- a/chrome/browser/resources/nearby_internals/OWNERS
+++ b/chrome/browser/resources/nearby_internals/OWNERS
@@ -1,4 +1,2 @@
 file://chrome/browser/nearby_sharing/OWNERS
 khorimoto@chromium.org
-
-# COMPONENT: OS>Systems>Multidevice>Nearby
diff --git a/chrome/browser/resources/nearby_share/BUILD.gn b/chrome/browser/resources/nearby_share/BUILD.gn
index 7b7aa9d..b86c197 100644
--- a/chrome/browser/resources/nearby_share/BUILD.gn
+++ b/chrome/browser/resources/nearby_share/BUILD.gn
@@ -77,10 +77,8 @@
   out_manifest = "$target_gen_dir/$preprocess_gen_manifest"
   in_files = [
     "app.js",
-    "icons.js",
     "nearby_confirmation_page.js",
     "nearby_discovery_page.js",
-    "nearby_preview.js",
   ]
 }
 
@@ -125,7 +123,6 @@
     ":discovery_manager",
     ":nearby_confirmation_page",
     ":nearby_discovery_page",
-    ":nearby_preview",
   ]
 }
 
@@ -149,7 +146,7 @@
 
 js_library("nearby_confirmation_page") {
   deps = [
-    ":nearby_preview",
+    "./shared:nearby_preview.m",
     "./shared:nearby_progress.m",
     "//chrome/browser/ui/webui/nearby_share:mojom_js_library_for_compile",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
@@ -162,7 +159,7 @@
 js_library("nearby_discovery_page") {
   deps = [
     ":discovery_manager",
-    ":nearby_preview",
+    "./shared:nearby_preview.m",
     "./shared:nearby_device.m",
     "//chrome/browser/ui/webui/nearby_share:mojom_js_library_for_compile",
     "//third_party/polymer/v3_0/components-chromium/iron-list",
@@ -173,18 +170,10 @@
   ]
 }
 
-js_library("nearby_preview") {
-  deps = [
-    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
-  ]
-}
-
 html_to_js("web_components") {
   js_files = [
     "app.js",
-    "icons.js",
     "nearby_confirmation_page.js",
     "nearby_discovery_page.js",
-    "nearby_preview.js",
   ]
 }
diff --git a/chrome/browser/resources/nearby_share/DIR_METADATA b/chrome/browser/resources/nearby_share/DIR_METADATA
new file mode 100644
index 0000000..ac713319
--- /dev/null
+++ b/chrome/browser/resources/nearby_share/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "UI>Browser>Sharing>Nearby"
+}
diff --git a/chrome/browser/resources/nearby_share/OWNERS b/chrome/browser/resources/nearby_share/OWNERS
index 72feb28..46b5a73 100644
--- a/chrome/browser/resources/nearby_share/OWNERS
+++ b/chrome/browser/resources/nearby_share/OWNERS
@@ -1,3 +1 @@
 file://chrome/browser/nearby_sharing/OWNERS
-
-# COMPONENT: UI>Browser>Sharing>Nearby
diff --git a/chrome/browser/resources/nearby_share/icons.html b/chrome/browser/resources/nearby_share/icons.html
deleted file mode 100644
index 019a3e8..0000000
--- a/chrome/browser/resources/nearby_share/icons.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<iron-iconset-svg name="nearby-share" size="24">
-  <svg>
-    <defs>
-      <!-- Nearby Share icons -->
-      <g id="done"><path d="M9 16.2L4.8 12l-1.4 1.4L9 19 21 7l-1.4-1.4L9 16.2z"></path></g>
-
-      <!--
-      These icons are copied from Polymer's iron-icons and kept in sorted order.
-      See http://goo.gl/Y1OdAq for instructions on adding additional icons.
-      -->
-      <g id="laptop"><path d="M20 18c1.1 0 2-.9 2-2V6c0-1.1-.9-2-2-2H4c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2H0v2h24v-2h-4zM4 6h16v10H4V6z"></path></g>
-      <g id="smartphone"><path d="M17 1.01L7 1c-1.1 0-2 .9-2 2v18c0 1.1.9 2 2 2h10c1.1 0 2-.9 2-2V3c0-1.1-.9-1.99-2-1.99zM17 19H7V5h10v14z"></path></g>
-      <g id="tablet"><path d="M21 4H3c-1.1 0-2 .9-2 2v12c0 1.1.9 2 2 2h18c1.1 0 1.99-.9 1.99-2L23 6c0-1.1-.9-2-2-2zm-2 14H5V6h14v12z"></path></g>
-    </defs>
-  </svg>
-</iron-iconset-svg>
diff --git a/chrome/browser/resources/nearby_share/icons.js b/chrome/browser/resources/nearby_share/icons.js
deleted file mode 100644
index dd8c63d1..0000000
--- a/chrome/browser/resources/nearby_share/icons.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright 2020 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'chrome://resources/polymer/v3_0/iron-iconset-svg/iron-iconset-svg.js';
-
-import {html} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
-
-const template = html`{__html_template__}`;
-document.head.appendChild(template.content);
diff --git a/chrome/browser/resources/nearby_share/nearby_confirmation_page.js b/chrome/browser/resources/nearby_share/nearby_confirmation_page.js
index e26e9073..5cf5000 100644
--- a/chrome/browser/resources/nearby_share/nearby_confirmation_page.js
+++ b/chrome/browser/resources/nearby_share/nearby_confirmation_page.js
@@ -12,10 +12,10 @@
 import 'chrome://resources/cr_elements/cr_checkbox/cr_checkbox.m.js';
 import 'chrome://resources/mojo/mojo/public/js/mojo_bindings_lite.js';
 import 'chrome://resources/mojo/mojo/public/mojom/base/unguessable_token.mojom-lite.js';
-import './nearby_preview.js';
 import './mojo/nearby_share_target_types.mojom-lite.js';
 import './mojo/nearby_share.mojom-lite.js';
 import './shared/nearby_page_template.m.js';
+import './shared/nearby_preview.m.js';
 import './shared/nearby_progress.m.js';
 import './strings.m.js';
 
diff --git a/chrome/browser/resources/nearby_share/nearby_discovery_page.js b/chrome/browser/resources/nearby_share/nearby_discovery_page.js
index fbd8ad5..cd6a51f 100644
--- a/chrome/browser/resources/nearby_share/nearby_discovery_page.js
+++ b/chrome/browser/resources/nearby_share/nearby_discovery_page.js
@@ -13,10 +13,10 @@
 import 'chrome://resources/mojo/mojo/public/mojom/base/unguessable_token.mojom-lite.js';
 import 'chrome://resources/polymer/v3_0/iron-list/iron-list.js';
 import './shared/nearby_device.m.js';
-import './nearby_preview.js';
 import './mojo/nearby_share_target_types.mojom-lite.js';
 import './mojo/nearby_share.mojom-lite.js';
 import './shared/nearby_page_template.m.js';
+import './shared/nearby_preview.m.js';
 import './strings.m.js';
 
 import {assert, assertNotReached} from 'chrome://resources/js/assert.m.js';
diff --git a/chrome/browser/resources/nearby_share/nearby_preview.html b/chrome/browser/resources/nearby_share/nearby_preview.html
deleted file mode 100644
index 940a413a..0000000
--- a/chrome/browser/resources/nearby_share/nearby_preview.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<style>
-  iron-icon {
-    display: block;
-    height: 68px;
-    margin: 12px auto 24px auto;
-    width: 68px;
-  }
-
-  iron-icon.disabled {
-    --nearby-preview-color: var(--google-grey-600);
-    --nearby-preview-background-color: var(--google-grey-200);
-  }
-
-  #title {
-    color: var(--google-grey-900);
-    font-size: 13px;
-    height: 60px;
-    letter-spacing: 0.2px;
-    line-height: 20px;
-    overflow: hidden;
-    overflow-wrap: break-word;
-    text-align: center;
-    width: 116px;
-  }
-</style>
-
-<iron-icon class$="[[getIconClass_(disabled)]]"
-    icon="[[getIronIconName_(sendPreview)]]">
-</iron-icon>
-<div id="title">[[getTitle_(sendPreview)]]</div>
diff --git a/chrome/browser/resources/nearby_share/shared/BUILD.gn b/chrome/browser/resources/nearby_share/shared/BUILD.gn
index 66f5f9bb2..aef829c 100644
--- a/chrome/browser/resources/nearby_share/shared/BUILD.gn
+++ b/chrome/browser/resources/nearby_share/shared/BUILD.gn
@@ -48,6 +48,8 @@
     "nearby_onboarding_page.js",
     "nearby_page_template.html",
     "nearby_page_template.js",
+    "nearby_preview.html",
+    "nearby_preview.js",
     "nearby_progress.html",
     "nearby_progress.js",
     "nearby_share_settings.html",
@@ -73,6 +75,7 @@
     "nearby_device.m.js",
     "nearby_onboarding_page.m.js",
     "nearby_page_template.m.js",
+    "nearby_preview.m.js",
     "nearby_progress.m.js",
     "nearby_share_settings.m.js",
     "nearby_share_settings_behavior.m.js",
@@ -90,6 +93,7 @@
     ":nearby_device",
     ":nearby_onboarding_page",
     ":nearby_page_template",
+    ":nearby_preview",
     ":nearby_progress",
     ":nearby_share_settings",
     ":nearby_share_settings_behavior",
@@ -141,6 +145,16 @@
 js_library("nearby_page_template") {
 }
 
+js_library("nearby_preview") {
+  deps = [
+    "//chrome/browser/ui/webui/nearby_share:mojom_js_library_for_compile",
+    "//chromeos/services/nearby/public/mojom:nearby_share_target_types_js_library_for_compile",
+    "//third_party/polymer/v1_0/components-chromium/iron-icon:iron-icon-extracted",
+    "//ui/webui/resources/js:assert",
+    "//ui/webui/resources/js:i18n_behavior",
+  ]
+}
+
 js_library("nearby_progress") {
   deps = [
     ":nearby_device_icon",
@@ -197,6 +211,7 @@
     ":nearby_device.m",
     ":nearby_onboarding_page.m",
     ":nearby_page_template.m",
+    ":nearby_preview.m",
     ":nearby_progress.m",
     ":nearby_share_settings.m",
     ":nearby_share_settings_behavior.m",
@@ -212,6 +227,7 @@
     ":nearby_device_module",
     ":nearby_onboarding_page_module",
     ":nearby_page_template_module",
+    ":nearby_preview_module",
     ":nearby_progress_module",
     ":nearby_shared_icons_module",
     ":nearby_shared_share_type_icons_module",
@@ -283,6 +299,18 @@
   extra_deps = [ ":nearby_page_template_module" ]
 }
 
+js_library("nearby_preview.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/nearby_share/shared/nearby_preview.m.js" ]
+  deps = [
+    "//chrome/browser/ui/webui/nearby_share:mojom_js_library_for_compile",
+    "//chromeos/services/nearby/public/mojom:nearby_share_target_types_js_library_for_compile",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/js:assert.m",
+    "//ui/webui/resources/js:i18n_behavior.m",
+  ]
+  extra_deps = [ ":nearby_preview_module" ]
+}
+
 js_library("nearby_progress.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/nearby_share/shared/nearby_progress.m.js" ]
   deps = [
@@ -363,6 +391,14 @@
   namespace_rewrites = nearby_shared_namespace_rewrites
 }
 
+polymer_modulizer("nearby_preview") {
+  js_file = "nearby_preview.js"
+  html_file = "nearby_preview.html"
+  html_type = "dom-module"
+  auto_imports = nearby_shared_auto_imports
+  namespace_rewrites = nearby_shared_namespace_rewrites
+}
+
 polymer_modulizer("nearby_progress") {
   js_file = "nearby_progress.js"
   html_file = "nearby_progress.html"
diff --git a/chrome/browser/resources/nearby_share/shared/nearby_preview.html b/chrome/browser/resources/nearby_share/shared/nearby_preview.html
new file mode 100644
index 0000000..922b3060
--- /dev/null
+++ b/chrome/browser/resources/nearby_share/shared/nearby_preview.html
@@ -0,0 +1,45 @@
+<link rel="import" href="chrome://resources/html/polymer.html">
+
+<link rel="import" href="chrome://resources/cr_elements/shared_style_css.html">
+<link rel="import" href="chrome://resources/cr_elements/cr_icons_css.html">
+<link rel="import" href="chrome://resources/html/assert.html">
+<link rel="import" href="chrome://resources/html/i18n_behavior.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
+<link rel="import" href="nearby_shared_icons.html">
+<link rel="import" href="nearby_shared_share_type_icons.html">
+
+<dom-module id="nearby-preview">
+  <template>
+    <style>
+      iron-icon {
+        display: block;
+        height: 68px;
+        margin: 12px auto 24px auto;
+        width: 68px;
+      }
+
+      iron-icon.disabled {
+        --nearby-preview-color: var(--google-grey-600);
+        --nearby-preview-background-color: var(--google-grey-200);
+      }
+
+      #title {
+        color: var(--google-grey-900);
+        font-size: 13px;
+        height: 60px;
+        letter-spacing: 0.2px;
+        line-height: 20px;
+        overflow: hidden;
+        overflow-wrap: break-word;
+        text-align: center;
+        width: 116px;
+      }
+    </style>
+
+    <iron-icon class$="[[getIconClass_(disabled)]]"
+        icon="[[getIronIconName_(sendPreview)]]">
+    </iron-icon>
+    <div id="title">[[getTitle_(sendPreview)]]</div>
+  </template>
+  <script src="nearby_preview.js"></script>
+</dom-module>
diff --git a/chrome/browser/resources/nearby_share/nearby_preview.js b/chrome/browser/resources/nearby_share/shared/nearby_preview.js
similarity index 90%
rename from chrome/browser/resources/nearby_share/nearby_preview.js
rename to chrome/browser/resources/nearby_share/shared/nearby_preview.js
index 0e6c2dc..6dce3f4 100644
--- a/chrome/browser/resources/nearby_share/nearby_preview.js
+++ b/chrome/browser/resources/nearby_share/shared/nearby_preview.js
@@ -7,19 +7,11 @@
  * sent to a remote device. The data might be some plain text, a URL or a file.
  */
 
-import './shared/nearby_shared_share_type_icons.m.js';
-
-import {assert, assertNotReached} from 'chrome://resources/js/assert.m.js';
-import {I18nBehavior} from 'chrome://resources/js/i18n_behavior.m.js';
-import {html, Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
-
 Polymer({
   is: 'nearby-preview',
 
   behaviors: [I18nBehavior],
 
-  _template: html`{__html_template__}`,
-
   properties: {
     /**
      * Preview info for the file(s) to send. Expected to start
diff --git a/chrome/browser/resources/net_internals/DIR_METADATA b/chrome/browser/resources/net_internals/DIR_METADATA
new file mode 100644
index 0000000..cf01a10
--- /dev/null
+++ b/chrome/browser/resources/net_internals/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "Internals>Network>Logging"
+}
diff --git a/chrome/browser/resources/net_internals/OWNERS b/chrome/browser/resources/net_internals/OWNERS
index ad60e1e8..53e68eb7 100644
--- a/chrome/browser/resources/net_internals/OWNERS
+++ b/chrome/browser/resources/net_internals/OWNERS
@@ -1,3 +1 @@
 mmenke@chromium.org
-
-# COMPONENT: Internals>Network>Logging
diff --git a/chrome/browser/resources/new_tab_page/DIR_METADATA b/chrome/browser/resources/new_tab_page/DIR_METADATA
new file mode 100644
index 0000000..467ac9b4
--- /dev/null
+++ b/chrome/browser/resources/new_tab_page/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "UI>Browser>NewTabPage"
+}
diff --git a/chrome/browser/resources/new_tab_page/OWNERS b/chrome/browser/resources/new_tab_page/OWNERS
index b6e7004..834fda6a 100644
--- a/chrome/browser/resources/new_tab_page/OWNERS
+++ b/chrome/browser/resources/new_tab_page/OWNERS
@@ -1,5 +1,3 @@
 aee@chromium.org
 mahmadi@chromium.org
 tiborg@chromium.org
-
-# COMPONENT: UI>Browser>NewTabPage
diff --git a/chrome/browser/resources/new_tab_page/customize_backgrounds.html b/chrome/browser/resources/new_tab_page/customize_backgrounds.html
index 555716f..04a0bbb6 100644
--- a/chrome/browser/resources/new_tab_page/customize_backgrounds.html
+++ b/chrome/browser/resources/new_tab_page/customize_backgrounds.html
@@ -34,7 +34,7 @@
   .label {
     color: var(--cr-primary-text-color);
     margin-bottom: 4px;
-    margin-top: 3px;
+    margin-top: 12px;
     min-height: 30px;
   }
 
diff --git a/chrome/browser/resources/new_tab_page/modules/kaleidoscope/DIR_METADATA b/chrome/browser/resources/new_tab_page/modules/kaleidoscope/DIR_METADATA
new file mode 100644
index 0000000..da324fd
--- /dev/null
+++ b/chrome/browser/resources/new_tab_page/modules/kaleidoscope/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "Internals>Media>UI>Kaleidoscope"
+}
diff --git a/chrome/browser/resources/new_tab_page/modules/kaleidoscope/OWNERS b/chrome/browser/resources/new_tab_page/modules/kaleidoscope/OWNERS
index d91fac21..111c788 100644
--- a/chrome/browser/resources/new_tab_page/modules/kaleidoscope/OWNERS
+++ b/chrome/browser/resources/new_tab_page/modules/kaleidoscope/OWNERS
@@ -1,3 +1 @@
 file://chrome/browser/media/kaleidoscope/OWNERS
-
-# COMPONENT: Internals>Media>UI>Kaleidoscope
diff --git a/chrome/browser/resources/new_tab_page/realbox.html b/chrome/browser/resources/new_tab_page/realbox.html
index 41746f8..850dcea 100644
--- a/chrome/browser/resources/new_tab_page/realbox.html
+++ b/chrome/browser/resources/new_tab_page/realbox.html
@@ -96,7 +96,8 @@
 <div id="inputWrapper" on-focusout=onInputWrapperFocusout_
     on-keydown="onInputWrapperKeydown_">
   <input id="input" type="search" autocomplete="off" spellcheck="false"
-      aria-live="polite" placeholder="$i18n{searchBoxHint}"
+      aria-live="[[inputAriaLive_]]" role="combobox"
+      placeholder="$i18n{searchBoxHint}"
       on-copy="onInputCutCopy_" on-cut="onInputCutCopy_"
       on-focus="onInputFocus_" on-blur="onInputBlur_" on-input="onInputInput_"
       on-keydown="onInputKeydown_" on-keyup="onInputKeyup_"
diff --git a/chrome/browser/resources/new_tab_page/realbox.js b/chrome/browser/resources/new_tab_page/realbox.js
index 013f657..160d1b5 100644
--- a/chrome/browser/resources/new_tab_page/realbox.js
+++ b/chrome/browser/resources/new_tab_page/realbox.js
@@ -177,9 +177,23 @@
         type: Number,
         value: -1,
       },
+
+      /**
+       * The value of the input element's 'aria-live' attribute.
+       * @type {string}
+       * @private
+       */
+      inputAriaLive_: {
+        type: String,
+        computed: `computeInputAriaLive_(selectedMatch_)`,
+      },
     };
   }
 
+  computeInputAriaLive_() {
+    return this.selectedMatch_ ? 'off' : 'polite';
+  }
+
   constructor() {
     performance.mark('realbox-creation-start');
     super();
diff --git a/chrome/browser/resources/new_tab_page/realbox_match.html b/chrome/browser/resources/new_tab_page/realbox_match.html
index b3011f40..bb822ad9 100644
--- a/chrome/browser/resources/new_tab_page/realbox_match.html
+++ b/chrome/browser/resources/new_tab_page/realbox_match.html
@@ -96,6 +96,7 @@
   <span id="description" inner-h-t-m-l="[[descriptionHtml_]]"></span>
 </div>
 <cr-icon-button id="remove" class="icon-clear"
+    aria-label="[[removeButtonAriaLabel_]]"
     on-click="onRemoveButtonClick_" on-mousedown="onRemoveButtonMouseDown_"
     title="[[removeButtonTitle_]]" hidden$="[[!removeButtonIsVisible_]]">
 </cr-icon-button>
diff --git a/chrome/browser/resources/new_tab_page/realbox_match.js b/chrome/browser/resources/new_tab_page/realbox_match.js
index bb5243a..11ba55e7 100644
--- a/chrome/browser/resources/new_tab_page/realbox_match.js
+++ b/chrome/browser/resources/new_tab_page/realbox_match.js
@@ -50,7 +50,7 @@
        */
       ariaLabel: {
         type: String,
-        computed: `computeAriaLabel_(match)`,
+        computed: `computeAriaLabel_(matchText_, removeButtonIsVisible_)`,
         reflectToAttribute: true,
       },
 
@@ -106,6 +106,27 @@
       },
 
       /**
+       * The text content of match used to calculate the 'aria-label' attributes
+       * of the element as well as the remove button.
+       * @type {string}
+       * @private
+       */
+      matchText_: {
+        type: String,
+        computed: `computeMatchText_(match)`,
+      },
+
+      /**
+       * Remove button's 'aria-label' attribute.
+       * @type {string}
+       * @private
+       */
+      removeButtonAriaLabel_: {
+        type: String,
+        computed: `computeRemoveButtonAriaLabel_(matchText_)`,
+      },
+
+      /**
        * @type {boolean}
        * @private
        */
@@ -213,7 +234,7 @@
    * @return {string}
    * @private
    */
-  computeAriaLabel_() {
+  computeMatchText_() {
     if (!this.match) {
       return '';
     }
@@ -228,6 +249,16 @@
    * @return {string}
    * @private
    */
+  computeAriaLabel_() {
+    return this.removeButtonIsVisible_ ?
+        loadTimeData.getStringF('removeSuggestionA11ySuffix', this.matchText_) :
+        this.matchText_;
+  }
+
+  /**
+   * @return {string}
+   * @private
+   */
   computeContentsHtml_() {
     if (!this.match) {
       return '';
@@ -280,6 +311,15 @@
    * @return {string}
    * @private
    */
+  computeRemoveButtonAriaLabel_() {
+    return loadTimeData.getStringF(
+        'removeSuggestionA11yPrefix', this.matchText_);
+  }
+
+  /**
+   * @return {string}
+   * @private
+   */
   computeSeparatorText_() {
     return this.match && decodeString16(this.match.description) ?
         loadTimeData.getString('realboxSeparator') :
diff --git a/chrome/browser/resources/ntp4/DIR_METADATA b/chrome/browser/resources/ntp4/DIR_METADATA
new file mode 100644
index 0000000..ef0d697
--- /dev/null
+++ b/chrome/browser/resources/ntp4/DIR_METADATA
@@ -0,0 +1,4 @@
+monorail:  {
+  component:  "UI>Browser>NewTabPage"
+}
+team_email:  "ntp-dev@chromium.org"
diff --git a/chrome/browser/resources/ntp4/OWNERS b/chrome/browser/resources/ntp4/OWNERS
index a5d6768..bf9aa61e 100644
--- a/chrome/browser/resources/ntp4/OWNERS
+++ b/chrome/browser/resources/ntp4/OWNERS
@@ -1,6 +1,3 @@
 file://components/search/OWNERS
 estade@chromium.org
 rbyers@chromium.org
-
-# TEAM: ntp-dev@chromium.org
-# COMPONENT: UI>Browser>NewTabPage
diff --git a/chrome/browser/resources/offline_pages/DIR_METADATA b/chrome/browser/resources/offline_pages/DIR_METADATA
new file mode 100644
index 0000000..9b20879
--- /dev/null
+++ b/chrome/browser/resources/offline_pages/DIR_METADATA
@@ -0,0 +1,4 @@
+monorail:  {
+  component:  "UI>Browser>Offline"
+}
+team_email:  "offline-dev@chromium.org"
diff --git a/chrome/browser/resources/offline_pages/OWNERS b/chrome/browser/resources/offline_pages/OWNERS
index f5dcbcc..901ae80 100644
--- a/chrome/browser/resources/offline_pages/OWNERS
+++ b/chrome/browser/resources/offline_pages/OWNERS
@@ -1,4 +1 @@
 file://components/offline_pages/OWNERS
-
-# TEAM: offline-dev@chromium.org
-# COMPONENT: UI>Browser>Offline
diff --git a/chrome/browser/resources/omnibox/DIR_METADATA b/chrome/browser/resources/omnibox/DIR_METADATA
new file mode 100644
index 0000000..e62a401d
--- /dev/null
+++ b/chrome/browser/resources/omnibox/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "UI>Browser>Omnibox"
+}
diff --git a/chrome/browser/resources/omnibox/OWNERS b/chrome/browser/resources/omnibox/OWNERS
index 90b1b756..5535cd2 100644
--- a/chrome/browser/resources/omnibox/OWNERS
+++ b/chrome/browser/resources/omnibox/OWNERS
@@ -1,3 +1 @@
 file://components/omnibox/OWNERS
-
-# COMPONENT: UI>Browser>Omnibox
diff --git a/chrome/browser/resources/pdf/DIR_METADATA b/chrome/browser/resources/pdf/DIR_METADATA
new file mode 100644
index 0000000..10f235d
--- /dev/null
+++ b/chrome/browser/resources/pdf/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "Internals>Plugins>PDF"
+}
diff --git a/chrome/browser/resources/pdf/OWNERS b/chrome/browser/resources/pdf/OWNERS
index 81f68356..3c0307c 100644
--- a/chrome/browser/resources/pdf/OWNERS
+++ b/chrome/browser/resources/pdf/OWNERS
@@ -1,4 +1,2 @@
 dsinclair@chromium.org
 hnakashima@chromium.org
-
-# COMPONENT: Internals>Plugins>PDF
diff --git a/chrome/browser/resources/plugin_metadata/DIR_METADATA b/chrome/browser/resources/plugin_metadata/DIR_METADATA
new file mode 100644
index 0000000..5008e90
--- /dev/null
+++ b/chrome/browser/resources/plugin_metadata/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "Internals>Plugins"
+}
diff --git a/chrome/browser/resources/plugin_metadata/OWNERS b/chrome/browser/resources/plugin_metadata/OWNERS
index 610dd4e..e87d635 100644
--- a/chrome/browser/resources/plugin_metadata/OWNERS
+++ b/chrome/browser/resources/plugin_metadata/OWNERS
@@ -1,4 +1,2 @@
 jschuh@chromium.org
 wfh@chromium.org
-
-# COMPONENT: Internals>Plugins
diff --git a/chrome/browser/resources/print_preview/DIR_METADATA b/chrome/browser/resources/print_preview/DIR_METADATA
new file mode 100644
index 0000000..1e9bc5e
--- /dev/null
+++ b/chrome/browser/resources/print_preview/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "UI>Browser>PrintPreview"
+}
diff --git a/chrome/browser/resources/print_preview/OWNERS b/chrome/browser/resources/print_preview/OWNERS
index e542f20..9b08c66 100644
--- a/chrome/browser/resources/print_preview/OWNERS
+++ b/chrome/browser/resources/print_preview/OWNERS
@@ -1,3 +1 @@
 file://printing/OWNERS
-
-# COMPONENT: UI>Browser>PrintPreview
diff --git a/chrome/browser/resources/print_preview/ui/BUILD.gn b/chrome/browser/resources/print_preview/ui/BUILD.gn
index ea35480..2d7f295 100644
--- a/chrome/browser/resources/print_preview/ui/BUILD.gn
+++ b/chrome/browser/resources/print_preview/ui/BUILD.gn
@@ -461,10 +461,13 @@
       "../data:destination",
       "../data:destination_store",
       "../data:invitation_store",
+      "../data:print_server_store",
       "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
       "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog.m",
+      "//ui/webui/resources/cr_elements/cr_searchable_drop_down:cr_searchable_drop_down.m",
       "//ui/webui/resources/js:event_tracker.m",
       "//ui/webui/resources/js:list_property_update_behavior.m",
+      "//ui/webui/resources/js:web_ui_listener_behavior.m",
     ]
   }
 } else {
diff --git a/chrome/browser/resources/print_preview/ui/destination_dialog_cros.html b/chrome/browser/resources/print_preview/ui/destination_dialog_cros.html
index d2465bc..da796a3 100644
--- a/chrome/browser/resources/print_preview/ui/destination_dialog_cros.html
+++ b/chrome/browser/resources/print_preview/ui/destination_dialog_cros.html
@@ -1,17 +1,41 @@
 <style include="destination-dialog">
+  .form-row {
+    align-items: center;
+    column-gap: 18px;
+    display: flex;
+    line-height: calc(20 / 15 * 1em);
+    margin-bottom: 14px;
+  }
+
+  .server-search-box-input {
+    --cr-searchable-drop-down-width: 100%;
+    display: inline-block;
+    flex-grow: 1;
+  }
 </style>
 <cr-dialog id="dialog" on-close="onCloseOrCancel_">
   <div slot="title" id="header">$i18n{destinationSearchTitle}</div>
   <div slot="body">
-    <div class="user-info" hidden$="[[!activeUser]]" hidden>
-      <label id="accountSelectLabel">$i18n{accountSelectTitle}</label>
-      <select class="md-select"
-          aria-labelledby="accountSelectLabel" on-change="onUserChange_">
-        <template is="dom-repeat" items="[[users]]">
-          <option value="[[item]]">[[item]]</option>
-        </template>
-        <option value="">$i18n{addAccountTitle}</option>
-      </select>
+    <div class="form-row">
+      <div class="user-info" hidden$="[[!activeUser]]" hidden>
+        <label id="accountSelectLabel">$i18n{accountSelectTitle}</label>
+        <select class="md-select"
+            aria-labelledby="accountSelectLabel" on-change="onUserChange_">
+          <template is="dom-repeat" items="[[users]]">
+            <option value="[[item]]">[[item]]</option>
+          </template>
+          <option value="">$i18n{addAccountTitle}</option>
+        </select>
+      </div>
+      <template is="dom-if" if="[[printServerScalingFlagEnabled_]]">
+        <!-- TODO(crbug.com/1013408): Uses deprecated iron-dropdown. -->
+        <cr-searchable-drop-down class="server-search-box-input"
+            hidden$="[[!isSingleServerFetchingMode_]]"
+            placeholder="$i18n{serverSearchBoxPlaceholder}"
+            value="{{printServerSelected_}}"
+            items="[[printServerNames_]]">
+        </cr-searchable-drop-down>
+      </template>
     </div>
     <print-preview-search-box id="searchBox"
         label="$i18n{searchBoxPlaceholder}" search-query="{{searchQuery_}}"
@@ -19,7 +43,7 @@
     </print-preview-search-box>
     <print-preview-destination-list id="printList"
         destinations="[[destinations_]]"
-        loading-destinations="[[loadingDestinations_]]"
+        loading-destinations="[[loadingAnyDestinations_]]"
         search-query="[[searchQuery_]]"
         on-destination-selected="onDestinationSelected_">
     </print-preview-destination-list>
diff --git a/chrome/browser/resources/print_preview/ui/destination_dialog_cros.js b/chrome/browser/resources/print_preview/ui/destination_dialog_cros.js
index f6333af..35b6a5c 100644
--- a/chrome/browser/resources/print_preview/ui/destination_dialog_cros.js
+++ b/chrome/browser/resources/print_preview/ui/destination_dialog_cros.js
@@ -4,6 +4,7 @@
 
 import 'chrome://resources/cr_elements/cr_button/cr_button.m.js';
 import 'chrome://resources/cr_elements/cr_dialog/cr_dialog.m.js';
+import 'chrome://resources/cr_elements/cr_searchable_drop_down/cr_searchable_drop_down.m.js';
 import 'chrome://resources/cr_elements/hidden_style_css.m.js';
 import 'chrome://resources/cr_elements/shared_vars_css.m.js';
 import 'chrome://resources/js/action_link.js';
@@ -26,20 +27,26 @@
 import {EventTracker} from 'chrome://resources/js/event_tracker.m.js';
 import {ListPropertyUpdateBehavior} from 'chrome://resources/js/list_property_update_behavior.m.js';
 import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js';
+import {WebUIListenerBehavior} from 'chrome://resources/js/web_ui_listener_behavior.m.js';
 import {beforeNextRender, html, Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
 import {Destination} from '../data/destination.js';
 import {DestinationStore} from '../data/destination_store.js';
 import {InvitationStore} from '../data/invitation_store.js';
+import {PrintServerStore} from '../data/print_server_store.js';
 import {Metrics, MetricsContext} from '../metrics.js';
 import {NativeLayerImpl} from '../native_layer.js';
+import {PrintServer, PrintServersConfig} from '../native_layer_cros.js';
 
 Polymer({
   is: 'print-preview-destination-dialog-cros',
 
   _template: html`{__html_template__}`,
 
-  behaviors: [ListPropertyUpdateBehavior],
+  behaviors: [
+    ListPropertyUpdateBehavior,
+    WebUIListenerBehavior,
+  ],
 
   properties: {
     /** @type {?DestinationStore} */
@@ -61,6 +68,13 @@
     /** @type {!Array<string>} */
     users: Array,
 
+    /** @private */
+    printServerSelected_: {
+      type: String,
+      value: '',
+      observer: 'onPrintServerSelected_',
+    },
+
     /** @private {!Array<!Destination>} */
     destinations_: {
       type: Array,
@@ -90,6 +104,42 @@
       },
       readOnly: true,
     },
+
+    /** @private {boolean} */
+    isSingleServerFetchingMode_: {
+      type: Boolean,
+      value: false,
+    },
+
+    /** @private {!Array<string>} */
+    printServerNames_: {
+      type: Array,
+      value() {
+        return [''];
+      },
+    },
+
+    /** @private */
+    printServerScalingFlagEnabled_: {
+      type: Boolean,
+      value() {
+        return loadTimeData.getBoolean('printServerScaling');
+      },
+      readOnly: true,
+    },
+
+    /** @private {boolean} */
+    loadingServerPrinters_: {
+      type: Boolean,
+      value: false,
+    },
+
+    /** @private {boolean} */
+    loadingAnyDestinations_: {
+      type: Boolean,
+      computed:
+          'computeLoadingDestinations_(loadingDestinations_, loadingServerPrinters_)'
+    },
   },
 
   listeners: {
@@ -105,11 +155,37 @@
   /** @private {boolean} */
   initialized_: false,
 
+  /** @private {?PrintServerStore} */
+  printServerStore_: null,
+
   /** @override */
   detached() {
     this.tracker_.removeAll();
   },
 
+  /** @override */
+  ready() {
+    if (!this.printServerScalingFlagEnabled_) {
+      return;
+    }
+    this.printServerStore_ = new PrintServerStore(
+        (/** string */ eventName, /** !Function */ callback) =>
+            void this.addWebUIListener(eventName, callback));
+    this.tracker_.add(
+        this.printServerStore_,
+        PrintServerStore.EventType.PRINT_SERVERS_CHANGED,
+        event => void this.onPrintServersChanged_(event));
+    this.tracker_.add(
+        this.printServerStore_,
+        PrintServerStore.EventType.SERVER_PRINTERS_LOADING,
+        event => void this.onServerPrintersLoading_(event));
+    this.printServerStore_.getPrintServersConfig().then(config => {
+      this.printServerNames_ =
+          config.printServers.map(printServer => printServer.name);
+      this.isSingleServerFetchingMode_ = config.isSingleServerFetchingMode;
+    });
+  },
+
   /**
    * @param {!KeyboardEvent} e Event containing the key
    * @private
@@ -292,6 +368,45 @@
     return this.$.dialog.hasAttribute('open');
   },
 
+  /**
+   * @param {string} printServerName The name of the print server.
+   * @private
+   */
+  onPrintServerSelected_(printServerName) {
+    if (!this.printServerScalingFlagEnabled_ || !this.printServerStore_) {
+      return;
+    }
+    this.printServerStore_.choosePrintServers(printServerName);
+  },
+
+  /**
+   * @param {!CustomEvent<!{printServerNames: !Array<string>,
+   *     isSingleServerFetchingMode: boolean}>} e Event containing the current
+   *     print server names and fetching mode.
+   * @private
+   */
+  onPrintServersChanged_(e) {
+    this.isSingleServerFetchingMode_ = e.detail.isSingleServerFetchingMode;
+    this.printServerNames_ = e.detail.printServerNames;
+  },
+
+  /**
+   * @param {!CustomEvent<boolean>} e Event containing whether server printers
+   *     are currently loading.
+   * @private
+   */
+  onServerPrintersLoading_(e) {
+    this.loadingServerPrinters_ = e.detail;
+  },
+
+  /**
+   * @return {boolean} Whether the destinations are loading.
+   * @private
+   */
+  computeLoadingDestinations_() {
+    return this.loadingDestinations_ || this.loadingServerPrinters_;
+  },
+
   /** @private */
   onUserChange_() {
     const select = this.$$('select');
diff --git a/chrome/browser/resources/quota_internals/DIR_METADATA b/chrome/browser/resources/quota_internals/DIR_METADATA
new file mode 100644
index 0000000..ed87c37
--- /dev/null
+++ b/chrome/browser/resources/quota_internals/DIR_METADATA
@@ -0,0 +1,4 @@
+monorail:  {
+  component:  "Blink>Storage>Quota"
+}
+team_email:  "storage-dev@chromium.org"
diff --git a/chrome/browser/resources/quota_internals/OWNERS b/chrome/browser/resources/quota_internals/OWNERS
index 84d5cb66..a61a714 100644
--- a/chrome/browser/resources/quota_internals/OWNERS
+++ b/chrome/browser/resources/quota_internals/OWNERS
@@ -1,4 +1 @@
 file://storage/browser/quota/OWNERS
-
-# TEAM: storage-dev@chromium.org
-# COMPONENT: Blink>Storage>Quota
diff --git a/chrome/browser/resources/read_later/DIR_METADATA b/chrome/browser/resources/read_later/DIR_METADATA
new file mode 100644
index 0000000..49ee9774
--- /dev/null
+++ b/chrome/browser/resources/read_later/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "UI>Browser>ReadLater"
+}
diff --git a/chrome/browser/resources/read_later/OWNERS b/chrome/browser/resources/read_later/OWNERS
index ad370ae..3288f77 100644
--- a/chrome/browser/resources/read_later/OWNERS
+++ b/chrome/browser/resources/read_later/OWNERS
@@ -1,4 +1,2 @@
 connily@chromium.org
 corising@chromium.org
-
-# COMPONENT: UI>Browser>ReadLater
\ No newline at end of file
diff --git a/chrome/browser/resources/reset_password/DIR_METADATA b/chrome/browser/resources/reset_password/DIR_METADATA
new file mode 100644
index 0000000..1864297
--- /dev/null
+++ b/chrome/browser/resources/reset_password/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "Services>Safebrowsing"
+}
diff --git a/chrome/browser/resources/reset_password/OWNERS b/chrome/browser/resources/reset_password/OWNERS
index f95b8fb..5225674 100644
--- a/chrome/browser/resources/reset_password/OWNERS
+++ b/chrome/browser/resources/reset_password/OWNERS
@@ -1,3 +1 @@
 file://components/safe_browsing/OWNERS
-
-# COMPONENT: Services>Safebrowsing
diff --git a/chrome/browser/resources/safe_browsing/DIR_METADATA b/chrome/browser/resources/safe_browsing/DIR_METADATA
new file mode 100644
index 0000000..1864297
--- /dev/null
+++ b/chrome/browser/resources/safe_browsing/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "Services>Safebrowsing"
+}
diff --git a/chrome/browser/resources/safe_browsing/OWNERS b/chrome/browser/resources/safe_browsing/OWNERS
index bbaf9c8..d586b97 100644
--- a/chrome/browser/resources/safe_browsing/OWNERS
+++ b/chrome/browser/resources/safe_browsing/OWNERS
@@ -2,5 +2,3 @@
 drubery@chromium.org
 nparker@chromium.org
 vakh@chromium.org
-
-# COMPONENT: Services>Safebrowsing
diff --git a/chrome/browser/resources/sandbox_internals/DIR_METADATA b/chrome/browser/resources/sandbox_internals/DIR_METADATA
new file mode 100644
index 0000000..d745958e
--- /dev/null
+++ b/chrome/browser/resources/sandbox_internals/DIR_METADATA
@@ -0,0 +1,4 @@
+monorail:  {
+  component:  "Internals>Sandbox"
+}
+team_email:  "security-dev@chromium.org"
diff --git a/chrome/browser/resources/sandbox_internals/OWNERS b/chrome/browser/resources/sandbox_internals/OWNERS
index 058ee25c..4b51da8 100644
--- a/chrome/browser/resources/sandbox_internals/OWNERS
+++ b/chrome/browser/resources/sandbox_internals/OWNERS
@@ -1,3 +1 @@
 file://sandbox/OWNERS
-# COMPONENT: Internals>Sandbox
-# TEAM: security-dev@chromium.org
diff --git a/chrome/browser/resources/settings/DIR_METADATA b/chrome/browser/resources/settings/DIR_METADATA
new file mode 100644
index 0000000..0c0ba0c
--- /dev/null
+++ b/chrome/browser/resources/settings/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "UI>Settings"
+}
diff --git a/chrome/browser/resources/settings/OWNERS b/chrome/browser/resources/settings/OWNERS
index 3ee12dc..93dfe88c 100644
--- a/chrome/browser/resources/settings/OWNERS
+++ b/chrome/browser/resources/settings/OWNERS
@@ -8,5 +8,3 @@
 
 # Chrome OS Settings
 per-file *os_settings*=file://chrome/browser/resources/settings/chromeos/OWNERS
-
-# COMPONENT: UI>Settings
diff --git a/chrome/browser/resources/settings/chromeos/DIR_METADATA b/chrome/browser/resources/settings/chromeos/DIR_METADATA
new file mode 100644
index 0000000..e3e253d
--- /dev/null
+++ b/chrome/browser/resources/settings/chromeos/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "OS>Systems>Settings"
+}
diff --git a/chrome/browser/resources/settings/chromeos/OWNERS b/chrome/browser/resources/settings/chromeos/OWNERS
index 2098f7c..809751bb 100644
--- a/chrome/browser/resources/settings/chromeos/OWNERS
+++ b/chrome/browser/resources/settings/chromeos/OWNERS
@@ -5,5 +5,3 @@
 michaelpg@chromium.org
 stevenjb@chromium.org
 zentaro@chromium.org
-
-# COMPONENT: OS>Systems>Settings
diff --git a/chrome/browser/resources/settings/chromeos/internet_page/DIR_METADATA b/chrome/browser/resources/settings/chromeos/internet_page/DIR_METADATA
new file mode 100644
index 0000000..07cee58
--- /dev/null
+++ b/chrome/browser/resources/settings/chromeos/internet_page/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "OS>Systems>Network"
+}
diff --git a/chrome/browser/resources/settings/chromeos/internet_page/OWNERS b/chrome/browser/resources/settings/chromeos/internet_page/OWNERS
index 1e04bd44..7632e21 100644
--- a/chrome/browser/resources/settings/chromeos/internet_page/OWNERS
+++ b/chrome/browser/resources/settings/chromeos/internet_page/OWNERS
@@ -3,5 +3,3 @@
 khorimoto@chromium.org
 stevenjb@chromium.org
 tbarzic@chromium.org
-
-# COMPONENT: OS>Systems>Network
diff --git a/chrome/browser/resources/settings/chromeos/multidevice_page/DIR_METADATA b/chrome/browser/resources/settings/chromeos/multidevice_page/DIR_METADATA
new file mode 100644
index 0000000..7859025
--- /dev/null
+++ b/chrome/browser/resources/settings/chromeos/multidevice_page/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "OS>Systems>Multidevice"
+}
diff --git a/chrome/browser/resources/settings/chromeos/multidevice_page/OWNERS b/chrome/browser/resources/settings/chromeos/multidevice_page/OWNERS
index 8eaf92b..7027ab7 100644
--- a/chrome/browser/resources/settings/chromeos/multidevice_page/OWNERS
+++ b/chrome/browser/resources/settings/chromeos/multidevice_page/OWNERS
@@ -1,3 +1 @@
 file://chromeos/components/multidevice/OWNERS
-
-# COMPONENT: OS>Systems>Multidevice
diff --git a/chrome/browser/resources/settings/chromeos/nearby_share_page/BUILD.gn b/chrome/browser/resources/settings/chromeos/nearby_share_page/BUILD.gn
index f720e03d..54012b4 100644
--- a/chrome/browser/resources/settings/chromeos/nearby_share_page/BUILD.gn
+++ b/chrome/browser/resources/settings/chromeos/nearby_share_page/BUILD.gn
@@ -27,6 +27,7 @@
   deps = [
     "//chrome/browser/resources/nearby_share/shared:nearby_device",
     "//chrome/browser/resources/nearby_share/shared:nearby_page_template",
+    "//chrome/browser/resources/nearby_share/shared:nearby_preview",
     "//chrome/browser/resources/nearby_share/shared:nearby_progress",
   ]
 }
@@ -165,6 +166,7 @@
   deps = [
     "//chrome/browser/resources/nearby_share/shared:nearby_device.m",
     "//chrome/browser/resources/nearby_share/shared:nearby_page_template.m",
+    "//chrome/browser/resources/nearby_share/shared:nearby_preview.m",
     "//chrome/browser/resources/nearby_share/shared:nearby_progress.m",
   ]
   extra_deps = [ ":nearby_share_confirm_page_module" ]
diff --git a/chrome/browser/resources/settings/chromeos/nearby_share_page/nearby_share_confirm_page.html b/chrome/browser/resources/settings/chromeos/nearby_share_page/nearby_share_confirm_page.html
index 7f6edcc..68ab1a3 100644
--- a/chrome/browser/resources/settings/chromeos/nearby_share_page/nearby_share_confirm_page.html
+++ b/chrome/browser/resources/settings/chromeos/nearby_share_page/nearby_share_confirm_page.html
@@ -2,6 +2,7 @@
 
 <link rel="import" href="../../shared/nearby_page_template.html">
 <link rel="import" href="../../shared/nearby_device.html">
+<link rel="import" href="../../shared/nearby_preview.html">
 <link rel="import" href="../../shared/nearby_progress.html">
 
 <dom-module id="nearby-share-confirm-page">
diff --git a/chrome/browser/resources/settings/chromeos/os_apps_page/DIR_METADATA b/chrome/browser/resources/settings/chromeos/os_apps_page/DIR_METADATA
new file mode 100644
index 0000000..03315ae5
--- /dev/null
+++ b/chrome/browser/resources/settings/chromeos/os_apps_page/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "Platform>Apps>Foundation"
+}
diff --git a/chrome/browser/resources/settings/chromeos/os_apps_page/OWNERS b/chrome/browser/resources/settings/chromeos/os_apps_page/OWNERS
index 94b2e07..b784206 100644
--- a/chrome/browser/resources/settings/chromeos/os_apps_page/OWNERS
+++ b/chrome/browser/resources/settings/chromeos/os_apps_page/OWNERS
@@ -1,4 +1,2 @@
 dominickn@chromium.org
 jshikaram@chromium.org
-
-# COMPONENT: Platform>Apps>Foundation
diff --git a/chrome/browser/resources/settings/chromeos/os_people_page/os_people_page.html b/chrome/browser/resources/settings/chromeos/os_people_page/os_people_page.html
index f5c4264..43983b5 100644
--- a/chrome/browser/resources/settings/chromeos/os_people_page/os_people_page.html
+++ b/chrome/browser/resources/settings/chromeos/os_people_page/os_people_page.html
@@ -125,10 +125,12 @@
           </settings-parental-controls-page>
         </template>
 
-        <cr-link-row id="manage-other-people-subpage-trigger"
-            label="$i18n{manageOtherPeople}" on-click="onManageOtherPeople_"
-            role-description="$i18n{subpageArrowRoleDescription}">
-        </cr-link-row>
+        <template is="dom-if" if="[[!isAccountManagementFlowsV2Enabled_]]">
+          <cr-link-row id="manage-other-people-subpage-trigger"
+              label="$i18n{manageOtherPeople}" on-click="onManageOtherPeople_"
+              role-description="$i18n{subpageArrowRoleDescription}">
+          </cr-link-row>
+        </template>
 
         <template is="dom-if" if="[[pageVisibility.people.kerberosAccounts]]">
           <cr-link-row id="kerberos-accounts-subpage-trigger" class="hr"
@@ -204,13 +206,16 @@
           </settings-subpage>
         </template>
       </template>
-      <template is="dom-if" route-path="/accounts">
-        <settings-subpage
-            associated-control="[[$$('#manage-other-people-subpage-trigger')]]"
-            page-title="$i18n{manageOtherPeople}">
-          <settings-users-page prefs="{{prefs}}">
-          </settings-users-page>
-        </settings-subpage>
+      <template is="dom-if" if="[[!isAccountManagementFlowsV2Enabled_]]">
+        <template is="dom-if" route-path="/accounts">
+          <settings-subpage
+              associated-control="[[
+                $$('#manage-other-people-subpage-trigger')]]"
+              page-title="$i18n{manageOtherPeople}">
+            <settings-users-page prefs="{{prefs}}">
+            </settings-users-page>
+          </settings-subpage>
+        </template>
       </template>
       <template is="dom-if" route-path="/accountManager">
         <settings-subpage
diff --git a/chrome/browser/resources/settings/chromeos/os_people_page/os_people_page.js b/chrome/browser/resources/settings/chromeos/os_people_page/os_people_page.js
index 85b1054..6e82aca 100644
--- a/chrome/browser/resources/settings/chromeos/os_people_page/os_people_page.js
+++ b/chrome/browser/resources/settings/chromeos/os_people_page/os_people_page.js
@@ -531,6 +531,9 @@
 
   /** @private */
   onManageOtherPeople_() {
+    assert(
+        !this.isAccountManagementFlowsV2Enabled_,
+        'onManageOtherPeople_ was called when kAccountManagementFlowsV2 is enabled');
     settings.Router.getInstance().navigateTo(settings.routes.ACCOUNTS);
   },
 
diff --git a/chrome/browser/resources/settings/chromeos/os_people_page/users_page.html b/chrome/browser/resources/settings/chromeos/os_people_page/users_page.html
index 3d1ad74e..0497b6a 100644
--- a/chrome/browser/resources/settings/chromeos/os_people_page/users_page.html
+++ b/chrome/browser/resources/settings/chromeos/os_people_page/users_page.html
@@ -47,20 +47,24 @@
         id="allowGuestBrowsing"
         label="$i18n{guestBrowsingLabel}"
         disabled="[[isEditingDisabled_(isOwner_, isUserListManaged_)]]"
-        deep-link-focus-id$="[[Setting.kGuestBrowsing]]">
+        deep-link-focus-id$="[[Setting.kGuestBrowsing]]
+            [[Setting.kGuestBrowsingV2]]">
     </settings-toggle-button>
     <settings-toggle-button
         pref="{{prefs.cros.accounts.showUserNamesOnSignIn}}"
+        id="showUserNamesOnSignIn"
         label="$i18n{showOnSigninLabel}"
         disabled="[[isEditingDisabled_(isOwner_, isUserListManaged_)]]"
-        deep-link-focus-id$="[[Setting.kShowUsernamesAndPhotosAtSignIn]]">
+        deep-link-focus-id$="[[Setting.kShowUsernamesAndPhotosAtSignIn]]
+            [[Setting.kShowUsernamesAndPhotosAtSignInV2]]">
     </settings-toggle-button>
     <settings-toggle-button
         pref="{{prefs.cros.accounts.allowGuest}}"
         id="restrictSignIn"
         label="$i18n{restrictSigninLabel}"
         disabled="[[isEditingDisabled_(isOwner_, isUserListManaged_)]]"
-        deep-link-focus-id$="[[Setting.kRestrictSignIn]]"
+        deep-link-focus-id$="[[Setting.kRestrictSignIn]]
+            [[Setting.kRestrictSignInV2]]"
         inverted>
     </settings-toggle-button>
     <template is="dom-if"
@@ -70,8 +74,10 @@
         <settings-user-list prefs="[[prefs]]">
         </settings-user-list>
         <div id="add-user-button" class="list-item">
-          <a is="action-link" class="list-button" on-click="openAddUserDialog_"
-              deep-link-focus-id$="[[Setting.kAddToUserAllowlist]]">
+          <a is="action-link"
+              deep-link-focus-id$="[[Setting.kAddToUserAllowlist]]
+                  [[Setting.kAddToUserAllowlistV2]]"
+              class="list-button" on-click="openAddUserDialog_">
             $i18n{addUsers}
           </a>
         </div>
diff --git a/chrome/browser/resources/settings/chromeos/os_people_page/users_page.js b/chrome/browser/resources/settings/chromeos/os_people_page/users_page.js
index d3888c0..d0693fa 100644
--- a/chrome/browser/resources/settings/chromeos/os_people_page/users_page.js
+++ b/chrome/browser/resources/settings/chromeos/os_people_page/users_page.js
@@ -56,8 +56,26 @@
         chromeos.settings.mojom.Setting.kRestrictSignIn,
         chromeos.settings.mojom.Setting.kAddToUserAllowlist,
         chromeos.settings.mojom.Setting.kRemoveFromUserAllowlist,
+
+        chromeos.settings.mojom.Setting.kGuestBrowsingV2,
+        chromeos.settings.mojom.Setting.kShowUsernamesAndPhotosAtSignInV2,
+        chromeos.settings.mojom.Setting.kRestrictSignInV2,
+        chromeos.settings.mojom.Setting.kAddToUserAllowlistV2,
+        chromeos.settings.mojom.Setting.kRemoveFromUserAllowlistV2,
       ]),
     },
+
+    /**
+     * True if redesign of account management flows is enabled.
+     * @private
+     */
+    isAccountManagementFlowsV2Enabled_: {
+      type: Boolean,
+      value() {
+        return loadTimeData.getBoolean('isAccountManagementFlowsV2Enabled');
+      },
+      readOnly: true,
+    },
   },
 
   listeners: {'all-managed-users-removed': 'focusAddUserButton_'},
@@ -80,7 +98,9 @@
    */
   beforeDeepLinkAttempt(settingId) {
     if (settingId !==
-        chromeos.settings.mojom.Setting.kRemoveFromUserAllowlist) {
+            chromeos.settings.mojom.Setting.kRemoveFromUserAllowlist &&
+        settingId !==
+            chromeos.settings.mojom.Setting.kRemoveFromUserAllowlistV2) {
       // Continue with deep linking attempt.
       return true;
     }
diff --git a/chrome/browser/resources/settings/chromeos/os_privacy_page/os_privacy_page.html b/chrome/browser/resources/settings/chromeos/os_privacy_page/os_privacy_page.html
index 2e019f6..d1a58c43 100644
--- a/chrome/browser/resources/settings/chromeos/os_privacy_page/os_privacy_page.html
+++ b/chrome/browser/resources/settings/chromeos/os_privacy_page/os_privacy_page.html
@@ -6,37 +6,68 @@
 <link rel="import" href="../../router.html">
 <link rel="import" href="../../controls/settings_toggle_button.html">
 <link rel="import" href="../../settings_shared_css.html">
+<link rel="import" href="../../settings_page/settings_subpage.html">
+<link rel="import" href="../os_people_page/users_page.html">
+<link rel="import" href="../../settings_page/settings_animated_pages.html">
+<link rel="import" href="chrome://resources/cr_elements/cr_link_row/cr_link_row.html">
 
 <dom-module id="os-settings-privacy-page">
   <template>
     <style include="settings-shared"></style>
+    <settings-animated-pages id="pages" section="osPrivacy"
+        focus-config="[[focusConfig_]]">
+
+      <div route-path="default">
+        <template is="dom-if" if="[[isAccountManagementFlowsV2Enabled_]]">
+          <cr-link-row id="manageOtherPeopleSubpageTrigger" class="hr"
+              label="$i18n{manageOtherPeople}"
+              on-click="onManageOtherPeople_"
+              role-description="$i18n{subpageArrowRoleDescription}">
+          </cr-link-row>
+        </template>
+
 <if expr="_google_chrome">
-    <settings-toggle-button
-        id="enable-logging"
-        class="hr"
-        pref="{{prefs.cros.metrics.reportingEnabled}}"
-        label="$i18n{enableLogging}"
-        sub-label="$i18n{enableLoggingDesc}"
-        deep-link-focus-id$="[[Setting.kUsageStatsAndCrashReports]]">
-    </settings-toggle-button>
+        <settings-toggle-button
+            id="enable-logging"
+            class="hr"
+            pref="{{prefs.cros.metrics.reportingEnabled}}"
+            label="$i18n{enableLogging}"
+            sub-label="$i18n{enableLoggingDesc}"
+            deep-link-focus-id$="[[Setting.kUsageStatsAndCrashReports]]">
+        </settings-toggle-button>
 </if>
-    <template is="dom-if" if="[[showSuggestedContentToggle_]]">
-      <settings-toggle-button
-          id="suggested-content"
-          class="hr"
-          pref="{{prefs.settings.suggested_content_enabled}}"
-          label="$i18n{enableSuggestedContent}"
-          sub-label="$i18n{enableSuggestedContentDesc}"
-          learn-more-url="$i18n{suggestedContentLearnMoreURL}">
-      </settings-toggle-button>
-    </template>
-    <settings-toggle-button
-        id="enable-verified-access"
-        class="hr"
-        pref="{{prefs.cros.device.attestation_for_content_protection_enabled}}"
-        label="$i18n{enableContentProtectionAttestation}"
-        deep-link-focus-id$="[[Setting.kVerifiedAccess]]">
-    </settings-toggle-button>
+        <template is="dom-if" if="[[showSuggestedContentToggle_]]">
+          <settings-toggle-button
+              id="suggested-content"
+              class="hr"
+              pref="{{prefs.settings.suggested_content_enabled}}"
+              label="$i18n{enableSuggestedContent}"
+              sub-label="$i18n{enableSuggestedContentDesc}"
+              learn-more-url="$i18n{suggestedContentLearnMoreURL}">
+          </settings-toggle-button>
+        </template>
+        <settings-toggle-button
+            id="enable-verified-access"
+            class="hr"
+            pref="{{
+              prefs.cros.device.attestation_for_content_protection_enabled}}"
+            label="$i18n{enableContentProtectionAttestation}"
+            deep-link-focus-id$="[[Setting.kVerifiedAccess]]">
+        </settings-toggle-button>
+      </div>
+
+      <template is="dom-if" if="[[isAccountManagementFlowsV2Enabled_]]">
+        <template is="dom-if" route-path="/osPrivacy/accounts">
+          <settings-subpage
+              associated-control="[[$$('#manageOtherPeopleSubpageTrigger')]]"
+              page-title="$i18n{manageOtherPeople}">
+            <settings-users-page prefs="{{prefs}}">
+            </settings-users-page>
+          </settings-subpage>
+        </template>
+      </template>
+
+    </settings-animated-pages>
   </template>
   <script src="os_privacy_page.js"></script>
 </dom-module>
diff --git a/chrome/browser/resources/settings/chromeos/os_privacy_page/os_privacy_page.js b/chrome/browser/resources/settings/chromeos/os_privacy_page/os_privacy_page.js
index 162e62d..5730260 100644
--- a/chrome/browser/resources/settings/chromeos/os_privacy_page/os_privacy_page.js
+++ b/chrome/browser/resources/settings/chromeos/os_privacy_page/os_privacy_page.js
@@ -25,6 +25,20 @@
       notify: true,
     },
 
+    /** @private {!Map<string, string>} */
+    focusConfig_: {
+      type: Object,
+      value() {
+        const map = new Map();
+        if (settings.routes.ACCOUNTS) {
+          map.set(
+              settings.routes.ACCOUNTS.path,
+              '#manageOtherPeopleSubpageTrigger');
+        }
+        return map;
+      },
+    },
+
     /**
      * Whether to show the Suggested Content toggle.
      * @private
@@ -47,6 +61,18 @@
         chromeos.settings.mojom.Setting.kUsageStatsAndCrashReports,
       ]),
     },
+
+    /**
+     * True if redesign of account management flows is enabled.
+     * @private
+     */
+    isAccountManagementFlowsV2Enabled_: {
+      type: Boolean,
+      value() {
+        return loadTimeData.getBoolean('isAccountManagementFlowsV2Enabled');
+      },
+      readOnly: true,
+    },
   },
 
   /**
@@ -61,4 +87,9 @@
 
     this.attemptDeepLink();
   },
+
+  /** @private */
+  onManageOtherPeople_() {
+    settings.Router.getInstance().navigateTo(settings.routes.ACCOUNTS);
+  },
 });
diff --git a/chrome/browser/resources/settings/chromeos/os_route.js b/chrome/browser/resources/settings/chromeos/os_route.js
index 476147d7..5ff8fc14 100644
--- a/chrome/browser/resources/settings/chromeos/os_route.js
+++ b/chrome/browser/resources/settings/chromeos/os_route.js
@@ -111,9 +111,11 @@
           Subpage.kSecurityAndSignIn);
       r.FINGERPRINT = createSubpage(
           r.LOCK_SCREEN, mojom.FINGERPRINT_SUBPAGE_PATH, Subpage.kFingerprint);
-      r.ACCOUNTS = createSubpage(
-          r.OS_PEOPLE, mojom.MANAGE_OTHER_PEOPLE_SUBPAGE_PATH,
-          Subpage.kManageOtherPeople);
+      if (!loadTimeData.getBoolean('isAccountManagementFlowsV2Enabled')) {
+        r.ACCOUNTS = createSubpage(
+            r.OS_PEOPLE, mojom.MANAGE_OTHER_PEOPLE_SUBPAGE_PATH,
+            Subpage.kManageOtherPeople);
+      }
       r.KERBEROS_ACCOUNTS = createSubpage(
           r.OS_PEOPLE, mojom.KERBEROS_ACCOUNTS_SUBPAGE_PATH,
           Subpage.kKerberosAccounts);
@@ -242,6 +244,11 @@
     r.OS_PRIVACY = createSection(
         r.ADVANCED, mojom.PRIVACY_AND_SECURITY_SECTION_PATH,
         Section.kPrivacyAndSecurity);
+    if (loadTimeData.getBoolean('isAccountManagementFlowsV2Enabled')) {
+      r.ACCOUNTS = createSubpage(
+          r.OS_PRIVACY, mojom.MANAGE_OTHER_PEOPLE_SUBPAGE_PATH_V2,
+          Subpage.kManageOtherPeopleV2);
+    }
 
     // Languages and Input section.
     r.OS_LANGUAGES = createSection(
diff --git a/chrome/browser/resources/settings/privacy_sandbox/DIR_METADATA b/chrome/browser/resources/settings/privacy_sandbox/DIR_METADATA
new file mode 100644
index 0000000..0917002
--- /dev/null
+++ b/chrome/browser/resources/settings/privacy_sandbox/DIR_METADATA
@@ -0,0 +1,4 @@
+monorail:  {
+  component:  "UI>Settings>Privacy"
+}
+team_email:  "chrome-friendly-settings@google.com"
diff --git a/chrome/browser/resources/settings/privacy_sandbox/OWNERS b/chrome/browser/resources/settings/privacy_sandbox/OWNERS
index 8218569b..cc11485 100644
--- a/chrome/browser/resources/settings/privacy_sandbox/OWNERS
+++ b/chrome/browser/resources/settings/privacy_sandbox/OWNERS
@@ -1,4 +1 @@
 sauski@google.com
-
-# COMPONENT: UI>Settings>Privacy
-# TEAM: chrome-friendly-settings@google.com
diff --git a/chrome/browser/resources/signin/dice_web_signin_intercept/DIR_METADATA b/chrome/browser/resources/signin/dice_web_signin_intercept/DIR_METADATA
new file mode 100644
index 0000000..53bc9e9
--- /dev/null
+++ b/chrome/browser/resources/signin/dice_web_signin_intercept/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "Services>SignIn"
+}
diff --git a/chrome/browser/resources/signin/dice_web_signin_intercept/OWNERS b/chrome/browser/resources/signin/dice_web_signin_intercept/OWNERS
index b2464ab..abcdb8d0 100644
--- a/chrome/browser/resources/signin/dice_web_signin_intercept/OWNERS
+++ b/chrome/browser/resources/signin/dice_web_signin_intercept/OWNERS
@@ -1,2 +1 @@
 file://components/signin/OWNERS
-# COMPONENT: Services>SignIn
diff --git a/chrome/browser/resources/signin/profile_customization/DIR_METADATA b/chrome/browser/resources/signin/profile_customization/DIR_METADATA
new file mode 100644
index 0000000..53bc9e9
--- /dev/null
+++ b/chrome/browser/resources/signin/profile_customization/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "Services>SignIn"
+}
diff --git a/chrome/browser/resources/signin/profile_customization/OWNERS b/chrome/browser/resources/signin/profile_customization/OWNERS
index b2464ab..abcdb8d0 100644
--- a/chrome/browser/resources/signin/profile_customization/OWNERS
+++ b/chrome/browser/resources/signin/profile_customization/OWNERS
@@ -1,2 +1 @@
 file://components/signin/OWNERS
-# COMPONENT: Services>SignIn
diff --git a/chrome/browser/resources/signin/profile_picker/profile_creation_flow/profile_type_choice.js b/chrome/browser/resources/signin/profile_picker/profile_creation_flow/profile_type_choice.js
index 7b9fb05..708aeb29 100644
--- a/chrome/browser/resources/signin/profile_picker/profile_creation_flow/profile_type_choice.js
+++ b/chrome/browser/resources/signin/profile_picker/profile_creation_flow/profile_type_choice.js
@@ -40,7 +40,8 @@
   /** @override */
   ready() {
     this.addWebUIListener(
-        'load-signin-failed', () => this.handleLoadSigninFailed_());
+        'load-signin-finished',
+        success => this.handleLoadSigninFinished_(success));
     FocusOutlineManager.forDocument(document);
   },
 
@@ -63,8 +64,9 @@
   },
 
   /** @private */
-  handleLoadSigninFailed_() {
-    // TODO(crbug.com/1126913): Show some error message to inform the user.
+  handleLoadSigninFinished_(success) {
+    // TODO(crbug.com/1126913): If failed, show some error message to inform the
+    // user.
     this.loadSigninInProgess_ = false;
   }
 });
diff --git a/chrome/browser/resources/sync_file_system_internals/DIR_METADATA b/chrome/browser/resources/sync_file_system_internals/DIR_METADATA
new file mode 100644
index 0000000..e898987
--- /dev/null
+++ b/chrome/browser/resources/sync_file_system_internals/DIR_METADATA
@@ -0,0 +1,4 @@
+monorail:  {
+  component:  "Blink>Storage>FileSystem"
+}
+team_email:  "storage-dev@chromium.org"
diff --git a/chrome/browser/resources/sync_file_system_internals/OWNERS b/chrome/browser/resources/sync_file_system_internals/OWNERS
index 0d7e100e..20f2629 100644
--- a/chrome/browser/resources/sync_file_system_internals/OWNERS
+++ b/chrome/browser/resources/sync_file_system_internals/OWNERS
@@ -2,6 +2,3 @@
 kinuko@chromium.org
 nhiroki@chromium.org
 pwnall@chromium.org
-
-# TEAM: storage-dev@chromium.org
-# COMPONENT: Blink>Storage>FileSystem
diff --git a/chrome/browser/resources/tab_search/DIR_METADATA b/chrome/browser/resources/tab_search/DIR_METADATA
new file mode 100644
index 0000000..e895932
--- /dev/null
+++ b/chrome/browser/resources/tab_search/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "UI>Browser>TabSearch"
+}
diff --git a/chrome/browser/resources/tab_search/OWNERS b/chrome/browser/resources/tab_search/OWNERS
index 57b7d60..09b0926 100644
--- a/chrome/browser/resources/tab_search/OWNERS
+++ b/chrome/browser/resources/tab_search/OWNERS
@@ -2,5 +2,3 @@
 tluk@chromium.org
 yuhengh@chromium.org
 romanarora@chromium.org
-
-# COMPONENT: UI>Browser>TabSearch
diff --git a/chrome/browser/resources/tab_search/tab_search_search_field.js b/chrome/browser/resources/tab_search/tab_search_search_field.js
index ec75e55..522ae4c 100644
--- a/chrome/browser/resources/tab_search/tab_search_search_field.js
+++ b/chrome/browser/resources/tab_search/tab_search_search_field.js
@@ -95,6 +95,17 @@
   onInputBlur_(text) {
     this.announceText_ = '';
   }
+
+  /**
+   * Do not schedule the timer from CrSearchFieldBehavior to make search more
+   * responsive.
+   * @override
+   */
+  onSearchTermInput() {
+    this.hasSearchText = this.$.searchInput.value !== '';
+    this.getSearchInput().dispatchEvent(
+        new CustomEvent('search', {composed: true, detail: this.getValue()}));
+  }
 }
 
 customElements.define(TabSearchSearchField.is, TabSearchSearchField);
diff --git a/chrome/browser/resources/usb_internals/DIR_METADATA b/chrome/browser/resources/usb_internals/DIR_METADATA
new file mode 100644
index 0000000..95896612
--- /dev/null
+++ b/chrome/browser/resources/usb_internals/DIR_METADATA
@@ -0,0 +1,4 @@
+monorail:  {
+  component:  "Blink>USB"
+}
+team_email:  "webusb@chromium.org"
diff --git a/chrome/browser/resources/usb_internals/OWNERS b/chrome/browser/resources/usb_internals/OWNERS
index 8dc3166..acf1a9e 100644
--- a/chrome/browser/resources/usb_internals/OWNERS
+++ b/chrome/browser/resources/usb_internals/OWNERS
@@ -1,4 +1 @@
 file://chrome/browser/usb/OWNERS
-
-# COMPONENT: Blink>USB
-# TEAM: webusb@chromium.org
diff --git a/chrome/browser/resources/video_tutorials/DIR_METADATA b/chrome/browser/resources/video_tutorials/DIR_METADATA
new file mode 100644
index 0000000..8834f88c
--- /dev/null
+++ b/chrome/browser/resources/video_tutorials/DIR_METADATA
@@ -0,0 +1,4 @@
+monorail:  {
+  component:  "Upboarding>VideoTutorials"
+}
+team_email:  "chrome-upboarding-eng@google.com"
diff --git a/chrome/browser/resources/video_tutorials/OWNERS b/chrome/browser/resources/video_tutorials/OWNERS
index 4ed3472..36c3bec 100644
--- a/chrome/browser/resources/video_tutorials/OWNERS
+++ b/chrome/browser/resources/video_tutorials/OWNERS
@@ -1,4 +1 @@
 file://chrome/browser/video_tutorials/OWNERS
-
-# TEAM: chrome-upboarding-eng@google.com
-# COMPONENT: Upboarding>VideoTutorials
diff --git a/chrome/browser/resources/vr/DIR_METADATA b/chrome/browser/resources/vr/DIR_METADATA
new file mode 100644
index 0000000..2da35f7a
--- /dev/null
+++ b/chrome/browser/resources/vr/DIR_METADATA
@@ -0,0 +1,4 @@
+monorail:  {
+  component:  "UI>Browser>VR"
+}
+team_email:  "xr-dev@chromium.org"
diff --git a/chrome/browser/resources/vr/OWNERS b/chrome/browser/resources/vr/OWNERS
index 49ca9b4b..3bdb0484 100644
--- a/chrome/browser/resources/vr/OWNERS
+++ b/chrome/browser/resources/vr/OWNERS
@@ -1,6 +1,3 @@
 alcooper@chromium.org
 bialpio@chromium.org
 tiborg@chromium.org
-
-# TEAM: xr-dev@chromium.org
-# COMPONENT: UI>Browser>VR
diff --git a/chrome/browser/resources/webstore_app/DIR_METADATA b/chrome/browser/resources/webstore_app/DIR_METADATA
new file mode 100644
index 0000000..bbb34dc
--- /dev/null
+++ b/chrome/browser/resources/webstore_app/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "Webstore"
+}
diff --git a/chrome/browser/resources/webstore_app/OWNERS b/chrome/browser/resources/webstore_app/OWNERS
index 1b4f88f..6987daa9 100644
--- a/chrome/browser/resources/webstore_app/OWNERS
+++ b/chrome/browser/resources/webstore_app/OWNERS
@@ -1,3 +1 @@
 file://extensions/OWNERS
-
-# COMPONENT: Webstore
diff --git a/chrome/browser/rlz/DIR_METADATA b/chrome/browser/rlz/DIR_METADATA
new file mode 100644
index 0000000..0d15fab0
--- /dev/null
+++ b/chrome/browser/rlz/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "Internals>Core"
+}
diff --git a/chrome/browser/rlz/OWNERS b/chrome/browser/rlz/OWNERS
index bee2d9df..c480874c 100644
--- a/chrome/browser/rlz/OWNERS
+++ b/chrome/browser/rlz/OWNERS
@@ -1,5 +1,3 @@
 cpu@chromium.org
 gwilson@chromium.org
 rogerta@chromium.org
-
-# COMPONENT: Internals>Core
diff --git a/chrome/browser/safe_browsing/DIR_METADATA b/chrome/browser/safe_browsing/DIR_METADATA
new file mode 100644
index 0000000..53bb65b
--- /dev/null
+++ b/chrome/browser/safe_browsing/DIR_METADATA
@@ -0,0 +1,4 @@
+monorail:  {
+  component:  "Services>Safebrowsing"
+}
+team_email:  "safebrowsing@chromium.org"
diff --git a/chrome/browser/safe_browsing/OWNERS b/chrome/browser/safe_browsing/OWNERS
index 32dec4e0..ad1f064f 100644
--- a/chrome/browser/safe_browsing/OWNERS
+++ b/chrome/browser/safe_browsing/OWNERS
@@ -3,6 +3,3 @@
 vakh@chromium.org
 
 per-file *password_protection*=file://components/safe_browsing/content/password_protection/OWNERS
-
-# COMPONENT: Services>Safebrowsing
-# TEAM: safebrowsing@chromium.org
diff --git a/chrome/browser/safe_browsing/android/DIR_METADATA b/chrome/browser/safe_browsing/android/DIR_METADATA
new file mode 100644
index 0000000..53bb65b
--- /dev/null
+++ b/chrome/browser/safe_browsing/android/DIR_METADATA
@@ -0,0 +1,4 @@
+monorail:  {
+  component:  "Services>Safebrowsing"
+}
+team_email:  "safebrowsing@chromium.org"
diff --git a/chrome/browser/safe_browsing/android/OWNERS b/chrome/browser/safe_browsing/android/OWNERS
index e7aac85..5ba4e22 100644
--- a/chrome/browser/safe_browsing/android/OWNERS
+++ b/chrome/browser/safe_browsing/android/OWNERS
@@ -1,5 +1,2 @@
 vakh@chromium.org
 xinghuilu@chromium.org
-
-# COMPONENT: Services>Safebrowsing
-# TEAM: safebrowsing@chromium.org
diff --git a/chrome/browser/safe_browsing/chrome_cleaner/DIR_METADATA b/chrome/browser/safe_browsing/chrome_cleaner/DIR_METADATA
new file mode 100644
index 0000000..1216cc6
--- /dev/null
+++ b/chrome/browser/safe_browsing/chrome_cleaner/DIR_METADATA
@@ -0,0 +1,4 @@
+monorail:  {
+  component:  "Services>Safebrowsing>ChromeCleanup"
+}
+team_email:  "safebrowsing@chromium.org"
diff --git a/chrome/browser/safe_browsing/chrome_cleaner/OWNERS b/chrome/browser/safe_browsing/chrome_cleaner/OWNERS
index fa464f2..c4b14f1 100644
--- a/chrome/browser/safe_browsing/chrome_cleaner/OWNERS
+++ b/chrome/browser/safe_browsing/chrome_cleaner/OWNERS
@@ -2,6 +2,3 @@
 
 joenotcharles@chromium.org  # emeritus
 proberge@chromium.org  # emeritus
-
-# COMPONENT: Services>Safebrowsing>ChromeCleanup
-# TEAM: safebrowsing@chromium.org
diff --git a/chrome/browser/safe_browsing/chrome_password_protection_service.cc b/chrome/browser/safe_browsing/chrome_password_protection_service.cc
index 3145880..8a62828 100644
--- a/chrome/browser/safe_browsing/chrome_password_protection_service.cc
+++ b/chrome/browser/safe_browsing/chrome_password_protection_service.cc
@@ -40,8 +40,8 @@
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/google/core/common/google_util.h"
 #include "components/omnibox/common/omnibox_features.h"
-#include "components/password_manager/core/browser/compromised_credentials_table.h"
 #include "components/password_manager/core/browser/form_parsing/form_parser.h"
+#include "components/password_manager/core/browser/insecure_credentials_table.h"
 #include "components/password_manager/core/browser/leak_detection_dialog_utils.h"
 #include "components/password_manager/core/browser/ui/password_check_referrer.h"
 #include "components/password_manager/core/common/password_manager_features.h"
@@ -1743,8 +1743,9 @@
       continue;
     }
     password_store->AddCompromisedCredentials(
-        {credential.signon_realm, credential.username, base::Time::Now(),
-         password_manager::CompromiseType::kPhished});
+        password_manager::CompromisedCredentials(
+            credential.signon_realm, credential.username, base::Time::Now(),
+            password_manager::CompromiseType::kPhished, false));
   }
 }
 
diff --git a/chrome/browser/safe_browsing/chrome_password_protection_service_unittest.cc b/chrome/browser/safe_browsing/chrome_password_protection_service_unittest.cc
index 5fe7777..e50267dc 100644
--- a/chrome/browser/safe_browsing/chrome_password_protection_service_unittest.cc
+++ b/chrome/browser/safe_browsing/chrome_password_protection_service_unittest.cc
@@ -26,8 +26,8 @@
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
-#include "components/password_manager/core/browser/compromised_credentials_table.h"
 #include "components/password_manager/core/browser/hash_password_manager.h"
+#include "components/password_manager/core/browser/insecure_credentials_table.h"
 #include "components/password_manager/core/browser/mock_password_store.h"
 #include "components/password_manager/core/browser/password_manager_metrics_util.h"
 #include "components/password_manager/core/browser/password_manager_test_utils.h"
diff --git a/chrome/browser/safe_browsing/download_protection/DIR_METADATA b/chrome/browser/safe_browsing/download_protection/DIR_METADATA
new file mode 100644
index 0000000..1864297
--- /dev/null
+++ b/chrome/browser/safe_browsing/download_protection/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "Services>Safebrowsing"
+}
diff --git a/chrome/browser/safe_browsing/download_protection/OWNERS b/chrome/browser/safe_browsing/download_protection/OWNERS
index fede9e2..70e4b68 100644
--- a/chrome/browser/safe_browsing/download_protection/OWNERS
+++ b/chrome/browser/safe_browsing/download_protection/OWNERS
@@ -1,5 +1,3 @@
 drubery@chromium.org
 nparker@chromium.org
 vakh@chromium.org
-
-# COMPONENT: Services>Safebrowsing
diff --git a/chrome/browser/safe_browsing/incident_reporting/DIR_METADATA b/chrome/browser/safe_browsing/incident_reporting/DIR_METADATA
new file mode 100644
index 0000000..b19c884
--- /dev/null
+++ b/chrome/browser/safe_browsing/incident_reporting/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "Services>SafeBrowsing"
+}
diff --git a/chrome/browser/safe_browsing/incident_reporting/OWNERS b/chrome/browser/safe_browsing/incident_reporting/OWNERS
index a06780a9..97303d90 100644
--- a/chrome/browser/safe_browsing/incident_reporting/OWNERS
+++ b/chrome/browser/safe_browsing/incident_reporting/OWNERS
@@ -2,5 +2,3 @@
 grt@chromium.org
 proberge@chromium.org
 robertshield@chromium.org
-
-# COMPONENT: Services>SafeBrowsing
diff --git a/chrome/browser/safe_browsing/settings_reset_prompt/DIR_METADATA b/chrome/browser/safe_browsing/settings_reset_prompt/DIR_METADATA
new file mode 100644
index 0000000..4ba6d30d
--- /dev/null
+++ b/chrome/browser/safe_browsing/settings_reset_prompt/DIR_METADATA
@@ -0,0 +1,4 @@
+monorail:  {
+  component:  "UI>Browser>Preferences>Protector"
+}
+team_email:  "security-dev@chromium.org"
diff --git a/chrome/browser/safe_browsing/settings_reset_prompt/OWNERS b/chrome/browser/safe_browsing/settings_reset_prompt/OWNERS
index 48e04c68..b99d926 100644
--- a/chrome/browser/safe_browsing/settings_reset_prompt/OWNERS
+++ b/chrome/browser/safe_browsing/settings_reset_prompt/OWNERS
@@ -1,4 +1 @@
 # Inherit owners from the parent directory, but use a different component.
-
-# TEAM: security-dev@chromium.org
-# COMPONENT: UI>Browser>Preferences>Protector
diff --git a/chrome/browser/safety_check/DIR_METADATA b/chrome/browser/safety_check/DIR_METADATA
new file mode 100644
index 0000000..5fe0fa58
--- /dev/null
+++ b/chrome/browser/safety_check/DIR_METADATA
@@ -0,0 +1,4 @@
+monorail:  {
+  component:  "UI>Settings>SafetyCheck"
+}
+team_email:  "chrome-friendly-settings@google.com"
diff --git a/chrome/browser/safety_check/OWNERS b/chrome/browser/safety_check/OWNERS
index 9f0501f9..44d121c 100644
--- a/chrome/browser/safety_check/OWNERS
+++ b/chrome/browser/safety_check/OWNERS
@@ -1,4 +1 @@
 file://components/safety_check/OWNERS
-
-# TEAM: chrome-friendly-settings@google.com
-# COMPONENT: UI>Settings>SafetyCheck
\ No newline at end of file
diff --git a/chrome/browser/search/DIR_METADATA b/chrome/browser/search/DIR_METADATA
new file mode 100644
index 0000000..ef0d697
--- /dev/null
+++ b/chrome/browser/search/DIR_METADATA
@@ -0,0 +1,4 @@
+monorail:  {
+  component:  "UI>Browser>NewTabPage"
+}
+team_email:  "ntp-dev@chromium.org"
diff --git a/chrome/browser/search/OWNERS b/chrome/browser/search/OWNERS
index 237280e..4f5f213 100644
--- a/chrome/browser/search/OWNERS
+++ b/chrome/browser/search/OWNERS
@@ -1,6 +1,3 @@
 file://components/search/OWNERS
 
 per-file *source*=fserb@chromium.org
-
-# COMPONENT: UI>Browser>NewTabPage
-# TEAM: ntp-dev@chromium.org
diff --git a/chrome/browser/search/suggestions/DIR_METADATA b/chrome/browser/search/suggestions/DIR_METADATA
new file mode 100644
index 0000000..ef0d697
--- /dev/null
+++ b/chrome/browser/search/suggestions/DIR_METADATA
@@ -0,0 +1,4 @@
+monorail:  {
+  component:  "UI>Browser>NewTabPage"
+}
+team_email:  "ntp-dev@chromium.org"
diff --git a/chrome/browser/search/suggestions/OWNERS b/chrome/browser/search/suggestions/OWNERS
index 229e4636..919d244 100644
--- a/chrome/browser/search/suggestions/OWNERS
+++ b/chrome/browser/search/suggestions/OWNERS
@@ -1,4 +1 @@
 file://components/suggestions/OWNERS
-
-# TEAM: ntp-dev@chromium.org
-# COMPONENT: UI>Browser>NewTabPage
diff --git a/chrome/browser/search_engines/DIR_METADATA b/chrome/browser/search_engines/DIR_METADATA
new file mode 100644
index 0000000..33fa8bc7
--- /dev/null
+++ b/chrome/browser/search_engines/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "UI>Browser>Search"
+}
diff --git a/chrome/browser/search_engines/OWNERS b/chrome/browser/search_engines/OWNERS
index c8cc236..b295cdc 100644
--- a/chrome/browser/search_engines/OWNERS
+++ b/chrome/browser/search_engines/OWNERS
@@ -3,5 +3,3 @@
 treib@chromium.org
 
 per-file default_search_policy_handler*=atwilson@chromium.org
-
-# COMPONENT: UI>Browser>Search
diff --git a/chrome/browser/search_provider_logos/DIR_METADATA b/chrome/browser/search_provider_logos/DIR_METADATA
new file mode 100644
index 0000000..467ac9b4
--- /dev/null
+++ b/chrome/browser/search_provider_logos/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "UI>Browser>NewTabPage"
+}
diff --git a/chrome/browser/search_provider_logos/OWNERS b/chrome/browser/search_provider_logos/OWNERS
index e6356992..b421596 100644
--- a/chrome/browser/search_provider_logos/OWNERS
+++ b/chrome/browser/search_provider_logos/OWNERS
@@ -1,3 +1 @@
 file://components/search_provider_logos/OWNERS
-
-# COMPONENT: UI>Browser>NewTabPage
diff --git a/chrome/browser/security_events/DIR_METADATA b/chrome/browser/security_events/DIR_METADATA
new file mode 100644
index 0000000..1864297
--- /dev/null
+++ b/chrome/browser/security_events/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "Services>Safebrowsing"
+}
diff --git a/chrome/browser/security_events/OWNERS b/chrome/browser/security_events/OWNERS
index 13cac5a6..d6260657 100644
--- a/chrome/browser/security_events/OWNERS
+++ b/chrome/browser/security_events/OWNERS
@@ -2,6 +2,3 @@
 vakh@chromium.org
 # For Chrome Sync related reviews
 markusheintz@chromium.org
-
-# COMPONENT: Services>Safebrowsing
-
diff --git a/chrome/browser/send_tab_to_self/DIR_METADATA b/chrome/browser/send_tab_to_self/DIR_METADATA
new file mode 100644
index 0000000..e64cd2d
--- /dev/null
+++ b/chrome/browser/send_tab_to_self/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "UI>Browser>Sharing"
+}
diff --git a/chrome/browser/send_tab_to_self/OWNERS b/chrome/browser/send_tab_to_self/OWNERS
index e58f618..1745104 100644
--- a/chrome/browser/send_tab_to_self/OWNERS
+++ b/chrome/browser/send_tab_to_self/OWNERS
@@ -1,3 +1 @@
 file://components/send_tab_to_self/OWNERS
-
-# COMPONENT: UI>Browser>Sharing
diff --git a/chrome/browser/serial/DIR_METADATA b/chrome/browser/serial/DIR_METADATA
new file mode 100644
index 0000000..e654970
--- /dev/null
+++ b/chrome/browser/serial/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "Blink>Serial"
+}
diff --git a/chrome/browser/serial/OWNERS b/chrome/browser/serial/OWNERS
index 4ae83ca..737283c 100644
--- a/chrome/browser/serial/OWNERS
+++ b/chrome/browser/serial/OWNERS
@@ -1,3 +1 @@
 file://content/browser/serial/OWNERS
-
-# COMPONENT: Blink>Serial
diff --git a/chrome/browser/service_process/DIR_METADATA b/chrome/browser/service_process/DIR_METADATA
new file mode 100644
index 0000000..7619ec17e
--- /dev/null
+++ b/chrome/browser/service_process/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "Services>CloudPrint"
+}
diff --git a/chrome/browser/service_process/OWNERS b/chrome/browser/service_process/OWNERS
index 3b8d2d0..be0f423b 100644
--- a/chrome/browser/service_process/OWNERS
+++ b/chrome/browser/service_process/OWNERS
@@ -1,3 +1 @@
 file://cloud_print/OWNERS
-
-# COMPONENT: Services>CloudPrint
diff --git a/chrome/browser/sessions/DIR_METADATA b/chrome/browser/sessions/DIR_METADATA
new file mode 100644
index 0000000..80992c1
--- /dev/null
+++ b/chrome/browser/sessions/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "UI>Browser>Sessions"
+}
diff --git a/chrome/browser/sessions/OWNERS b/chrome/browser/sessions/OWNERS
index 5467058..aab6f95 100644
--- a/chrome/browser/sessions/OWNERS
+++ b/chrome/browser/sessions/OWNERS
@@ -7,4 +7,3 @@
 per-file session_restore_android*=felipeg@chromium.org
 
 per-file session_restore*chromeos*=xiyuan@chromium.org
-# COMPONENT: UI>Browser>Sessions
diff --git a/chrome/browser/share/DIR_METADATA b/chrome/browser/share/DIR_METADATA
new file mode 100644
index 0000000..e64cd2d
--- /dev/null
+++ b/chrome/browser/share/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "UI>Browser>Sharing"
+}
diff --git a/chrome/browser/share/OWNERS b/chrome/browser/share/OWNERS
index f8e745b..1745104 100644
--- a/chrome/browser/share/OWNERS
+++ b/chrome/browser/share/OWNERS
@@ -1,3 +1 @@
 file://components/send_tab_to_self/OWNERS
-
-# COMPONENT: UI>Browser>Sharing
\ No newline at end of file
diff --git a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/DIR_METADATA b/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/DIR_METADATA
new file mode 100644
index 0000000..e64cd2d
--- /dev/null
+++ b/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "UI>Browser>Sharing"
+}
diff --git a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/OWNERS b/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/OWNERS
index e58f618..1745104 100644
--- a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/OWNERS
+++ b/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/OWNERS
@@ -1,3 +1 @@
 file://components/send_tab_to_self/OWNERS
-
-# COMPONENT: UI>Browser>Sharing
diff --git a/chrome/browser/sharesheet/DIR_METADATA b/chrome/browser/sharesheet/DIR_METADATA
new file mode 100644
index 0000000..03315ae5
--- /dev/null
+++ b/chrome/browser/sharesheet/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "Platform>Apps>Foundation"
+}
diff --git a/chrome/browser/sharesheet/OWNERS b/chrome/browser/sharesheet/OWNERS
index b575733..79b299b 100644
--- a/chrome/browser/sharesheet/OWNERS
+++ b/chrome/browser/sharesheet/OWNERS
@@ -1,4 +1,2 @@
 dominickn@chromium.org
 melzhang@chromium.org
-
-# COMPONENT: Platform>Apps>Foundation
diff --git a/chrome/browser/sharing/DIR_METADATA b/chrome/browser/sharing/DIR_METADATA
new file mode 100644
index 0000000..e64cd2d
--- /dev/null
+++ b/chrome/browser/sharing/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "UI>Browser>Sharing"
+}
diff --git a/chrome/browser/sharing/OWNERS b/chrome/browser/sharing/OWNERS
index 17dcb10e6..440968d8 100644
--- a/chrome/browser/sharing/OWNERS
+++ b/chrome/browser/sharing/OWNERS
@@ -2,5 +2,3 @@
 knollr@chromium.org
 mvanouwerkerk@chromium.org
 peter@chromium.org
-
-# COMPONENT: UI>Browser>Sharing
diff --git a/chrome/browser/signin/DIR_METADATA b/chrome/browser/signin/DIR_METADATA
new file mode 100644
index 0000000..e97d654
--- /dev/null
+++ b/chrome/browser/signin/DIR_METADATA
@@ -0,0 +1,4 @@
+monorail:  {
+  component:  "Services>SignIn"
+}
+team_email:  "chrome-signin@chromium.org"
diff --git a/chrome/browser/signin/OWNERS b/chrome/browser/signin/OWNERS
index a5c06f58..407a748 100644
--- a/chrome/browser/signin/OWNERS
+++ b/chrome/browser/signin/OWNERS
@@ -9,6 +9,3 @@
 per-file easy_unlock_*=xiyuan@chromium.org
 
 per-file signin_profile_attributes_updater*=msalama@chromium.org
-
-# TEAM: chrome-signin@chromium.org
-# COMPONENT: Services>SignIn
diff --git a/chrome/browser/site_isolation/DIR_METADATA b/chrome/browser/site_isolation/DIR_METADATA
new file mode 100644
index 0000000..c94379e
--- /dev/null
+++ b/chrome/browser/site_isolation/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "Internals>Sandbox>SiteIsolation"
+}
diff --git a/chrome/browser/site_isolation/OWNERS b/chrome/browser/site_isolation/OWNERS
index eea8617..8dc95e0 100644
--- a/chrome/browser/site_isolation/OWNERS
+++ b/chrome/browser/site_isolation/OWNERS
@@ -5,5 +5,3 @@
 lukasza@chromium.org
 nasko@chromium.org
 wjmaclean@chromium.org
-
-# COMPONENT: Internals>Sandbox>SiteIsolation
diff --git a/chrome/browser/speech/DIR_METADATA b/chrome/browser/speech/DIR_METADATA
new file mode 100644
index 0000000..929d509
--- /dev/null
+++ b/chrome/browser/speech/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "Blink>Speech"
+}
diff --git a/chrome/browser/speech/OWNERS b/chrome/browser/speech/OWNERS
index 20b99fd..9d2997a0 100644
--- a/chrome/browser/speech/OWNERS
+++ b/chrome/browser/speech/OWNERS
@@ -8,5 +8,3 @@
 
 # Speech recognition service
 per-file *speech_recognition_*=evliu@google.com
-
-# COMPONENT: Blink>Speech
diff --git a/chrome/browser/speech/extension_api/DIR_METADATA b/chrome/browser/speech/extension_api/DIR_METADATA
new file mode 100644
index 0000000..5d850f3
--- /dev/null
+++ b/chrome/browser/speech/extension_api/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "Internals>SpeechSynthesis"
+}
diff --git a/chrome/browser/speech/extension_api/OWNERS b/chrome/browser/speech/extension_api/OWNERS
index 219d056..11e8fd83 100644
--- a/chrome/browser/speech/extension_api/OWNERS
+++ b/chrome/browser/speech/extension_api/OWNERS
@@ -1,4 +1,2 @@
 dmazzoni@chromium.org
 dtseng@chromium.org
-
-# COMPONENT: Internals>SpeechSynthesis
diff --git a/chrome/browser/ssl/DIR_METADATA b/chrome/browser/ssl/DIR_METADATA
new file mode 100644
index 0000000..dbd946f
--- /dev/null
+++ b/chrome/browser/ssl/DIR_METADATA
@@ -0,0 +1,4 @@
+monorail:  {
+  component:  "UI>Browser>Interstitials"
+}
+team_email:  "security-enamel@chromium.org"
diff --git a/chrome/browser/ssl/OWNERS b/chrome/browser/ssl/OWNERS
index 62bf9b3..756eae9 100644
--- a/chrome/browser/ssl/OWNERS
+++ b/chrome/browser/ssl/OWNERS
@@ -4,6 +4,3 @@
 felt@chromium.org
 meacer@chromium.org
 rsleevi@chromium.org
-
-# TEAM: security-enamel@chromium.org
-# COMPONENT: UI>Browser>Interstitials
diff --git a/chrome/browser/status_icons/DIR_METADATA b/chrome/browser/status_icons/DIR_METADATA
new file mode 100644
index 0000000..51aa2df
--- /dev/null
+++ b/chrome/browser/status_icons/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "UI>Shell>StatusArea"
+}
diff --git a/chrome/browser/status_icons/OWNERS b/chrome/browser/status_icons/OWNERS
index b8894adf..3e63b462 100644
--- a/chrome/browser/status_icons/OWNERS
+++ b/chrome/browser/status_icons/OWNERS
@@ -1,3 +1 @@
 atwilson@chromium.org
-
-# COMPONENT: UI>Shell>StatusArea
diff --git a/chrome/browser/storage/DIR_METADATA b/chrome/browser/storage/DIR_METADATA
new file mode 100644
index 0000000..ed87c37
--- /dev/null
+++ b/chrome/browser/storage/DIR_METADATA
@@ -0,0 +1,4 @@
+monorail:  {
+  component:  "Blink>Storage>Quota"
+}
+team_email:  "storage-dev@chromium.org"
diff --git a/chrome/browser/storage/OWNERS b/chrome/browser/storage/OWNERS
index 8cefc415..c7962de 100644
--- a/chrome/browser/storage/OWNERS
+++ b/chrome/browser/storage/OWNERS
@@ -3,6 +3,3 @@
 pwnall@chromium.org
 
 per-file *permission_context*=file://components/permissions/PERMISSIONS_OWNERS
-
-# TEAM: storage-dev@chromium.org
-# COMPONENT: Blink>Storage>Quota
diff --git a/chrome/browser/subresource_filter/DIR_METADATA b/chrome/browser/subresource_filter/DIR_METADATA
new file mode 100644
index 0000000..ee26cc0
--- /dev/null
+++ b/chrome/browser/subresource_filter/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "UI>Browser>AdFilter"
+}
diff --git a/chrome/browser/subresource_filter/OWNERS b/chrome/browser/subresource_filter/OWNERS
index 2f591e86..5c9fd14 100644
--- a/chrome/browser/subresource_filter/OWNERS
+++ b/chrome/browser/subresource_filter/OWNERS
@@ -1,3 +1 @@
 file://components/subresource_filter/OWNERS
-
-# COMPONENT: UI>Browser>AdFilter
\ No newline at end of file
diff --git a/chrome/browser/subresource_redirect/DIR_METADATA b/chrome/browser/subresource_redirect/DIR_METADATA
new file mode 100644
index 0000000..b0650c8
--- /dev/null
+++ b/chrome/browser/subresource_redirect/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "Internals>Network>DataProxy"
+}
diff --git a/chrome/browser/subresource_redirect/OWNERS b/chrome/browser/subresource_redirect/OWNERS
index be748d62..2783dea 100644
--- a/chrome/browser/subresource_redirect/OWNERS
+++ b/chrome/browser/subresource_redirect/OWNERS
@@ -1,3 +1 @@
 file://components/data_reduction_proxy/OWNERS
-
-# COMPONENT: Internals>Network>DataProxy
diff --git a/chrome/browser/supervised_user/DIR_METADATA b/chrome/browser/supervised_user/DIR_METADATA
new file mode 100644
index 0000000..b0c85ce1
--- /dev/null
+++ b/chrome/browser/supervised_user/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "Services>SupervisedUser"
+}
diff --git a/chrome/browser/supervised_user/OWNERS b/chrome/browser/supervised_user/OWNERS
index 462930de..ae2c41c 100644
--- a/chrome/browser/supervised_user/OWNERS
+++ b/chrome/browser/supervised_user/OWNERS
@@ -5,5 +5,3 @@
 
 # Previous owner, feel free to add for any questions or historical context:
 # treib@chromium.org
-
-# COMPONENT: Services>SupervisedUser
diff --git a/chrome/browser/supervised_user/supervised_user_error_page/DIR_METADATA b/chrome/browser/supervised_user/supervised_user_error_page/DIR_METADATA
new file mode 100644
index 0000000..b0c85ce1
--- /dev/null
+++ b/chrome/browser/supervised_user/supervised_user_error_page/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "Services>SupervisedUser"
+}
diff --git a/chrome/browser/supervised_user/supervised_user_error_page/OWNERS b/chrome/browser/supervised_user/supervised_user_error_page/OWNERS
index 507bdf4..c2f8c29 100644
--- a/chrome/browser/supervised_user/supervised_user_error_page/OWNERS
+++ b/chrome/browser/supervised_user/supervised_user_error_page/OWNERS
@@ -3,5 +3,3 @@
 
 # Previous owner, feel free to add for any questions or historical context:
 # treib@chromium.org
-
-# COMPONENT: Services>SupervisedUser
diff --git a/chrome/browser/sync/DIR_METADATA b/chrome/browser/sync/DIR_METADATA
new file mode 100644
index 0000000..4a34521
--- /dev/null
+++ b/chrome/browser/sync/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "Services>Sync"
+}
diff --git a/chrome/browser/sync/OWNERS b/chrome/browser/sync/OWNERS
index b717eb64..ca6b57a 100644
--- a/chrome/browser/sync/OWNERS
+++ b/chrome/browser/sync/OWNERS
@@ -3,5 +3,3 @@
 per-file profile_sync_service_android*=nyquist@chromium.org
 per-file *web_app*=file://chrome/browser/web_applications/OWNERS
 per-file wifi_configuration*=file://chromeos/components/sync_wifi/OWNERS
-
-# COMPONENT: Services>Sync
diff --git a/chrome/browser/sync/test/integration/migration_test.cc b/chrome/browser/sync/test/integration/migration_test.cc
index 2171094..1f28ca0 100644
--- a/chrome/browser/sync/test/integration/migration_test.cc
+++ b/chrome/browser/sync/test/integration/migration_test.cc
@@ -116,6 +116,7 @@
     // request that it be migrated.
     preferred_data_types.Remove(syncer::AUTOFILL_WALLET_DATA);
     preferred_data_types.Remove(syncer::AUTOFILL_WALLET_METADATA);
+    preferred_data_types.Remove(syncer::AUTOFILL_WALLET_OFFER);
 
     // ARC package will be unready during this test, so we should not request
     // that it be migrated.
diff --git a/chrome/browser/sync/test/integration/two_client_web_apps_bmo_sync_test.cc b/chrome/browser/sync/test/integration/two_client_web_apps_bmo_sync_test.cc
index 5d5bb52..acb202c 100644
--- a/chrome/browser/sync/test/integration/two_client_web_apps_bmo_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_web_apps_bmo_sync_test.cc
@@ -9,7 +9,6 @@
 #include "build/build_config.h"
 #include "build/chromeos_buildflags.h"
 #include "chrome/app/chrome_command_ids.h"
-#include "chrome/browser/installable/installable_metrics.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
@@ -29,6 +28,7 @@
 #include "chrome/browser/web_applications/web_app_provider.h"
 #include "chrome/browser/web_applications/web_app_registrar.h"
 #include "chrome/test/base/ui_test_utils.h"
+#include "components/webapps/installable/installable_metrics.h"
 #include "content/public/test/browser_test.h"
 #include "content/public/test/test_utils.h"
 #include "extensions/browser/app_sorting.h"
@@ -96,7 +96,8 @@
 
   AppId InstallAppAsUserInitiated(
       Profile* profile,
-      WebappInstallSource source = WebappInstallSource::OMNIBOX_INSTALL_ICON,
+      webapps::WebappInstallSource source =
+          webapps::WebappInstallSource::OMNIBOX_INSTALL_ICON,
       GURL start_url = GURL()) {
     Browser* browser = CreateBrowser(profile);
     if (!start_url.is_valid())
@@ -122,12 +123,13 @@
   }
 
   AppId InstallApp(const WebApplicationInfo& info, Profile* profile) {
-    return InstallApp(info, profile, WebappInstallSource::OMNIBOX_INSTALL_ICON);
+    return InstallApp(info, profile,
+                      webapps::WebappInstallSource::OMNIBOX_INSTALL_ICON);
   }
 
   AppId InstallApp(const WebApplicationInfo& info,
                    Profile* profile,
-                   WebappInstallSource source) {
+                   webapps::WebappInstallSource source) {
     DCHECK(info.start_url.is_valid());
 
     base::RunLoop run_loop;
@@ -347,7 +349,7 @@
 
   // Install a non-syncing web app.
   AppId app_id = InstallAppAsUserInitiated(
-      GetProfile(0), WebappInstallSource::EXTERNAL_DEFAULT);
+      GetProfile(0), webapps::WebappInstallSource::EXTERNAL_DEFAULT);
 
   // Install a 'dummy' app & wait for installation to ensure sync has processed
   // the initial apps.
@@ -367,7 +369,7 @@
 
   // Install a non-syncing web app.
   AppId app_id = InstallAppAsUserInitiated(
-      GetProfile(0), WebappInstallSource::EXTERNAL_DEFAULT);
+      GetProfile(0), webapps::WebappInstallSource::EXTERNAL_DEFAULT);
 
   // Install the same app as a syncing app on profile 1.
   AppId app_id2 = InstallAppAsUserInitiated(GetProfile(1));
@@ -410,7 +412,7 @@
 
   // Install a non-syncing web app.
   AppId app_id = InstallAppAsUserInitiated(
-      GetProfile(0), WebappInstallSource::EXTERNAL_POLICY);
+      GetProfile(0), webapps::WebappInstallSource::EXTERNAL_POLICY);
 
   // Install the same app as a syncing app on profile 1.
   AppId app_id2 = InstallAppAsUserInitiated(GetProfile(1));
@@ -478,7 +480,7 @@
   // Install two different apps.
   AppId app_id1 = InstallAppAsUserInitiated(GetProfile(0));
   AppId app_id2 = InstallAppAsUserInitiated(
-      GetProfile(0), WebappInstallSource::OMNIBOX_INSTALL_ICON,
+      GetProfile(0), webapps::WebappInstallSource::OMNIBOX_INSTALL_ICON,
       GetUserInitiatedAppURL2());
 
   ASSERT_NE(app_id1, app_id2);
diff --git a/chrome/browser/sync/test/integration/two_client_web_apps_sync_test.cc b/chrome/browser/sync/test/integration/two_client_web_apps_sync_test.cc
index ebeb6ae..2c830c9 100644
--- a/chrome/browser/sync/test/integration/two_client_web_apps_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_web_apps_sync_test.cc
@@ -8,7 +8,6 @@
 #include "base/test/bind.h"
 #include "build/chromeos_buildflags.h"
 #include "chrome/app/chrome_command_ids.h"
-#include "chrome/browser/installable/installable_metrics.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
@@ -21,6 +20,7 @@
 #include "chrome/browser/web_applications/test/web_app_install_observer.h"
 #include "chrome/browser/web_applications/web_app_provider.h"
 #include "chrome/test/base/ui_test_utils.h"
+#include "components/webapps/installable/installable_metrics.h"
 #include "content/public/test/browser_test.h"
 #include "content/public/test/test_utils.h"
 #include "third_party/blink/public/common/manifest/manifest.h"
@@ -50,7 +50,7 @@
 
     WebAppProvider::Get(profile)->install_manager().InstallWebAppFromInfo(
         std::make_unique<WebApplicationInfo>(info), ForInstallableSite::kYes,
-        WebappInstallSource::OMNIBOX_INSTALL_ICON,
+        webapps::WebappInstallSource::OMNIBOX_INSTALL_ICON,
         base::BindLambdaForTesting(
             [&run_loop, &app_id](const AppId& new_app_id,
                                  InstallResultCode code) {
diff --git a/chrome/browser/sync_file_system/DIR_METADATA b/chrome/browser/sync_file_system/DIR_METADATA
new file mode 100644
index 0000000..e898987
--- /dev/null
+++ b/chrome/browser/sync_file_system/DIR_METADATA
@@ -0,0 +1,4 @@
+monorail:  {
+  component:  "Blink>Storage>FileSystem"
+}
+team_email:  "storage-dev@chromium.org"
diff --git a/chrome/browser/sync_file_system/OWNERS b/chrome/browser/sync_file_system/OWNERS
index 6b8c78b..ecd339e 100644
--- a/chrome/browser/sync_file_system/OWNERS
+++ b/chrome/browser/sync_file_system/OWNERS
@@ -1,6 +1,3 @@
 kinuko@chromium.org
 nhiroki@chromium.org
 pwnall@chromium.org
-
-# TEAM: storage-dev@chromium.org
-# COMPONENT: Blink>Storage>FileSystem
diff --git a/chrome/browser/tab/DIR_METADATA b/chrome/browser/tab/DIR_METADATA
new file mode 100644
index 0000000..4e634b0
--- /dev/null
+++ b/chrome/browser/tab/DIR_METADATA
@@ -0,0 +1 @@
+os:  ANDROID
diff --git a/chrome/browser/tab/OWNERS b/chrome/browser/tab/OWNERS
index 6f8ed05..185f573 100644
--- a/chrome/browser/tab/OWNERS
+++ b/chrome/browser/tab/OWNERS
@@ -2,5 +2,3 @@
 jinsukkim@chromium.org
 nyquist@chromium.org
 yusufo@chromium.org
-
-# OS: Android
diff --git a/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/EmptyTabObserver.java b/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/EmptyTabObserver.java
index 5aa1647..70de2f3 100644
--- a/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/EmptyTabObserver.java
+++ b/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/EmptyTabObserver.java
@@ -15,6 +15,7 @@
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.net.NetError;
 import org.chromium.ui.base.WindowAndroid;
+import org.chromium.url.GURL;
 
 /**
  * An implementation of the {@link TabObserver} which has empty implementations of all methods.
@@ -45,10 +46,10 @@
     public void onLoadUrl(Tab tab, LoadUrlParams params, int loadType) {}
 
     @Override
-    public void onPageLoadStarted(Tab tab, String url) {}
+    public void onPageLoadStarted(Tab tab, GURL url) {}
 
     @Override
-    public void onPageLoadFinished(Tab tab, String url) {}
+    public void onPageLoadFinished(Tab tab, GURL url) {}
 
     @Override
     public void onPageLoadFailed(Tab tab, @NetError int errorCode) {}
diff --git a/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/TabObserver.java b/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/TabObserver.java
index 586ee1272..7ba8fb3 100644
--- a/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/TabObserver.java
+++ b/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/TabObserver.java
@@ -14,6 +14,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;
 
 /**
  * An observer that is notified of changes to a {@link Tab} object.
@@ -86,19 +87,17 @@
      * <p>
      * For visual loading indicators/throbbers, {@link #onLoadStarted(Tab)} and
      * {@link #onLoadStopped(Tab)} should be used to drive updates.
-     *
-     * @param tab The notifying {@link Tab}.
+     *  @param tab The notifying {@link Tab}.
      * @param url The committed URL being navigated to.
      */
-    void onPageLoadStarted(Tab tab, String url);
+    void onPageLoadStarted(Tab tab, GURL url);
 
     /**
      * Called when a tab has finished loading a page.
-     *
-     * @param tab The notifying {@link Tab}.
+     *  @param tab The notifying {@link Tab}.
      * @param url The committed URL that was navigated to.
      */
-    void onPageLoadFinished(Tab tab, String url);
+    void onPageLoadFinished(Tab tab, GURL url);
 
     /**
      * Called when a tab has failed loading a page.
@@ -182,9 +181,9 @@
 
     /**
      * Called when the WebContents starts loading. Different from
-     * {@link #onPageLoadStarted(Tab, String)}, if the user is navigated to a different url while
+     * {@link #onPageLoadStarted(Tab, GURL)}, if the user is navigated to a different url while
      * staying in the same html document, {@link #onLoadStarted(Tab)} will be called, while
-     * {@link #onPageLoadStarted(Tab, String)} will not.
+     * {@link #onPageLoadStarted(Tab, GURL)} will not.
      * @param tab The notifying {@link Tab}.
      * @param toDifferentDocument Whether this navigation will transition between
      * documents (i.e., not a fragment navigation or JS History API call).
diff --git a/chrome/browser/tab_contents/DIR_METADATA b/chrome/browser/tab_contents/DIR_METADATA
new file mode 100644
index 0000000..3d8600bf
--- /dev/null
+++ b/chrome/browser/tab_contents/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "UI>Browser"
+}
diff --git a/chrome/browser/tab_contents/OWNERS b/chrome/browser/tab_contents/OWNERS
index a3d4786..704db9f 100644
--- a/chrome/browser/tab_contents/OWNERS
+++ b/chrome/browser/tab_contents/OWNERS
@@ -1,2 +1 @@
 avi@chromium.org
-# COMPONENT: UI>Browser
diff --git a/chrome/browser/tabmodel/DIR_METADATA b/chrome/browser/tabmodel/DIR_METADATA
new file mode 100644
index 0000000..875946bb
--- /dev/null
+++ b/chrome/browser/tabmodel/DIR_METADATA
@@ -0,0 +1,5 @@
+monorail:  {
+  component:  "UI>Browser>Mobile>TabModel"
+}
+team_email:  "clank-app-team@google.com"
+os:  ANDROID
diff --git a/chrome/browser/tabmodel/OWNERS b/chrome/browser/tabmodel/OWNERS
index c3390b8..ed81765 100644
--- a/chrome/browser/tabmodel/OWNERS
+++ b/chrome/browser/tabmodel/OWNERS
@@ -1,8 +1,3 @@
 dtrainor@chromium.org
 hnakashima@chromium.org
 meiliang@chromium.org
-
-# TEAM: clank-app-team@google.com
-# COMPONENT: UI>Browser>Mobile>TabModel
-# OS: Android
-
diff --git a/chrome/browser/tabpersistence/DIR_METADATA b/chrome/browser/tabpersistence/DIR_METADATA
new file mode 100644
index 0000000..6388584
--- /dev/null
+++ b/chrome/browser/tabpersistence/DIR_METADATA
@@ -0,0 +1,5 @@
+monorail:  {
+  component:  "UI>Browser>Mobile"
+}
+team_email:  "clank-app-team@google.com"
+os:  ANDROID
diff --git a/chrome/browser/tabpersistence/OWNERS b/chrome/browser/tabpersistence/OWNERS
index efa7ebfb..697c69ed 100644
--- a/chrome/browser/tabpersistence/OWNERS
+++ b/chrome/browser/tabpersistence/OWNERS
@@ -1,5 +1 @@
 file://chrome/android/OWNERS
-
-# TEAM: clank-app-team@google.com
-# COMPONENT: UI>Browser>Mobile
-# OS: Android
diff --git a/chrome/browser/task_manager/DIR_METADATA b/chrome/browser/task_manager/DIR_METADATA
new file mode 100644
index 0000000..777f8c5
--- /dev/null
+++ b/chrome/browser/task_manager/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "UI>TaskManager"
+}
diff --git a/chrome/browser/task_manager/OWNERS b/chrome/browser/task_manager/OWNERS
index 67739e3a9..111b3ba 100644
--- a/chrome/browser/task_manager/OWNERS
+++ b/chrome/browser/task_manager/OWNERS
@@ -1,3 +1 @@
 afakhry@chromium.org
-
-# COMPONENT: UI>TaskManager
diff --git a/chrome/browser/test_dummy/DIR_METADATA b/chrome/browser/test_dummy/DIR_METADATA
new file mode 100644
index 0000000..1c6c7fa3
--- /dev/null
+++ b/chrome/browser/test_dummy/DIR_METADATA
@@ -0,0 +1,5 @@
+monorail:  {
+  component:  "Mobile>FeatureModules"
+}
+team_email:  "clank-lego@chromium.org"
+os:  ANDROID
diff --git a/chrome/browser/test_dummy/OWNERS b/chrome/browser/test_dummy/OWNERS
index 38b4dc2..eff9811d 100644
--- a/chrome/browser/test_dummy/OWNERS
+++ b/chrome/browser/test_dummy/OWNERS
@@ -1,8 +1,3 @@
 fredmello@chromium.org
 huangs@chromium.org
 wnwen@chromium.org
-
-# TEAM: clank-lego@chromium.org
-# COMPONENT: Mobile>FeatureModules
-# OS: Android
-
diff --git a/chrome/browser/tflite_experiment/DIR_METADATA b/chrome/browser/tflite_experiment/DIR_METADATA
new file mode 100644
index 0000000..142a254
--- /dev/null
+++ b/chrome/browser/tflite_experiment/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "Internals>OptimizationGuide"
+}
diff --git a/chrome/browser/tflite_experiment/OWNERS b/chrome/browser/tflite_experiment/OWNERS
index 3d1e06b..1ee724d 100644
--- a/chrome/browser/tflite_experiment/OWNERS
+++ b/chrome/browser/tflite_experiment/OWNERS
@@ -1,3 +1 @@
 file://components/optimization_guide/OWNERS
-
-# COMPONENT: Internals>OptimizationGuide
diff --git a/chrome/browser/themes/DIR_METADATA b/chrome/browser/themes/DIR_METADATA
new file mode 100644
index 0000000..18d07219
--- /dev/null
+++ b/chrome/browser/themes/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "UI>Browser>Themes"
+}
diff --git a/chrome/browser/themes/OWNERS b/chrome/browser/themes/OWNERS
index 8bbbf35..ab6aa4c 100644
--- a/chrome/browser/themes/OWNERS
+++ b/chrome/browser/themes/OWNERS
@@ -1,5 +1,3 @@
 estade@chromium.org
 pkasting@chromium.org
 pkotwicz@chromium.org
-
-# COMPONENT: UI>Browser>Themes
diff --git a/chrome/browser/thumbnail/DIR_METADATA b/chrome/browser/thumbnail/DIR_METADATA
new file mode 100644
index 0000000..d3e49d2b9
--- /dev/null
+++ b/chrome/browser/thumbnail/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "UI>Browser>Thumbnail"
+}
diff --git a/chrome/browser/thumbnail/OWNERS b/chrome/browser/thumbnail/OWNERS
index c38b7ccb..a876e63 100644
--- a/chrome/browser/thumbnail/OWNERS
+++ b/chrome/browser/thumbnail/OWNERS
@@ -1,4 +1,2 @@
 dtrainor@chromium.org
 wychen@chromium.org
-
-# COMPONENT: UI>Browser>Thumbnail
\ No newline at end of file
diff --git a/chrome/browser/touch_to_fill/DIR_METADATA b/chrome/browser/touch_to_fill/DIR_METADATA
new file mode 100644
index 0000000..41b767ea
--- /dev/null
+++ b/chrome/browser/touch_to_fill/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "UI>Browser>Passwords"
+}
diff --git a/chrome/browser/touch_to_fill/OWNERS b/chrome/browser/touch_to_fill/OWNERS
index 4f16b7c..2d3493b 100644
--- a/chrome/browser/touch_to_fill/OWNERS
+++ b/chrome/browser/touch_to_fill/OWNERS
@@ -1,3 +1 @@
 file://chrome/browser/password_manager/OWNERS
-
-# COMPONENT: UI>Browser>Passwords
diff --git a/chrome/browser/touch_to_fill/android/DIR_METADATA b/chrome/browser/touch_to_fill/android/DIR_METADATA
new file mode 100644
index 0000000..41b767ea
--- /dev/null
+++ b/chrome/browser/touch_to_fill/android/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail:  {
+  component:  "UI>Browser>Passwords"
+}
diff --git a/chrome/browser/touch_to_fill/android/OWNERS b/chrome/browser/touch_to_fill/android/OWNERS
index ea9b03f9..e6e4ee91 100644
--- a/chrome/browser/touch_to_fill/android/OWNERS
+++ b/chrome/browser/touch_to_fill/android/OWNERS
@@ -1,5 +1,3 @@
 jdoerrie@chromium.org
 fhorschig@chromium.org
 bsazonov@chromium.org
-
-# COMPONENT: UI>Browser>Passwords
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
index cc312e0..28c8616 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -187,6 +187,7 @@
     "webauthn/authenticator_request_dialog.h",
     "webid/identity_dialog_controller.cc",
     "webid/identity_dialog_controller.h",
+    "webid/identity_dialogs.h",
     "webui/about_ui.cc",
     "webui/about_ui.h",
     "webui/autofill_and_password_manager_internals/autofill_internals_ui.cc",
@@ -531,6 +532,7 @@
     "//components/viz/host",
     "//components/web_cache/browser",
     "//components/web_resource",
+    "//components/webapps",
     "//components/webrtc_logging/browser",
     "//content/app/resources",
     "//content/browser/webrtc/resources",
@@ -755,6 +757,7 @@
       "android/tab_model/tab_model_observer_jni_bridge.h",
       "android/toolbar/location_bar_model_android.cc",
       "android/toolbar/location_bar_model_android.h",
+      "android/webid/identity_dialogs_android.cc",
       "browser_otr_state_android.cc",
       "javascript_dialogs/javascript_tab_modal_dialog_manager_delegate_android.cc",
       "javascript_dialogs/javascript_tab_modal_dialog_manager_delegate_android.h",
@@ -4147,6 +4150,10 @@
       "views/webauthn/sheet_view_factory.h",
       "views/webauthn/webauthn_hover_button.cc",
       "views/webauthn/webauthn_hover_button.h",
+      "views/webid/webid_permission_infobar.cc",
+      "views/webid/webid_permission_infobar.h",
+      "views/webid/webid_signin_window.cc",
+      "views/webid/webid_signin_window.h",
       "views/window_name_prompt.cc",
       "webauthn/account_hover_list_model.cc",
       "webauthn/account_hover_list_model.h",
diff --git a/chrome/browser/ui/android/webid/OWNERS b/chrome/browser/ui/android/webid/OWNERS
new file mode 100644
index 0000000..cfed0af
--- /dev/null
+++ b/chrome/browser/ui/android/webid/OWNERS
@@ -0,0 +1 @@
+file://content/browser/webid/OWNERS
diff --git a/chrome/browser/ui/android/webid/identity_dialogs_android.cc b/chrome/browser/ui/android/webid/identity_dialogs_android.cc
new file mode 100644
index 0000000..e6af46b
--- /dev/null
+++ b/chrome/browser/ui/android/webid/identity_dialogs_android.cc
@@ -0,0 +1,30 @@
+// Copyright 2020 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/ui/webid/identity_dialogs.h"
+
+#include <string>
+#include "base/callback.h"
+#include "base/notreached.h"
+#include "base/strings/string16.h"
+#include "content/public/browser/identity_request_dialog_controller.h"
+#include "content/public/browser/web_contents.h"
+#include "url/gurl.h"
+
+// Stub implementations for Identity UI on Android.
+
+void ShowWebIDPermissionInfoBar(
+    content::WebContents* web_contents,
+    const base::string16& message,
+    content::IdentityRequestDialogController::InitialApprovalCallback
+        callback) {
+  NOTIMPLEMENTED();
+}
+
+void ShowWebIDSigninWindow(content::WebContents* web_contents,
+                           const GURL& idp_signin_url,
+                           base::OnceCallback<void(std::string)> on_done,
+                           base::OnceCallback<void()> on_close) {
+  NOTIMPLEMENTED();
+}
diff --git a/chrome/browser/ui/ash/launcher/shelf_context_menu_unittest.cc b/chrome/browser/ui/ash/launcher/shelf_context_menu_unittest.cc
index 5def6b7..021ba85 100644
--- a/chrome/browser/ui/ash/launcher/shelf_context_menu_unittest.cc
+++ b/chrome/browser/ui/ash/launcher/shelf_context_menu_unittest.cc
@@ -27,7 +27,6 @@
 #include "chrome/browser/chromeos/guest_os/guest_os_registry_service_factory.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/test_extension_system.h"
-#include "chrome/browser/installable/installable_metrics.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_icon.h"
diff --git a/chrome/browser/ui/extensions/hosted_app_browser_controller.cc b/chrome/browser/ui/extensions/hosted_app_browser_controller.cc
index cb11a3d..c1595bc 100644
--- a/chrome/browser/ui/extensions/hosted_app_browser_controller.cc
+++ b/chrome/browser/ui/extensions/hosted_app_browser_controller.cc
@@ -10,7 +10,6 @@
 #include "chrome/browser/apps/app_service/app_service_proxy_factory.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/extensions/tab_helper.h"
-#include "chrome/browser/installable/installable_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ssl/security_state_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/ui/hats/hats_service.cc b/chrome/browser/ui/hats/hats_service.cc
index 7f9eda4..a954c36 100644
--- a/chrome/browser/ui/hats/hats_service.cc
+++ b/chrome/browser/ui/hats/hats_service.cc
@@ -34,14 +34,6 @@
 constexpr char kHatsSurveyTriggerSatisfaction[] = "satisfaction";
 constexpr char kHatsSurveyTriggerSettings[] = "settings";
 constexpr char kHatsSurveyTriggerSettingsPrivacy[] = "settings-privacy";
-constexpr char kHatsSurveyTriggerDevToolsIssuesCOEP[] = "devtools-issues-coep";
-constexpr char kHatsSurveyTriggerDevToolsIssuesMixedContent[] =
-    "devtools-issues-mixed-content";
-constexpr char kHatsSurveyTriggerDevToolsIssuesCookiesSameSite[] =
-    "devtools-issues-cookies-samesite";
-constexpr char kHatsSurveyTriggerDevToolsIssuesHeavyAd[] =
-    "devtools-issues-heavy-ad";
-constexpr char kHatsSurveyTriggerDevToolsIssuesCSP[] = "devtools-issues-csp";
 
 constexpr char kHatsNextSurveyTriggerIDTesting[] =
     "zishSVViB0kPN8UwQ150VGjBKuBP";
@@ -51,19 +43,6 @@
 
 namespace {
 
-const base::Feature* survey_features[] = {
-    &features::kHappinessTrackingSurveysForDesktop,
-    &features::kHaTSDesktopDevToolsIssuesCOEP,
-    &features::kHaTSDesktopDevToolsIssuesMixedContent,
-    &features::kHappinessTrackingSurveysForDesktopDevToolsIssuesCookiesSameSite,
-    &features::kHaTSDesktopDevToolsIssuesHeavyAd,
-    &features::kHaTSDesktopDevToolsIssuesCSP,
-    &features::kHappinessTrackingSurveysForDesktopSettings,
-    &features::kHappinessTrackingSurveysForDesktopSettingsPrivacy};
-
-// Which survey we're triggering
-constexpr char kHatsSurveyTrigger[] = "survey";
-
 constexpr char kHatsSurveyProbability[] = "probability";
 
 constexpr char kHatsSurveyEnSiteID[] = "en_site_id";
@@ -140,24 +119,58 @@
   hats_service_->RemoveTask(*this);
 }
 
+struct SurveyIdentifiers {
+  const base::Feature* feature;
+  const char* trigger;
+  const char* trigger_id;
+};
+
+const char* kTriggerIdProvidedByFeatureParams = "";
+
+// The Feature for each survey is generally disabled by default, and only
+// enabled via a Finch config. The trigger_id can be provided via feature
+// params. If the feature params don't contain a trigger_id (called en_site_id
+// in the params), the fallback here will be used. For features that we want to
+// enable all at the same time (in the same 'group'), we can't provide the
+// trigger_id via feature params due to a limitation that prevents duplicate
+// param names, even for different features within a group.
+const SurveyIdentifiers surveys[] = {
+    {&features::kHappinessTrackingSurveysForDesktop,
+     kHatsSurveyTriggerSatisfaction, "test_site_id"},
+    {&features::kHaTSDesktopDevToolsIssuesCOEP, "devtools-issues-coep",
+     "1DbEs89FS0ugnJ3q1cK0Nx6T99yT"},
+    {&features::kHaTSDesktopDevToolsIssuesMixedContent,
+     "devtools-issues-mixed-content", "BhCYpUmyf0ugnJ3q1cK0VtxCftzo"},
+    {&features::
+         kHappinessTrackingSurveysForDesktopDevToolsIssuesCookiesSameSite,
+     "devtools-issues-cookies-samesite", "w9JqqpmEr0ugnJ3q1cK0NezVg4iK"},
+    {&features::kHaTSDesktopDevToolsIssuesHeavyAd, "devtools-issues-heavy-ad",
+     "bAeiT5J4P0ugnJ3q1cK0Ra6jg7s8"},
+    {&features::kHaTSDesktopDevToolsIssuesCSP, "devtools-issues-csp",
+     "c9fjDmwjb0ugnJ3q1cK0USeAJJ9C"},
+    {&features::kHappinessTrackingSurveysForDesktopSettings,
+     kHatsSurveyTriggerSettings, kTriggerIdProvidedByFeatureParams},
+    {&features::kHappinessTrackingSurveysForDesktopSettingsPrivacy,
+     kHatsSurveyTriggerSettingsPrivacy, kTriggerIdProvidedByFeatureParams},
+};
+
 HatsService::HatsService(Profile* profile) : profile_(profile) {
   constexpr char kHatsSurveyUserPrompted[] = "user_prompted";
   constexpr bool kHatsSurveyUserPromptedDefault = false;
 
-  for (auto* survey_feature : survey_features) {
-    if (!base::FeatureList::IsEnabled(*survey_feature))
+  for (const SurveyIdentifiers& survey : surveys) {
+    if (!base::FeatureList::IsEnabled(*survey.feature))
       continue;
     survey_configs_by_triggers_.emplace(
-        base::FeatureParam<std::string>(survey_feature, kHatsSurveyTrigger, "")
-            .Get(),
+        survey.trigger,
         SurveyConfig(
-            base::FeatureParam<double>(survey_feature, kHatsSurveyProbability,
+            base::FeatureParam<double>(survey.feature, kHatsSurveyProbability,
                                        kHatsSurveyProbabilityDefault)
                 .Get(),
-            base::FeatureParam<std::string>(survey_feature, kHatsSurveyEnSiteID,
-                                            kHatsSurveyEnSiteIDDefault)
+            base::FeatureParam<std::string>(survey.feature, kHatsSurveyEnSiteID,
+                                            survey.trigger_id)
                 .Get(),
-            base::FeatureParam<bool>(survey_feature, kHatsSurveyUserPrompted,
+            base::FeatureParam<bool>(survey.feature, kHatsSurveyUserPrompted,
                                      kHatsSurveyUserPromptedDefault)
                 .Get()));
   }
diff --git a/chrome/browser/ui/manifest_web_app_browser_controller.cc b/chrome/browser/ui/manifest_web_app_browser_controller.cc
index 5c3ef5e..dfcb183 100644
--- a/chrome/browser/ui/manifest_web_app_browser_controller.cc
+++ b/chrome/browser/ui/manifest_web_app_browser_controller.cc
@@ -4,10 +4,10 @@
 
 #include "chrome/browser/ui/manifest_web_app_browser_controller.h"
 
-#include "chrome/browser/installable/installable_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ssl/security_state_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
+#include "components/webapps/installable/installable_manager.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/common/url_constants.h"
 #include "extensions/common/constants.h"
@@ -47,7 +47,7 @@
 
   // Show if on a insecure external website. This checks the security level,
   // different from IsOriginSecure which just checks the origin itself.
-  if (!InstallableManager::IsContentSecure(web_contents))
+  if (!webapps::InstallableManager::IsContentSecure(web_contents))
     return true;
 
   return false;
diff --git a/chrome/browser/ui/passwords/manage_passwords_test.cc b/chrome/browser/ui/passwords/manage_passwords_test.cc
index 605b7c4a..e2b439a 100644
--- a/chrome/browser/ui/passwords/manage_passwords_test.cc
+++ b/chrome/browser/ui/passwords/manage_passwords_test.cc
@@ -153,10 +153,9 @@
       PasswordStoreFactory::GetForProfile(browser()->profile(),
                                           ServiceAccessType::IMPLICIT_ACCESS);
   // This is an unrelated compromised credential that should still be fixed.
-  password_manager::CompromisedCredentials compromised = {
-      .signon_realm = "https://somesite.com/",
-      .username = ASCIIToUTF16(kTestUsername),
-  };
+  password_manager::CompromisedCredentials compromised(
+      "https://somesite.com/", ASCIIToUTF16(kTestUsername), base::Time(),
+      password_manager::CompromiseType::kLeaked, false);
   password_store->AddCompromisedCredentials(compromised);
   SetupPendingPassword();
   GetController()->SavePassword(password_form_.username_value,
@@ -173,14 +172,12 @@
       PasswordStoreFactory::GetForProfile(browser()->profile(),
                                           ServiceAccessType::IMPLICIT_ACCESS);
   // This is an unrelated compromised credential that should still be fixed.
-  password_manager::CompromisedCredentials some_compromised = {
-      .signon_realm = "https://somesite.com/",
-      .username = ASCIIToUTF16(kTestUsername),
-  };
-  password_manager::CompromisedCredentials current_compromised = {
-      .signon_realm = password_form_.signon_realm,
-      .username = password_form_.username_value,
-  };
+  password_manager::CompromisedCredentials some_compromised(
+      "https://somesite.com/", ASCIIToUTF16(kTestUsername), base::Time(),
+      password_manager::CompromiseType::kLeaked, false);
+  password_manager::CompromisedCredentials current_compromised(
+      password_form_.signon_realm, password_form_.username_value, base::Time(),
+      password_manager::CompromiseType::kLeaked, false);
   password_store->AddCompromisedCredentials(some_compromised);
   password_store->AddCompromisedCredentials(current_compromised);
   SetupPendingPassword();
@@ -237,10 +234,9 @@
           base::WrapUnique(new password_manager::StubFormSaver)),
       nullptr /*  metrics_recorder */);
 
-  password_manager::CompromisedCredentials compromised = {
-      .signon_realm = password_form_.signon_realm,
-      .username = password_form_.username_value,
-  };
+  password_manager::CompromisedCredentials compromised(
+      password_form_.signon_realm, password_form_.username_value, base::Time(),
+      password_manager::CompromiseType::kLeaked, false);
   fetcher_.set_compromised({compromised});
 
   fetcher_.NotifyFetchCompleted();
diff --git a/chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc b/chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc
index 652a895..b995949 100644
--- a/chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc
+++ b/chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc
@@ -212,11 +212,9 @@
 }
 
 CompromisedCredentials CreateCompromised(const PasswordForm& form) {
-  return CompromisedCredentials{
-      .signon_realm = form.signon_realm,
-      .username = form.username_value,
-      .compromise_type = password_manager::CompromiseType::kLeaked,
-  };
+  return CompromisedCredentials(
+      form.signon_realm, form.username_value, base::Time(),
+      password_manager::CompromiseType::kLeaked, false);
 }
 
 }  // namespace
diff --git a/chrome/browser/ui/profile_picker.h b/chrome/browser/ui/profile_picker.h
index 4eb57dc..5315cc16 100644
--- a/chrome/browser/ui/profile_picker.h
+++ b/chrome/browser/ui/profile_picker.h
@@ -54,10 +54,11 @@
   // Starts the sign-in flow. The layout of the window gets updated for the
   // sign-in flow. At the same time, the new profile is created (with
   // `profile_color`) and the sign-in page is rendered using the new profile.
-  // If the creation of the new profile fails, `switch_failure_callback` gets
-  // called.
-  static void SwitchToSignIn(SkColor profile_color,
-                             base::OnceClosure switch_failure_callback);
+  // `switch_finished_callback` gets informed whether the creation of the new
+  // profile succeeded and the sign-in page gets displayed.
+  static void SwitchToSignIn(
+      SkColor profile_color,
+      base::OnceCallback<void(bool)> switch_finished_callback);
 
   // Finishes the sign-in flow by moving to the sync confirmation screen. It
   // uses the same new profile created by `SwitchToSignIn()`.
diff --git a/chrome/browser/ui/startup/credential_provider_signin_dialog_win.cc b/chrome/browser/ui/startup/credential_provider_signin_dialog_win.cc
index 07911436..a678179d 100644
--- a/chrome/browser/ui/startup/credential_provider_signin_dialog_win.cc
+++ b/chrome/browser/ui/startup/credential_provider_signin_dialog_win.cc
@@ -126,7 +126,8 @@
     // deleted once it is finished.
     auto fetcher = std::make_unique<CredentialProviderSigninInfoFetcher>(
         refresh_token, url_loader_factory);
-    fetcher->SetCompletionCallbackAndStart(
+    auto* const fetcher_ptr = fetcher.get();
+    fetcher_ptr->SetCompletionCallbackAndStart(
         access_token, additional_mdm_oauth_scopes,
         base::BindOnce(&HandleAllGcpwInfoFetched, std::move(keep_alive),
                        std::move(fetcher), std::move(signin_result)));
diff --git a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
index a4bd10c6..66b5129 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
@@ -30,7 +30,6 @@
 #include "chrome/browser/extensions/launch_util.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/infobars/infobar_service.h"
-#include "chrome/browser/installable/installable_metrics.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/prefs/chrome_pref_service_factory.h"
 #include "chrome/browser/prefs/session_startup_pref.h"
@@ -78,6 +77,7 @@
 #include "components/policy/core/common/mock_configuration_policy_provider.h"
 #include "components/policy/policy_constants.h"
 #include "components/prefs/pref_service.h"
+#include "components/webapps/installable/installable_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test.h"
@@ -1283,7 +1283,7 @@
   web_app::InstallFinalizer& web_app_finalizer = provider->install_finalizer();
 
   web_app::InstallFinalizer::FinalizeOptions options;
-  options.install_source = WebappInstallSource::OMNIBOX_INSTALL_ICON;
+  options.install_source = webapps::WebappInstallSource::OMNIBOX_INSTALL_ICON;
 
   // Install web app set to open as a tab.
   {
diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
index 78bf9b43..7e54548 100644
--- a/chrome/browser/ui/tab_helpers.cc
+++ b/chrome/browser/ui/tab_helpers.cc
@@ -31,7 +31,6 @@
 #include "chrome/browser/history/history_tab_helper.h"
 #include "chrome/browser/history/top_sites_factory.h"
 #include "chrome/browser/infobars/infobar_service.h"
-#include "chrome/browser/installable/installable_manager.h"
 #include "chrome/browser/lite_video/lite_video_observer.h"
 #include "chrome/browser/media/history/media_history_contents_observer.h"
 #include "chrome/browser/media/media_engagement_service.h"
@@ -112,6 +111,7 @@
 #include "components/sync/engine/sync_engine_switches.h"
 #include "components/tracing/common/tracing_switches.h"
 #include "components/ukm/content/source_url_recorder.h"
+#include "components/webapps/installable/installable_manager.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/buildflags/buildflags.h"
 #include "media/base/media_switches.h"
@@ -262,7 +262,7 @@
       web_contents, TopSitesFactory::GetForProfile(profile).get());
   HistoryTabHelper::CreateForWebContents(web_contents);
   InfoBarService::CreateForWebContents(web_contents);
-  InstallableManager::CreateForWebContents(web_contents);
+  webapps::InstallableManager::CreateForWebContents(web_contents);
   PrefetchProxyTabHelper::CreateForWebContents(web_contents);
   LiteVideoObserver::MaybeCreateForWebContents(web_contents);
 
diff --git a/chrome/browser/ui/translate/translate_bubble_model_impl.cc b/chrome/browser/ui/translate/translate_bubble_model_impl.cc
index c760188..78c71b3 100644
--- a/chrome/browser/ui/translate/translate_bubble_model_impl.cc
+++ b/chrome/browser/ui/translate/translate_bubble_model_impl.cc
@@ -105,15 +105,15 @@
 }
 
 bool TranslateBubbleModelImpl::ShouldNeverTranslateSite() {
-  return ui_delegate_->IsSiteBlacklisted();
+  return ui_delegate_->IsSiteOnNeverPromptList();
 }
 
 void TranslateBubbleModelImpl::SetNeverTranslateSite(bool value) {
-  ui_delegate_->SetSiteBlacklist(value);
+  ui_delegate_->SetNeverPrompt(value);
 }
 
 bool TranslateBubbleModelImpl::CanBlocklistSite() {
-  return ui_delegate_->CanBlacklistSite();
+  return ui_delegate_->CanAddToNeverPromptList();
 }
 
 bool TranslateBubbleModelImpl::ShouldAlwaysTranslate() const {
diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc
index e239e06..30f485b1 100644
--- a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc
+++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc
@@ -507,13 +507,9 @@
 
 void ChromeNativeAppWindowViewsAuraAsh::OnWindowDestroying(
     aura::Window* window) {
-  if (window_state_observation_.IsObserving()) {
-    DCHECK(window_state_observation_.IsObservingSource(
-        ash::WindowState::Get(window)));
-    window_state_observation_.RemoveObservation();
-  }
+  window_state_observation_.Reset();
   DCHECK(window_observation_.IsObservingSource(window));
-  window_observation_.RemoveObservation();
+  window_observation_.Reset();
 }
 
 void ChromeNativeAppWindowViewsAuraAsh::OnTabletModeToggled(bool enabled) {
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc
index 2efd814..42f274b 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc
@@ -457,8 +457,10 @@
   }
 
   void OnWidgetDestroying(views::Widget* widget) override {
-    if (widget == window())
-      bookmark_bar_observation_.RemoveObservation();
+    if (widget == window()) {
+      DCHECK(bookmark_bar_observation_.IsObserving());
+      bookmark_bar_observation_.Reset();
+    }
   }
 
   void OnWidgetDestroyed(views::Widget* widget) override {
@@ -2289,4 +2291,13 @@
   }
 };
 
-VIEW_TEST(BookmarkBarViewTest28, ClickWithModifierOnFolderOpensAllBookmarks)
+// Flaky on Windows, see crbug.com/1156666
+#if defined(OS_WIN)
+#define MAYBE_ClickWithModifierOnFolderOpensAllBookmarks \
+  DISABLED_ClickWithModifierOnFolderOpensAllBookmarks
+#else
+#define MAYBE_ClickWithModifierOnFolderOpensAllBookmarks \
+  ClickWithModifierOnFolderOpensAllBookmarks
+#endif
+VIEW_TEST(BookmarkBarViewTest28,
+          MAYBE_ClickWithModifierOnFolderOpensAllBookmarks)
diff --git a/chrome/browser/ui/views/bubble/webui_bubble_manager.cc b/chrome/browser/ui/views/bubble/webui_bubble_manager.cc
index 4a56b6f..f1506984 100644
--- a/chrome/browser/ui/views/bubble/webui_bubble_manager.cc
+++ b/chrome/browser/ui/views/bubble/webui_bubble_manager.cc
@@ -76,7 +76,8 @@
   DCHECK(bubble_view_);
   DCHECK_EQ(bubble_view_->GetWidget(), widget);
   cached_web_view_ = bubble_view_->RemoveWebView();
-  bubble_widget_observation_.RemoveObservation();
+  DCHECK(bubble_widget_observation_.IsObserving());
+  bubble_widget_observation_.Reset();
   DCHECK(close_bubble_helper_);
   close_bubble_helper_.reset();
   cache_timer_->Reset();
diff --git a/chrome/browser/ui/views/extensions/extension_action_platform_delegate_views.cc b/chrome/browser/ui/views/extensions/extension_action_platform_delegate_views.cc
index 154ef0d3..206a4aa 100644
--- a/chrome/browser/ui/views/extensions/extension_action_platform_delegate_views.cc
+++ b/chrome/browser/ui/views/extensions/extension_action_platform_delegate_views.cc
@@ -133,7 +133,8 @@
 }
 
 void ExtensionActionPlatformDelegateViews::OnCommandServiceDestroying() {
-  command_service_observation_.RemoveObservation();
+  DCHECK(command_service_observation_.IsObserving());
+  command_service_observation_.Reset();
 }
 
 bool ExtensionActionPlatformDelegateViews::AcceleratorPressed(
diff --git a/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc b/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc
index 3b674e88..0e3cc70 100644
--- a/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc
+++ b/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc
@@ -419,7 +419,7 @@
       extensions::ExtensionRegistry::Get(profile_);
   DCHECK_EQ(extension_registry, registry);
   DCHECK(extension_registry_observation_.IsObservingSource(extension_registry));
-  extension_registry_observation_.RemoveObservation();
+  extension_registry_observation_.Reset();
   CloseDialog();
 }
 
diff --git a/chrome/browser/ui/views/extensions/extension_popup.cc b/chrome/browser/ui/views/extensions/extension_popup.cc
index f918ddf..264212c 100644
--- a/chrome/browser/ui/views/extensions/extension_popup.cc
+++ b/chrome/browser/ui/views/extensions/extension_popup.cc
@@ -162,7 +162,8 @@
     host_.reset();
     // Stop observing the registry immediately to prevent any subsequent
     // notifications, since Widget::Close is asynchronous.
-    extension_registry_observation_.RemoveObservation();
+    DCHECK(extension_registry_observation_.IsObserving());
+    extension_registry_observation_.Reset();
 
     GetWidget()->Close();
   }
diff --git a/chrome/browser/ui/views/flying_indicator.cc b/chrome/browser/ui/views/flying_indicator.cc
index f45f93d..a244290 100644
--- a/chrome/browser/ui/views/flying_indicator.cc
+++ b/chrome/browser/ui/views/flying_indicator.cc
@@ -111,8 +111,7 @@
 FlyingIndicator::~FlyingIndicator() {
   // Kill the callback before deleting the widget so we don't call it.
   done_callback_.Reset();
-  if (scoped_observation_.IsObserving())
-    scoped_observation_.RemoveObservation();
+  scoped_observation_.Reset();
   if (widget_)
     widget_->Close();
 }
@@ -120,7 +119,8 @@
 void FlyingIndicator::OnWidgetDestroyed(views::Widget* widget) {
   if (widget != widget_)
     return;
-  scoped_observation_.RemoveObservation();
+  DCHECK(scoped_observation_.IsObserving());
+  scoped_observation_.Reset();
   widget_ = nullptr;
   animation_.Stop();
   if (done_callback_)
@@ -183,7 +183,8 @@
   if (done_callback_)
     std::move(done_callback_).Run();
   if (widget_) {
-    scoped_observation_.RemoveObservation();
+    DCHECK(scoped_observation_.IsObserving());
+    scoped_observation_.Reset();
     widget_->Close();
     widget_ = nullptr;
   }
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_chromeos.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_chromeos.cc
index 4f375120..4c3689f 100644
--- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_chromeos.cc
+++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_chromeos.cc
@@ -512,7 +512,8 @@
 
 void BrowserNonClientFrameViewChromeOS::OnWindowDestroying(
     aura::Window* window) {
-  window_observation_.RemoveObservation();
+  DCHECK(window_observation_.IsObserving());
+  window_observation_.Reset();
 }
 
 void BrowserNonClientFrameViewChromeOS::OnWindowPropertyChanged(
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_chromeos_browsertest.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_chromeos_browsertest.cc
index 6e614c4..09016d1 100644
--- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_chromeos_browsertest.cc
+++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_chromeos_browsertest.cc
@@ -241,7 +241,8 @@
   }
 
   void OnImmersiveModeControllerDestroyed() override {
-    scoped_observation_.RemoveObservation();
+    DCHECK(scoped_observation_.IsObserving());
+    scoped_observation_.Reset();
   }
 
   void OnImmersiveFullscreenExited() override {
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index 212e8e1..e84263e 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -1197,8 +1197,7 @@
       loading_bar_->SetWebContents(nullptr);
     contents_web_view_->SetWebContents(nullptr);
     infobar_container_->ChangeInfoBarManager(nullptr);
-    if (app_banner_manager_observation_.IsObserving())
-      app_banner_manager_observation_.RemoveObservation();
+    app_banner_manager_observation_.Reset();
     UpdateDevToolsForContents(nullptr, true);
   }
 }
@@ -2574,7 +2573,7 @@
 
 void BrowserView::OnWidgetDestroying(views::Widget* widget) {
   DCHECK(widget_observation_.IsObservingSource(widget));
-  widget_observation_.RemoveObservation();
+  widget_observation_.Reset();
   // Destroy any remaining WebContents early on. Doing so may result in
   // calling back to one of the Views/LayoutManagers or supporting classes of
   // BrowserView. By destroying here we ensure all said classes are valid.
diff --git a/chrome/browser/ui/views/frame/glass_browser_caption_button_container.cc b/chrome/browser/ui/views/frame/glass_browser_caption_button_container.cc
index 78da52a..4738d196 100644
--- a/chrome/browser/ui/views/frame/glass_browser_caption_button_container.cc
+++ b/chrome/browser/ui/views/frame/glass_browser_caption_button_container.cc
@@ -111,7 +111,7 @@
 
 void GlassBrowserCaptionButtonContainer::RemovedFromWidget() {
   DCHECK(widget_observation_.IsObserving());
-  widget_observation_.RemoveObservation();
+  widget_observation_.Reset();
 }
 
 void GlassBrowserCaptionButtonContainer::OnWidgetBoundsChanged(
diff --git a/chrome/browser/ui/views/frame/immersive_mode_controller_chromeos.cc b/chrome/browser/ui/views/frame/immersive_mode_controller_chromeos.cc
index 43db7ea..9b4d4bd 100644
--- a/chrome/browser/ui/views/frame/immersive_mode_controller_chromeos.cc
+++ b/chrome/browser/ui/views/frame/immersive_mode_controller_chromeos.cc
@@ -255,6 +255,6 @@
   // Clean up observers here rather than in the destructor because the owning
   // BrowserView has already destroyed the aura::Window.
   DCHECK(window_observation_.IsObservingSource(window));
-  window_observation_.RemoveObservation();
+  window_observation_.Reset();
   DCHECK(!window_observation_.IsObserving());
 }
diff --git a/chrome/browser/ui/views/keyboard_access_browsertest.cc b/chrome/browser/ui/views/keyboard_access_browsertest.cc
index 312993ee..4528a4c 100644
--- a/chrome/browser/ui/views/keyboard_access_browsertest.cc
+++ b/chrome/browser/ui/views/keyboard_access_browsertest.cc
@@ -104,7 +104,8 @@
           FROM_HERE, base::RunLoop::QuitCurrentWhenIdleClosureDeprecated(),
           base::TimeDelta::FromMilliseconds(200));
     } else {
-      observation_.RemoveObservation();
+      DCHECK(observation_.IsObserving());
+      observation_.Reset();
       // Press DOWN to select the first item, then RETURN to select it.
       SendKeyPress(browser_, ui::VKEY_DOWN);
       SendKeyPress(browser_, ui::VKEY_RETURN);
diff --git a/chrome/browser/ui/views/location_bar/content_setting_image_view.cc b/chrome/browser/ui/views/location_bar/content_setting_image_view.cc
index f825b033..48e116bd 100644
--- a/chrome/browser/ui/views/location_bar/content_setting_image_view.cc
+++ b/chrome/browser/ui/views/location_bar/content_setting_image_view.cc
@@ -211,7 +211,7 @@
     return;
 
   DCHECK(observation_.IsObservingSource(widget));
-  observation_.RemoveObservation();
+  observation_.Reset();
   bubble_view_ = nullptr;
   UnpauseAnimation();
 }
diff --git a/chrome/browser/ui/views/location_bar/cookie_controls_bubble_view.cc b/chrome/browser/ui/views/location_bar/cookie_controls_bubble_view.cc
index e80bebe..20cde1a4 100644
--- a/chrome/browser/ui/views/location_bar/cookie_controls_bubble_view.cc
+++ b/chrome/browser/ui/views/location_bar/cookie_controls_bubble_view.cc
@@ -299,5 +299,5 @@
 void CookieControlsBubbleView::OnTooltipIconDestroying(
     views::TooltipIcon* icon) {
   DCHECK(tooltip_observation_.IsObservingSource(icon));
-  tooltip_observation_.RemoveObservation();
+  tooltip_observation_.Reset();
 }
diff --git a/chrome/browser/ui/views/media_router/presentation_receiver_window_view.cc b/chrome/browser/ui/views/media_router/presentation_receiver_window_view.cc
index c17318fc..87e54d90 100644
--- a/chrome/browser/ui/views/media_router/presentation_receiver_window_view.cc
+++ b/chrome/browser/ui/views/media_router/presentation_receiver_window_view.cc
@@ -90,7 +90,8 @@
   }
 
   void OnWindowDestroying(aura::Window* window) override {
-    window_observation_.RemoveObservation();
+    DCHECK(window_observation_.IsObserving());
+    window_observation_.Reset();
   }
 
   base::RepeatingClosure on_fullscreen_change_;
diff --git a/chrome/browser/ui/views/menu_view_drag_and_drop_test.cc b/chrome/browser/ui/views/menu_view_drag_and_drop_test.cc
index 46a64db..c56b324 100644
--- a/chrome/browser/ui/views/menu_view_drag_and_drop_test.cc
+++ b/chrome/browser/ui/views/menu_view_drag_and_drop_test.cc
@@ -229,8 +229,7 @@
 }
 
 void MenuViewDragAndDropTest::TearDown() {
-  if (widget_observation_.IsObserving())
-    widget_observation_.RemoveObservation();
+  widget_observation_.Reset();
   MenuTestBase::TearDown();
 }
 
diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
index 08b9ad0..e39ddece 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
+++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
@@ -854,8 +854,7 @@
 
 void OmniboxViewViews::RemovedFromWidget() {
   views::Textfield::RemovedFromWidget();
-  if (scoped_compositor_observation_.IsObserving())
-    scoped_compositor_observation_.RemoveObservation();
+  scoped_compositor_observation_.Reset();
 }
 
 OmniboxViewViews::ElideAnimation*
@@ -2524,8 +2523,7 @@
 }
 
 void OmniboxViewViews::OnCompositingShuttingDown(ui::Compositor* compositor) {
-  if (scoped_compositor_observation_.IsObserving())
-    scoped_compositor_observation_.RemoveObservation();
+  scoped_compositor_observation_.Reset();
 }
 
 void OmniboxViewViews::OnTemplateURLServiceChanged() {
diff --git a/chrome/browser/ui/views/page_action/pwa_install_view.cc b/chrome/browser/ui/views/page_action/pwa_install_view.cc
index 242b47e..cb70c04 100644
--- a/chrome/browser/ui/views/page_action/pwa_install_view.cc
+++ b/chrome/browser/ui/views/page_action/pwa_install_view.cc
@@ -13,7 +13,6 @@
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/banners/app_banner_manager.h"
-#include "chrome/browser/installable/installable_metrics.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/user_education/feature_promo_controller.h"
 #include "chrome/browser/ui/user_education/feature_promo_text_replacements.h"
@@ -27,6 +26,7 @@
 #include "chrome/grit/generated_resources.h"
 #include "components/feature_engagement/public/feature_constants.h"
 #include "components/omnibox/browser/vector_icons.h"
+#include "components/webapps/installable/installable_metrics.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
@@ -148,10 +148,11 @@
     controller->CloseBubble(feature_engagement::kIPHDesktopPwaInstallFeature);
   }
 
-  web_app::CreateWebAppFromManifest(GetWebContents(),
-                                    /*bypass_service_worker_check=*/false,
-                                    WebappInstallSource::OMNIBOX_INSTALL_ICON,
-                                    base::DoNothing(), iph_state);
+  web_app::CreateWebAppFromManifest(
+      GetWebContents(),
+      /*bypass_service_worker_check=*/false,
+      webapps::WebappInstallSource::OMNIBOX_INSTALL_ICON, base::DoNothing(),
+      iph_state);
 }
 
 views::BubbleDialogDelegate* PwaInstallView::GetBubble() const {
diff --git a/chrome/browser/ui/views/page_action/pwa_install_view_browsertest.cc b/chrome/browser/ui/views/page_action/pwa_install_view_browsertest.cc
index e695ba4d..cac4d8d 100644
--- a/chrome/browser/ui/views/page_action/pwa_install_view_browsertest.cc
+++ b/chrome/browser/ui/views/page_action/pwa_install_view_browsertest.cc
@@ -29,6 +29,7 @@
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/omnibox/browser/omnibox_popup_model.h"
 #include "components/omnibox/browser/omnibox_view.h"
+#include "components/webapps/installable/installable_metrics.h"
 #include "content/public/common/referrer.h"
 #include "content/public/test/browser_test.h"
 #include "extensions/common/extension.h"
@@ -241,7 +242,7 @@
     std::vector<base::Bucket> expected_buckets;
     if (expected_count > 0) {
       expected_buckets.push_back(
-          {static_cast<int>(WebappInstallSource::OMNIBOX_INSTALL_ICON),
+          {static_cast<int>(webapps::WebappInstallSource::OMNIBOX_INSTALL_ICON),
            expected_count});
     }
     EXPECT_EQ(histogram_tester.GetAllSamples("Webapp.Install.InstallBounce"),
diff --git a/chrome/browser/ui/views/profiles/profile_picker_interactive_uitest.cc b/chrome/browser/ui/views/profiles/profile_picker_interactive_uitest.cc
index 6281d8b..0af6051 100644
--- a/chrome/browser/ui/views/profiles/profile_picker_interactive_uitest.cc
+++ b/chrome/browser/ui/views/profiles/profile_picker_interactive_uitest.cc
@@ -182,9 +182,9 @@
   WaitForLayoutWithoutToolbar();
 
   // Simulate a click on the signin button.
-  base::MockCallback<base::OnceClosure> switch_failure_callback;
-  EXPECT_CALL(switch_failure_callback, Run()).Times(0);
-  ProfilePicker::SwitchToSignIn(SK_ColorRED, switch_failure_callback.Get());
+  base::MockCallback<base::OnceCallback<void(bool)>> switch_finished_callback;
+  EXPECT_CALL(switch_finished_callback, Run(true));
+  ProfilePicker::SwitchToSignIn(SK_ColorRED, switch_finished_callback.Get());
 
   // Switch to the signin webview.
   WaitForLayoutWithToolbar();
diff --git a/chrome/browser/ui/views/profiles/profile_picker_view.cc b/chrome/browser/ui/views/profiles/profile_picker_view.cc
index 9a85303..d7336045 100644
--- a/chrome/browser/ui/views/profiles/profile_picker_view.cc
+++ b/chrome/browser/ui/views/profiles/profile_picker_view.cc
@@ -104,11 +104,12 @@
 }
 
 // static
-void ProfilePicker::SwitchToSignIn(SkColor profile_color,
-                                   base::OnceClosure switch_failure_callback) {
+void ProfilePicker::SwitchToSignIn(
+    SkColor profile_color,
+    base::OnceCallback<void(bool)> switch_finished_callback) {
   if (g_profile_picker_view) {
     g_profile_picker_view->SwitchToSignIn(profile_color,
-                                          std::move(switch_failure_callback));
+                                          std::move(switch_finished_callback));
   }
 }
 
@@ -259,9 +260,9 @@
 
 void ProfilePickerView::SwitchToSignIn(
     SkColor profile_color,
-    base::OnceClosure switch_failure_callback) {
-  DCHECK(!switch_failure_callback_);
-  switch_failure_callback_ = std::move(switch_failure_callback);
+    base::OnceCallback<void(bool)> switch_finished_callback) {
+  DCHECK(!switch_finished_callback_);
+  switch_finished_callback_ = std::move(switch_finished_callback);
   size_t icon_index = profiles::GetPlaceholderAvatarIndex();
   // Silently create the new profile for browsing on GAIA (so that the sign-in
   // cookies are stored in the right profile).
@@ -279,18 +280,15 @@
     Profile* profile,
     Profile::CreateStatus status) {
   if (status == Profile::CREATE_STATUS_LOCAL_FAIL) {
-    if (switch_failure_callback_)
-      std::move(switch_failure_callback_).Run();
+    if (switch_finished_callback_)
+      std::move(switch_finished_callback_).Run(false);
     return;
   } else if (status != Profile::CREATE_STATUS_INITIALIZED) {
     return;
   }
 
-  // No need to report failure any more, delete the callback.
-  DCHECK(switch_failure_callback_);
-  switch_failure_callback_ = base::OnceClosure();
-
   DCHECK(profile);
+  std::move(switch_finished_callback_).Run(true);
 
   ProfileAttributesEntry* entry = nullptr;
   if (!g_browser_process->profile_manager()
@@ -550,7 +548,7 @@
   // Stop listening to further changes.
   DCHECK(identity_manager_observation_.IsObservingSource(
       IdentityManagerFactory::GetForProfile(signed_in_profile_being_created_)));
-  identity_manager_observation_.RemoveObservation();
+  identity_manager_observation_.Reset();
 
   if (on_profile_name_available_)
     std::move(on_profile_name_available_).Run();
diff --git a/chrome/browser/ui/views/profiles/profile_picker_view.h b/chrome/browser/ui/views/profiles/profile_picker_view.h
index 1a0d006..3dc1596 100644
--- a/chrome/browser/ui/views/profiles/profile_picker_view.h
+++ b/chrome/browser/ui/views/profiles/profile_picker_view.h
@@ -60,7 +60,7 @@
 
   // Switches the layout to the sign-in flow (and creates a new profile)
   void SwitchToSignIn(SkColor profile_color,
-                      base::OnceClosure switch_failure_callback);
+                      base::OnceCallback<void(bool)> switch_finished_callback);
   // On creation success for the sign-in profile, it rebuilds the view.
   void OnProfileForSigninCreated(SkColor profile_color,
                                  Profile* new_profile,
@@ -151,7 +151,7 @@
   base::TimeDelta extended_account_info_timeout_;
 
   // Not null iff switching to sign-in is in progress.
-  base::OnceClosure switch_failure_callback_;
+  base::OnceCallback<void(bool)> switch_finished_callback_;
   base::ScopedObservation<signin::IdentityManager,
                           signin::IdentityManager::Observer>
       identity_manager_observation_{this};
diff --git a/chrome/browser/ui/views/profiles/profile_picker_view_browsertest.cc b/chrome/browser/ui/views/profiles/profile_picker_view_browsertest.cc
index 36d6a06..787a4e4 100644
--- a/chrome/browser/ui/views/profiles/profile_picker_view_browsertest.cc
+++ b/chrome/browser/ui/views/profiles/profile_picker_view_browsertest.cc
@@ -258,9 +258,9 @@
   WaitForLayoutWithoutToolbar();
 
   // Simulate a click on the signin button.
-  base::MockCallback<base::OnceClosure> switch_failure_callback;
-  EXPECT_CALL(switch_failure_callback, Run()).Times(0);
-  ProfilePicker::SwitchToSignIn(kProfileColor, switch_failure_callback.Get());
+  base::MockCallback<base::OnceCallback<void(bool)>> switch_finished_callback;
+  EXPECT_CALL(switch_finished_callback, Run(true));
+  ProfilePicker::SwitchToSignIn(kProfileColor, switch_finished_callback.Get());
 
   // The DICE navigation happens in a new web contents (for the profile being
   // created), wait for it.
@@ -320,9 +320,9 @@
   WaitForLayoutWithoutToolbar();
 
   // Simulate a click on the signin button.
-  base::MockCallback<base::OnceClosure> switch_failure_callback;
-  EXPECT_CALL(switch_failure_callback, Run()).Times(0);
-  ProfilePicker::SwitchToSignIn(kProfileColor, switch_failure_callback.Get());
+  base::MockCallback<base::OnceCallback<void(bool)>> switch_finished_callback;
+  EXPECT_CALL(switch_finished_callback, Run(true));
+  ProfilePicker::SwitchToSignIn(kProfileColor, switch_finished_callback.Get());
 
   // The DICE navigation happens in a new web contents (for the profile being
   // created), wait for it.
@@ -384,9 +384,9 @@
   WaitForLayoutWithoutToolbar();
 
   // Simulate a click on the signin button.
-  base::MockCallback<base::OnceClosure> switch_failure_callback;
-  EXPECT_CALL(switch_failure_callback, Run()).Times(0);
-  ProfilePicker::SwitchToSignIn(kProfileColor, switch_failure_callback.Get());
+  base::MockCallback<base::OnceCallback<void(bool)>> switch_finished_callback;
+  EXPECT_CALL(switch_finished_callback, Run(true));
+  ProfilePicker::SwitchToSignIn(kProfileColor, switch_finished_callback.Get());
 
   // The DICE navigation happens in a new web contents (for the profile being
   // created), wait for it.
@@ -445,9 +445,9 @@
   WaitForLayoutWithoutToolbar();
 
   // Simulate a click on the signin button.
-  base::MockCallback<base::OnceClosure> switch_failure_callback;
-  EXPECT_CALL(switch_failure_callback, Run()).Times(0);
-  ProfilePicker::SwitchToSignIn(kProfileColor, switch_failure_callback.Get());
+  base::MockCallback<base::OnceCallback<void(bool)>> switch_finished_callback;
+  EXPECT_CALL(switch_finished_callback, Run(true));
+  ProfilePicker::SwitchToSignIn(kProfileColor, switch_finished_callback.Get());
 
   // The DICE navigation happens in a new web contents (for the profile being
   // created), wait for it.
@@ -505,9 +505,9 @@
   WaitForLayoutWithoutToolbar();
 
   // Simulate a click on the signin button.
-  base::MockCallback<base::OnceClosure> switch_failure_callback;
-  EXPECT_CALL(switch_failure_callback, Run()).Times(0);
-  ProfilePicker::SwitchToSignIn(kProfileColor, switch_failure_callback.Get());
+  base::MockCallback<base::OnceCallback<void(bool)>> switch_finished_callback;
+  EXPECT_CALL(switch_finished_callback, Run(true));
+  ProfilePicker::SwitchToSignIn(kProfileColor, switch_finished_callback.Get());
 
   // The DICE navigation happens in a new web contents (for the profile being
   // created), wait for it.
@@ -555,9 +555,9 @@
   WaitForLayoutWithoutToolbar();
 
   // Simulate a click on the signin button.
-  base::MockCallback<base::OnceClosure> switch_failure_callback;
-  EXPECT_CALL(switch_failure_callback, Run()).Times(0);
-  ProfilePicker::SwitchToSignIn(kProfileColor, switch_failure_callback.Get());
+  base::MockCallback<base::OnceCallback<void(bool)>> switch_finished_callback;
+  EXPECT_CALL(switch_finished_callback, Run(true));
+  ProfilePicker::SwitchToSignIn(kProfileColor, switch_finished_callback.Get());
 
   // The DICE navigation happens in a new web contents (for the profile being
   // created), wait for it.
@@ -631,9 +631,9 @@
   WaitForLayoutWithoutToolbar();
 
   // Simulate a click on the signin button.
-  base::MockCallback<base::OnceClosure> switch_failure_callback;
-  EXPECT_CALL(switch_failure_callback, Run()).Times(0);
-  ProfilePicker::SwitchToSignIn(kProfileColor, switch_failure_callback.Get());
+  base::MockCallback<base::OnceCallback<void(bool)>> switch_finished_callback;
+  EXPECT_CALL(switch_finished_callback, Run(true));
+  ProfilePicker::SwitchToSignIn(kProfileColor, switch_finished_callback.Get());
 
   // The DICE navigation happens in a new web contents (for the profile being
   // created), wait for it.
@@ -702,9 +702,9 @@
   WaitForLayoutWithoutToolbar();
 
   // Simulate a click on the signin button.
-  base::MockCallback<base::OnceClosure> switch_failure_callback;
-  EXPECT_CALL(switch_failure_callback, Run()).Times(0);
-  ProfilePicker::SwitchToSignIn(kProfileColor, switch_failure_callback.Get());
+  base::MockCallback<base::OnceCallback<void(bool)>> switch_finished_callback;
+  EXPECT_CALL(switch_finished_callback, Run(true));
+  ProfilePicker::SwitchToSignIn(kProfileColor, switch_finished_callback.Get());
 
   // The DICE navigation happens in a new web contents (for the profile being
   // created), wait for it.
diff --git a/chrome/browser/ui/views/profiles/profile_picker_view_sync_delegate.cc b/chrome/browser/ui/views/profiles/profile_picker_view_sync_delegate.cc
index 4f75f04..a42a42bc 100644
--- a/chrome/browser/ui/views/profiles/profile_picker_view_sync_delegate.cc
+++ b/chrome/browser/ui/views/profiles/profile_picker_view_sync_delegate.cc
@@ -128,7 +128,7 @@
   // No need to listen to further confirmations any more.
   DCHECK(scoped_login_ui_service_observation_.IsObservingSource(
       LoginUIServiceFactory::GetForProfile(profile_)));
-  scoped_login_ui_service_observation_.RemoveObservation();
+  scoped_login_ui_service_observation_.Reset();
 
   DCHECK(sync_confirmation_callback_);
   std::move(sync_confirmation_callback_).Run(result);
diff --git a/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_platform_impl_chromeos.cc b/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_platform_impl_chromeos.cc
index 7054422..73632b3 100644
--- a/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_platform_impl_chromeos.cc
+++ b/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_platform_impl_chromeos.cc
@@ -152,8 +152,6 @@
 }
 
 void RelaunchNotificationControllerPlatformImpl::StopObserving() {
-  if (display_observation_.IsObserving())
-    display_observation_.RemoveObservation();
-  if (session_observation_.IsObserving())
-    session_observation_.RemoveObservation();
+  display_observation_.Reset();
+  session_observation_.Reset();
 }
diff --git a/chrome/browser/ui/views/tabs/tab.cc b/chrome/browser/ui/views/tabs/tab.cc
index d593e00..3e13de28 100644
--- a/chrome/browser/ui/views/tabs/tab.cc
+++ b/chrome/browser/ui/views/tabs/tab.cc
@@ -152,7 +152,8 @@
   TabCloseButtonObserver& operator=(const TabCloseButtonObserver&) = delete;
 
   ~TabCloseButtonObserver() override {
-    tab_close_button_observation_.RemoveObservation();
+    DCHECK(tab_close_button_observation_.IsObserving());
+    tab_close_button_observation_.Reset();
   }
 
  private:
diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller.cc b/chrome/browser/ui/views/tabs/tab_drag_controller.cc
index 9132856..e95ee6b 100644
--- a/chrome/browser/ui/views/tabs/tab_drag_controller.cc
+++ b/chrome/browser/ui/views/tabs/tab_drag_controller.cc
@@ -1431,7 +1431,7 @@
 
   if (move_loop_widget_ &&
       widget_observation_.IsObservingSource(move_loop_widget_)) {
-    widget_observation_.RemoveObservation();
+    widget_observation_.Reset();
   }
   move_loop_widget_ = nullptr;
 
diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc
index 3b69bcc..4b7c071e 100644
--- a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc
+++ b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc
@@ -29,7 +29,6 @@
 #include "build/build_config.h"
 #include "build/chromeos_buildflags.h"
 #include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/installable/installable_metrics.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_list.h"
diff --git a/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc b/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc
index 4139d63b..8757384 100644
--- a/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc
+++ b/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc
@@ -411,8 +411,7 @@
     if (current_image_ == thumbnail_image)
       return;
 
-    if (scoped_observation_.IsObserving())
-      scoped_observation_.RemoveObservation();
+    scoped_observation_.Reset();
     current_image_ = std::move(thumbnail_image);
 
     if (current_image_) {
diff --git a/chrome/browser/ui/views/tabs/tab_search_button.cc b/chrome/browser/ui/views/tabs/tab_search_button.cc
index be6ee8f..93759cc 100644
--- a/chrome/browser/ui/views/tabs/tab_search_button.cc
+++ b/chrome/browser/ui/views/tabs/tab_search_button.cc
@@ -98,7 +98,7 @@
   DCHECK_EQ(webui_bubble_manager_.GetBubbleWidget(), widget);
   DCHECK(bubble_widget_observation_.IsObservingSource(
       webui_bubble_manager_.GetBubbleWidget()));
-  bubble_widget_observation_.RemoveObservation();
+  bubble_widget_observation_.Reset();
   pressed_lock_.reset();
 }
 
diff --git a/chrome/browser/ui/views/tabs/tab_strip.cc b/chrome/browser/ui/views/tabs/tab_strip.cc
index b3b3427..500b245 100644
--- a/chrome/browser/ui/views/tabs/tab_strip.cc
+++ b/chrome/browser/ui/views/tabs/tab_strip.cc
@@ -1034,8 +1034,7 @@
   // but before moving the mouse.
   RemoveMessageLoopObserver();
 
-  if (hover_card_observation_.IsObserving())
-    hover_card_observation_.RemoveObservation();
+  hover_card_observation_.Reset();
 
   // Since TabGroupViews expects be able to remove the views it creates, clear
   // |group_views_| before removing the remaining children below.
@@ -3288,7 +3287,7 @@
 
 void TabStrip::DropArrow::OnWidgetDestroying(views::Widget* widget) {
   DCHECK(scoped_observation_.IsObservingSource(arrow_window_));
-  scoped_observation_.RemoveObservation();
+  scoped_observation_.Reset();
   arrow_window_ = nullptr;
 }
 
@@ -3629,7 +3628,7 @@
 void TabStrip::OnViewIsDeleting(views::View* observed_view) {
   if (observed_view == hover_card_) {
     DCHECK(hover_card_observation_.IsObservingSource(hover_card_));
-    hover_card_observation_.RemoveObservation();
+    hover_card_observation_.Reset();
     hover_card_event_sniffer_.reset();
     hover_card_ = nullptr;
   }
diff --git a/chrome/browser/ui/views/toolbar/extension_toolbar_menu_view.cc b/chrome/browser/ui/views/toolbar/extension_toolbar_menu_view.cc
index c633c0e6..f822845 100644
--- a/chrome/browser/ui/views/toolbar/extension_toolbar_menu_view.cc
+++ b/chrome/browser/ui/views/toolbar/extension_toolbar_menu_view.cc
@@ -84,7 +84,7 @@
 
 void ExtensionToolbarMenuView::OnToolbarActionsBarDestroyed() {
   DCHECK(toolbar_actions_bar_observation_.IsObserving());
-  toolbar_actions_bar_observation_.RemoveObservation();
+  toolbar_actions_bar_observation_.Reset();
 }
 
 void ExtensionToolbarMenuView::OnToolbarActionDragDone() {
diff --git a/chrome/browser/ui/views/toolbar/webui_tab_counter_button.cc b/chrome/browser/ui/views/toolbar/webui_tab_counter_button.cc
index d9ea0a1..a664964 100644
--- a/chrome/browser/ui/views/toolbar/webui_tab_counter_button.cc
+++ b/chrome/browser/ui/views/toolbar/webui_tab_counter_button.cc
@@ -161,7 +161,7 @@
     // Clean up all of our observers and event handlers before the native window
     // disappears.
     DCHECK(scoped_widget_observation_.IsObservingSource(widget));
-    scoped_widget_observation_.RemoveObservation();
+    scoped_widget_observation_.Reset();
     if (widget->GetNativeWindow()) {
       widget->GetNativeWindow()->RemovePreTargetHandler(this);
       native_window_ = nullptr;
diff --git a/chrome/browser/ui/views/webid/OWNERS b/chrome/browser/ui/views/webid/OWNERS
new file mode 100644
index 0000000..cfed0af
--- /dev/null
+++ b/chrome/browser/ui/views/webid/OWNERS
@@ -0,0 +1 @@
+file://content/browser/webid/OWNERS
diff --git a/chrome/browser/ui/views/webid/webid_permission_infobar.cc b/chrome/browser/ui/views/webid/webid_permission_infobar.cc
new file mode 100644
index 0000000..b171457
--- /dev/null
+++ b/chrome/browser/ui/views/webid/webid_permission_infobar.cc
@@ -0,0 +1,64 @@
+// Copyright 2020 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/ui/views/webid/webid_permission_infobar.h"
+
+#include "chrome/browser/infobars/infobar_service.h"
+#include "chrome/browser/ui/webid/identity_dialogs.h"
+#include "components/infobars/core/infobar.h"
+#include "components/strings/grit/components_strings.h"
+#include "ui/base/l10n/l10n_util.h"
+
+void ShowWebIDPermissionInfoBar(
+    content::WebContents* web_contents,
+    const base::string16& message,
+    WebIDPermissionInfoBarDelegate::Callback callback) {
+  InfoBarService* infobar_service =
+      InfoBarService::FromWebContents(web_contents);
+
+  auto delegate = std::make_unique<WebIDPermissionInfoBarDelegate>(
+      message, std::move(callback));
+  infobar_service->AddInfoBar(
+      infobar_service->CreateConfirmInfoBar(std::move(delegate)));
+}
+
+WebIDPermissionInfoBarDelegate::WebIDPermissionInfoBarDelegate(
+    const base::string16& message,
+    WebIDPermissionInfoBarDelegate::Callback callback)
+    : message_(message), callback_(std::move(callback)) {
+  DCHECK(callback_);
+}
+
+WebIDPermissionInfoBarDelegate::~WebIDPermissionInfoBarDelegate() {
+  if (callback_) {
+    // The infobar has closed without the user expressing an explicit
+    // preference. The current request should be denied.
+    std::move(callback_).Run(UserApproval::kDenied);
+  }
+}
+
+infobars::InfoBarDelegate::InfoBarIdentifier
+WebIDPermissionInfoBarDelegate::GetIdentifier() const {
+  return WEBID_PERMISSION_INFOBAR_DELEGATE;
+}
+
+base::string16 WebIDPermissionInfoBarDelegate::GetMessageText() const {
+  return message_;
+}
+
+base::string16 WebIDPermissionInfoBarDelegate::GetButtonLabel(
+    InfoBarButton button) const {
+  return l10n_util::GetStringUTF16((button == BUTTON_OK) ? IDS_PERMISSION_ALLOW
+                                                         : IDS_PERMISSION_DENY);
+}
+
+bool WebIDPermissionInfoBarDelegate::Accept() {
+  std::move(callback_).Run(UserApproval::kApproved);
+  return true;
+}
+
+bool WebIDPermissionInfoBarDelegate::Cancel() {
+  std::move(callback_).Run(UserApproval::kDenied);
+  return true;
+}
diff --git a/chrome/browser/ui/views/webid/webid_permission_infobar.h b/chrome/browser/ui/views/webid/webid_permission_infobar.h
new file mode 100644
index 0000000..efbadb52
--- /dev/null
+++ b/chrome/browser/ui/views/webid/webid_permission_infobar.h
@@ -0,0 +1,39 @@
+// Copyright 2020 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CHROME_BROWSER_UI_VIEWS_WEBID_WEBID_PERMISSION_INFOBAR_H_
+#define CHROME_BROWSER_UI_VIEWS_WEBID_WEBID_PERMISSION_INFOBAR_H_
+
+#include "base/callback.h"
+#include "base/strings/string16.h"
+#include "components/infobars/core/confirm_infobar_delegate.h"
+#include "content/public/browser/identity_request_dialog_controller.h"
+
+// Basic infobar that is used to ask for user approval in various WebID flows.
+//
+// Currently it is  used to obtain user approval on initial information exchange
+// between the Relying Party and Identity Provider to exchange informations.
+class WebIDPermissionInfoBarDelegate : public ConfirmInfoBarDelegate {
+ public:
+  using UserApproval = content::IdentityRequestDialogController::UserApproval;
+  using Callback =
+      content::IdentityRequestDialogController::InitialApprovalCallback;
+
+  WebIDPermissionInfoBarDelegate(const base::string16& message,
+                                 Callback callback);
+  ~WebIDPermissionInfoBarDelegate() override;
+
+ private:
+  // ConfirmInfoBarDelegate:
+  infobars::InfoBarDelegate::InfoBarIdentifier GetIdentifier() const override;
+  base::string16 GetMessageText() const override;
+  base::string16 GetButtonLabel(InfoBarButton button) const override;
+  bool Accept() override;
+  bool Cancel() override;
+
+  const base::string16 message_;
+  Callback callback_;
+};
+
+#endif  // CHROME_BROWSER_UI_VIEWS_WEBID_WEBID_PERMISSION_INFOBAR_H_
diff --git a/chrome/browser/ui/views/webid/webid_signin_window.cc b/chrome/browser/ui/views/webid/webid_signin_window.cc
new file mode 100644
index 0000000..66ce6a9
--- /dev/null
+++ b/chrome/browser/ui/views/webid/webid_signin_window.cc
@@ -0,0 +1,93 @@
+// Copyright 2020 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/ui/views/webid/webid_signin_window.h"
+
+#include "chrome/browser/ui/webid/identity_dialog_controller.h"
+#include "chrome/browser/ui/webid/identity_dialogs.h"
+#include "components/constrained_window/constrained_window_views.h"
+#include "components/web_modal/web_contents_modal_dialog_manager.h"
+#include "components/web_modal/web_contents_modal_dialog_manager_delegate.h"
+#include "content/public/browser/web_contents.h"
+#include "ui/views/controls/webview/webview.h"
+#include "ui/views/layout/fill_layout.h"
+#include "ui/views/window/dialog_delegate.h"
+
+// Dimensions of the dialog itself.
+constexpr int kDialogMinWidth = 512;
+constexpr int kDialogHeight = 450;
+// Dimension of the header.
+constexpr int kHeaderHeight = 75;
+
+class ModalDialog : public views::DialogDelegateView {
+ public:
+  ModalDialog(content::WebContents* contents, const GURL& provider)
+      : initiator_web_contents_(contents), web_view_(nullptr) {
+    DialogDelegate::SetButtons(ui::DIALOG_BUTTON_NONE);
+    SetModalType(ui::MODAL_TYPE_CHILD);
+    SetLayoutManager(std::make_unique<views::FillLayout>());
+
+    web_view_ = AddChildView(CreateWebView(provider));
+    SetInitiallyFocusedView(web_view_);
+  }
+
+  std::unique_ptr<views::WebView> CreateWebView(const GURL& provider) {
+    auto web_view = std::make_unique<views::WebView>(
+        initiator_web_contents_->GetBrowserContext());
+
+    web_view->LoadInitialURL(provider);
+
+    // The webview must get an explicitly set height otherwise the layout
+    // doesn't make it fill its container. This is likely because it has no
+    // content at the time of first layout (nothing has loaded yet). Because of
+    // this, set it to. total_dialog_height - header_height. On the other hand,
+    // the width will be properly set so it can be 0 here.
+    web_view->SetPreferredSize(
+        {kDialogMinWidth, kDialogHeight - kHeaderHeight});
+
+    return web_view;
+  }
+
+  void Show() {
+    // ShowWebModalDialogViews takes ownership of this, by way of the
+    // DeleteDelegate method.
+    constrained_window::ShowWebModalDialogViews(this, initiator_web_contents_);
+  }
+
+ private:
+  content::WebContents* initiator_web_contents_;
+  // The contents of the dialog, owned by the view hierarchy.
+  views::WebView* web_view_;
+};
+
+WebIDSigninWindow::WebIDSigninWindow(
+    content::WebContents* initiator_web_contents,
+    const GURL& provider,
+    base::OnceCallback<void(std::string)> on_done,
+    base::OnceCallback<void()> on_close)
+    : on_done_(std::move(on_done)) {
+  auto* modal = new ModalDialog(initiator_web_contents, provider);
+
+  modal->SetCloseCallback(std::move(on_close));
+  // TODO(majidvp): Actually call on_done callback once we have a token.
+
+  // ModalDialog is a WidgetDelegate, owned by its views::Widget. It is
+  // destroyed by `DeleteDelegate()` which is invoked by view hierarchy. Once
+  // modal is deleted we should delete the window class as well.
+  modal->RegisterDeleteDelegateCallback(
+      base::BindOnce([](WebIDSigninWindow* window) { delete window; },
+                     base::Unretained(this)));
+
+  modal->Show();
+}
+
+WebIDSigninWindow::~WebIDSigninWindow() = default;
+
+void ShowWebIDSigninWindow(content::WebContents* initiator_web_contents,
+                           const GURL& provider,
+                           base::OnceCallback<void(std::string)> on_done,
+                           base::OnceCallback<void()> on_close) {
+  new WebIDSigninWindow(initiator_web_contents, provider, std::move(on_done),
+                        std::move(on_close));
+}
diff --git a/chrome/browser/ui/views/webid/webid_signin_window.h b/chrome/browser/ui/views/webid/webid_signin_window.h
new file mode 100644
index 0000000..89e2dae4
--- /dev/null
+++ b/chrome/browser/ui/views/webid/webid_signin_window.h
@@ -0,0 +1,39 @@
+// Copyright 2020 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CHROME_BROWSER_UI_VIEWS_WEBID_WEBID_SIGNIN_WINDOW_H_
+#define CHROME_BROWSER_UI_VIEWS_WEBID_WEBID_SIGNIN_WINDOW_H_
+
+#include <memory>
+#include <string>
+
+#include "base/callback.h"
+
+class GURL;
+
+namespace content {
+class WebContents;
+}
+
+// The WebIDSigninWindow loads Idp sign-in page in a modal allowing user to
+// sign in. The modal may be closed by user or once Idp sign-in page has
+// completed its process and have called the appropriate JS callback.
+class WebIDSigninWindow {
+ public:
+  // Creates and shows the modal Signin Window. It takes two callbacks:
+  //  - on_done: called when IDP has provided an id_token with the id_token as
+  //             its parameter.
+  //  - on_close: called when window is closed.
+  WebIDSigninWindow(content::WebContents* initiator_web_contents,
+                    const GURL& provider,
+                    base::OnceCallback<void(std::string)> on_done,
+                    base::OnceCallback<void()> on_close);
+  WebIDSigninWindow(const WebIDSigninWindow&) = delete;
+  WebIDSigninWindow& operator=(const WebIDSigninWindow&) = delete;
+
+ private:
+  base::OnceCallback<void(std::string)> on_done_;
+  ~WebIDSigninWindow();
+};
+#endif  // CHROME_BROWSER_UI_VIEWS_WEBID_WEBID_SIGNIN_WINDOW_H_
diff --git a/chrome/browser/ui/web_applications/app_browser_controller.cc b/chrome/browser/ui/web_applications/app_browser_controller.cc
index 2108710..ac5bf83 100644
--- a/chrome/browser/ui/web_applications/app_browser_controller.cc
+++ b/chrome/browser/ui/web_applications/app_browser_controller.cc
@@ -10,7 +10,6 @@
 #include "base/strings/string_piece.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/chromeos_buildflags.h"
-#include "chrome/browser/installable/installable_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ssl/security_state_tab_helper.h"
 #include "chrome/browser/themes/browser_theme_pack.h"
@@ -33,6 +32,7 @@
 #include "chrome/grit/generated_resources.h"
 #include "components/security_state/core/security_state.h"
 #include "components/url_formatter/url_formatter.h"
+#include "components/webapps/installable/installable_manager.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/navigation_handle.h"
@@ -241,7 +241,8 @@
       // Some origins are (such as localhost) are considered secure even when
       // served over non-secure schemes. However, in order to hide the toolbar,
       // the 'considered secure' origin must also be in the app's scope.
-      return out_of_scope || !InstallableManager::IsOriginConsideredSecure(url);
+      return out_of_scope ||
+             !webapps::InstallableManager::IsOriginConsideredSecure(url);
     }
 
     if (is_for_system_web_app()) {
@@ -267,7 +268,7 @@
   // Insecure external web sites show the toolbar.
   // Note: IsContentSecure is false until a navigation is committed.
   if (!last_committed_url.is_empty() && !is_internal_start_url_scheme &&
-      !InstallableManager::IsContentSecure(web_contents)) {
+      !webapps::InstallableManager::IsContentSecure(web_contents)) {
     return true;
   }
 
diff --git a/chrome/browser/ui/web_applications/app_browser_controller_browsertest.cc b/chrome/browser/ui/web_applications/app_browser_controller_browsertest.cc
index aa94f8d..cc9cbc0 100644
--- a/chrome/browser/ui/web_applications/app_browser_controller_browsertest.cc
+++ b/chrome/browser/ui/web_applications/app_browser_controller_browsertest.cc
@@ -10,7 +10,6 @@
 #include "base/test/bind.h"
 #include "build/chromeos_buildflags.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
-#include "chrome/browser/installable/installable_metrics.h"
 #include "chrome/browser/themes/custom_theme_supplier.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/browser_commands.h"
diff --git a/chrome/browser/ui/web_applications/create_shortcut_browsertest.cc b/chrome/browser/ui/web_applications/create_shortcut_browsertest.cc
index 7c95bf8..c1733a422 100644
--- a/chrome/browser/ui/web_applications/create_shortcut_browsertest.cc
+++ b/chrome/browser/ui/web_applications/create_shortcut_browsertest.cc
@@ -7,7 +7,6 @@
 #include "base/test/metrics/user_action_tester.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/banners/test_app_banner_manager_desktop.h"
-#include "chrome/browser/installable/installable_metrics.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_dialogs.h"
@@ -21,6 +20,7 @@
 #include "chrome/browser/web_applications/components/web_app_prefs_utils.h"
 #include "chrome/browser/web_applications/components/web_app_provider_base.h"
 #include "chrome/browser/web_applications/test/web_app_install_observer.h"
+#include "components/webapps/installable/installable_metrics.h"
 #include "content/public/test/browser_test.h"
 #include "content/public/test/browser_test_utils.h"
 #include "url/gurl.h"
@@ -80,11 +80,12 @@
     base::Optional<int> install_source = GetIntWebAppPref(
         profile()->GetPrefs(), app_id, kLatestWebAppInstallSource);
     EXPECT_TRUE(install_source.has_value());
-    EXPECT_EQ(static_cast<WebappInstallSource>(*install_source),
-              WebappInstallSource::MENU_CREATE_SHORTCUT);
+    EXPECT_EQ(static_cast<webapps::WebappInstallSource>(*install_source),
+              webapps::WebappInstallSource::MENU_CREATE_SHORTCUT);
     histogram_tester.ExpectUniqueSample(
         "Webapp.Install.InstallEvent",
-        static_cast<int>(WebappInstallSource::MENU_CREATE_SHORTCUT), 1);
+        static_cast<int>(webapps::WebappInstallSource::MENU_CREATE_SHORTCUT),
+        1);
   }
 }
 
diff --git a/chrome/browser/ui/web_applications/system_web_app_ui_utils.cc b/chrome/browser/ui/web_applications/system_web_app_ui_utils.cc
index 0a81b98..5cc1013 100644
--- a/chrome/browser/ui/web_applications/system_web_app_ui_utils.cc
+++ b/chrome/browser/ui/web_applications/system_web_app_ui_utils.cc
@@ -20,7 +20,6 @@
 #include "chrome/browser/apps/app_service/launch_utils.h"
 #include "chrome/browser/chromeos/printing/print_management/print_management_uma.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
-#include "chrome/browser/installable/installable_params.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_navigator.h"
diff --git a/chrome/browser/ui/web_applications/test/web_app_browsertest_util.cc b/chrome/browser/ui/web_applications/test/web_app_browsertest_util.cc
index 29c3e42a..f740600 100644
--- a/chrome/browser/ui/web_applications/test/web_app_browsertest_util.cc
+++ b/chrome/browser/ui/web_applications/test/web_app_browsertest_util.cc
@@ -13,7 +13,6 @@
 #include "chrome/browser/apps/app_service/app_service_proxy.h"
 #include "chrome/browser/apps/app_service/app_service_proxy_factory.h"
 #include "chrome/browser/apps/app_service/browser_app_launcher.h"
-#include "chrome/browser/installable/installable_metrics.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
@@ -39,6 +38,7 @@
 #include "chrome/browser/web_applications/web_app_provider.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/security_interstitials/content/security_interstitial_tab_helper.h"
+#include "components/webapps/installable/installable_metrics.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_navigation_observer.h"
@@ -102,7 +102,7 @@
   WaitUntilReady(provider);
   provider->install_manager().InstallWebAppFromInfo(
       std::move(web_app_info), ForInstallableSite::kYes,
-      WebappInstallSource::OMNIBOX_INSTALL_ICON,
+      webapps::WebappInstallSource::OMNIBOX_INSTALL_ICON,
       base::BindLambdaForTesting(
           [&](const AppId& installed_app_id, InstallResultCode code) {
             EXPECT_EQ(InstallResultCode::kSuccessNewInstall, code);
@@ -128,7 +128,8 @@
   WaitUntilReady(provider);
   provider->install_manager().InstallWebAppFromManifestWithFallback(
       browser->tab_strip_model()->GetActiveWebContents(),
-      /*force_shortcut_app=*/false, WebappInstallSource::MENU_BROWSER_TAB,
+      /*force_shortcut_app=*/false,
+      webapps::WebappInstallSource::MENU_BROWSER_TAB,
       base::BindLambdaForTesting(
           [](content::WebContents* initiator_web_contents,
              std::unique_ptr<WebApplicationInfo> web_app_info,
diff --git a/chrome/browser/ui/web_applications/web_app_dialog_utils.cc b/chrome/browser/ui/web_applications/web_app_dialog_utils.cc
index e724ece..328d6eb2 100644
--- a/chrome/browser/ui/web_applications/web_app_dialog_utils.cc
+++ b/chrome/browser/ui/web_applications/web_app_dialog_utils.cc
@@ -13,7 +13,6 @@
 #include "base/feature_list.h"
 #include "base/no_destructor.h"
 #include "chrome/browser/banners/app_banner_manager.h"
-#include "chrome/browser/installable/installable_metrics.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_dialogs.h"
@@ -24,6 +23,7 @@
 #include "chrome/browser/web_applications/components/web_app_utils.h"
 #include "chrome/browser/web_applications/components/web_application_info.h"
 #include "chrome/browser/web_applications/web_app_provider.h"
+#include "components/webapps/installable/installable_metrics.h"
 #include "content/public/browser/navigation_entry.h"
 
 namespace web_app {
@@ -31,7 +31,7 @@
 namespace {
 
 void WebAppInstallDialogCallback(
-    WebappInstallSource install_source,
+    webapps::WebappInstallSource install_source,
     chrome::PwaInProductHelpState iph_state,
     content::WebContents* initiator_web_contents,
     std::unique_ptr<WebApplicationInfo> web_app_info,
@@ -108,9 +108,11 @@
   auto* provider = WebAppProvider::GetForWebContents(web_contents);
   DCHECK(provider);
 
-  WebappInstallSource install_source = InstallableMetrics::GetInstallSource(
-      web_contents, force_shortcut_app ? InstallTrigger::CREATE_SHORTCUT
-                                       : InstallTrigger::MENU);
+  webapps::WebappInstallSource install_source =
+      webapps::InstallableMetrics::GetInstallSource(
+          web_contents, force_shortcut_app
+                            ? webapps::InstallTrigger::CREATE_SHORTCUT
+                            : webapps::InstallTrigger::MENU);
 
   WebAppInstalledCallback callback = base::DoNothing();
 
@@ -123,7 +125,7 @@
 
 bool CreateWebAppFromManifest(content::WebContents* web_contents,
                               bool bypass_service_worker_check,
-                              WebappInstallSource install_source,
+                              webapps::WebappInstallSource install_source,
                               WebAppInstalledCallback installed_callback,
                               chrome::PwaInProductHelpState iph_state) {
   auto* provider = WebAppProvider::GetForWebContents(web_contents);
diff --git a/chrome/browser/ui/web_applications/web_app_dialog_utils.h b/chrome/browser/ui/web_applications/web_app_dialog_utils.h
index ef16f87f..7904e4082 100644
--- a/chrome/browser/ui/web_applications/web_app_dialog_utils.h
+++ b/chrome/browser/ui/web_applications/web_app_dialog_utils.h
@@ -9,7 +9,6 @@
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/web_applications/components/web_app_id.h"
 
-enum class WebappInstallSource;
 class Browser;
 class Profile;
 
@@ -17,6 +16,10 @@
 class WebContents;
 }
 
+namespace webapps {
+enum class WebappInstallSource;
+}
+
 namespace web_app {
 
 enum class InstallResultCode;
@@ -47,7 +50,7 @@
 // |iph_state| indicates whether or not in-product-help prompted this call.
 bool CreateWebAppFromManifest(content::WebContents* web_contents,
                               bool bypass_service_worker_check,
-                              WebappInstallSource install_source,
+                              webapps::WebappInstallSource install_source,
                               WebAppInstalledCallback installed_callback,
                               chrome::PwaInProductHelpState iph_state =
                                   chrome::PwaInProductHelpState::kNotShown);
diff --git a/chrome/browser/ui/web_applications/web_app_metrics.cc b/chrome/browser/ui/web_applications/web_app_metrics.cc
index f59721c..c25ee06 100644
--- a/chrome/browser/ui/web_applications/web_app_metrics.cc
+++ b/chrome/browser/ui/web_applications/web_app_metrics.cc
@@ -10,7 +10,6 @@
 #include "base/power_monitor/power_monitor.h"
 #include "base/time/time.h"
 #include "chrome/browser/engagement/site_engagement_service.h"
-#include "chrome/browser/installable/installable_metrics.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
@@ -21,6 +20,7 @@
 #include "chrome/browser/web_applications/components/web_app_ui_manager.h"
 #include "chrome/browser/web_applications/daily_metrics_helper.h"
 #include "chrome/browser/web_applications/web_app_provider.h"
+#include "components/webapps/installable/installable_metrics.h"
 #include "third_party/blink/public/mojom/manifest/display_mode.mojom.h"
 
 using DisplayMode = blink::mojom::DisplayMode;
@@ -64,7 +64,8 @@
   Optional<int> value =
       GetIntWebAppPref(prefs, app_id, kLatestWebAppInstallSource);
   DCHECK_GE(value.value_or(0), 0);
-  DCHECK_LT(value.value_or(0), static_cast<int>(WebappInstallSource::COUNT));
+  DCHECK_LT(value.value_or(0),
+            static_cast<int>(webapps::WebappInstallSource::COUNT));
   return value;
 }
 
diff --git a/chrome/browser/ui/web_applications/web_app_metrics_browsertest.cc b/chrome/browser/ui/web_applications/web_app_metrics_browsertest.cc
index 929a0bc..81f169a 100644
--- a/chrome/browser/ui/web_applications/web_app_metrics_browsertest.cc
+++ b/chrome/browser/ui/web_applications/web_app_metrics_browsertest.cc
@@ -8,7 +8,6 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/task/thread_pool/thread_pool_instance.h"
 #include "base/test/scoped_mock_clock_override.h"
-#include "chrome/browser/installable/installable_metrics.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/web_applications/test/web_app_browsertest_util.h"
@@ -17,6 +16,7 @@
 #include "chrome/browser/web_applications/components/web_app_constants.h"
 #include "chrome/browser/web_applications/daily_metrics_helper.h"
 #include "components/ukm/test_ukm_recorder.h"
+#include "components/webapps/installable/installable_metrics.h"
 #include "content/public/test/browser_test.h"
 #include "services/metrics/public/cpp/ukm_builders.h"
 #include "testing/gmock/include/gmock/gmock-matchers.h"
@@ -130,7 +130,7 @@
   // |InstallWebApp| always sets |OMNIBOX_INSTALL_ICON| as the install source.
   ukm::TestAutoSetUkmRecorder::ExpectEntryMetric(
       entry, UkmEntry::kInstallSourceName,
-      static_cast<int>(WebappInstallSource::OMNIBOX_INSTALL_ICON));
+      static_cast<int>(webapps::WebappInstallSource::OMNIBOX_INSTALL_ICON));
   ukm::TestAutoSetUkmRecorder::ExpectEntryMetric(
       entry, UkmEntry::kDisplayModeName,
       static_cast<int>(DisplayMode::kStandalone));
@@ -172,7 +172,7 @@
   // |InstallWebApp| always sets |OMNIBOX_INSTALL_ICON| as the install source.
   ukm::TestAutoSetUkmRecorder::ExpectEntryMetric(
       entry, UkmEntry::kInstallSourceName,
-      static_cast<int>(WebappInstallSource::OMNIBOX_INSTALL_ICON));
+      static_cast<int>(webapps::WebappInstallSource::OMNIBOX_INSTALL_ICON));
   ukm::TestAutoSetUkmRecorder::ExpectEntryMetric(
       entry, UkmEntry::kDisplayModeName,
       static_cast<int>(DisplayMode::kStandalone));
diff --git a/chrome/browser/ui/webid/DIR_METADATA b/chrome/browser/ui/webid/DIR_METADATA
index b36c62f..8019f44 100644
--- a/chrome/browser/ui/webid/DIR_METADATA
+++ b/chrome/browser/ui/webid/DIR_METADATA
@@ -1,3 +1,4 @@
 monorail {
   component: "Blink>Identity>WebID"
 }
+team_email: "web-identity@chromium.org"
\ No newline at end of file
diff --git a/chrome/browser/ui/webid/identity_dialog_controller.cc b/chrome/browser/ui/webid/identity_dialog_controller.cc
index f5083222..2e0fc4b 100644
--- a/chrome/browser/ui/webid/identity_dialog_controller.cc
+++ b/chrome/browser/ui/webid/identity_dialog_controller.cc
@@ -4,6 +4,9 @@
 
 #include "chrome/browser/ui/webid/identity_dialog_controller.h"
 
+#include "base/strings/utf_string_conversions.h"
+#include "chrome/browser/ui/webid/identity_dialogs.h"
+#include "components/infobars/core/infobar.h"
 #include "url/gurl.h"
 
 IdentityDialogController::IdentityDialogController() = default;
@@ -11,18 +14,31 @@
 IdentityDialogController::~IdentityDialogController() = default;
 
 void IdentityDialogController::ShowInitialPermissionDialog(
+    content::WebContents* web_contents,
     InitialApprovalCallback callback) {
-  // TODO(kenrb): Add UI permission dialog.
-  std::move(callback).Run(
-      content::IdentityRequestDialogController::UserApproval::kApproved);
+  // The WebContents should be that of RP page to make sure info bar is shown on
+  // the RP page.
+
+  // TODO(majidvp): Consider using a modal dialog instead of an Inforbar.
+  // http://crbug.com/1141125
+
+  // TODO(majidvp): Use a localized string. http://crbug.com/1141125
+  ShowWebIDPermissionInfoBar(
+      web_contents,
+      base::ASCIIToUTF16(
+          "WebID: Allow Identity provider to learn about this site?"),
+      std::move(callback));
 }
 
 void IdentityDialogController::ShowIdProviderWindow(
+    content::WebContents* web_contents,
     const GURL& idp_signin_url,
     IdProviderWindowClosedCallback callback) {
-  // TODO(kenrb): Add UI modal window to display the IDP UI and load the IDP
-  // page.
-  std::move(callback).Run();
+  // TODO(majidvp): Pass in a callback to receive the token.
+  // http://crbug.com/1141125
+  ShowWebIDSigninWindow(web_contents, idp_signin_url,
+                        base::OnceCallback<void(std::string)>(),
+                        std::move(callback));
 }
 
 void IdentityDialogController::ShowTokenExchangePermissionDialog(
diff --git a/chrome/browser/ui/webid/identity_dialog_controller.h b/chrome/browser/ui/webid/identity_dialog_controller.h
index 072dbfa..f17ef4e 100644
--- a/chrome/browser/ui/webid/identity_dialog_controller.h
+++ b/chrome/browser/ui/webid/identity_dialog_controller.h
@@ -7,9 +7,11 @@
 
 #include "base/callback.h"
 #include "content/public/browser/identity_request_dialog_controller.h"
+#include "content/public/browser/web_contents.h"
 
 class GURL;
 
+using UserApproval = content::IdentityRequestDialogController::UserApproval;
 using InitialApprovalCallback =
     content::IdentityRequestDialogController::InitialApprovalCallback;
 using IdProviderWindowClosedCallback =
@@ -30,9 +32,12 @@
   ~IdentityDialogController() override;
 
   // content::IdentityRequestDelegate
-  void ShowInitialPermissionDialog(InitialApprovalCallback) override;
-  void ShowIdProviderWindow(const GURL& idp_signin_url,
+  void ShowInitialPermissionDialog(content::WebContents*,
+                                   InitialApprovalCallback) override;
+  void ShowIdProviderWindow(content::WebContents*,
+                            const GURL& idp_signin_url,
                             IdProviderWindowClosedCallback) override;
+
   void ShowTokenExchangePermissionDialog(
       TokenExchangeApprovalCallback) override;
 };
diff --git a/chrome/browser/ui/webid/identity_dialogs.h b/chrome/browser/ui/webid/identity_dialogs.h
new file mode 100644
index 0000000..d10522e
--- /dev/null
+++ b/chrome/browser/ui/webid/identity_dialogs.h
@@ -0,0 +1,37 @@
+// Copyright 2020 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CHROME_BROWSER_UI_WEBID_IDENTITY_DIALOGS_H_
+#define CHROME_BROWSER_UI_WEBID_IDENTITY_DIALOGS_H_
+
+#include <string>
+
+#include "base/callback.h"
+#include "base/strings/string16.h"
+#include "content/public/browser/identity_request_dialog_controller.h"
+#include "url/gurl.h"
+
+namespace content {
+class WebContents;
+}  // namespace content
+
+// Creates and shows a confirmation infobar and delegate and adds the infobar to
+// |infobar_service|. The provided callback is called with appropriate status
+// depending on whether user accepted or denied/closed the infobar.
+void ShowWebIDPermissionInfoBar(
+    content::WebContents* web_contents,
+    const base::string16& message,
+    content::IdentityRequestDialogController::InitialApprovalCallback callback);
+
+// Creates and shows a window that loads the identity provider sign in page at
+// the given URL. It takes two callbacks:
+//  - on_done: called when IDP has provided an id_token with the id_token as
+//             its parameter.
+//  - on_close: called when window is closed.
+void ShowWebIDSigninWindow(content::WebContents* web_contents,
+                           const GURL& idp_signin_url,
+                           base::OnceCallback<void(std::string)> on_done,
+                           base::OnceCallback<void()> on_close);
+
+#endif  // CHROME_BROWSER_UI_WEBID_IDENTITY_DIALOGS_H_
diff --git a/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc b/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc
index 81b8216..af9e163 100644
--- a/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc
+++ b/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc
@@ -181,6 +181,8 @@
       {"searchBoxHint", IDS_GOOGLE_SEARCH_BOX_EMPTY_HINT_MD},
       {"realboxSeparator", IDS_AUTOCOMPLETE_MATCH_DESCRIPTION_SEPARATOR},
       {"removeSuggestion", IDS_OMNIBOX_REMOVE_SUGGESTION},
+      {"removeSuggestionA11ySuffix", IDS_ACC_REMOVE_SUGGESTION_SUFFIX},
+      {"removeSuggestionA11yPrefix", IDS_ACC_REMOVE_SUGGESTION_FOCUSED_PREFIX},
       {"hideSuggestions", IDS_TOOLTIP_HEADER_HIDE_SUGGESTIONS_BUTTON},
       {"showSuggestions", IDS_TOOLTIP_HEADER_SHOW_SUGGESTIONS_BUTTON},
       {"hideSection", IDS_ACC_HEADER_HIDE_SUGGESTIONS_BUTTON},
diff --git a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc
index db7bef1..02dc4a0aa 100644
--- a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc
+++ b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc
@@ -37,7 +37,6 @@
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/extensions/launch_util.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
-#include "chrome/browser/installable/installable_metrics.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/apps/app_info_dialog.h"
 #include "chrome/browser/ui/browser_dialogs.h"
@@ -75,6 +74,7 @@
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/prefs/pref_service.h"
 #include "components/prefs/scoped_user_pref_update.h"
+#include "components/webapps/installable/installable_metrics.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_ui.h"
 #include "extensions/browser/app_sorting.h"
@@ -1221,7 +1221,7 @@
 
   web_app_provider_->install_manager().InstallWebAppFromInfo(
       std::move(web_app), web_app::ForInstallableSite::kUnknown,
-      WebappInstallSource::SYNC, std::move(install_complete_callback));
+      webapps::WebappInstallSource::SYNC, std::move(install_complete_callback));
 }
 
 void AppLauncherHandler::SetAppToBeHighlighted() {
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_ui.cc b/chrome/browser/ui/webui/print_preview/print_preview_ui.cc
index 2fc15c1a..4b2c753 100644
--- a/chrome/browser/ui/webui/print_preview/print_preview_ui.cc
+++ b/chrome/browser/ui/webui/print_preview/print_preview_ui.cc
@@ -313,6 +313,10 @@
     {"selectButton", IDS_PRINT_PREVIEW_BUTTON_SELECT},
     {"seeMore", IDS_PRINT_PREVIEW_SEE_MORE},
     {"seeMoreDestinationsLabel", IDS_PRINT_PREVIEW_SEE_MORE_DESTINATIONS_LABEL},
+#if defined(OS_CHROMEOS)
+    {"serverSearchBoxPlaceholder",
+     IDS_PRINT_PREVIEW_SERVER_SEARCH_BOX_PLACEHOLDER},
+#endif
     {"title", IDS_PRINT_PREVIEW_TITLE},
     {"top", IDS_PRINT_PREVIEW_TOP_MARGIN_LABEL},
     {"unsupportedCloudPrinter", IDS_PRINT_PREVIEW_UNSUPPORTED_CLOUD_PRINTER},
@@ -400,6 +404,9 @@
   source->AddBoolean(
       "printSaveToDrive",
       base::FeatureList::IsEnabled(chromeos::features::kPrintSaveToDrive));
+  source->AddBoolean(
+      "printServerScaling",
+      base::FeatureList::IsEnabled(chromeos::features::kPrintServerScaling));
 #endif
 }
 
@@ -574,8 +581,7 @@
   PrintPreviewDataService::GetInstance()->RemoveEntry(*id_);
 }
 
-void PrintPreviewUI::SetInitiatorTitle(
-    const base::string16& job_title) {
+void PrintPreviewUI::SetInitiatorTitle(const base::string16& job_title) {
   initiator_title_ = job_title;
 }
 
diff --git a/chrome/browser/ui/webui/settings/chromeos/constants/routes.mojom b/chrome/browser/ui/webui/settings/chromeos/constants/routes.mojom
index 88c70a7..1ebfd66 100644
--- a/chrome/browser/ui/webui/settings/chromeos/constants/routes.mojom
+++ b/chrome/browser/ui/webui/settings/chromeos/constants/routes.mojom
@@ -104,7 +104,8 @@
   // Date and Time section.
   kTimeZone = 1000,
 
-  // Note: Privacy section has no subpages.
+  // Privacy section.
+  kManageOtherPeopleV2 = 1100,
 
   // Languages and Input section.
   kLanguagesAndInputDetails = 1200,
@@ -220,6 +221,7 @@
 
 // Privacy and Security section.
 const string kPrivacyAndSecuritySectionPath = "osPrivacy";
+const string kManageOtherPeopleSubpagePathV2 = "osPrivacy/accounts";
 
 // Languages and Input section.
 const string kLanguagesAndInputSectionPath = "osLanguages";
diff --git a/chrome/browser/ui/webui/settings/chromeos/constants/setting.mojom b/chrome/browser/ui/webui/settings/chromeos/constants/setting.mojom
index 894d6dd3..5be872f 100644
--- a/chrome/browser/ui/webui/settings/chromeos/constants/setting.mojom
+++ b/chrome/browser/ui/webui/settings/chromeos/constants/setting.mojom
@@ -170,6 +170,11 @@
   // see https://bugs.chromium.org/p/chromium/issues/detail?id=1077126.
   // Do not reuse.
   kUsageStatsAndCrashReports = 1103,
+  kGuestBrowsingV2 = 1104,
+  kShowUsernamesAndPhotosAtSignInV2 = 1105,
+  kRestrictSignInV2 = 1106,
+  kAddToUserAllowlistV2 = 1107,
+  kRemoveFromUserAllowlistV2 = 1108,
 
   // Languages and Input section.
   kAddLanguage = 1200,
diff --git a/chrome/browser/ui/webui/settings/chromeos/people_section.cc b/chrome/browser/ui/webui/settings/chromeos/people_section.cc
index c65f9d8..133cc145 100644
--- a/chrome/browser/ui/webui/settings/chromeos/people_section.cc
+++ b/chrome/browser/ui/webui/settings/chromeos/people_section.cc
@@ -71,33 +71,12 @@
          {.setting = mojom::Setting::kChangeAuthPin},
          {IDS_OS_SETTINGS_TAG_LOCK_SCREEN_PIN_OR_PASSWORD_ALT1,
           SearchConcept::kAltTagEnd}},
-        {IDS_OS_SETTINGS_TAG_USERNAMES_AND_PHOTOS,
-         mojom::kManageOtherPeopleSubpagePath,
-         mojom::SearchResultIcon::kAvatar,
-         mojom::SearchResultDefaultRank::kMedium,
-         mojom::SearchResultType::kSetting,
-         {.setting = mojom::Setting::kShowUsernamesAndPhotosAtSignIn},
-         {IDS_OS_SETTINGS_TAG_USERNAMES_AND_PHOTOS_ALT1,
-          IDS_OS_SETTINGS_TAG_USERNAMES_AND_PHOTOS_ALT2,
-          SearchConcept::kAltTagEnd}},
         {IDS_OS_SETTINGS_TAG_PEOPLE_ACCOUNTS,
          mojom::kMyAccountsSubpagePath,
          mojom::SearchResultIcon::kAvatar,
          mojom::SearchResultDefaultRank::kMedium,
          mojom::SearchResultType::kSubpage,
          {.subpage = mojom::Subpage::kMyAccounts}},
-        {IDS_OS_SETTINGS_TAG_RESTRICT_SIGN_IN_REMOVE,
-         mojom::kManageOtherPeopleSubpagePath,
-         mojom::SearchResultIcon::kAvatar,
-         mojom::SearchResultDefaultRank::kMedium,
-         mojom::SearchResultType::kSetting,
-         {.setting = mojom::Setting::kRemoveFromUserAllowlist}},
-        {IDS_OS_SETTINGS_TAG_GUEST_BROWSING,
-         mojom::kManageOtherPeopleSubpagePath,
-         mojom::SearchResultIcon::kAvatar,
-         mojom::SearchResultDefaultRank::kMedium,
-         mojom::SearchResultType::kSetting,
-         {.setting = mojom::Setting::kGuestBrowsing}},
         {IDS_OS_SETTINGS_TAG_LOCK_SCREEN_WHEN_WAKING,
          mojom::kSecurityAndSignInSubpagePath,
          mojom::SearchResultIcon::kLock,
@@ -106,26 +85,12 @@
          {.setting = mojom::Setting::kLockScreen},
          {IDS_OS_SETTINGS_TAG_LOCK_SCREEN_WHEN_WAKING_ALT1,
           SearchConcept::kAltTagEnd}},
-        {IDS_OS_SETTINGS_TAG_RESTRICT_SIGN_IN,
-         mojom::kManageOtherPeopleSubpagePath,
-         mojom::SearchResultIcon::kAvatar,
-         mojom::SearchResultDefaultRank::kMedium,
-         mojom::SearchResultType::kSetting,
-         {.setting = mojom::Setting::kRestrictSignIn},
-         {IDS_OS_SETTINGS_TAG_RESTRICT_SIGN_IN_ALT1,
-          SearchConcept::kAltTagEnd}},
         {IDS_OS_SETTINGS_TAG_LOCK_SCREEN,
          mojom::kSecurityAndSignInSubpagePath,
          mojom::SearchResultIcon::kLock,
          mojom::SearchResultDefaultRank::kMedium,
          mojom::SearchResultType::kSubpage,
          {.subpage = mojom::Subpage::kSecurityAndSignIn}},
-        {IDS_OS_SETTINGS_TAG_RESTRICT_SIGN_IN_ADD,
-         mojom::kManageOtherPeopleSubpagePath,
-         mojom::SearchResultIcon::kAvatar,
-         mojom::SearchResultDefaultRank::kMedium,
-         mojom::SearchResultType::kSetting,
-         {.setting = mojom::Setting::kAddToUserAllowlist}},
     });
 
     if (chromeos::features::IsAccountManagementFlowsV2Enabled()) {
@@ -143,19 +108,57 @@
                         mojom::SearchResultType::kSetting,
                         {.setting = mojom::Setting::kAddAccount}}});
     } else {
-      all_tags.insert(all_tags.end(),
-                      {{IDS_OS_SETTINGS_TAG_PEOPLE,
-                        mojom::kPeopleSectionPath,
-                        mojom::SearchResultIcon::kAvatar,
-                        mojom::SearchResultDefaultRank::kMedium,
-                        mojom::SearchResultType::kSection,
-                        {.section = mojom::Section::kPeople}},
-                       {IDS_OS_SETTINGS_TAG_PEOPLE_ACCOUNTS_ADD,
-                        mojom::kMyAccountsSubpagePath,
-                        mojom::SearchResultIcon::kAvatar,
-                        mojom::SearchResultDefaultRank::kMedium,
-                        mojom::SearchResultType::kSetting,
-                        {.setting = mojom::Setting::kAddAccount}}});
+      all_tags.insert(
+          all_tags.end(),
+          {
+              {IDS_OS_SETTINGS_TAG_PEOPLE,
+               mojom::kPeopleSectionPath,
+               mojom::SearchResultIcon::kAvatar,
+               mojom::SearchResultDefaultRank::kMedium,
+               mojom::SearchResultType::kSection,
+               {.section = mojom::Section::kPeople}},
+              {IDS_OS_SETTINGS_TAG_PEOPLE_ACCOUNTS_ADD,
+               mojom::kMyAccountsSubpagePath,
+               mojom::SearchResultIcon::kAvatar,
+               mojom::SearchResultDefaultRank::kMedium,
+               mojom::SearchResultType::kSetting,
+               {.setting = mojom::Setting::kAddAccount}},
+              {IDS_OS_SETTINGS_TAG_USERNAMES_AND_PHOTOS,
+               mojom::kManageOtherPeopleSubpagePath,
+               mojom::SearchResultIcon::kAvatar,
+               mojom::SearchResultDefaultRank::kMedium,
+               mojom::SearchResultType::kSetting,
+               {.setting = mojom::Setting::kShowUsernamesAndPhotosAtSignIn},
+               {IDS_OS_SETTINGS_TAG_USERNAMES_AND_PHOTOS_ALT1,
+                IDS_OS_SETTINGS_TAG_USERNAMES_AND_PHOTOS_ALT2,
+                SearchConcept::kAltTagEnd}},
+              {IDS_OS_SETTINGS_TAG_RESTRICT_SIGN_IN_REMOVE,
+               mojom::kManageOtherPeopleSubpagePath,
+               mojom::SearchResultIcon::kAvatar,
+               mojom::SearchResultDefaultRank::kMedium,
+               mojom::SearchResultType::kSetting,
+               {.setting = mojom::Setting::kRemoveFromUserAllowlist}},
+              {IDS_OS_SETTINGS_TAG_GUEST_BROWSING,
+               mojom::kManageOtherPeopleSubpagePath,
+               mojom::SearchResultIcon::kAvatar,
+               mojom::SearchResultDefaultRank::kMedium,
+               mojom::SearchResultType::kSetting,
+               {.setting = mojom::Setting::kGuestBrowsing}},
+              {IDS_OS_SETTINGS_TAG_RESTRICT_SIGN_IN,
+               mojom::kManageOtherPeopleSubpagePath,
+               mojom::SearchResultIcon::kAvatar,
+               mojom::SearchResultDefaultRank::kMedium,
+               mojom::SearchResultType::kSetting,
+               {.setting = mojom::Setting::kRestrictSignIn},
+               {IDS_OS_SETTINGS_TAG_RESTRICT_SIGN_IN_ALT1,
+                SearchConcept::kAltTagEnd}},
+              {IDS_OS_SETTINGS_TAG_RESTRICT_SIGN_IN_ADD,
+               mojom::kManageOtherPeopleSubpagePath,
+               mojom::SearchResultIcon::kAvatar,
+               mojom::SearchResultDefaultRank::kMedium,
+               mojom::SearchResultType::kSetting,
+               {.setting = mojom::Setting::kAddToUserAllowlist}},
+          });
     }
     return all_tags;
   }());
diff --git a/chrome/browser/ui/webui/settings/chromeos/privacy_section.cc b/chrome/browser/ui/webui/settings/chromeos/privacy_section.cc
index 7a740f1..0357dd89 100644
--- a/chrome/browser/ui/webui/settings/chromeos/privacy_section.cc
+++ b/chrome/browser/ui/webui/settings/chromeos/privacy_section.cc
@@ -23,20 +23,65 @@
 namespace {
 
 const std::vector<SearchConcept>& GetPrivacySearchConcepts() {
-  static const base::NoDestructor<std::vector<SearchConcept>> tags({
-      {IDS_OS_SETTINGS_TAG_PRIVACY_VERIFIED_ACCESS,
-       mojom::kPrivacyAndSecuritySectionPath,
-       mojom::SearchResultIcon::kShield,
-       mojom::SearchResultDefaultRank::kMedium,
-       mojom::SearchResultType::kSetting,
-       {.setting = mojom::Setting::kVerifiedAccess}},
-      {IDS_OS_SETTINGS_TAG_PRIVACY,
-       mojom::kPrivacyAndSecuritySectionPath,
-       mojom::SearchResultIcon::kShield,
-       mojom::SearchResultDefaultRank::kMedium,
-       mojom::SearchResultType::kSection,
-       {.section = mojom::Section::kPrivacyAndSecurity}},
-  });
+  static const base::NoDestructor<std::vector<SearchConcept>> tags([] {
+    std::vector<SearchConcept> all_tags({
+        {IDS_OS_SETTINGS_TAG_PRIVACY_VERIFIED_ACCESS,
+         mojom::kPrivacyAndSecuritySectionPath,
+         mojom::SearchResultIcon::kShield,
+         mojom::SearchResultDefaultRank::kMedium,
+         mojom::SearchResultType::kSetting,
+         {.setting = mojom::Setting::kVerifiedAccess}},
+        {IDS_OS_SETTINGS_TAG_PRIVACY,
+         mojom::kPrivacyAndSecuritySectionPath,
+         mojom::SearchResultIcon::kShield,
+         mojom::SearchResultDefaultRank::kMedium,
+         mojom::SearchResultType::kSection,
+         {.section = mojom::Section::kPrivacyAndSecurity}},
+    });
+
+    if (chromeos::features::IsAccountManagementFlowsV2Enabled()) {
+      all_tags.insert(
+          all_tags.end(),
+          {{IDS_OS_SETTINGS_TAG_GUEST_BROWSING,
+            mojom::kManageOtherPeopleSubpagePathV2,
+            mojom::SearchResultIcon::kAvatar,
+            mojom::SearchResultDefaultRank::kMedium,
+            mojom::SearchResultType::kSetting,
+            {.setting = mojom::Setting::kGuestBrowsingV2}},
+           {IDS_OS_SETTINGS_TAG_USERNAMES_AND_PHOTOS,
+            mojom::kManageOtherPeopleSubpagePathV2,
+            mojom::SearchResultIcon::kAvatar,
+            mojom::SearchResultDefaultRank::kMedium,
+            mojom::SearchResultType::kSetting,
+            {.setting = mojom::Setting::kShowUsernamesAndPhotosAtSignInV2},
+            {IDS_OS_SETTINGS_TAG_USERNAMES_AND_PHOTOS_ALT1,
+             IDS_OS_SETTINGS_TAG_USERNAMES_AND_PHOTOS_ALT2,
+             SearchConcept::kAltTagEnd}},
+           {IDS_OS_SETTINGS_TAG_RESTRICT_SIGN_IN,
+            mojom::kManageOtherPeopleSubpagePathV2,
+            mojom::SearchResultIcon::kAvatar,
+            mojom::SearchResultDefaultRank::kMedium,
+            mojom::SearchResultType::kSetting,
+            {.setting = mojom::Setting::kRestrictSignInV2},
+            {IDS_OS_SETTINGS_TAG_RESTRICT_SIGN_IN_ALT1,
+             SearchConcept::kAltTagEnd}},
+           {IDS_OS_SETTINGS_TAG_RESTRICT_SIGN_IN_ADD,
+            mojom::kManageOtherPeopleSubpagePathV2,
+            mojom::SearchResultIcon::kAvatar,
+            mojom::SearchResultDefaultRank::kMedium,
+            mojom::SearchResultType::kSetting,
+            {.setting = mojom::Setting::kAddToUserAllowlistV2}},
+           {IDS_OS_SETTINGS_TAG_RESTRICT_SIGN_IN_REMOVE,
+            mojom::kManageOtherPeopleSubpagePathV2,
+            mojom::SearchResultIcon::kAvatar,
+            mojom::SearchResultDefaultRank::kMedium,
+            mojom::SearchResultType::kSetting,
+            {.setting = mojom::Setting::kRemoveFromUserAllowlistV2}}});
+    }
+
+    return all_tags;
+  }());
+
   return *tags;
 }
 
@@ -125,6 +170,22 @@
   generator->RegisterTopLevelSetting(mojom::Setting::kVerifiedAccess);
   generator->RegisterTopLevelSetting(
       mojom::Setting::kUsageStatsAndCrashReports);
+
+  // Manage other people.
+  generator->RegisterTopLevelSubpage(IDS_SETTINGS_PEOPLE_MANAGE_OTHER_PEOPLE,
+                                     mojom::Subpage::kManageOtherPeopleV2,
+                                     mojom::SearchResultIcon::kAvatar,
+                                     mojom::SearchResultDefaultRank::kMedium,
+                                     mojom::kManageOtherPeopleSubpagePathV2);
+  static constexpr mojom::Setting kManageOtherPeopleSettings[] = {
+      mojom::Setting::kGuestBrowsingV2,
+      mojom::Setting::kShowUsernamesAndPhotosAtSignInV2,
+      mojom::Setting::kRestrictSignInV2,
+      mojom::Setting::kAddToUserAllowlistV2,
+      mojom::Setting::kRemoveFromUserAllowlistV2,
+  };
+  RegisterNestedSettingBulk(mojom::Subpage::kManageOtherPeopleV2,
+                            kManageOtherPeopleSettings, generator);
 }
 
 }  // namespace settings
diff --git a/chrome/browser/ui/webui/settings/safety_check_handler_unittest.cc b/chrome/browser/ui/webui/settings/safety_check_handler_unittest.cc
index 157f100..007e40d 100644
--- a/chrome/browser/ui/webui/settings/safety_check_handler_unittest.cc
+++ b/chrome/browser/ui/webui/settings/safety_check_handler_unittest.cc
@@ -163,10 +163,11 @@
 
   void InvokeOnCompromisedCredentialsChanged() {
     // Credentials have to be unique, so the callback is always invoked.
-    store_->AddCompromisedCredentials(
-        {"test.com",
-         base::ASCIIToUTF16("test" +
-                            base::NumberToString(test_credential_counter_++))});
+    store_->AddCompromisedCredentials(password_manager::CompromisedCredentials(
+        "test.com",
+        base::ASCIIToUTF16("test" +
+                           base::NumberToString(test_credential_counter_++)),
+        base::Time(), password_manager::CompromiseType::kLeaked, false));
     base::RunLoop().RunUntilIdle();
   }
 
diff --git a/chrome/browser/ui/webui/signin/profile_picker_handler.cc b/chrome/browser/ui/webui/signin/profile_picker_handler.cc
index cd48f9a..fa31a3b 100644
--- a/chrome/browser/ui/webui/signin/profile_picker_handler.cc
+++ b/chrome/browser/ui/webui/signin/profile_picker_handler.cc
@@ -504,13 +504,13 @@
   DCHECK(args->GetList()[0].is_int());
   SkColor profile_color = args->GetList()[0].GetInt();
   ProfilePicker::SwitchToSignIn(
-      profile_color, base::BindOnce(&ProfilePickerHandler::OnLoadSigninFailed,
+      profile_color, base::BindOnce(&ProfilePickerHandler::OnLoadSigninFinished,
                                     weak_factory_.GetWeakPtr()));
 }
 
-void ProfilePickerHandler::OnLoadSigninFailed() {
+void ProfilePickerHandler::OnLoadSigninFinished(bool success) {
   if (IsJavascriptAllowed())
-    FireWebUIListener("load-signin-failed", base::Value());
+    FireWebUIListener("load-signin-finished", base::Value(success));
 }
 
 void ProfilePickerHandler::OnSwitchToProfileComplete(
diff --git a/chrome/browser/ui/webui/signin/profile_picker_handler.h b/chrome/browser/ui/webui/signin/profile_picker_handler.h
index 30e5416..9e917301 100644
--- a/chrome/browser/ui/webui/signin/profile_picker_handler.h
+++ b/chrome/browser/ui/webui/signin/profile_picker_handler.h
@@ -46,7 +46,7 @@
   void HandleGetProfileThemeInfo(const base::ListValue* args);
   void HandleCreateProfile(const base::ListValue* args);
 
-  void OnLoadSigninFailed();
+  void OnLoadSigninFinished(bool success);
   void GatherProfileStatistics(Profile* profile);
   void OnProfileStatisticsReceived(base::FilePath profile_path,
                                    profiles::ProfileCategoryStats result);
diff --git a/chrome/browser/web_applications/BUILD.gn b/chrome/browser/web_applications/BUILD.gn
index e229b00..b30947e21 100644
--- a/chrome/browser/web_applications/BUILD.gn
+++ b/chrome/browser/web_applications/BUILD.gn
@@ -89,6 +89,7 @@
     "//components/services/app_service/public/cpp:protocol_handling",
     "//components/sync",
     "//components/user_manager",
+    "//components/webapps",
     "//content/public/browser",
     "//services/metrics/public/cpp:ukm_builders",
     "//skia",
@@ -221,6 +222,7 @@
     "//chrome/test:test_support",
     "//components/services/app_service/public/cpp:app_url_handling",
     "//components/services/app_service/public/cpp:protocol_handling",
+    "//components/webapps",
     "//content/public/browser",
     "//content/test:test_support",
     "//services/metrics/public/cpp:ukm_builders",
@@ -281,6 +283,7 @@
     "//components/permissions:permissions",
     "//components/services/app_service/public/cpp:app_update",
     "//components/services/app_service/public/cpp:intents",
+    "//components/webapps",
     "//extensions/browser:test_support",
   ]
 
diff --git a/chrome/browser/web_applications/components/BUILD.gn b/chrome/browser/web_applications/components/BUILD.gn
index b34cdca3..79a91272 100644
--- a/chrome/browser/web_applications/components/BUILD.gn
+++ b/chrome/browser/web_applications/components/BUILD.gn
@@ -148,6 +148,7 @@
     "//components/services/app_service/public/mojom",
     "//components/site_engagement/core/mojom:mojo_bindings",
     "//components/user_manager:user_manager",
+    "//components/webapps",
     "//content/public/browser",
     "//extensions/common:common_constants",
     "//net",
@@ -213,6 +214,8 @@
     "//chrome/browser/web_applications:web_applications_test_support",
     "//chrome/browser/web_applications/extensions:extensions",
     "//chrome/test:test_support",
+    "//components/webapps",
+    "//components/webapps:test_support",
     "//content/public/browser",
     "//skia",
     "//testing/gmock",
diff --git a/chrome/browser/web_applications/components/app_registrar.cc b/chrome/browser/web_applications/components/app_registrar.cc
index bf110422..1c393a1 100644
--- a/chrome/browser/web_applications/components/app_registrar.cc
+++ b/chrome/browser/web_applications/components/app_registrar.cc
@@ -49,7 +49,7 @@
   for (AppRegistrarObserver& observer : observers_)
     observer.OnWebAppInstalled(app_id);
   // TODO(alancutter): Call RecordWebAppInstallation here when we get access to
-  // the WebappInstallSource in this event.
+  // the webapps::WebappInstallSource in this event.
 }
 
 void AppRegistrar::NotifyWebAppManifestUpdated(const AppId& app_id,
diff --git a/chrome/browser/web_applications/components/install_bounce_metric.cc b/chrome/browser/web_applications/components/install_bounce_metric.cc
index 97726df8..e26da75 100644
--- a/chrome/browser/web_applications/components/install_bounce_metric.cc
+++ b/chrome/browser/web_applications/components/install_bounce_metric.cc
@@ -51,7 +51,7 @@
 
 struct InstallMetrics {
   base::Time timestamp;
-  WebappInstallSource source;
+  webapps::WebappInstallSource source;
 };
 
 base::Optional<InstallMetrics> ParseInstallMetricsFromPrefs(
@@ -77,8 +77,8 @@
   if (!source || !source->is_int())
     return base::nullopt;
 
-  return InstallMetrics{*timestamp,
-                        static_cast<WebappInstallSource>(source->GetInt())};
+  return InstallMetrics{
+      *timestamp, static_cast<webapps::WebappInstallSource>(source->GetInt())};
 }
 
 void WriteInstallMetricsToPrefs(const InstallMetrics& install_metrics,
@@ -106,9 +106,10 @@
   registry->RegisterDictionaryPref(prefs::kWebAppInstallMetrics);
 }
 
-void RecordWebAppInstallationTimestamp(PrefService* pref_service,
-                                       const AppId& app_id,
-                                       WebappInstallSource install_source) {
+void RecordWebAppInstallationTimestamp(
+    PrefService* pref_service,
+    const AppId& app_id,
+    webapps::WebappInstallSource install_source) {
   WriteInstallMetricsToPrefs(InstallMetrics{GetTime(), install_source},
                              pref_service, app_id);
 }
@@ -126,7 +127,7 @@
     return;
 
   UMA_HISTOGRAM_ENUMERATION("Webapp.Install.InstallBounce", metrics->source,
-                            WebappInstallSource::COUNT);
+                            webapps::WebappInstallSource::COUNT);
 }
 
 }  // namespace web_app
diff --git a/chrome/browser/web_applications/components/install_bounce_metric.h b/chrome/browser/web_applications/components/install_bounce_metric.h
index af54fcd..3d28ece3 100644
--- a/chrome/browser/web_applications/components/install_bounce_metric.h
+++ b/chrome/browser/web_applications/components/install_bounce_metric.h
@@ -8,8 +8,8 @@
 #include "base/macros.h"
 #include "base/optional.h"
 #include "base/time/time.h"
-#include "chrome/browser/installable/installable_metrics.h"
 #include "chrome/browser/web_applications/components/web_app_id.h"
+#include "components/webapps/installable/installable_metrics.h"
 
 class PrefService;
 class PrefRegistrySimple;
@@ -20,9 +20,10 @@
 
 void RegisterInstallBounceMetricProfilePrefs(PrefRegistrySimple* registry);
 
-void RecordWebAppInstallationTimestamp(PrefService* pref_service,
-                                       const AppId& app_id,
-                                       WebappInstallSource install_source);
+void RecordWebAppInstallationTimestamp(
+    PrefService* pref_service,
+    const AppId& app_id,
+    webapps::WebappInstallSource install_source);
 
 void RecordWebAppUninstallation(PrefService* pref_service, const AppId& app_id);
 
diff --git a/chrome/browser/web_applications/components/install_finalizer.h b/chrome/browser/web_applications/components/install_finalizer.h
index e633f81..6c1ac18 100644
--- a/chrome/browser/web_applications/components/install_finalizer.h
+++ b/chrome/browser/web_applications/components/install_finalizer.h
@@ -9,9 +9,9 @@
 
 #include "base/callback_forward.h"
 #include "base/optional.h"
-#include "chrome/browser/installable/installable_metrics.h"
 #include "chrome/browser/web_applications/components/web_app_chromeos_data.h"
 #include "chrome/browser/web_applications/components/web_app_id.h"
+#include "components/webapps/installable/installable_metrics.h"
 
 struct WebApplicationInfo;
 class GURL;
@@ -43,7 +43,8 @@
     ~FinalizeOptions();
     FinalizeOptions(const FinalizeOptions&);
 
-    WebappInstallSource install_source = WebappInstallSource::COUNT;
+    webapps::WebappInstallSource install_source =
+        webapps::WebappInstallSource::COUNT;
     bool locally_installed = true;
 
     base::Optional<WebAppChromeOsData> chromeos_data;
diff --git a/chrome/browser/web_applications/components/install_finalizer_unittest.cc b/chrome/browser/web_applications/components/install_finalizer_unittest.cc
index 4c6b1320..1139051 100644
--- a/chrome/browser/web_applications/components/install_finalizer_unittest.cc
+++ b/chrome/browser/web_applications/components/install_finalizer_unittest.cc
@@ -107,7 +107,7 @@
   info->start_url = GURL("https://foo.example");
   info->title = base::ASCIIToUTF16("Foo Title");
   InstallFinalizer::FinalizeOptions options;
-  options.install_source = WebappInstallSource::INTERNAL_DEFAULT;
+  options.install_source = webapps::WebappInstallSource::INTERNAL_DEFAULT;
 
   FinalizeInstallResult result = AwaitFinalizeInstall(*info, options);
 
@@ -120,7 +120,7 @@
   info->start_url = GURL("https://foo.example");
   info->title = base::ASCIIToUTF16("Foo Title");
   InstallFinalizer::FinalizeOptions options;
-  options.install_source = WebappInstallSource::INTERNAL_DEFAULT;
+  options.install_source = webapps::WebappInstallSource::INTERNAL_DEFAULT;
 
   FinalizeInstallResult result = AwaitFinalizeInstall(*info, options);
 
@@ -128,8 +128,8 @@
       GetIntWebAppPref(profile()->GetPrefs(), result.installed_app_id,
                        kLatestWebAppInstallSource);
   EXPECT_TRUE(install_source.has_value());
-  EXPECT_EQ(static_cast<WebappInstallSource>(*install_source),
-            WebappInstallSource::INTERNAL_DEFAULT);
+  EXPECT_EQ(static_cast<webapps::WebappInstallSource>(*install_source),
+            webapps::WebappInstallSource::INTERNAL_DEFAULT);
 }
 
 }  // namespace web_app
diff --git a/chrome/browser/web_applications/components/install_manager.h b/chrome/browser/web_applications/components/install_manager.h
index b0dff73..c131aa77 100644
--- a/chrome/browser/web_applications/components/install_manager.h
+++ b/chrome/browser/web_applications/components/install_manager.h
@@ -17,14 +17,16 @@
 #include "chrome/browser/web_applications/components/web_app_install_utils.h"
 #include "chrome/browser/web_applications/components/web_app_url_loader.h"
 
-enum class WebappInstallSource;
+class Profile;
 struct WebApplicationInfo;
 
 namespace content {
 class WebContents;
 }
 
-class Profile;
+namespace webapps {
+enum class WebappInstallSource;
+}
 
 namespace web_app {
 
@@ -75,7 +77,7 @@
   virtual void InstallWebAppFromManifest(
       content::WebContents* web_contents,
       bool bypass_service_worker_check,
-      WebappInstallSource install_source,
+      webapps::WebappInstallSource install_source,
       WebAppInstallDialogCallback dialog_callback,
       OnceInstallCallback callback) = 0;
 
@@ -87,7 +89,7 @@
   virtual void InstallWebAppFromManifestWithFallback(
       content::WebContents* web_contents,
       bool force_shortcut_app,
-      WebappInstallSource install_source,
+      webapps::WebappInstallSource install_source,
       WebAppInstallDialogCallback dialog_callback,
       OnceInstallCallback callback) = 0;
 
@@ -127,10 +129,11 @@
   };
   // Starts a background web app installation process for a given
   // |web_contents|.
-  virtual void InstallWebAppWithParams(content::WebContents* web_contents,
-                                       const InstallParams& install_params,
-                                       WebappInstallSource install_source,
-                                       OnceInstallCallback callback) = 0;
+  virtual void InstallWebAppWithParams(
+      content::WebContents* web_contents,
+      const InstallParams& install_params,
+      webapps::WebappInstallSource install_source,
+      OnceInstallCallback callback) = 0;
 
   // Starts a web app installation process using prefilled
   // |web_application_info| which holds all the data needed for installation.
@@ -139,14 +142,14 @@
   virtual void InstallWebAppFromInfo(
       std::unique_ptr<WebApplicationInfo> web_application_info,
       ForInstallableSite for_installable_site,
-      WebappInstallSource install_source,
+      webapps::WebappInstallSource install_source,
       OnceInstallCallback callback) = 0;
 
   virtual void InstallWebAppFromInfo(
       std::unique_ptr<WebApplicationInfo> web_application_info,
       ForInstallableSite for_installable_site,
       const base::Optional<InstallParams>& install_params,
-      WebappInstallSource install_source,
+      webapps::WebappInstallSource install_source,
       OnceInstallCallback callback) = 0;
 
   // For backward compatibility with ExtensionSyncService-based system:
@@ -176,7 +179,7 @@
   // valid manifest. Calls |callback| with results.
   virtual void LoadWebAppAndCheckManifest(
       const GURL& web_app_url,
-      WebappInstallSource install_source,
+      webapps::WebappInstallSource install_source,
       WebAppManifestCheckCallback callback) = 0;
 
   void DisableBookmarkAppSyncInstallForTesting() {
diff --git a/chrome/browser/web_applications/components/web_app_data_retriever.cc b/chrome/browser/web_applications/components/web_app_data_retriever.cc
index cce6cef1..d4994dc 100644
--- a/chrome/browser/web_applications/components/web_app_data_retriever.cc
+++ b/chrome/browser/web_applications/components/web_app_data_retriever.cc
@@ -13,11 +13,11 @@
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/installable/installable_data.h"
-#include "chrome/browser/installable/installable_manager.h"
 #include "chrome/browser/web_applications/components/web_app_icon_generator.h"
 #include "chrome/browser/web_applications/components/web_application_info.h"
 #include "chrome/common/chrome_render_frame.mojom.h"
+#include "components/webapps/installable/installable_data.h"
+#include "components/webapps/installable/installable_manager.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
@@ -83,8 +83,8 @@
     content::WebContents* web_contents,
     bool bypass_service_worker_check,
     CheckInstallabilityCallback callback) {
-  InstallableManager* installable_manager =
-      InstallableManager::FromWebContents(web_contents);
+  webapps::InstallableManager* installable_manager =
+      webapps::InstallableManager::FromWebContents(web_contents);
   DCHECK(installable_manager);
 
   Observe(web_contents);
@@ -94,7 +94,7 @@
   check_installability_callback_ = std::move(callback);
 
   // TODO(crbug.com/829232) Unify with other calls to GetData.
-  InstallableParams params;
+  webapps::InstallableParams params;
   params.check_eligibility = true;
   params.valid_primary_icon = true;
   params.valid_manifest = true;
@@ -176,7 +176,7 @@
 }
 
 void WebAppDataRetriever::OnDidPerformInstallableCheck(
-    const InstallableData& data) {
+    const webapps::InstallableData& data) {
   if (ShouldStopRetrieval())
     return;
 
diff --git a/chrome/browser/web_applications/components/web_app_data_retriever.h b/chrome/browser/web_applications/components/web_app_data_retriever.h
index 1e71026b..58d2ad08 100644
--- a/chrome/browser/web_applications/components/web_app_data_retriever.h
+++ b/chrome/browser/web_applications/components/web_app_data_retriever.h
@@ -20,7 +20,6 @@
 #include "mojo/public/cpp/bindings/associated_remote.h"
 
 class GURL;
-struct InstallableData;
 struct WebApplicationInfo;
 
 namespace blink {
@@ -31,6 +30,10 @@
 class WebContents;
 }
 
+namespace webapps {
+struct InstallableData;
+}
+
 namespace web_app {
 
 // Class used by WebAppInstallTask to retrieve the necessary information to
@@ -84,7 +87,7 @@
           chrome_render_frame,
       int last_committed_nav_entry_unique_id,
       chrome::mojom::WebPageMetadataPtr web_page_metadata);
-  void OnDidPerformInstallableCheck(const InstallableData& data);
+  void OnDidPerformInstallableCheck(const webapps::InstallableData& data);
   void OnIconsDownloaded(bool success, IconsMap icons_map);
 
   void CallCallbackOnError();
diff --git a/chrome/browser/web_applications/components/web_app_data_retriever_unittest.cc b/chrome/browser/web_applications/components/web_app_data_retriever_unittest.cc
index 46000fd..ccbf09b 100644
--- a/chrome/browser/web_applications/components/web_app_data_retriever_unittest.cc
+++ b/chrome/browser/web_applications/components/web_app_data_retriever_unittest.cc
@@ -13,15 +13,15 @@
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/bind.h"
-#include "chrome/browser/installable/fake_installable_manager.h"
-#include "chrome/browser/installable/installable_data.h"
-#include "chrome/browser/installable/installable_manager.h"
-#include "chrome/browser/installable/installable_metrics.h"
 #include "chrome/browser/web_applications/components/web_application_info.h"
 #include "chrome/common/chrome_render_frame.mojom-test-utils.h"
 #include "chrome/common/web_page_metadata.mojom.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
+#include "components/webapps/installable/fake_installable_manager.h"
+#include "components/webapps/installable/installable_data.h"
+#include "components/webapps/installable/installable_manager.h"
+#include "components/webapps/installable/installable_metrics.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/test/browser_task_environment.h"
@@ -328,8 +328,8 @@
 
   {
     auto manifest = std::make_unique<blink::Manifest>();
-    FakeInstallableManager::CreateForWebContentsWithManifest(
-        web_contents(), NO_MANIFEST, GURL(), std::move(manifest));
+    webapps::FakeInstallableManager::CreateForWebContentsWithManifest(
+        web_contents(), webapps::NO_MANIFEST, GURL(), std::move(manifest));
   }
 
   base::RunLoop run_loop;
@@ -407,9 +407,9 @@
     manifest->scope = manifest_scope;
     manifest->theme_color = manifest_theme_color;
 
-    FakeInstallableManager::CreateForWebContentsWithManifest(
-        web_contents(), NO_ERROR_DETECTED, GURL("https://example.com/manifest"),
-        std::move(manifest));
+    webapps::FakeInstallableManager::CreateForWebContentsWithManifest(
+        web_contents(), webapps::NO_ERROR_DETECTED,
+        GURL("https://example.com/manifest"), std::move(manifest));
   }
 
   base::RunLoop run_loop;
@@ -443,8 +443,8 @@
 
   {
     auto manifest = std::make_unique<blink::Manifest>();
-    FakeInstallableManager::CreateForWebContentsWithManifest(
-        web_contents(), NO_MANIFEST, GURL(), std::move(manifest));
+    webapps::FakeInstallableManager::CreateForWebContentsWithManifest(
+        web_contents(), webapps::NO_MANIFEST, GURL(), std::move(manifest));
   }
 
   base::RunLoop run_loop;
diff --git a/chrome/browser/web_applications/components/web_app_id_constants.h b/chrome/browser/web_applications/components/web_app_id_constants.h
index dbf3f7a..8589e23 100644
--- a/chrome/browser/web_applications/components/web_app_id_constants.h
+++ b/chrome/browser/web_applications/components/web_app_id_constants.h
@@ -71,6 +71,9 @@
 //     "https://books.google.com/ebooks/app"))
 constexpr char kPlayBooksAppId[] = "jglfhlbohpgcbefmhdmpancnijacbbji";
 
+// Generated as: web_app::GenerateAppIdFromURL(GURL("chrome://scanning/"))
+constexpr char kScanningAppId[] = "cdkahakpgkdaoffdmfgnhgomkelkocfo";
+
 // Generated as: web_app::GenerateAppIdFromURL(GURL(
 //     "chrome://settings/"))
 constexpr char kSettingsAppId[] = "inogagmajamaleonmanpkpkkigmklfad";
diff --git a/chrome/browser/web_applications/components/web_app_install_utils.cc b/chrome/browser/web_applications/components/web_app_install_utils.cc
index eeead0f..74970d6 100644
--- a/chrome/browser/web_applications/components/web_app_install_utils.cc
+++ b/chrome/browser/web_applications/components/web_app_install_utils.cc
@@ -17,13 +17,13 @@
 #include "chrome/browser/banners/app_banner_manager.h"
 #include "chrome/browser/banners/app_banner_manager_desktop.h"
 #include "chrome/browser/banners/app_banner_settings_helper.h"
-#include "chrome/browser/installable/installable_data.h"
-#include "chrome/browser/installable/installable_metrics.h"
 #include "chrome/browser/web_applications/components/web_app_constants.h"
 #include "chrome/browser/web_applications/components/web_app_icon_generator.h"
 #include "chrome/browser/web_applications/components/web_application_info.h"
 #include "chrome/common/chrome_features.h"
 #include "components/services/app_service/public/cpp/share_target.h"
+#include "components/webapps/installable/installable_data.h"
+#include "components/webapps/installable/installable_metrics.h"
 #include "third_party/blink/public/common/manifest/manifest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
@@ -403,24 +403,24 @@
       base::Time::Now());
 }
 
-WebappInstallSource ConvertExternalInstallSourceToInstallSource(
+webapps::WebappInstallSource ConvertExternalInstallSourceToInstallSource(
     ExternalInstallSource external_install_source) {
-  WebappInstallSource install_source;
+  webapps::WebappInstallSource install_source;
   switch (external_install_source) {
     case ExternalInstallSource::kInternalDefault:
-      install_source = WebappInstallSource::INTERNAL_DEFAULT;
+      install_source = webapps::WebappInstallSource::INTERNAL_DEFAULT;
       break;
     case ExternalInstallSource::kExternalDefault:
-      install_source = WebappInstallSource::EXTERNAL_DEFAULT;
+      install_source = webapps::WebappInstallSource::EXTERNAL_DEFAULT;
       break;
     case ExternalInstallSource::kExternalPolicy:
-      install_source = WebappInstallSource::EXTERNAL_POLICY;
+      install_source = webapps::WebappInstallSource::EXTERNAL_POLICY;
       break;
     case ExternalInstallSource::kSystemInstalled:
-      install_source = WebappInstallSource::SYSTEM_DEFAULT;
+      install_source = webapps::WebappInstallSource::SYSTEM_DEFAULT;
       break;
     case ExternalInstallSource::kArc:
-      install_source = WebappInstallSource::ARC;
+      install_source = webapps::WebappInstallSource::ARC;
       break;
   }
 
diff --git a/chrome/browser/web_applications/components/web_app_install_utils.h b/chrome/browser/web_applications/components/web_app_install_utils.h
index 39ab386..4baa8d2 100644
--- a/chrome/browser/web_applications/components/web_app_install_utils.h
+++ b/chrome/browser/web_applications/components/web_app_install_utils.h
@@ -11,7 +11,6 @@
 
 #include "url/gurl.h"
 
-enum class WebappInstallSource;
 struct WebApplicationInfo;
 class SkBitmap;
 
@@ -23,6 +22,10 @@
 class WebContents;
 }
 
+namespace webapps {
+enum class WebappInstallSource;
+}
+
 namespace web_app {
 
 enum class ExternalInstallSource;
@@ -61,7 +64,7 @@
 // shown for this app.
 void RecordAppBanner(content::WebContents* contents, const GURL& app_url);
 
-WebappInstallSource ConvertExternalInstallSourceToInstallSource(
+webapps::WebappInstallSource ConvertExternalInstallSourceToInstallSource(
     ExternalInstallSource external_install_source);
 
 }  // namespace web_app
diff --git a/chrome/browser/web_applications/extensions/bookmark_app_install_finalizer.cc b/chrome/browser/web_applications/extensions/bookmark_app_install_finalizer.cc
index e75f10e8..d705846 100644
--- a/chrome/browser/web_applications/extensions/bookmark_app_install_finalizer.cc
+++ b/chrome/browser/web_applications/extensions/bookmark_app_install_finalizer.cc
@@ -72,17 +72,17 @@
   switch (options.install_source) {
       // TODO(nigeltao/ortuno): should these two cases lead to different
       // Manifest::Location values: INTERNAL vs EXTERNAL_PREF_DOWNLOAD?
-    case WebappInstallSource::INTERNAL_DEFAULT:
-    case WebappInstallSource::EXTERNAL_DEFAULT:
+    case webapps::WebappInstallSource::INTERNAL_DEFAULT:
+    case webapps::WebappInstallSource::EXTERNAL_DEFAULT:
       crx_installer->set_install_source(Manifest::EXTERNAL_PREF_DOWNLOAD);
       // CrxInstaller::InstallWebApp will OR the creation flags with
       // FROM_BOOKMARK.
       crx_installer->set_creation_flags(Extension::WAS_INSTALLED_BY_DEFAULT);
       break;
-    case WebappInstallSource::EXTERNAL_POLICY:
+    case webapps::WebappInstallSource::EXTERNAL_POLICY:
       crx_installer->set_install_source(Manifest::EXTERNAL_POLICY_DOWNLOAD);
       break;
-    case WebappInstallSource::SYSTEM_DEFAULT:
+    case webapps::WebappInstallSource::SYSTEM_DEFAULT:
       // System Apps are considered EXTERNAL_COMPONENT as they are downloaded
       // from the WebUI they point to. COMPONENT seems like the more correct
       // value, but usages (icon loading, filesystem cleanup), are tightly
@@ -91,12 +91,12 @@
       // InstallWebApp will OR the creation flags with FROM_BOOKMARK.
       crx_installer->set_creation_flags(Extension::WAS_INSTALLED_BY_DEFAULT);
       break;
-    case WebappInstallSource::ARC:
+    case webapps::WebappInstallSource::ARC:
       // Ensure that WebApk is not synced. There is some mechanism to propagate
       // the local source of data in place of usual extension sync.
       crx_installer->set_install_source(Manifest::EXTERNAL_PREF_DOWNLOAD);
       break;
-    case WebappInstallSource::COUNT:
+    case webapps::WebappInstallSource::COUNT:
       NOTREACHED();
       break;
     default:
diff --git a/chrome/browser/web_applications/extensions/bookmark_app_install_finalizer_unittest.cc b/chrome/browser/web_applications/extensions/bookmark_app_install_finalizer_unittest.cc
index 3d6e478..4fc9aa7 100644
--- a/chrome/browser/web_applications/extensions/bookmark_app_install_finalizer_unittest.cc
+++ b/chrome/browser/web_applications/extensions/bookmark_app_install_finalizer_unittest.cc
@@ -136,7 +136,7 @@
     info->title = base::ASCIIToUTF16(kWebAppTitle);
 
     web_app::InstallFinalizer::FinalizeOptions options;
-    options.install_source = WebappInstallSource::EXTERNAL_POLICY;
+    options.install_source = webapps::WebappInstallSource::EXTERNAL_POLICY;
 
     web_app::AppId app_id;
     base::RunLoop run_loop;
@@ -196,7 +196,7 @@
 
   base::RunLoop run_loop;
   web_app::InstallFinalizer::FinalizeOptions options;
-  options.install_source = WebappInstallSource::INTERNAL_DEFAULT;
+  options.install_source = webapps::WebappInstallSource::INTERNAL_DEFAULT;
   bool callback_called = false;
 
   finalizer().FinalizeInstall(
@@ -226,7 +226,7 @@
   bool callback1_called = false;
   bool callback2_called = false;
   web_app::InstallFinalizer::FinalizeOptions options;
-  options.install_source = WebappInstallSource::INTERNAL_DEFAULT;
+  options.install_source = webapps::WebappInstallSource::INTERNAL_DEFAULT;
 
   // Start install finalization for the 1st app
   {
@@ -274,7 +274,7 @@
   info->title = base::ASCIIToUTF16(kWebAppTitle);
 
   web_app::InstallFinalizer::FinalizeOptions options;
-  options.install_source = WebappInstallSource::EXTERNAL_DEFAULT;
+  options.install_source = webapps::WebappInstallSource::EXTERNAL_DEFAULT;
 
   base::RunLoop run_loop;
   finalizer().FinalizeInstall(
@@ -301,7 +301,7 @@
   info->title = base::ASCIIToUTF16(kWebAppTitle);
 
   web_app::InstallFinalizer::FinalizeOptions options;
-  options.install_source = WebappInstallSource::EXTERNAL_POLICY;
+  options.install_source = webapps::WebappInstallSource::EXTERNAL_POLICY;
 
   base::RunLoop run_loop;
   finalizer().FinalizeInstall(
@@ -326,7 +326,7 @@
   info->start_url = WebAppUrl();
 
   web_app::InstallFinalizer::FinalizeOptions options;
-  options.install_source = WebappInstallSource::ARC;
+  options.install_source = webapps::WebappInstallSource::ARC;
 
   base::RunLoop run_loop;
   finalizer().FinalizeInstall(
@@ -456,7 +456,7 @@
   info->start_url = WebAppUrl();
 
   web_app::InstallFinalizer::FinalizeOptions options;
-  options.install_source = WebappInstallSource::INTERNAL_DEFAULT;
+  options.install_source = webapps::WebappInstallSource::INTERNAL_DEFAULT;
   options.locally_installed = false;
 
   base::RunLoop run_loop;
diff --git a/chrome/browser/web_applications/extensions/pending_app_install_task_unittest.cc b/chrome/browser/web_applications/extensions/pending_app_install_task_unittest.cc
index c715efa..10d9394 100644
--- a/chrome/browser/web_applications/extensions/pending_app_install_task_unittest.cc
+++ b/chrome/browser/web_applications/extensions/pending_app_install_task_unittest.cc
@@ -413,7 +413,7 @@
         EXPECT_EQ(0u, finalizer()->num_reparent_tab_calls());
 
         EXPECT_FALSE(web_app_info().open_as_window);
-        EXPECT_EQ(WebappInstallSource::INTERNAL_DEFAULT,
+        EXPECT_EQ(webapps::WebappInstallSource::INTERNAL_DEFAULT,
                   finalize_options().install_source);
 
         run_loop.Quit();
@@ -599,7 +599,7 @@
         EXPECT_EQ(InstallResultCode::kSuccessNewInstall, result.code);
         EXPECT_TRUE(app_id.has_value());
 
-        EXPECT_EQ(WebappInstallSource::INTERNAL_DEFAULT,
+        EXPECT_EQ(webapps::WebappInstallSource::INTERNAL_DEFAULT,
                   finalize_options().install_source);
         run_loop.Quit();
       }));
@@ -621,7 +621,7 @@
         EXPECT_EQ(InstallResultCode::kSuccessNewInstall, result.code);
         EXPECT_TRUE(app_id.has_value());
 
-        EXPECT_EQ(WebappInstallSource::EXTERNAL_POLICY,
+        EXPECT_EQ(webapps::WebappInstallSource::EXTERNAL_POLICY,
                   finalize_options().install_source);
         run_loop.Quit();
       }));
@@ -647,7 +647,7 @@
 
         EXPECT_EQ(1u, os_integration_manager()->num_create_shortcuts_calls());
         EXPECT_EQ(1u, finalizer()->finalize_options_list().size());
-        EXPECT_EQ(WebappInstallSource::EXTERNAL_POLICY,
+        EXPECT_EQ(webapps::WebappInstallSource::EXTERNAL_POLICY,
                   finalize_options().install_source);
         const WebApplicationInfo& web_app_info =
             finalizer()->web_app_info_list().at(0);
@@ -684,7 +684,7 @@
 
         EXPECT_EQ(0u, os_integration_manager()->num_create_shortcuts_calls());
         EXPECT_EQ(1u, finalizer()->finalize_options_list().size());
-        EXPECT_EQ(WebappInstallSource::EXTERNAL_POLICY,
+        EXPECT_EQ(webapps::WebappInstallSource::EXTERNAL_POLICY,
                   finalize_options().install_source);
         const WebApplicationInfo& web_app_info =
             finalizer()->web_app_info_list().at(0);
diff --git a/chrome/browser/web_applications/manifest_update_manager_browsertest.cc b/chrome/browser/web_applications/manifest_update_manager_browsertest.cc
index 52b3fe1..1308882 100644
--- a/chrome/browser/web_applications/manifest_update_manager_browsertest.cc
+++ b/chrome/browser/web_applications/manifest_update_manager_browsertest.cc
@@ -16,7 +16,6 @@
 #include "base/test/scoped_feature_list.h"
 #include "base/time/time.h"
 #include "chrome/app/chrome_command_ids.h"
-#include "chrome/browser/installable/installable_metrics.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
@@ -40,6 +39,7 @@
 #include "chrome/common/chrome_features.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
+#include "components/webapps/installable/installable_metrics.h"
 #include "content/public/common/content_features.h"
 #include "content/public/test/browser_test.h"
 #include "content/public/test/url_loader_interceptor.h"
@@ -268,7 +268,8 @@
     base::RunLoop run_loop;
     GetProvider().install_manager().InstallWebAppFromManifestWithFallback(
         browser()->tab_strip_model()->GetActiveWebContents(),
-        /*force_shortcut_app=*/false, WebappInstallSource::OMNIBOX_INSTALL_ICON,
+        /*force_shortcut_app=*/false,
+        webapps::WebappInstallSource::OMNIBOX_INSTALL_ICON,
         base::BindOnce(TestAcceptDialogCallback),
         base::BindLambdaForTesting(
             [&](const AppId& new_app_id, InstallResultCode code) {
diff --git a/chrome/browser/web_applications/manifest_update_task.cc b/chrome/browser/web_applications/manifest_update_task.cc
index 12a9ae4..6e44a76 100644
--- a/chrome/browser/web_applications/manifest_update_task.cc
+++ b/chrome/browser/web_applications/manifest_update_task.cc
@@ -11,7 +11,6 @@
 
 #include "base/feature_list.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/installable/installable_manager.h"
 #include "chrome/browser/web_applications/components/app_icon_manager.h"
 #include "chrome/browser/web_applications/components/app_registrar.h"
 #include "chrome/browser/web_applications/components/install_manager.h"
@@ -21,6 +20,7 @@
 #include "chrome/browser/web_applications/components/web_app_ui_manager.h"
 #include "chrome/browser/web_applications/components/web_application_info.h"
 #include "chrome/common/chrome_features.h"
+#include "components/webapps/installable/installable_manager.h"
 #include "content/public/common/content_features.h"
 #include "ui/gfx/skia_util.h"
 
@@ -95,11 +95,11 @@
     return;
 
   stage_ = Stage::kPendingInstallableData;
-  InstallableParams params;
+  webapps::InstallableParams params;
   params.valid_primary_icon = true;
   params.valid_manifest = true;
   params.check_webapp_manifest_display = false;
-  InstallableManager::FromWebContents(web_contents())
+  webapps::InstallableManager::FromWebContents(web_contents())
       ->GetData(params,
                 base::BindOnce(&ManifestUpdateTask::OnDidGetInstallableData,
                                AsWeakPtr()));
@@ -123,7 +123,8 @@
   }
 }
 
-void ManifestUpdateTask::OnDidGetInstallableData(const InstallableData& data) {
+void ManifestUpdateTask::OnDidGetInstallableData(
+    const webapps::InstallableData& data) {
   DCHECK_EQ(stage_, Stage::kPendingInstallableData);
 
   if (!data.errors.empty()) {
diff --git a/chrome/browser/web_applications/manifest_update_task.h b/chrome/browser/web_applications/manifest_update_task.h
index 8b24b05..b095cf6 100644
--- a/chrome/browser/web_applications/manifest_update_task.h
+++ b/chrome/browser/web_applications/manifest_update_task.h
@@ -17,9 +17,12 @@
 #include "content/public/browser/web_contents_observer.h"
 #include "third_party/blink/public/common/manifest/manifest.h"
 
-struct InstallableData;
 struct WebApplicationInfo;
 
+namespace webapps {
+struct InstallableData;
+}
+
 namespace web_app {
 
 class AppIconManager;
@@ -98,7 +101,7 @@
     kPendingInstallation,
   };
 
-  void OnDidGetInstallableData(const InstallableData& data);
+  void OnDidGetInstallableData(const webapps::InstallableData& data);
   bool IsUpdateNeededForManifest() const;
   void LoadAndCheckIconContents();
   void OnIconsDownloaded(bool success, IconsMap icons_map);
diff --git a/chrome/browser/web_applications/pending_app_install_task.cc b/chrome/browser/web_applications/pending_app_install_task.cc
index 3c6aa6a..c20f0d1 100644
--- a/chrome/browser/web_applications/pending_app_install_task.cc
+++ b/chrome/browser/web_applications/pending_app_install_task.cc
@@ -13,9 +13,6 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/favicon/favicon_utils.h"
-#include "chrome/browser/installable/installable_manager.h"
-#include "chrome/browser/installable/installable_metrics.h"
-#include "chrome/browser/installable/installable_params.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ssl/security_state_tab_helper.h"
 #include "chrome/browser/web_applications/components/install_finalizer.h"
@@ -23,6 +20,9 @@
 #include "chrome/browser/web_applications/components/web_app_constants.h"
 #include "chrome/browser/web_applications/components/web_app_ui_manager.h"
 #include "chrome/browser/web_applications/components/web_application_info.h"
+#include "components/webapps/installable/installable_manager.h"
+#include "components/webapps/installable/installable_metrics.h"
+#include "components/webapps/installable/installable_params.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace web_app {
@@ -30,7 +30,7 @@
 // static
 void PendingAppInstallTask::CreateTabHelpers(
     content::WebContents* web_contents) {
-  InstallableManager::CreateForWebContents(web_contents);
+  webapps::InstallableManager::CreateForWebContents(web_contents);
   SecurityStateTabHelper::CreateForWebContents(web_contents);
   favicon::CreateContentFaviconDriverForWebContents(web_contents);
 }
@@ -218,7 +218,7 @@
   }
 
   InstallFinalizer::FinalizeOptions options;
-  options.install_source = WebappInstallSource::EXTERNAL_POLICY;
+  options.install_source = webapps::WebappInstallSource::EXTERNAL_POLICY;
 
   install_finalizer_->FinalizeInstall(
       web_app_info, options,
diff --git a/chrome/browser/web_applications/pending_app_manager_impl.cc b/chrome/browser/web_applications/pending_app_manager_impl.cc
index 43425d5..6f4971e 100644
--- a/chrome/browser/web_applications/pending_app_manager_impl.cc
+++ b/chrome/browser/web_applications/pending_app_manager_impl.cc
@@ -282,7 +282,7 @@
         current_install_->task->install_options());
   }
 
-  // Post a task to avoid InstallableManager crashing and do so before
+  // Post a task to avoid webapps::InstallableManager crashing and do so before
   // running the callback in case the callback tries to install another
   // app.
   PostMaybeStartNext();
diff --git a/chrome/browser/web_applications/test/web_app_install_test_utils.cc b/chrome/browser/web_applications/test/web_app_install_test_utils.cc
index 6f973a3..eaeb52b5 100644
--- a/chrome/browser/web_applications/test/web_app_install_test_utils.cc
+++ b/chrome/browser/web_applications/test/web_app_install_test_utils.cc
@@ -33,7 +33,7 @@
   web_app_info.open_as_window = true;
 
   InstallFinalizer::FinalizeOptions options;
-  options.install_source = WebappInstallSource::EXTERNAL_DEFAULT;
+  options.install_source = webapps::WebappInstallSource::EXTERNAL_DEFAULT;
 
   // In unit tests, we do not have Browser or WebContents instances.
   // Hence we use FinalizeInstall instead of InstallWebAppFromManifest
diff --git a/chrome/browser/web_applications/web_app_icon_manager_browsertest.cc b/chrome/browser/web_applications/web_app_icon_manager_browsertest.cc
index 637e0b2..b538ab1 100644
--- a/chrome/browser/web_applications/web_app_icon_manager_browsertest.cc
+++ b/chrome/browser/web_applications/web_app_icon_manager_browsertest.cc
@@ -10,7 +10,6 @@
 #include "chrome/browser/apps/app_service/app_service_proxy_factory.h"
 #include "chrome/browser/apps/app_service/app_service_test.h"
 #include "chrome/browser/apps/app_service/browser_app_launcher.h"
-#include "chrome/browser/installable/installable_metrics.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/web_applications/web_app_browser_controller.h"
@@ -23,6 +22,7 @@
 #include "chrome/common/chrome_features.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "components/services/app_service/public/mojom/types.mojom.h"
+#include "components/webapps/installable/installable_metrics.h"
 #include "content/public/test/browser_test.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "third_party/skia/include/core/SkBitmap.h"
@@ -92,7 +92,7 @@
     base::RunLoop run_loop;
     install_manager.InstallWebAppFromInfo(
         std::move(web_application_info), ForInstallableSite::kYes,
-        WebappInstallSource::OMNIBOX_INSTALL_ICON,
+        webapps::WebappInstallSource::OMNIBOX_INSTALL_ICON,
         base::BindLambdaForTesting(
             [&app_id, &run_loop](const AppId& installed_app_id,
                                  InstallResultCode code) {
diff --git a/chrome/browser/web_applications/web_app_install_finalizer.cc b/chrome/browser/web_applications/web_app_install_finalizer.cc
index 3e3126a..ad26dcb 100644
--- a/chrome/browser/web_applications/web_app_install_finalizer.cc
+++ b/chrome/browser/web_applications/web_app_install_finalizer.cc
@@ -17,7 +17,6 @@
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "base/values.h"
-#include "chrome/browser/installable/installable_metrics.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/web_applications/components/app_registrar.h"
 #include "chrome/browser/web_applications/components/os_integration_manager.h"
@@ -32,6 +31,7 @@
 #include "chrome/browser/web_applications/web_app_installation_utils.h"
 #include "chrome/browser/web_applications/web_app_registry_update.h"
 #include "chrome/browser/web_applications/web_app_sync_bridge.h"
+#include "components/webapps/installable/installable_metrics.h"
 #include "content/public/browser/browser_thread.h"
 #include "third_party/skia/include/core/SkColor.h"
 
@@ -42,37 +42,37 @@
 // TODO(loyso): Call sites should specify Source explicitly as a part of
 // AppTraits parameter object.
 Source::Type InferSourceFromMetricsInstallSource(
-    WebappInstallSource install_source) {
+    webapps::WebappInstallSource install_source) {
   switch (install_source) {
-    case WebappInstallSource::MENU_BROWSER_TAB:
-    case WebappInstallSource::MENU_CUSTOM_TAB:
-    case WebappInstallSource::AUTOMATIC_PROMPT_BROWSER_TAB:
-    case WebappInstallSource::AUTOMATIC_PROMPT_CUSTOM_TAB:
-    case WebappInstallSource::API_BROWSER_TAB:
-    case WebappInstallSource::API_CUSTOM_TAB:
-    case WebappInstallSource::DEVTOOLS:
-    case WebappInstallSource::MANAGEMENT_API:
-    case WebappInstallSource::AMBIENT_BADGE_BROWSER_TAB:
-    case WebappInstallSource::AMBIENT_BADGE_CUSTOM_TAB:
-    case WebappInstallSource::OMNIBOX_INSTALL_ICON:
-    case WebappInstallSource::SYNC:
-    case WebappInstallSource::MENU_CREATE_SHORTCUT:
+    case webapps::WebappInstallSource::MENU_BROWSER_TAB:
+    case webapps::WebappInstallSource::MENU_CUSTOM_TAB:
+    case webapps::WebappInstallSource::AUTOMATIC_PROMPT_BROWSER_TAB:
+    case webapps::WebappInstallSource::AUTOMATIC_PROMPT_CUSTOM_TAB:
+    case webapps::WebappInstallSource::API_BROWSER_TAB:
+    case webapps::WebappInstallSource::API_CUSTOM_TAB:
+    case webapps::WebappInstallSource::DEVTOOLS:
+    case webapps::WebappInstallSource::MANAGEMENT_API:
+    case webapps::WebappInstallSource::AMBIENT_BADGE_BROWSER_TAB:
+    case webapps::WebappInstallSource::AMBIENT_BADGE_CUSTOM_TAB:
+    case webapps::WebappInstallSource::OMNIBOX_INSTALL_ICON:
+    case webapps::WebappInstallSource::SYNC:
+    case webapps::WebappInstallSource::MENU_CREATE_SHORTCUT:
       return Source::kSync;
 
-    case WebappInstallSource::INTERNAL_DEFAULT:
-    case WebappInstallSource::EXTERNAL_DEFAULT:
+    case webapps::WebappInstallSource::INTERNAL_DEFAULT:
+    case webapps::WebappInstallSource::EXTERNAL_DEFAULT:
       return Source::kDefault;
 
-    case WebappInstallSource::EXTERNAL_POLICY:
+    case webapps::WebappInstallSource::EXTERNAL_POLICY:
       return Source::kPolicy;
 
-    case WebappInstallSource::SYSTEM_DEFAULT:
+    case webapps::WebappInstallSource::SYSTEM_DEFAULT:
       return Source::kSystem;
 
-    case WebappInstallSource::ARC:
+    case webapps::WebappInstallSource::ARC:
       return Source::kWebAppStore;
 
-    case WebappInstallSource::COUNT:
+    case webapps::WebappInstallSource::COUNT:
       NOTREACHED();
       return Source::kSync;
   }
diff --git a/chrome/browser/web_applications/web_app_install_manager.cc b/chrome/browser/web_applications/web_app_install_manager.cc
index dcc8c47..a383a15 100644
--- a/chrome/browser/web_applications/web_app_install_manager.cc
+++ b/chrome/browser/web_applications/web_app_install_manager.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <utility>
-
-#include "base/optional.h"
 #include "chrome/browser/web_applications/web_app_install_manager.h"
 
+#include <utility>
+
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/metrics/histogram_macros.h"
+#include "base/optional.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/chromeos_buildflags.h"
 #include "chrome/browser/profiles/profile.h"
@@ -21,6 +21,7 @@
 #include "chrome/browser/web_applications/components/web_application_info.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/browser/web_applications/web_app_install_task.h"
+#include "components/webapps/installable/installable_metrics.h"
 #include "content/public/browser/web_contents.h"
 
 namespace web_app {
@@ -86,7 +87,7 @@
 
 void WebAppInstallManager::LoadWebAppAndCheckManifest(
     const GURL& web_app_url,
-    WebappInstallSource install_source,
+    webapps::WebappInstallSource install_source,
     WebAppManifestCheckCallback callback) {
   DCHECK(started_);
 
@@ -106,7 +107,7 @@
 void WebAppInstallManager::InstallWebAppFromManifest(
     content::WebContents* contents,
     bool bypass_service_worker_check,
-    WebappInstallSource install_source,
+    webapps::WebappInstallSource install_source,
     WebAppInstallDialogCallback dialog_callback,
     OnceInstallCallback callback) {
   DCHECK(started_);
@@ -126,7 +127,7 @@
 void WebAppInstallManager::InstallWebAppFromManifestWithFallback(
     content::WebContents* contents,
     bool force_shortcut_app,
-    WebappInstallSource install_source,
+    webapps::WebappInstallSource install_source,
     WebAppInstallDialogCallback dialog_callback,
     OnceInstallCallback callback) {
   DCHECK(started_);
@@ -145,7 +146,7 @@
 void WebAppInstallManager::InstallWebAppFromInfo(
     std::unique_ptr<WebApplicationInfo> web_application_info,
     ForInstallableSite for_installable_site,
-    WebappInstallSource install_source,
+    webapps::WebappInstallSource install_source,
     OnceInstallCallback callback) {
   InstallWebAppFromInfo(std::move(web_application_info), for_installable_site,
                         base::nullopt, install_source, std::move(callback));
@@ -155,7 +156,7 @@
     std::unique_ptr<WebApplicationInfo> web_application_info,
     ForInstallableSite for_installable_site,
     const base::Optional<InstallParams>& install_params,
-    WebappInstallSource install_source,
+    webapps::WebappInstallSource install_source,
     OnceInstallCallback callback) {
   DCHECK(started_);
 
@@ -176,7 +177,7 @@
 void WebAppInstallManager::InstallWebAppWithParams(
     content::WebContents* web_contents,
     const InstallParams& install_params,
-    WebappInstallSource install_source,
+    webapps::WebappInstallSource install_source,
     OnceInstallCallback callback) {
   DCHECK(started_);
 
@@ -254,7 +255,7 @@
   base::OnceClosure start_task = base::BindOnce(
       &WebAppInstallTask::LoadAndInstallWebAppFromManifestWithFallback,
       task->GetWeakPtr(), start_url, EnsureWebContentsCreated(),
-      base::Unretained(url_loader_.get()), WebappInstallSource::SYNC,
+      base::Unretained(url_loader_.get()), webapps::WebappInstallSource::SYNC,
       base::BindOnce(&WebAppInstallManager::OnQueuedTaskCompleted,
                      base::Unretained(this), task.get(),
                      std::move(task_completed_callback)));
@@ -377,7 +378,7 @@
       data_retriever_factory_.Run(), registrar());
 
   InstallFinalizer::FinalizeOptions finalize_options;
-  finalize_options.install_source = WebappInstallSource::SYNC;
+  finalize_options.install_source = webapps::WebappInstallSource::SYNC;
   finalize_options.locally_installed = kLocallyInstallWebAppsOnSync;
 
   base::OnceClosure start_task = base::BindOnce(
diff --git a/chrome/browser/web_applications/web_app_install_manager.h b/chrome/browser/web_applications/web_app_install_manager.h
index df2062d..73ce879 100644
--- a/chrome/browser/web_applications/web_app_install_manager.h
+++ b/chrome/browser/web_applications/web_app_install_manager.h
@@ -44,35 +44,35 @@
   // InstallManager:
   void LoadWebAppAndCheckManifest(
       const GURL& web_app_url,
-      WebappInstallSource install_source,
+      webapps::WebappInstallSource install_source,
       WebAppManifestCheckCallback callback) override;
   void InstallWebAppFromManifest(content::WebContents* contents,
                                  bool bypass_service_worker_check,
-                                 WebappInstallSource install_source,
+                                 webapps::WebappInstallSource install_source,
                                  WebAppInstallDialogCallback dialog_callback,
                                  OnceInstallCallback callback) override;
   void InstallWebAppFromManifestWithFallback(
       content::WebContents* contents,
       bool force_shortcut_app,
-      WebappInstallSource install_source,
+      webapps::WebappInstallSource install_source,
       WebAppInstallDialogCallback dialog_callback,
       OnceInstallCallback callback) override;
 
   void InstallWebAppFromInfo(
       std::unique_ptr<WebApplicationInfo> web_application_info,
       ForInstallableSite for_installable_site,
-      WebappInstallSource install_source,
+      webapps::WebappInstallSource install_source,
       OnceInstallCallback callback) override;
 
   void InstallWebAppFromInfo(
       std::unique_ptr<WebApplicationInfo> web_application_info,
       ForInstallableSite for_installable_site,
       const base::Optional<InstallParams>& install_params,
-      WebappInstallSource install_source,
+      webapps::WebappInstallSource install_source,
       OnceInstallCallback callback) override;
   void InstallWebAppWithParams(content::WebContents* web_contents,
                                const InstallParams& install_params,
-                               WebappInstallSource install_source,
+                               webapps::WebappInstallSource install_source,
                                OnceInstallCallback callback) override;
   void InstallBookmarkAppFromSync(
       const AppId& bookmark_app_id,
diff --git a/chrome/browser/web_applications/web_app_install_manager_unittest.cc b/chrome/browser/web_applications/web_app_install_manager_unittest.cc
index d9502825..a89b018 100644
--- a/chrome/browser/web_applications/web_app_install_manager_unittest.cc
+++ b/chrome/browser/web_applications/web_app_install_manager_unittest.cc
@@ -282,7 +282,7 @@
     base::RunLoop run_loop;
     install_manager().InstallWebAppFromManifestWithFallback(
         web_contents(), /*force_shortcut_app=*/false,
-        WebappInstallSource::OMNIBOX_INSTALL_ICON,
+        webapps::WebappInstallSource::OMNIBOX_INSTALL_ICON,
         base::BindOnce(TestAcceptDialogCallback),
         base::BindLambdaForTesting(
             [&](const AppId& installed_app_id, InstallResultCode code) {
@@ -332,7 +332,7 @@
     base::RunLoop run_loop;
     install_manager().InstallWebAppFromInfo(
         std::move(web_application_info), ForInstallableSite::kYes,
-        WebappInstallSource::SYSTEM_DEFAULT,
+        webapps::WebappInstallSource::SYSTEM_DEFAULT,
         base::BindLambdaForTesting(
             [&](const AppId& installed_app_id, InstallResultCode code) {
               result.app_id = installed_app_id;
diff --git a/chrome/browser/web_applications/web_app_install_task.cc b/chrome/browser/web_applications/web_app_install_task.cc
index 416a1f7..a363115 100644
--- a/chrome/browser/web_applications/web_app_install_task.cc
+++ b/chrome/browser/web_applications/web_app_install_task.cc
@@ -14,8 +14,6 @@
 #include "base/strings/string16.h"
 #include "build/chromeos_buildflags.h"
 #include "chrome/browser/favicon/favicon_utils.h"
-#include "chrome/browser/installable/installable_manager.h"
-#include "chrome/browser/installable/installable_metrics.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ssl/security_state_tab_helper.h"
 #include "chrome/browser/web_applications/components/app_registrar.h"
@@ -29,6 +27,8 @@
 #include "chrome/browser/web_applications/components/web_app_utils.h"
 #include "chrome/browser/web_applications/components/web_application_info.h"
 #include "chrome/common/chrome_features.h"
+#include "components/webapps/installable/installable_manager.h"
+#include "components/webapps/installable/installable_metrics.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "third_party/blink/public/common/manifest/manifest.h"
@@ -99,7 +99,7 @@
 
 void WebAppInstallTask::LoadWebAppAndCheckManifest(
     const GURL& url,
-    WebappInstallSource install_source,
+    webapps::WebappInstallSource install_source,
     WebAppUrlLoader* url_loader,
     LoadWebAppAndCheckManifestCallback callback) {
   DCHECK(url_loader);
@@ -132,7 +132,7 @@
 void WebAppInstallTask::InstallWebAppFromManifest(
     content::WebContents* contents,
     bool bypass_service_worker_check,
-    WebappInstallSource install_source,
+    webapps::WebappInstallSource install_source,
     InstallManager::WebAppInstallDialogCallback dialog_callback,
     InstallManager::OnceInstallCallback install_callback) {
   DCHECK(AreWebAppsUserInstallable(profile_));
@@ -155,7 +155,7 @@
 void WebAppInstallTask::InstallWebAppFromManifestWithFallback(
     content::WebContents* contents,
     bool force_shortcut_app,
-    WebappInstallSource install_source,
+    webapps::WebappInstallSource install_source,
     InstallManager::WebAppInstallDialogCallback dialog_callback,
     InstallManager::OnceInstallCallback install_callback) {
   DCHECK(AreWebAppsUserInstallable(profile_));
@@ -176,7 +176,7 @@
     const GURL& launch_url,
     content::WebContents* contents,
     WebAppUrlLoader* url_loader,
-    WebappInstallSource install_source,
+    webapps::WebappInstallSource install_source,
     InstallManager::OnceInstallCallback install_callback) {
   DCHECK(AreWebAppsUserInstallable(profile_));
   CheckInstallPreconditions();
@@ -196,7 +196,7 @@
 void WebAppInstallTask::InstallWebAppFromInfo(
     std::unique_ptr<WebApplicationInfo> web_application_info,
     ForInstallableSite for_installable_site,
-    WebappInstallSource install_source,
+    webapps::WebappInstallSource install_source,
     InstallManager::OnceInstallCallback callback) {
   CheckInstallPreconditions();
 
@@ -230,7 +230,7 @@
 void WebAppInstallTask::InstallWebAppWithParams(
     content::WebContents* contents,
     const InstallManager::InstallParams& install_params,
-    WebappInstallSource install_source,
+    webapps::WebappInstallSource install_source,
     InstallManager::OnceInstallCallback install_callback) {
   CheckInstallPreconditions();
 
@@ -293,7 +293,7 @@
   std::unique_ptr<content::WebContents> web_contents =
       content::WebContents::Create(content::WebContents::CreateParams(profile));
 
-  InstallableManager::CreateForWebContents(web_contents.get());
+  webapps::InstallableManager::CreateForWebContents(web_contents.get());
   SecurityStateTabHelper::CreateForWebContents(web_contents.get());
   favicon::CreateContentFaviconDriverForWebContents(web_contents.get());
 
@@ -328,8 +328,8 @@
 void WebAppInstallTask::RecordInstallEvent() {
   DCHECK(install_source_ != kNoInstallSource);
 
-  if (InstallableMetrics::IsReportableInstallSource(install_source_)) {
-    InstallableMetrics::TrackInstallEvent(install_source_);
+  if (webapps::InstallableMetrics::IsReportableInstallSource(install_source_)) {
+    webapps::InstallableMetrics::TrackInstallEvent(install_source_);
   }
 }
 
@@ -517,7 +517,7 @@
   std::vector<GURL> icon_urls = GetValidIconUrlsToDownload(*web_app_info);
 
   // A system app should always have a manifest icon.
-  if (install_source_ == WebappInstallSource::SYSTEM_DEFAULT) {
+  if (install_source_ == webapps::WebappInstallSource::SYSTEM_DEFAULT) {
     DCHECK(manifest);
     DCHECK(!manifest->icons.empty());
   }
@@ -615,7 +615,7 @@
 
   data_retriever_->GetIcons(
       web_contents(), icon_urls, skip_page_favicons,
-      install_source_ == WebappInstallSource::SYNC
+      install_source_ == webapps::WebappInstallSource::SYNC
           ? WebAppIconDownloader::Histogram::kForSync
           : WebAppIconDownloader::Histogram::kForCreate,
       base::BindOnce(&WebAppInstallTask::OnIconsRetrievedShowDialog,
@@ -641,7 +641,7 @@
   // Skip downloading the page favicons as everything in is the URL list.
   data_retriever_->GetIcons(
       web_contents, icon_urls, /*skip_page_fav_icons=*/true,
-      install_source_ == WebappInstallSource::SYNC
+      install_source_ == webapps::WebappInstallSource::SYNC
           ? WebAppIconDownloader::Histogram::kForSync
           : WebAppIconDownloader::Histogram::kForCreate,
       base::BindOnce(&WebAppInstallTask::OnIconsRetrieved,
@@ -816,7 +816,7 @@
   options.os_hooks[OsHookType::kFileHandlers] = true;
   options.os_hooks[OsHookType::kUninstallationViaOsSettings] = true;
 
-  if (install_source_ == WebappInstallSource::SYNC)
+  if (install_source_ == webapps::WebappInstallSource::SYNC)
     options.add_to_quick_launch_bar = false;
 
   if (install_params_) {
diff --git a/chrome/browser/web_applications/web_app_install_task.h b/chrome/browser/web_applications/web_app_install_task.h
index 28e4e3b..e62b329 100644
--- a/chrome/browser/web_applications/web_app_install_task.h
+++ b/chrome/browser/web_applications/web_app_install_task.h
@@ -12,7 +12,6 @@
 #include "base/callback.h"
 #include "base/memory/weak_ptr.h"
 #include "base/optional.h"
-#include "chrome/browser/installable/installable_metrics.h"
 #include "chrome/browser/web_applications/components/install_finalizer.h"
 #include "chrome/browser/web_applications/components/install_manager.h"
 #include "chrome/browser/web_applications/components/os_integration_manager.h"
@@ -20,6 +19,7 @@
 #include "chrome/browser/web_applications/components/web_app_install_utils.h"
 #include "chrome/browser/web_applications/components/web_app_url_loader.h"
 #include "chrome/browser/web_applications/components/web_application_info.h"
+#include "components/webapps/installable/installable_metrics.h"
 #include "content/public/browser/web_contents_observer.h"
 
 class GURL;
@@ -76,7 +76,7 @@
       InstallResultCode code)>;
   // Load a web app from the given URL and check for valid manifest.
   void LoadWebAppAndCheckManifest(const GURL& url,
-                                  WebappInstallSource install_source,
+                                  webapps::WebappInstallSource install_source,
                                   WebAppUrlLoader* url_loader,
                                   LoadWebAppAndCheckManifestCallback callback);
 
@@ -85,7 +85,7 @@
   void InstallWebAppFromManifest(
       content::WebContents* web_contents,
       bool bypass_service_worker_check,
-      WebappInstallSource install_source,
+      webapps::WebappInstallSource install_source,
       InstallManager::WebAppInstallDialogCallback dialog_callback,
       InstallManager::OnceInstallCallback callback);
 
@@ -96,7 +96,7 @@
   void InstallWebAppFromManifestWithFallback(
       content::WebContents* web_contents,
       bool force_shortcut_app,
-      WebappInstallSource install_source,
+      webapps::WebappInstallSource install_source,
       InstallManager::WebAppInstallDialogCallback dialog_callback,
       InstallManager::OnceInstallCallback callback);
 
@@ -107,7 +107,7 @@
       const GURL& launch_url,
       content::WebContents* web_contents,
       WebAppUrlLoader* url_loader,
-      WebappInstallSource install_source,
+      webapps::WebappInstallSource install_source,
       InstallManager::OnceInstallCallback callback);
 
   // Fetches the icon URLs in |web_application_info| to populate the icon
@@ -125,7 +125,7 @@
   void InstallWebAppFromInfo(
       std::unique_ptr<WebApplicationInfo> web_application_info,
       ForInstallableSite for_installable_site,
-      WebappInstallSource install_source,
+      webapps::WebappInstallSource install_source,
       InstallManager::OnceInstallCallback callback);
 
   // Starts a background web app installation process for a given
@@ -135,7 +135,7 @@
   void InstallWebAppWithParams(
       content::WebContents* web_contents,
       const InstallManager::InstallParams& install_params,
-      WebappInstallSource install_source,
+      webapps::WebappInstallSource install_source,
       InstallManager::OnceInstallCallback callback);
 
   void UpdateWebAppFromInfo(
@@ -263,9 +263,9 @@
 
   // The mechanism via which the app creation was triggered, will stay as
   // kNoInstallSource for updates.
-  static constexpr WebappInstallSource kNoInstallSource =
-      WebappInstallSource::COUNT;
-  WebappInstallSource install_source_ = kNoInstallSource;
+  static constexpr webapps::WebappInstallSource kNoInstallSource =
+      webapps::WebappInstallSource::COUNT;
+  webapps::WebappInstallSource install_source_ = kNoInstallSource;
 
   std::unique_ptr<WebAppDataRetriever> data_retriever_;
   std::unique_ptr<WebApplicationInfo> web_application_info_;
diff --git a/chrome/browser/web_applications/web_app_install_task_unittest.cc b/chrome/browser/web_applications/web_app_install_task_unittest.cc
index 71dbf71..54664e6 100644
--- a/chrome/browser/web_applications/web_app_install_task_unittest.cc
+++ b/chrome/browser/web_applications/web_app_install_task_unittest.cc
@@ -21,8 +21,6 @@
 #include "base/test/scoped_feature_list.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "build/chromeos_buildflags.h"
-#include "chrome/browser/installable/installable_data.h"
-#include "chrome/browser/installable/installable_metrics.h"
 #include "chrome/browser/web_applications/components/web_app_constants.h"
 #include "chrome/browser/web_applications/components/web_app_helpers.h"
 #include "chrome/browser/web_applications/components/web_app_icon_generator.h"
@@ -49,6 +47,8 @@
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/testing_profile_manager.h"
+#include "components/webapps/installable/installable_data.h"
+#include "components/webapps/installable/installable_metrics.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/blink/public/common/manifest/manifest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
@@ -238,7 +238,7 @@
     const bool force_shortcut_app = false;
     install_task_->InstallWebAppFromManifestWithFallback(
         web_contents(), force_shortcut_app,
-        WebappInstallSource::MENU_BROWSER_TAB,
+        webapps::WebappInstallSource::MENU_BROWSER_TAB,
         base::BindOnce(TestAcceptDialogCallback),
         base::BindLambdaForTesting(
             [&](const AppId& installed_app_id, InstallResultCode code) {
@@ -254,7 +254,7 @@
     InstallResult result;
     base::RunLoop run_loop;
     install_task_->LoadAndInstallWebAppFromManifestWithFallback(
-        url, web_contents(), &url_loader(), WebappInstallSource::SYNC,
+        url, web_contents(), &url_loader(), webapps::WebappInstallSource::SYNC,
         base::BindLambdaForTesting(
             [&](const AppId& installed_app_id, InstallResultCode code) {
               result.app_id = installed_app_id;
@@ -291,7 +291,7 @@
     AppId app_id;
     base::RunLoop run_loop;
     install_task_->InstallWebAppWithParams(
-        web_contents(), params, WebappInstallSource::EXTERNAL_DEFAULT,
+        web_contents(), params, webapps::WebappInstallSource::EXTERNAL_DEFAULT,
         base::BindLambdaForTesting(
             [&](const AppId& installed_app_id, InstallResultCode code) {
               ASSERT_EQ(InstallResultCode::kSuccessNewInstall, code);
@@ -412,7 +412,8 @@
   const bool force_shortcut_app = false;
 
   install_task_->InstallWebAppFromManifestWithFallback(
-      web_contents(), force_shortcut_app, WebappInstallSource::MENU_BROWSER_TAB,
+      web_contents(), force_shortcut_app,
+      webapps::WebappInstallSource::MENU_BROWSER_TAB,
       base::BindOnce(TestAcceptDialogCallback),
       base::BindLambdaForTesting(
           [&](const AppId& installed_app_id, InstallResultCode code) {
@@ -464,7 +465,8 @@
   const bool force_shortcut_app = false;
 
   install_task_->InstallWebAppFromManifestWithFallback(
-      web_contents(), force_shortcut_app, WebappInstallSource::MENU_BROWSER_TAB,
+      web_contents(), force_shortcut_app,
+      webapps::WebappInstallSource::MENU_BROWSER_TAB,
       base::BindOnce(TestAcceptDialogCallback),
       base::BindLambdaForTesting(
           [&](const AppId& force_installed_app_id, InstallResultCode code) {
@@ -489,7 +491,8 @@
   const bool force_shortcut_app = false;
 
   install_task_->InstallWebAppFromManifestWithFallback(
-      web_contents(), force_shortcut_app, WebappInstallSource::MENU_BROWSER_TAB,
+      web_contents(), force_shortcut_app,
+      webapps::WebappInstallSource::MENU_BROWSER_TAB,
       base::BindOnce(TestAcceptDialogCallback),
       base::BindLambdaForTesting(
           [&](const AppId& installed_app_id, InstallResultCode code) {
@@ -513,7 +516,8 @@
   const bool force_shortcut_app = false;
 
   install_task_->InstallWebAppFromManifestWithFallback(
-      web_contents(), force_shortcut_app, WebappInstallSource::MENU_BROWSER_TAB,
+      web_contents(), force_shortcut_app,
+      webapps::WebappInstallSource::MENU_BROWSER_TAB,
       base::BindOnce(TestAcceptDialogCallback),
       base::BindLambdaForTesting(
           [&](const AppId& installed_app_id, InstallResultCode code) {
@@ -563,7 +567,8 @@
   const bool force_shortcut_app = false;
 
   install_task_->InstallWebAppFromManifestWithFallback(
-      web_contents(), force_shortcut_app, WebappInstallSource::MENU_BROWSER_TAB,
+      web_contents(), force_shortcut_app,
+      webapps::WebappInstallSource::MENU_BROWSER_TAB,
       base::BindOnce(TestAcceptDialogCallback),
       base::BindLambdaForTesting(
           [&](const AppId& installed_app_id, InstallResultCode code) {
@@ -737,7 +742,8 @@
   const bool force_shortcut_app = false;
 
   install_task_->InstallWebAppFromManifestWithFallback(
-      web_contents(), force_shortcut_app, WebappInstallSource::MENU_BROWSER_TAB,
+      web_contents(), force_shortcut_app,
+      webapps::WebappInstallSource::MENU_BROWSER_TAB,
       base::BindOnce(TestAcceptDialogCallback),
       base::BindLambdaForTesting(
           [&](const AppId& installed_app_id, InstallResultCode code) {
@@ -771,7 +777,8 @@
   const bool force_shortcut_app = false;
 
   install_task_->InstallWebAppFromManifestWithFallback(
-      web_contents(), force_shortcut_app, WebappInstallSource::MENU_BROWSER_TAB,
+      web_contents(), force_shortcut_app,
+      webapps::WebappInstallSource::MENU_BROWSER_TAB,
       base::BindOnce(TestDeclineDialogCallback),
       base::BindLambdaForTesting(
           [&](const AppId& installed_app_id, InstallResultCode code) {
@@ -838,7 +845,7 @@
 
   install_task_->InstallWebAppFromManifest(
       web_contents(), /*bypass_service_worker_check=*/false,
-      WebappInstallSource::MENU_BROWSER_TAB,
+      webapps::WebappInstallSource::MENU_BROWSER_TAB,
       base::BindOnce(TestAcceptDialogCallback),
       base::BindLambdaForTesting(
           [&](const AppId& installed_app_id, InstallResultCode code) {
@@ -865,7 +872,7 @@
 
   install_task_->InstallWebAppFromInfo(
       std::move(web_app_info), ForInstallableSite::kYes,
-      WebappInstallSource::MENU_BROWSER_TAB,
+      webapps::WebappInstallSource::MENU_BROWSER_TAB,
       base::BindLambdaForTesting(
           [&](const AppId& installed_app_id, InstallResultCode code) {
             EXPECT_EQ(InstallResultCode::kSuccessNewInstall, code);
@@ -897,7 +904,7 @@
 
   install_task_->InstallWebAppFromInfo(
       std::move(web_app_info), ForInstallableSite::kYes,
-      WebappInstallSource::ARC,
+      webapps::WebappInstallSource::ARC,
       base::BindLambdaForTesting([&](const AppId& installed_app_id,
                                      InstallResultCode code) {
         std::unique_ptr<WebApplicationInfo> final_web_app_info =
@@ -932,7 +939,7 @@
 
   install_task_->InstallWebAppFromManifestWithFallback(
       web_contents(), /*force_shortcut_app=*/true,
-      WebappInstallSource::MENU_BROWSER_TAB,
+      webapps::WebappInstallSource::MENU_BROWSER_TAB,
       base::BindOnce(TestAcceptDialogCallback),
       base::BindLambdaForTesting([&](const AppId& installed_app_id,
                                      InstallResultCode code) {
@@ -985,7 +992,7 @@
   base::RunLoop run_loop;
   install_task_->InstallWebAppFromManifestWithFallback(
       web_contents(), /*force_shortcut_app=*/false,
-      WebappInstallSource::MENU_BROWSER_TAB,
+      webapps::WebappInstallSource::MENU_BROWSER_TAB,
       base::BindOnce(TestAcceptDialogCallback),
       base::BindLambdaForTesting(
           [&](const AppId& installed_app_id, InstallResultCode code) {
@@ -1028,7 +1035,8 @@
 
   base::RunLoop run_loop;
   install_task->InstallWebAppWithParams(
-      web_contents(), MakeParams(), WebappInstallSource::EXTERNAL_DEFAULT,
+      web_contents(), MakeParams(),
+      webapps::WebappInstallSource::EXTERNAL_DEFAULT,
       base::BindLambdaForTesting(
           [&](const AppId& app_id, InstallResultCode code) {
             EXPECT_EQ(InstallResultCode::kSuccessNewInstall, code);
@@ -1236,7 +1244,8 @@
   const bool force_shortcut_app = false;
 
   install_task_->InstallWebAppFromManifestWithFallback(
-      web_contents(), force_shortcut_app, WebappInstallSource::MENU_BROWSER_TAB,
+      web_contents(), force_shortcut_app,
+      webapps::WebappInstallSource::MENU_BROWSER_TAB,
       base::BindOnce(TestAcceptDialogCallback),
       base::BindLambdaForTesting(
           [&](const AppId& installed_app_id, InstallResultCode code) {
@@ -1282,7 +1291,8 @@
   const bool force_shortcut_app = false;
 
   install_task_->InstallWebAppFromManifestWithFallback(
-      web_contents(), force_shortcut_app, WebappInstallSource::MENU_BROWSER_TAB,
+      web_contents(), force_shortcut_app,
+      webapps::WebappInstallSource::MENU_BROWSER_TAB,
       base::BindOnce(TestAcceptDialogCallback),
       base::BindLambdaForTesting(
           [&](const AppId& installed_app_id, InstallResultCode code) {
@@ -1356,7 +1366,7 @@
 
     install_task_->InstallWebAppFromManifest(
         web_contents(), /*bypass_service_worker_check=*/false,
-        WebappInstallSource::MENU_BROWSER_TAB,
+        webapps::WebappInstallSource::MENU_BROWSER_TAB,
         base::BindOnce(TestAcceptDialogCallback),
         base::BindLambdaForTesting([&](const AppId& installed_app_id,
                                        InstallResultCode code) {
diff --git a/chrome/browser/web_applications/web_app_migration_manager_browsertest.cc b/chrome/browser/web_applications/web_app_migration_manager_browsertest.cc
index 502dc72..9bde6ebc6 100644
--- a/chrome/browser/web_applications/web_app_migration_manager_browsertest.cc
+++ b/chrome/browser/web_applications/web_app_migration_manager_browsertest.cc
@@ -13,7 +13,6 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/bind.h"
 #include "base/threading/thread_restrictions.h"
-#include "chrome/browser/installable/installable_metrics.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_dialogs.h"
@@ -36,6 +35,7 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
+#include "components/webapps/installable/installable_metrics.h"
 #include "content/public/test/browser_test.h"
 #include "content/public/test/test_launcher.h"
 #include "content/public/test/url_loader_interceptor.h"
@@ -146,7 +146,7 @@
     bool started = CreateWebAppFromManifest(
         browser()->tab_strip_model()->GetActiveWebContents(),
         /*bypass_service_worker_check=*/false,
-        WebappInstallSource::OMNIBOX_INSTALL_ICON,
+        webapps::WebappInstallSource::OMNIBOX_INSTALL_ICON,
         base::BindLambdaForTesting(
             [&](const AppId& installed_app_id, InstallResultCode code) {
               EXPECT_EQ(code, InstallResultCode::kSuccessNewInstall);
diff --git a/chrome/browser/web_applications/web_app_migration_user_display_mode_clean_up_browsertest.cc b/chrome/browser/web_applications/web_app_migration_user_display_mode_clean_up_browsertest.cc
index 3a4bf26..fd2c96b 100644
--- a/chrome/browser/web_applications/web_app_migration_user_display_mode_clean_up_browsertest.cc
+++ b/chrome/browser/web_applications/web_app_migration_user_display_mode_clean_up_browsertest.cc
@@ -79,7 +79,7 @@
   ASSERT_TRUE(bookmark_app_finalizer);
 
   InstallFinalizer::FinalizeOptions options;
-  options.install_source = WebappInstallSource::OMNIBOX_INSTALL_ICON;
+  options.install_source = webapps::WebappInstallSource::OMNIBOX_INSTALL_ICON;
 
   // Install bookmark app set to open as window.
   {
diff --git a/chrome/browser/webapps/chrome_webapps_client.cc b/chrome/browser/webapps/chrome_webapps_client.cc
index 3fab64fa..bbf2327 100644
--- a/chrome/browser/webapps/chrome_webapps_client.cc
+++ b/chrome/browser/webapps/chrome_webapps_client.cc
@@ -4,7 +4,14 @@
 
 #include "chrome/browser/webapps/chrome_webapps_client.h"
 
+#include "build/build_config.h"
 #include "chrome/browser/ssl/security_state_tab_helper.h"
+#include "components/webapps/installable/installable_metrics.h"
+
+#if defined(OS_ANDROID)
+#include "chrome/browser/android/tab_android.h"
+#include "chrome/browser/android/tab_web_contents_delegate_android.h"
+#endif
 
 namespace webapps {
 
@@ -21,4 +28,37 @@
       ->GetSecurityLevel();
 }
 
+WebappInstallSource ChromeWebappsClient::GetInstallSource(
+    content::WebContents* web_contents,
+    InstallTrigger trigger) {
+  bool is_custom_tab = false;
+#if defined(OS_ANDROID)
+  auto* delegate = static_cast<android::TabWebContentsDelegateAndroid*>(
+      web_contents->GetDelegate());
+  is_custom_tab = delegate->IsCustomTab();
+#endif
+
+  switch (trigger) {
+    case InstallTrigger::AMBIENT_BADGE:
+      return is_custom_tab ? WebappInstallSource::AMBIENT_BADGE_CUSTOM_TAB
+                           : WebappInstallSource::AMBIENT_BADGE_BROWSER_TAB;
+    case InstallTrigger::API:
+      return is_custom_tab ? WebappInstallSource::API_CUSTOM_TAB
+                           : WebappInstallSource::API_BROWSER_TAB;
+    case InstallTrigger::AUTOMATIC_PROMPT:
+      return is_custom_tab ? WebappInstallSource::AUTOMATIC_PROMPT_CUSTOM_TAB
+                           : WebappInstallSource::AUTOMATIC_PROMPT_BROWSER_TAB;
+    case InstallTrigger::MENU:
+      return is_custom_tab ? WebappInstallSource::MENU_CUSTOM_TAB
+                           : WebappInstallSource::MENU_BROWSER_TAB;
+    // Create shortcut does not exist on Android, so it doesn't apply to custom
+    // tab.
+    case InstallTrigger::CREATE_SHORTCUT:
+      DCHECK(!is_custom_tab);
+      return WebappInstallSource::MENU_CREATE_SHORTCUT;
+  }
+  NOTREACHED();
+  return WebappInstallSource::COUNT;
+}
+
 }  // namespace webapps
diff --git a/chrome/browser/webapps/chrome_webapps_client.h b/chrome/browser/webapps/chrome_webapps_client.h
index 48b011e..a4bcc98 100644
--- a/chrome/browser/webapps/chrome_webapps_client.h
+++ b/chrome/browser/webapps/chrome_webapps_client.h
@@ -10,16 +10,18 @@
 
 namespace webapps {
 
-class ChromeWebappsClient : public webapps::WebappsClient {
+class ChromeWebappsClient : public WebappsClient {
  public:
   ChromeWebappsClient(const ChromeWebappsClient&) = delete;
   ChromeWebappsClient& operator=(const ChromeWebappsClient&) = delete;
 
   static ChromeWebappsClient* GetInstance();
 
-  // webapps::WebappsClient:
+  // WebappsClient:
   security_state::SecurityLevel GetSecurityLevelForWebContents(
       content::WebContents* web_contents) override;
+  WebappInstallSource GetInstallSource(content::WebContents* web_contents,
+                                       InstallTrigger trigger) override;
 
  private:
   friend base::NoDestructor<ChromeWebappsClient>;
diff --git a/chrome/build/linux.pgo.txt b/chrome/build/linux.pgo.txt
index a8ae543..c87d1345 100644
--- a/chrome/build/linux.pgo.txt
+++ b/chrome/build/linux.pgo.txt
@@ -1 +1 @@
-chrome-linux-master-1607407031-3aa7c176f7320c5baa78db92893fe31481ff0a44.profdata
+chrome-linux-master-1607428729-15b0b20b7f7ec45672a4f128279fd58906f3383e.profdata
diff --git a/chrome/build/mac.pgo.txt b/chrome/build/mac.pgo.txt
index bb9d2de..879e29f 100644
--- a/chrome/build/mac.pgo.txt
+++ b/chrome/build/mac.pgo.txt
@@ -1 +1 @@
-chrome-mac-master-1607407031-63b5db867e1f1fedbce39b6034a36fb366360e89.profdata
+chrome-mac-master-1607428729-5d7fb4cc4f483e4100008e013fc190caf99a5621.profdata
diff --git a/chrome/build/win32.pgo.txt b/chrome/build/win32.pgo.txt
index 11304f2..004084e 100644
--- a/chrome/build/win32.pgo.txt
+++ b/chrome/build/win32.pgo.txt
@@ -1 +1 @@
-chrome-win32-master-1607396289-70fddd0960b2020da66aa7308994f58594fe5850.profdata
+chrome-win32-master-1607417661-75f85540ed87ef8a12b8b8faecb9dcd6afc972b8.profdata
diff --git a/chrome/build/win64.pgo.txt b/chrome/build/win64.pgo.txt
index 2d99a9a..14f643a 100644
--- a/chrome/build/win64.pgo.txt
+++ b/chrome/build/win64.pgo.txt
@@ -1 +1 @@
-chrome-win64-master-1607396289-b814d12d89d9aa0b6942a46cc974733f2726887a.profdata
+chrome-win64-master-1607417661-b29be925ba4468c1cb5f7aba9df03f08f5d1a452.profdata
diff --git a/chrome/credential_provider/test/gcp_fakes.cc b/chrome/credential_provider/test/gcp_fakes.cc
index 3e3c998..b1c17b8b 100644
--- a/chrome/credential_provider/test/gcp_fakes.cc
+++ b/chrome/credential_provider/test/gcp_fakes.cc
@@ -706,7 +706,7 @@
   if (fake_responses_.count(url) == 0 && failed_http_fetch_hr_.count(url) == 0)
     return nullptr;
 
-  FakeWinHttpUrlFetcher* fetcher = new FakeWinHttpUrlFetcher(std::move(url));
+  FakeWinHttpUrlFetcher* fetcher = new FakeWinHttpUrlFetcher(url);
 
   if (fake_responses_.count(url) != 0) {
     const Response& response = fake_responses_[url].front();
diff --git a/chrome/renderer/searchbox/searchbox_extension.cc b/chrome/renderer/searchbox/searchbox_extension.cc
index 70193e0d..0f8395b 100644
--- a/chrome/renderer/searchbox/searchbox_extension.cc
+++ b/chrome/renderer/searchbox/searchbox_extension.cc
@@ -989,7 +989,7 @@
 
   // This corresponds to "window.devicePixelRatio" in JavaScript.
   float zoom_factor =
-      blink::PageZoomLevelToZoomFactor(render_view->GetZoomLevel());
+      blink::PageZoomLevelToZoomFactor(render_view->GetWebView()->ZoomLevel());
   float device_pixel_ratio = render_frame->GetDeviceScaleFactor() * zoom_factor;
 
   int render_view_id = render_view->GetRoutingID();
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 1915842..bdb7b693 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -472,6 +472,7 @@
       "//build:chromeos_buildflags",
       "//chrome/browser/web_applications:web_applications_on_extensions_test_support",
       "//chrome/browser/web_applications:web_applications_test_support",
+      "//components/webapps",
     ]
     allow_circular_includes_from = [
       "//chrome/browser/web_applications:web_applications_on_extensions_test_support",
@@ -3489,8 +3490,6 @@
     "../browser/idle/idle_detection_permission_context_unittest.cc",
     "../browser/infobars/mock_infobar_service.cc",
     "../browser/infobars/mock_infobar_service.h",
-    "../browser/installable/installable_manager_unittest.cc",
-    "../browser/installable/installable_task_queue_unittest.cc",
     "../browser/internal_auth_unittest.cc",
     "../browser/language/language_model_manager_factory_unittest.cc",
     "../browser/language/url_language_histogram_factory_unittest.cc",
diff --git a/chrome/test/android/javatests/src/org/chromium/chrome/browser/tab/TabTestUtils.java b/chrome/test/android/javatests/src/org/chromium/chrome/browser/tab/TabTestUtils.java
index a89f3cd6..f5aa6eec 100644
--- a/chrome/test/android/javatests/src/org/chromium/chrome/browser/tab/TabTestUtils.java
+++ b/chrome/test/android/javatests/src/org/chromium/chrome/browser/tab/TabTestUtils.java
@@ -38,7 +38,7 @@
      */
     public static void simulatePageLoadFinished(Tab tab) {
         RewindableIterator<TabObserver> observers = ((TabImpl) tab).getTabObservers();
-        while (observers.hasNext()) observers.next().onPageLoadFinished(tab, tab.getUrlString());
+        while (observers.hasNext()) observers.next().onPageLoadFinished(tab, tab.getUrl());
     }
 
     /**
diff --git a/chrome/test/android/javatests/src/org/chromium/chrome/test/util/ChromeTabUtils.java b/chrome/test/android/javatests/src/org/chromium/chrome/test/util/ChromeTabUtils.java
index 1fb70af..510aaa5 100644
--- a/chrome/test/android/javatests/src/org/chromium/chrome/test/util/ChromeTabUtils.java
+++ b/chrome/test/android/javatests/src/org/chromium/chrome/test/util/ChromeTabUtils.java
@@ -111,8 +111,8 @@
         }
 
         @Override
-        public void onPageLoadFinished(Tab tab, String url) {
-            if (mExpectedUrl == null || TextUtils.equals(url, mExpectedUrl)) {
+        public void onPageLoadFinished(Tab tab, GURL url) {
+            if (mExpectedUrl == null || TextUtils.equals(url.getSpec(), mExpectedUrl)) {
                 mCallback.notifyCalled();
                 tab.removeObserver(this);
             }
@@ -271,8 +271,8 @@
         TestThreadUtils.runOnUiThreadBlocking(() -> {
             tab.addObserver(new EmptyTabObserver() {
                 @Override
-                public void onPageLoadStarted(Tab tab, String url) {
-                    if (expectedUrl == null || TextUtils.equals(url, expectedUrl)) {
+                public void onPageLoadStarted(Tab tab, GURL url) {
+                    if (expectedUrl == null || TextUtils.equals(url.getSpec(), expectedUrl)) {
                         startedCallback.notifyCalled();
                         tab.removeObserver(this);
                     }
diff --git a/chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/TabLoadObserver.java b/chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/TabLoadObserver.java
index 16989c4..ff5bdd1 100644
--- a/chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/TabLoadObserver.java
+++ b/chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/TabLoadObserver.java
@@ -18,6 +18,7 @@
 import org.chromium.content_public.browser.UiThreadTaskTraits;
 import org.chromium.content_public.browser.test.util.Coordinates;
 import org.chromium.ui.base.PageTransition;
+import org.chromium.url.GURL;
 
 /**
  * Monitors that a Tab starts loading and stops loading a URL.
@@ -44,12 +45,12 @@
     }
 
     @Override
-    public void onPageLoadStarted(Tab tab, String url) {
+    public void onPageLoadStarted(Tab tab, GURL url) {
         mTabLoadStartedCallback.notifyCalled();
     }
 
     @Override
-    public void onPageLoadFinished(Tab tab, String url) {
+    public void onPageLoadFinished(Tab tab, GURL url) {
         mTabLoadFinishedCallback.notifyCalled();
     }
 
diff --git a/chrome/test/data/webui/nearby_share/BUILD.gn b/chrome/test/data/webui/nearby_share/BUILD.gn
index ccd6d5f..89526c6 100644
--- a/chrome/test/data/webui/nearby_share/BUILD.gn
+++ b/chrome/test/data/webui/nearby_share/BUILD.gn
@@ -19,7 +19,6 @@
     ":fake_mojo_interfaces",
     ":nearby_confirmation_page_test",
     ":nearby_discovery_page_test",
-    ":nearby_preview_test",
     ":nearby_share_app_test",
   ]
 }
@@ -49,15 +48,6 @@
   externs_list = [ "$externs_path/mocha-2.5.js" ]
 }
 
-js_library("nearby_preview_test") {
-  deps = [
-    "..:chai_assert",
-    "//chrome/browser/resources/nearby_share:nearby_preview",
-    "//chrome/browser/ui/webui/nearby_share:mojom_js_library_for_compile",
-  ]
-  externs_list = [ "$externs_path/mocha-2.5.js" ]
-}
-
 js_library("nearby_share_app_test") {
   deps = [
     "..:chai_assert",
diff --git a/chrome/test/data/webui/nearby_share/nearby_browsertest.js b/chrome/test/data/webui/nearby_share/nearby_browsertest.js
index 211e840b..b08af1d2 100644
--- a/chrome/test/data/webui/nearby_share/nearby_browsertest.js
+++ b/chrome/test/data/webui/nearby_share/nearby_browsertest.js
@@ -42,7 +42,6 @@
 
 [['ConfirmationPage', 'nearby_confirmation_page_test.js'],
  ['DiscoveryPage', 'nearby_discovery_page_test.js'],
- ['Preview', 'nearby_preview_test.js'],
  ['ShareApp', 'nearby_share_app_test.js'],
 ].forEach(test => registerTest(...test));
 
diff --git a/chrome/test/data/webui/nearby_share/shared/BUILD.gn b/chrome/test/data/webui/nearby_share/shared/BUILD.gn
index ccfd3c8..be2e050 100644
--- a/chrome/test/data/webui/nearby_share/shared/BUILD.gn
+++ b/chrome/test/data/webui/nearby_share/shared/BUILD.gn
@@ -17,6 +17,7 @@
     "nearby_device_test.js",
     "nearby_onboarding_page_test.js",
     "nearby_page_template_test.js",
+    "nearby_preview_test.js",
     "nearby_progress_test.js",
     "nearby_visibility_page_test.js",
   ]
@@ -43,6 +44,7 @@
     ":nearby_device_test.m",
     ":nearby_onboarding_page_test.m",
     ":nearby_page_template_test.m",
+    ":nearby_preview_test.m",
     ":nearby_progress_test.m",
     ":nearby_visibility_page_test.m",
   ]
@@ -111,6 +113,16 @@
   externs_list = [ "$externs_path/mocha-2.5.js" ]
 }
 
+js_library("nearby_preview_test.m") {
+  sources = [ "$root_gen_dir/chrome/test/data/webui/nearby_share/shared/nearby_preview_test.m.js" ]
+  deps = [
+    "../..:chai_assert",
+    "//chrome/browser/resources/nearby_share/shared:nearby_preview.m",
+  ]
+  extra_deps = [ ":modulize" ]
+  externs_list = [ "$externs_path/mocha-2.5.js" ]
+}
+
 js_library("nearby_progress_test.m") {
   sources = [ "$root_gen_dir/chrome/test/data/webui/nearby_share/shared/nearby_progress_test.m.js" ]
   deps = [
diff --git a/chrome/test/data/webui/nearby_share/nearby_preview_test.js b/chrome/test/data/webui/nearby_share/shared/nearby_preview_test.js
similarity index 68%
rename from chrome/test/data/webui/nearby_share/nearby_preview_test.js
rename to chrome/test/data/webui/nearby_share/shared/nearby_preview_test.js
index 1549f60f..bda21e9 100644
--- a/chrome/test/data/webui/nearby_share/nearby_preview_test.js
+++ b/chrome/test/data/webui/nearby_share/shared/nearby_preview_test.js
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+// clang-format off
 // So that mojo is defined.
-import 'chrome://resources/mojo/mojo/public/js/mojo_bindings_lite.js';
-import 'chrome://resources/mojo/mojo/public/mojom/base/unguessable_token.mojom-lite.js';
-import 'chrome://nearby/mojo/nearby_share_target_types.mojom-lite.js';
-import 'chrome://nearby/mojo/nearby_share.mojom-lite.js';
-
-import 'chrome://nearby/nearby_preview.js';
-
-import {assertEquals} from '../chai_assert.js';
+// #import 'chrome://resources/mojo/mojo/public/js/mojo_bindings_lite.js';
+// #import 'chrome://resources/mojo/mojo/public/mojom/base/unguessable_token.mojom-lite.js';
+// #import 'chrome://nearby/mojo/nearby_share_target_types.mojom-lite.js';
+// #import 'chrome://nearby/mojo/nearby_share.mojom-lite.js';
+// #import 'chrome://nearby/shared/nearby_preview.m.js';
+// #import {assertEquals} from '../../chai_assert.js';
+// clang-format on
 
 suite('PreviewTest', function() {
   /** @type {!NearbyPreviewElement} */
diff --git a/chrome/test/data/webui/nearby_share/shared/nearby_shared_browsertest.js b/chrome/test/data/webui/nearby_share/shared/nearby_shared_browsertest.js
index 3c2f98a..6cda677 100644
--- a/chrome/test/data/webui/nearby_share/shared/nearby_shared_browsertest.js
+++ b/chrome/test/data/webui/nearby_share/shared/nearby_shared_browsertest.js
@@ -129,6 +129,24 @@
 /**
  * @extends {NearbySharedBrowserTest}
  */
+var NearbyPreviewTest = class extends NearbySharedBrowserTest {
+  /** @override */
+  get browsePreload() {
+    return super.browsePreload + 'shared/nearby_preview.html';
+  }
+  /** @override */
+  get extraLibraries() {
+    return super.extraLibraries.concat([
+      'nearby_preview_test.js',
+    ]);
+  }
+};
+
+TEST_F('NearbyPreviewTest', 'All', () => mocha.run());
+
+/**
+ * @extends {NearbySharedBrowserTest}
+ */
 var NearbyProgressTest = class extends NearbySharedBrowserTest {
   /** @override */
   get browsePreload() {
diff --git a/chrome/test/data/webui/nearby_share/shared/nearby_shared_v3_browsertest.js b/chrome/test/data/webui/nearby_share/shared/nearby_shared_v3_browsertest.js
index 1a85d23..10adcfa 100644
--- a/chrome/test/data/webui/nearby_share/shared/nearby_shared_v3_browsertest.js
+++ b/chrome/test/data/webui/nearby_share/shared/nearby_shared_v3_browsertest.js
@@ -43,6 +43,7 @@
  ['Device', 'nearby_device_test.m.js'],
  ['OnboardingPage', 'nearby_onboarding_page_test.m.js'],
  ['PageTemplate', 'nearby_page_template_test.m.js'],
+ ['Preview', 'nearby_preview_test.m.js'],
  ['Progress', 'nearby_progress_test.m.js'],
  ['VisibilityPage', 'nearby_visibility_page_test.m.js'],
  ['ContactVisibility', 'nearby_contact_visibility_test.m.js'],
diff --git a/chrome/test/data/webui/print_preview/destination_dialog_cros_test.js b/chrome/test/data/webui/print_preview/destination_dialog_cros_test.js
index d6a911b..1108960 100644
--- a/chrome/test/data/webui/print_preview/destination_dialog_cros_test.js
+++ b/chrome/test/data/webui/print_preview/destination_dialog_cros_test.js
@@ -4,15 +4,16 @@
 
 import {Destination, DestinationConnectionStatus, DestinationOrigin, DestinationStore, DestinationType, InvitationStore, LocalDestinationInfo, makeRecentDestination, NativeLayerImpl, RecentDestination} from 'chrome://print/print_preview.js';
 import {assert} from 'chrome://resources/js/assert.m.js';
+import {webUIListenerCallback} from 'chrome://resources/js/cr.m.js';
 import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js';
 import {keyEventOn} from 'chrome://resources/polymer/v3_0/iron-test-helpers/mock-interactions.js';
 import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
-import {assertEquals, assertFalse, assertTrue} from '../chai_assert.js';
-import {eventToPromise} from '../test_util.m.js';
+import {assertDeepEquals, assertEquals, assertFalse, assertTrue} from '../chai_assert.js';
+import {eventToPromise, waitAfterNextRender} from '../test_util.m.js';
 
 import {CloudPrintInterfaceStub} from './cloud_print_interface_stub.js';
-import {setNativeLayerCrosInstance} from './native_layer_cros_stub.js';
+import {NativeLayerCrosStub, setNativeLayerCrosInstance} from './native_layer_cros_stub.js';
 import {NativeLayerStub} from './native_layer_stub.js';
 import {createDestinationStore, getDestinations, getGoogleDriveDestination, setupTestListenerElement} from './print_preview_test_utils.js';
 
@@ -24,6 +25,8 @@
   PrinterList: 'PrinterList',
   ShowProvisionalDialog: 'ShowProvisionalDialog',
   UserAccounts: 'UserAccounts',
+  PrintServersChanged: 'PrintServersChanged',
+  PrintServerSelected: 'PrintServerSelected',
 };
 
 suite(destination_dialog_cros_test.suiteName, function() {
@@ -36,6 +39,9 @@
   /** @type {!NativeLayerStub} */
   let nativeLayer;
 
+  /** @type {!NativeLayerCrosStub} */
+  let nativeLayerCros;
+
   /** @type {!CloudPrintInterfaceStub} */
   let cloudPrintInterface;
 
@@ -61,7 +67,7 @@
     // Create data classes
     nativeLayer = new NativeLayerStub();
     NativeLayerImpl.instance_ = nativeLayer;
-    setNativeLayerCrosInstance();
+    nativeLayerCros = setNativeLayerCrosInstance();
     cloudPrintInterface = new CloudPrintInterfaceStub();
     destinationStore = createDestinationStore();
     destinationStore.setCloudPrintInterface(cloudPrintInterface);
@@ -306,4 +312,61 @@
         // Cloud print should have been queried again for the new account.
         assertEquals(3, cloudPrintInterface.getCallCount('search'));
       });
+
+  // Test that checks that print server searchable input and its selections are
+  // updated according to the PRINT_SERVERS_CHANGED event.
+  test(
+      assert(destination_dialog_cros_test.TestNames.PrintServersChanged),
+      async () => {
+        await finishSetup();
+
+        const printServers = [
+          {id: 'print-server-1', name: 'Print Server 1'},
+          {id: 'print-server-2', name: 'Print Server 2'},
+        ];
+        const isSingleServerFetchingMode = true;
+        webUIListenerCallback('print-servers-config-changed', {
+          printServers: printServers,
+          isSingleServerFetchingMode: isSingleServerFetchingMode,
+        });
+        await waitAfterNextRender(dialog);
+
+        assertFalse(dialog.$$('.server-search-box-input').hidden);
+        const serverSelector = dialog.$$('.server-search-box-input');
+        const serverSelections =
+            serverSelector.shadowRoot.querySelectorAll('.list-item');
+        assertEquals('Print Server 1', serverSelections[0].textContent.trim());
+        assertEquals('Print Server 2', serverSelections[1].textContent.trim());
+      });
+
+  // Tests that choosePrintServers is called when the print server searchable
+  // input value is changed.
+  test(
+      assert(destination_dialog_cros_test.TestNames.PrintServerSelected),
+      async () => {
+        await finishSetup();
+        const printServers = [
+          {id: 'user-print-server-1', name: 'Print Server 1'},
+          {id: 'user-print-server-2', name: 'Print Server 2'},
+          {id: 'device-print-server-1', name: 'Print Server 1'},
+          {id: 'device-print-server-2', name: 'Print Server 2'},
+        ];
+        const isSingleServerFetchingMode = true;
+        webUIListenerCallback('print-servers-config-changed', {
+          printServers: printServers,
+          isSingleServerFetchingMode: isSingleServerFetchingMode,
+        });
+        await waitAfterNextRender(dialog);
+        nativeLayerCros.reset();
+
+        const pendingPrintServerId =
+            nativeLayerCros.whenCalled('choosePrintServers');
+        dialog.$$('cr-searchable-drop-down').value = 'Print Server 2';
+        await waitAfterNextRender(dialog);
+
+        assertEquals(1, nativeLayerCros.getCallCount('choosePrintServers'));
+        assertDeepEquals(
+            ['user-print-server-2', 'device-print-server-2'],
+            await pendingPrintServerId);
+      });
 });
diff --git a/chrome/test/data/webui/print_preview/print_preview_ui_browsertest.js b/chrome/test/data/webui/print_preview/print_preview_ui_browsertest.js
index 20c5bc1..55eab43 100644
--- a/chrome/test/data/webui/print_preview/print_preview_ui_browsertest.js
+++ b/chrome/test/data/webui/print_preview/print_preview_ui_browsertest.js
@@ -726,6 +726,16 @@
   get suiteName() {
     return destination_dialog_cros_test.suiteName;
   }
+
+  /** @override */
+  get featureList() {
+    const featureList = super.featureList || [];
+    const kPrintServerScaling = ['chromeos::features::kPrintServerScaling'];
+    featureList.enabled = featureList.enabled ?
+        featureList.enabled.concat(kPrintServerScaling) :
+        kPrintServerScaling;
+    return featureList;
+  }
 };
 
 TEST_F('PrintPreviewDestinationDialogCrosTest', 'PrinterList', function() {
@@ -743,6 +753,18 @@
   this.runMochaTest(destination_dialog_cros_test.TestNames.UserAccounts);
 });
 
+TEST_F(
+    'PrintPreviewDestinationDialogCrosTest', 'PrintServersChanged', function() {
+      this.runMochaTest(
+          destination_dialog_cros_test.TestNames.PrintServersChanged);
+    });
+
+TEST_F(
+    'PrintPreviewDestinationDialogCrosTest', 'PrintServerSelected', function() {
+      this.runMochaTest(
+          destination_dialog_cros_test.TestNames.PrintServerSelected);
+    });
+
 GEN('#endif');
 
 // eslint-disable-next-line no-var
diff --git a/chrome/test/data/webui/print_preview/print_server_store_test.js b/chrome/test/data/webui/print_preview/print_server_store_test.js
index e0ede85..7749fdf 100644
--- a/chrome/test/data/webui/print_preview/print_server_store_test.js
+++ b/chrome/test/data/webui/print_preview/print_server_store_test.js
@@ -80,7 +80,7 @@
       async () => {
         const printServers = [
           {id: 'server1', name: 'Print Server 1'},
-          {id: 'server2', name: 'Print Server 2'}
+          {id: 'server2', name: 'Print Server 2'},
         ];
         const whenPrintServersChangedEvent = eventToPromise(
             PrintServerStore.EventType.PRINT_SERVERS_CHANGED, printServerStore);
diff --git a/chrome/test/data/webui/settings/chromeos/os_people_page_test.js b/chrome/test/data/webui/settings/chromeos/os_people_page_test.js
index 94821b1..40dfd253 100644
--- a/chrome/test/data/webui/settings/chromeos/os_people_page_test.js
+++ b/chrome/test/data/webui/settings/chromeos/os_people_page_test.js
@@ -209,6 +209,10 @@
       document.body.appendChild(peoplePage);
       Polymer.dom.flush();
 
+      if (peoplePage.isAccountManagementFlowsV2Enabled_) {
+        return;
+      }
+
       const params = new URLSearchParams;
       params.append('settingId', '305');
       settings.Router.getInstance().navigateTo(
diff --git a/chrome/test/data/webui/settings/chromeos/os_settings_browsertest.js b/chrome/test/data/webui/settings/chromeos/os_settings_browsertest.js
index f3b9127..8f387a3 100644
--- a/chrome/test/data/webui/settings/chromeos/os_settings_browsertest.js
+++ b/chrome/test/data/webui/settings/chromeos/os_settings_browsertest.js
@@ -235,6 +235,11 @@
   }
 
   /** @override */
+  get featureList() {
+    return {disabled: ['chromeos::features::kAccountManagementFlowsV2']};
+  }
+
+  /** @override */
   get extraLibraries() {
     return super.extraLibraries.concat([
       '//ui/webui/resources/js/assert.js',
@@ -250,6 +255,21 @@
   mocha.run();
 });
 
+// eslint-disable-next-line no-var
+var OSSettingsUserPageTestWithAccountManagementFlowsV2Enabled =
+    class extends OSSettingsUserPageTest {
+  /** @override */
+  get featureList() {
+    return {enabled: ['chromeos::features::kAccountManagementFlowsV2']};
+  }
+};
+
+TEST_F(
+    'OSSettingsUserPageTestWithAccountManagementFlowsV2Enabled', 'AllJsTests',
+    () => {
+      mocha.run();
+    });
+
 // Tests for ambient mode page.
 // eslint-disable-next-line no-var
 var OSSettingsAmbientModePageTest = class extends OSSettingsBrowserTest {
@@ -1069,8 +1089,8 @@
     class extends OSSettingsBrowserTest {
   /** @override */
   get browsePreload() {
-    return super.browsePreload;/* +
-        'chromeos/internet_page/cellular_setup_dialog.html';*/
+    return super.browsePreload +
+        'chromeos/internet_page/cellular_setup_dialog.html';
   }
 
   /** @override */
@@ -1778,6 +1798,30 @@
 });
 GEN('#endif');
 
+// Tests for the People section with `kAccountManagementFlowsV2` flag enabled.
+// eslint-disable-next-line no-var
+var OSSettingsPrivacyPageTestWithAccountManagementFlowsV2Enabled =
+    class extends OSSettingsPrivacyPageTest {
+  /** @override */
+  get featureList() {
+    return {enabled: ['chromeos::features::kAccountManagementFlowsV2']};
+  }
+};
+
+TEST_F(
+    'OSSettingsPrivacyPageTestWithAccountManagementFlowsV2Enabled', 'AllBuilds',
+    () => {
+      mocha.grep('/^(?!PrivacePageTest_OfficialBuild).*$/').run();
+    });
+
+GEN('#if BUILDFLAG(GOOGLE_CHROME_BRANDING)');
+TEST_F(
+    'OSSettingsPrivacyPageTestWithAccountManagementFlowsV2Enabled',
+    'PrivacePage_OfficialBuild', () => {
+      mocha.grep('PrivacePageTest_OfficialBuild').run();
+    });
+GEN('#endif');
+
 // Tests for the Files section.
 // eslint-disable-next-line no-var
 var OSSettingsFilesPageTest = class extends OSSettingsBrowserTest {
diff --git a/chrome/test/data/webui/settings/chromeos/os_settings_v3_browsertest.js b/chrome/test/data/webui/settings/chromeos/os_settings_v3_browsertest.js
index 4c57b1ec..6bd5626 100644
--- a/chrome/test/data/webui/settings/chromeos/os_settings_v3_browsertest.js
+++ b/chrome/test/data/webui/settings/chromeos/os_settings_v3_browsertest.js
@@ -97,6 +97,19 @@
 TEST_F('OSSettingsNearbyShareSubPageV3Test', 'All', () => mocha.run());
 
 // eslint-disable-next-line no-var
+var OSSettingsPrivacyPageV3Test = class extends OSSettingsV3BrowserTest {
+  /** @override */
+  get browsePreload() {
+    return 'chrome://os-settings/test_loader.html?module=settings/chromeos/os_privacy_page_test.m.js';
+  }
+
+  /** @override */
+  get featureList() {
+    return {disabled: ['chromeos::features::kAccountManagementFlowsV2']};
+  }
+};
+
+// eslint-disable-next-line no-var
 var OSSettingsPeoplePageAccountManagerV3Test =
     class extends OSSettingsV3BrowserTest {
   /** @override */
@@ -125,6 +138,39 @@
     'OSSettingsPeoplePageAccountManagerV3TestWithAccountManagementFlowsV2Enabled',
     'All', () => mocha.run());
 
+TEST_F('OSSettingsPrivacyPageV3Test', 'AllBuilds', () => {
+  mocha.grep('/^(?!PrivacePageTest_OfficialBuild).*$/').run();
+});
+
+GEN('#if BUILDFLAG(GOOGLE_CHROME_BRANDING)');
+TEST_F('OSSettingsPrivacyPageV3Test', 'PrivacePage_OfficialBuild', () => {
+  mocha.grep('PrivacePageTest_OfficialBuild').run();
+});
+GEN('#endif');
+
+// eslint-disable-next-line no-var
+var OSSettingsPrivacyPageV3TestWithAccountManagementFlowsV2Enabled =
+    class extends OSSettingsPrivacyPageV3Test {
+  /** @override */
+  get featureList() {
+    return {enabled: ['chromeos::features::kAccountManagementFlowsV2']};
+  }
+};
+
+TEST_F(
+    'OSSettingsPrivacyPageV3TestWithAccountManagementFlowsV2Enabled',
+    'AllBuilds', () => {
+      mocha.grep('/^(?!PrivacePageTest_OfficialBuild).*$/').run();
+    });
+
+GEN('#if BUILDFLAG(GOOGLE_CHROME_BRANDING)');
+TEST_F(
+    'OSSettingsPrivacyPageV3TestWithAccountManagementFlowsV2Enabled',
+    'PrivacePage_OfficialBuild', () => {
+      mocha.grep('PrivacePageTest_OfficialBuild').run();
+    });
+GEN('#endif');
+
 [['AboutPage', 'os_about_page_tests.m.js'],
  ['AmbientModePage', 'ambient_mode_page_test.m.js'],
  ['BluetoothPage', 'bluetooth_page_tests.m.js'],
@@ -171,7 +217,6 @@
  ['PeoplePageKerberosAccounts', 'people_page_kerberos_accounts_test.m.js'],
  ['PersonalizationPage', 'personalization_page_test.m.js'],
  ['PrintingPage', 'os_printing_page_tests.m.js'],
- ['PrivacyPage', 'os_privacy_page_test.m.js'],
  ['ResetPage', 'os_reset_page_test.m.js'],
  ['SmartInputsPage', 'smart_inputs_page_test.m.js'],
  ['SmbPage', 'smb_shares_page_tests.m.js'],
diff --git a/chrome/test/data/webui/settings/chromeos/user_page_tests.js b/chrome/test/data/webui/settings/chromeos/user_page_tests.js
index fec8d67..adbe10b 100644
--- a/chrome/test/data/webui/settings/chromeos/user_page_tests.js
+++ b/chrome/test/data/webui/settings/chromeos/user_page_tests.js
@@ -5,6 +5,7 @@
 // clang-format off
 // #import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 // #import {getDeepActiveElement} from 'chrome://resources/js/util.m.js';
+// #import {waitAfterNextRender} from 'chrome://test/test_util.m.js';
 // clang-format on
 
 let page = null;
@@ -90,6 +91,7 @@
 
   teardown(function() {
     removeUsersPage();
+    settings.Router.getInstance().resetRouteForTesting();
   });
 
   test('Focus add user button after all managed users are removed', () => {
@@ -109,4 +111,53 @@
     removeManagedUsers(removeUserIcons, userList);
     assertEquals(getDeepActiveElement(), addUserButton);
   });
-});
\ No newline at end of file
+
+  test('Deep link to Guest browsing', async () => {
+    loadTimeData.overrideValues({isDeepLinkingEnabled: true});
+    const settingId = page.isAccountManagementFlowsV2Enabled_ ? '1104' : '305';
+
+    const params = new URLSearchParams;
+    params.append('settingId', settingId);
+    settings.Router.getInstance().navigateTo(settings.routes.ACCOUNTS, params);
+
+    const deepLinkElement = page.$$('#allowGuestBrowsing').$$('cr-toggle');
+    assertTrue(!!deepLinkElement);
+    await test_util.waitAfterNextRender(deepLinkElement);
+    assertEquals(
+        deepLinkElement, getDeepActiveElement(),
+        'Guest browsing toggle should be focused for settingId=' + settingId);
+  });
+
+  test('Deep link to Show Usernames And Photos At Signin', async () => {
+    loadTimeData.overrideValues({isDeepLinkingEnabled: true});
+    const settingId = page.isAccountManagementFlowsV2Enabled_ ? '1105' : '306';
+
+    const params = new URLSearchParams;
+    params.append('settingId', settingId);
+    settings.Router.getInstance().navigateTo(settings.routes.ACCOUNTS, params);
+
+    const deepLinkElement = page.$$('#showUserNamesOnSignIn').$$('cr-toggle');
+    assertTrue(!!deepLinkElement);
+    await test_util.waitAfterNextRender(deepLinkElement);
+    assertEquals(
+        deepLinkElement, getDeepActiveElement(),
+        'Show Usernames And Photos toggle should be focused for settingId=' +
+            settingId);
+  });
+
+  test('Deep link to Restrict Signin', async () => {
+    loadTimeData.overrideValues({isDeepLinkingEnabled: true});
+    const settingId = page.isAccountManagementFlowsV2Enabled_ ? '1106' : '307';
+
+    const params = new URLSearchParams;
+    params.append('settingId', settingId);
+    settings.Router.getInstance().navigateTo(settings.routes.ACCOUNTS, params);
+
+    const deepLinkElement = page.$$('#restrictSignIn').$$('cr-toggle');
+    assertTrue(!!deepLinkElement);
+    await test_util.waitAfterNextRender(deepLinkElement);
+    assertEquals(
+        deepLinkElement, getDeepActiveElement(),
+        'Restrict Signin toggle should be focused for settingId=' + settingId);
+  });
+});
diff --git a/chromecast/browser/webview/client/webview.cc b/chromecast/browser/webview/client/webview.cc
index 76a825a..3141d3b 100644
--- a/chromecast/browser/webview/client/webview.cc
+++ b/chromecast/browser/webview/client/webview.cc
@@ -16,6 +16,8 @@
 #include "base/time/time.h"
 #include "chromecast/browser/webview/proto/webview.pb.h"
 #include "third_party/grpc/src/include/grpcpp/grpcpp.h"
+#include "third_party/skia/include/core/SkCanvas.h"
+#include "third_party/skia/include/core/SkSurface.h"
 #include "third_party/skia/include/gpu/GrDirectContext.h"
 #include "ui/gl/gl_bindings.h"
 
@@ -28,6 +30,7 @@
 
 constexpr char kBackCommand[] = "back";
 constexpr char kCreateCommand[] = "create";
+constexpr char kCreateSurfaceCommand[] = "create_surface";
 constexpr char kDestroyCommand[] = "destroy";
 constexpr char kForwardCommand[] = "forward";
 constexpr char kListCommand[] = "list";
@@ -35,6 +38,7 @@
 constexpr char kResizeCommand[] = "resize";
 constexpr char kPositionCommand[] = "position";
 constexpr char kKeyCommand[] = "key";
+constexpr char kFillCommand[] = "fill";
 
 void FrameCallback(void* data, wl_callback* callback, uint32_t time) {
   WebviewClient* webview_client = static_cast<WebviewClient*>(data);
@@ -57,10 +61,24 @@
 using chromecast::webview::WebviewRequest;
 using chromecast::webview::WebviewResponse;
 
-WebviewClient::Webview::Webview() {}
+WebviewClient::Webview::Webview() {
+  isWebview = true;
+}
 
 WebviewClient::Webview::~Webview() {}
 
+WebviewClient::Surface::Surface() {}
+
+WebviewClient::Surface::~Surface() {}
+
+WebviewClient::Webview* WebviewClient::Webview::FromSurface(
+    WebviewClient::Surface* surface) {
+  if (!surface->isWebview) {
+    return nullptr;
+  }
+  return static_cast<Webview*>(surface);
+}
+
 WebviewClient::WebviewClient()
     : task_runner_(base::ThreadTaskRunnerHandle::Get()),
       file_descriptor_watcher_(task_runner_) {}
@@ -125,28 +143,41 @@
   }
 }
 
-void WebviewClient::CreateWebview(const std::vector<std::string>& tokens) {
+bool WebviewClient::SetupSurface(const std::vector<std::string>& tokens,
+                                 Surface* surface,
+                                 int* id) {
   if (tokens.size() != 2) {
     LOG(ERROR) << "Usage: create [ID]";
-    return;
+    return false;
   }
 
-  int id;
-  if (!base::StringToInt(tokens[1], &id)) {
+  if (!base::StringToInt(tokens[1], id)) {
     LOG(ERROR) << "ID is not an int";
-    return;
-  } else if (webviews_.find(id) != webviews_.end()) {
-    LOG(ERROR) << "Webview with ID " << tokens[1] << " already exists";
-    return;
+    return false;
+  } else if (surfaces_.find(*id) != surfaces_.end()) {
+    LOG(ERROR) << "Surface with ID " << tokens[1] << " already exists";
+    return false;
   }
 
-  std::unique_ptr<Webview> webview = std::make_unique<Webview>();
+  surface->buffer = CreateBuffer(gfx::Size(1, 1), drm_format_, bo_usage_);
 
-  webview->buffer = CreateBuffer(gfx::Size(1, 1), drm_format_, bo_usage_);
-
-  webview->surface.reset(static_cast<wl_surface*>(
+  surface->surface.reset(static_cast<wl_surface*>(
       wl_compositor_create_surface(globals_.compositor.get())));
 
+  surface->subsurface.reset(wl_subcompositor_get_subsurface(
+      globals_.subcompositor.get(), surface->surface.get(), surface_.get()));
+  wl_subsurface_set_sync(surface->subsurface.get());
+
+  return true;
+}
+
+void WebviewClient::CreateWebview(const std::vector<std::string>& tokens) {
+  std::unique_ptr<Webview> webview = std::make_unique<Webview>();
+  int id;
+  if (!SetupSurface(tokens, webview.get(), &id)) {
+    return;
+  }
+
   webview->context = std::make_unique<::grpc::ClientContext>();
   webview->client = stub_->CreateWebview(webview->context.get());
 
@@ -164,10 +195,6 @@
     return;
   }
 
-  webview->subsurface.reset(wl_subcompositor_get_subsurface(
-      globals_.subcompositor.get(), webview->surface.get(), surface_.get()));
-  wl_subsurface_set_sync(webview->subsurface.get());
-
   std::unique_ptr<zaura_surface> aura_surface;
   aura_surface.reset(zaura_shell_get_aura_surface(globals_.aura_shell.get(),
                                                   webview->surface.get()));
@@ -177,16 +204,25 @@
   }
   zaura_surface_set_client_surface_id(aura_surface.get(), id);
 
-  webviews_[id] = std::move(webview);
+  surfaces_[id] = std::move(webview);
 }
 
-void WebviewClient::DestroyWebview(const std::vector<std::string>& tokens) {
+void WebviewClient::CreateSurface(const std::vector<std::string>& tokens) {
+  std::unique_ptr<Surface> surface = std::make_unique<Surface>();
+  int id;
+  if (!SetupSurface(tokens, surface.get(), &id)) {
+    return;
+  }
+  surfaces_[id] = std::move(surface);
+}
+
+void WebviewClient::DestroySurface(const std::vector<std::string>& tokens) {
   int id;
   if (tokens.size() != 2 || !base::StringToInt(tokens[1], &id)) {
     LOG(ERROR) << "Usage: destroy [ID]";
     return;
   }
-  webviews_.erase(id);
+  surfaces_.erase(id);
 }
 
 void WebviewClient::HandleDown(void* data,
@@ -200,17 +236,17 @@
   gfx::Point touch_point(wl_fixed_to_int(x), wl_fixed_to_int(y));
 
   auto iter = std::find_if(
-      webviews_.begin(), webviews_.end(),
-      [surface](const std::pair<const int, std::unique_ptr<Webview>>& pair) {
+      surfaces_.begin(), surfaces_.end(),
+      [surface](const std::pair<const int, std::unique_ptr<Surface>>& pair) {
         const auto& webview = pair.second;
         return webview->surface.get() == surface;
       });
-  if (iter == webviews_.end()) {
+  if (iter == surfaces_.end() || !Webview::FromSurface(iter->second.get())) {
     focused_webview_ = nullptr;
     return;
   }
 
-  const Webview* webview = iter->second.get();
+  const Webview* webview = Webview::FromSurface(iter->second.get());
   focused_webview_ = webview;
   SendTouchInput(focused_webview_, touch_point.x(), touch_point.y(),
                  ui::ET_TOUCH_PRESSED, time, id);
@@ -300,14 +336,16 @@
 
   if (tokens[0] == kCreateCommand)
     CreateWebview(tokens);
+  else if (tokens[0] == kCreateSurfaceCommand)
+    CreateSurface(tokens);
   else if (tokens[0] == kDestroyCommand)
-    DestroyWebview(tokens);
+    DestroySurface(tokens);
   else if (tokens[0] == kListCommand)
-    ListActiveWebviews();
+    ListActiveSurfaces();
   else if (tokens[1] == kNavigateCommand)
     SendNavigationRequest(tokens);
   else if (tokens[1] == kResizeCommand)
-    SendResizeRequest(tokens);
+    HandleResizeRequest(tokens);
   else if (tokens[1] == kPositionCommand)
     SetPosition(tokens);
   else if (tokens[1] == kBackCommand)
@@ -316,14 +354,16 @@
     SendForwardRequest(tokens);
   else if (tokens[1] == kKeyCommand)
     SendKeyRequest(tokens);
+  else if (tokens[1] == kFillCommand)
+    HandleFillSurfaceColor(tokens);
 
   std::cout << "Enter command: ";
   std::cout.flush();
 }
 
-void WebviewClient::ListActiveWebviews() {
-  for (const auto& pair : webviews_)
-    std::cout << pair.first << std::endl;
+void WebviewClient::ListActiveSurfaces() {
+  for (const auto& pair : surfaces_)
+    std::cout << "Surface: " << pair.first << std::endl;
 }
 
 void WebviewClient::Paint() {
@@ -348,14 +388,14 @@
   static wl_callback_listener frame_listener = {FrameCallback};
   wl_callback_add_listener(frame_callback_.get(), &frame_listener, this);
 
-  for (const auto& pair : webviews_) {
-    Webview* webview = pair.second.get();
-    wl_surface_set_buffer_scale(webview->surface.get(), scale_);
-    wl_surface_damage(webview->surface.get(), 0, 0, surface_size_.width(),
+  for (const auto& pair : surfaces_) {
+    Surface* surface = pair.second.get();
+    wl_surface_set_buffer_scale(surface->surface.get(), scale_);
+    wl_surface_damage(surface->surface.get(), 0, 0, surface_size_.width(),
                       surface_size_.height());
-    wl_surface_attach(webview->surface.get(), webview->buffer->buffer.get(), 0,
+    wl_surface_attach(surface->surface.get(), surface->buffer->buffer.get(), 0,
                       0);
-    wl_surface_commit(webview->surface.get());
+    wl_surface_commit(surface->surface.get());
   }
 
   wl_surface_commit(surface_.get());
@@ -370,12 +410,15 @@
 void WebviewClient::SendBackRequest(const std::vector<std::string>& tokens) {
   int id;
   if (tokens.size() != 2 || !base::StringToInt(tokens[0], &id) ||
-      webviews_.find(id) == webviews_.end()) {
+      surfaces_.find(id) == surfaces_.end()) {
     LOG(ERROR) << "Usage: [ID] back";
     return;
   }
 
-  const auto& webview = webviews_[id];
+  const Webview* webview = Webview::FromSurface(surfaces_[id].get());
+  if (!webview)
+    return;
+
   WebviewRequest back_request;
   back_request.mutable_go_back();
   if (!webview->client->Write(back_request)) {
@@ -386,12 +429,15 @@
 void WebviewClient::SendForwardRequest(const std::vector<std::string>& tokens) {
   int id;
   if (tokens.size() != 2 || !base::StringToInt(tokens[0], &id) ||
-      webviews_.find(id) == webviews_.end()) {
+      surfaces_.find(id) == surfaces_.end()) {
     LOG(ERROR) << "Usage: [ID] forward";
     return;
   }
 
-  const auto& webview = webviews_[id];
+  const Webview* webview = Webview::FromSurface(surfaces_[id].get());
+  if (!webview)
+    return;
+
   WebviewRequest forward_request;
   forward_request.mutable_go_forward();
   if (!webview->client->Write(forward_request)) {
@@ -403,12 +449,15 @@
     const std::vector<std::string>& tokens) {
   int id;
   if (tokens.size() != 3 || !base::StringToInt(tokens[0], &id) ||
-      webviews_.find(id) == webviews_.end()) {
+      surfaces_.find(id) == surfaces_.end()) {
     LOG(ERROR) << "Usage: [ID] navigate [URL]";
     return;
   }
 
-  const auto& webview = webviews_[id];
+  const Webview* webview = Webview::FromSurface(surfaces_[id].get());
+  if (!webview)
+    return;
+
   WebviewRequest load_url_request;
   load_url_request.mutable_navigate()->set_url(tokens[2]);
   if (!webview->client->Write(load_url_request)) {
@@ -416,17 +465,41 @@
   }
 }
 
-void WebviewClient::SendResizeRequest(const std::vector<std::string>& tokens) {
+void WebviewClient::HandleResizeRequest(
+    const std::vector<std::string>& tokens) {
   int id, width, height;
   if (tokens.size() != 4 || !base::StringToInt(tokens[0], &id) ||
-      webviews_.find(id) == webviews_.end() ||
       !base::StringToInt(tokens[2], &width) ||
       !base::StringToInt(tokens[3], &height)) {
     LOG(ERROR) << "Usage: [ID] resize [WIDTH] [HEIGHT]";
     return;
   }
 
-  const auto& webview = webviews_[id];
+  if (surfaces_.find(id) != surfaces_.end()) {
+    Webview* webview = Webview::FromSurface(surfaces_[id].get());
+    if (webview) {
+      SendResizeRequest(webview, width, height);
+    } else {
+      surfaces_[id]->buffer =
+          CreateBuffer(gfx::Size(width, height), drm_format_, bo_usage_);
+    }
+  }
+}
+
+void WebviewClient::HandleFillSurfaceColor(
+    const std::vector<std::string>& tokens) {
+  int id;
+  uint32_t color;
+  if (tokens.size() != 3 || !base::StringToInt(tokens[0], &id) ||
+      !base::HexStringToUInt(tokens[2], &color) ||
+      surfaces_.find(id) == surfaces_.end()) {
+    LOG(ERROR) << "Usage: [ID] " << kFillCommand << " [ARGB] (e.g. FF000000)";
+    return;
+  }
+  surfaces_[id]->buffer->sk_surface->getCanvas()->clear(color);
+}
+
+void WebviewClient::SendResizeRequest(Webview* webview, int width, int height) {
   WebviewRequest resize_request;
   resize_request.mutable_resize()->set_width(width);
   resize_request.mutable_resize()->set_height(height);
@@ -446,12 +519,14 @@
     return;
   }
 
-  const auto& webview = webviews_[id];
+  const Webview* webview = Webview::FromSurface(surfaces_[id].get());
+  if (!webview)
+    return;
 
-  SendKeyEvent(webview.get(), base::Time::Now().ToDeltaSinceWindowsEpoch(),
-               tokens[2], true);
-  SendKeyEvent(webview.get(), base::Time::Now().ToDeltaSinceWindowsEpoch(),
-               tokens[2], false);
+  SendKeyEvent(webview, base::Time::Now().ToDeltaSinceWindowsEpoch(), tokens[2],
+               true);
+  SendKeyEvent(webview, base::Time::Now().ToDeltaSinceWindowsEpoch(), tokens[2],
+               false);
 }
 
 void WebviewClient::SendKeyEvent(const Webview* webview,
@@ -501,14 +576,18 @@
 void WebviewClient::SetPosition(const std::vector<std::string>& tokens) {
   int id, x, y;
   if (tokens.size() != 4 || !base::StringToInt(tokens[0], &id) ||
-      webviews_.find(id) == webviews_.end() ||
       !base::StringToInt(tokens[2], &x) || !base::StringToInt(tokens[3], &y)) {
     LOG(ERROR) << "Usage: [ID] position [X] [Y]";
     return;
   }
 
-  const auto& webview = webviews_[id];
-  wl_subsurface_set_position(webview->subsurface.get(), x, y);
+  Surface* surface = nullptr;
+  if (surfaces_.find(id) != surfaces_.end()) {
+    surface = surfaces_[id].get();
+  } else {
+    LOG(ERROR) << "Cannont find surface with ID: " << id;
+  }
+  wl_subsurface_set_position(surface->subsurface.get(), x, y);
 }
 
 void WebviewClient::TakeExclusiveAccess() {
diff --git a/chromecast/browser/webview/client/webview.h b/chromecast/browser/webview/client/webview.h
index 4540f378..e2f1733f 100644
--- a/chromecast/browser/webview/client/webview.h
+++ b/chromecast/browser/webview/client/webview.h
@@ -40,19 +40,30 @@
   using WebviewRequestResponseClient =
       ::grpc::ClientReaderWriterInterface<chromecast::webview::WebviewRequest,
                                           chromecast::webview::WebviewResponse>;
-  struct Webview {
-    Webview();
-    ~Webview();
+  struct Surface {
+    Surface();
+    virtual ~Surface();
+    bool isWebview = false;
     std::unique_ptr<ClientBase::Buffer> buffer;
     std::unique_ptr<wl_surface> surface;
     std::unique_ptr<wl_subsurface> subsurface;
+  };
+
+  struct Webview : public Surface {
+    Webview();
+    ~Webview() override;
+    static Webview* FromSurface(Surface* surface);
     std::unique_ptr<WebviewRequestResponseClient> client;
     std::unique_ptr<::grpc::ClientContext> context;
   };
 
   void AllocateBuffers(const InitParams& params);
   void CreateWebview(const std::vector<std::string>& tokens);
-  void DestroyWebview(const std::vector<std::string>& tokens);
+  void CreateSurface(const std::vector<std::string>& tokens);
+  bool SetupSurface(const std::vector<std::string>& tokens,
+                    Surface* surface,
+                    int* id);
+  void DestroySurface(const std::vector<std::string>& tokens);
   void HandleDown(void* data,
                   struct wl_touch* wl_touch,
                   uint32_t serial,
@@ -79,12 +90,14 @@
                 uint32_t time,
                 int32_t id) override;
   void InputCallback();
-  void ListActiveWebviews();
+  void ListActiveSurfaces();
   void Paint();
   void SendBackRequest(const std::vector<std::string>& tokens);
   void SendForwardRequest(const std::vector<std::string>& tokens);
   void SendNavigationRequest(const std::vector<std::string>& tokens);
-  void SendResizeRequest(const std::vector<std::string>& tokens);
+  void SendResizeRequest(Webview* webview, int width, int height);
+  void HandleResizeRequest(const std::vector<std::string>& tokens);
+  void HandleFillSurfaceColor(const std::vector<std::string>& tokens);
   void SendKeyRequest(const std::vector<std::string>& tokens);
 
   void SendTouchInput(const Webview* webview,
@@ -106,7 +119,7 @@
   int32_t bo_usage_ = 0;
 
   const Webview* focused_webview_;
-  std::map<int, std::unique_ptr<Webview>> webviews_;
+  std::map<int, std::unique_ptr<Surface>> surfaces_;
   std::map<int32_t, gfx::Point> points_;
 
   std::unique_ptr<wl_callback> frame_callback_;
diff --git a/chromeos/components/scanning/resources/color_mode_select.html b/chromeos/components/scanning/resources/color_mode_select.html
index 213cf7a..76f33f8 100644
--- a/chromeos/components/scanning/resources/color_mode_select.html
+++ b/chromeos/components/scanning/resources/color_mode_select.html
@@ -1,11 +1,12 @@
 <style include="scanning-shared"></style>
 <scan-settings-section>
-  <span id="colorModeLabel" slot="label">[[i18n('colorModeDropdownLabel')]]</span>
+  <span id="colorModeLabel" slot="label" aria-hidden="true">
+    [[i18n('colorModeDropdownLabel')]]
+  </span>
   <div slot="settings">
-    <!-- TODO(jschettler): Verify this meets a11y expecations (e.g. ChromeVox
-        should announce when a new option is focused). -->
     <select id="colorModeSelect" class="md-select"
-        value="{{selectedColorMode::change}}" disabled="[[disabled]]">
+        value="{{selectedColorMode::change}}" disabled="[[disabled]]"
+        aria-labelledby="colorModeLabel">
       <!-- TODO(jschettler): Determine how the color modes should be sorted. -->
       <template is="dom-repeat" items="[[colorModes]]" as="colorMode">
         <option value="[[colorMode]]"
diff --git a/chromeos/components/scanning/resources/file_type_select.html b/chromeos/components/scanning/resources/file_type_select.html
index bca68fdb..81bce600 100644
--- a/chromeos/components/scanning/resources/file_type_select.html
+++ b/chromeos/components/scanning/resources/file_type_select.html
@@ -1,11 +1,12 @@
 <style include="scanning-shared"></style>
 <scan-settings-section>
-  <span id="fileTypeLabel" slot="label">[[i18n('fileTypeDropdownLabel')]]</span>
+  <span id="fileTypeLabel" slot="label" aria-hidden="true">
+    [[i18n('fileTypeDropdownLabel')]]
+  </span>
   <div slot="settings">
-    <!-- TODO(jschettler): Verify this meets a11y expecations (e.g. ChromeVox
-        should announce when a new option is focused). -->
     <select id="fileTypeSelect" class="md-select"
-        value="{{selectedFileType::change}}" disabled="[[disabled]]">
+        value="{{selectedFileType::change}}" disabled="[[disabled]]"
+        aria-labelledby="fileTypeLabel">
       <!-- The option values must match the chromeos.scanning.mojom.FileType
           values they correspond to. -->
       <!-- TODO(jschettler): Change default back to PDF when it's supported. -->
diff --git a/chromeos/components/scanning/resources/page_size_select.html b/chromeos/components/scanning/resources/page_size_select.html
index 2ba65d8..c48602a 100644
--- a/chromeos/components/scanning/resources/page_size_select.html
+++ b/chromeos/components/scanning/resources/page_size_select.html
@@ -1,11 +1,12 @@
 <style include="scanning-shared"></style>
 <scan-settings-section>
-  <span id="pageSizeLabel" slot="label">[[i18n('pageSizeDropdownLabel')]]</span>
+  <span id="pageSizeLabel" slot="label" aria-hidden="true">
+    [[i18n('pageSizeDropdownLabel')]]
+  </span>
   <div slot="settings">
-    <!-- TODO(jschettler): Verify this meets a11y expecations (e.g. ChromeVox
-        should announce when a new option is focused). -->
     <select id="pageSizeSelect" class="md-select"
-        value="{{selectedPageSize::change}}" disabled="[[disabled]]">
+        value="{{selectedPageSize::change}}" disabled="[[disabled]]"
+        aria-labelledby="pageSizeLabel">
       <!-- TODO(jschettler): Sort the page sizes. -->
       <template is="dom-repeat" items="[[pageSizes]]" as="pageSize">
         <option value="[[pageSize]]"
diff --git a/chromeos/components/scanning/resources/resolution_select.html b/chromeos/components/scanning/resources/resolution_select.html
index 95857a31..9f2269b 100644
--- a/chromeos/components/scanning/resources/resolution_select.html
+++ b/chromeos/components/scanning/resources/resolution_select.html
@@ -1,11 +1,12 @@
 <style include="scanning-shared"></style>
 <scan-settings-section>
-  <span id="resolutionLabel" slot="label">[[i18n('resolutionDropdownLabel')]]</span>
+  <span id="resolutionLabel" slot="label" aria-hidden="true">
+    [[i18n('resolutionDropdownLabel')]]
+  </span>
   <div slot="settings">
-    <!-- TODO(jschettler): Verify this meets a11y expecations (e.g. ChromeVox
-        should announce when a new option is focused). -->
     <select id="resolutionSelect" class="md-select"
-        value="{{selectedResolution::change}}" disabled="[[disabled]]">
+        value="{{selectedResolution::change}}" disabled="[[disabled]]"
+        aria-labelledby="resolutionLabel">
       <!-- TODO(jschettler): Sort the resolutions. -->
       <template is="dom-repeat" items="[[resolutions]]" as="resolution">
         <option value="[[resolution]]"
diff --git a/chromeos/components/scanning/resources/scan_done_section.html b/chromeos/components/scanning/resources/scan_done_section.html
index 3b65f1e..ab3f306 100644
--- a/chromeos/components/scanning/resources/scan_done_section.html
+++ b/chromeos/components/scanning/resources/scan_done_section.html
@@ -39,13 +39,15 @@
   }
 </style>
 <iron-icon id="checkMarkIcon" icon="scanning:check-mark"></iron-icon>
-<h1 id="title" >
+<h1 id="title" role="alert">
   [[getTitleText_(pageNumber)]]
 </h1>
 <div class="container">
-  <span class="label">[[i18n('showFileLocationLabel')]]</span>
+  <span id="showFileLocationLabel" class="label" aria-hidden="true">
+    [[i18n('showFileLocationLabel')]]
+  </span>
   <cr-icon-button id="showFileButton" class="button" iron-icon="cr:open-in-new"
-      on-click="showFileInLocation_">
+      on-click="showFileInLocation_" aria-labelledby="showFileLocationLabel">
   </cr-icon-button>
 </div>
 <div class="done-button-container">
diff --git a/chromeos/components/scanning/resources/scan_to_select.html b/chromeos/components/scanning/resources/scan_to_select.html
index 06c7499..b23964c 100644
--- a/chromeos/components/scanning/resources/scan_to_select.html
+++ b/chromeos/components/scanning/resources/scan_to_select.html
@@ -1,10 +1,11 @@
 <style include="scanning-shared"></style>
 <scan-settings-section>
-  <span id="scanToLabel" slot="label">[[i18n('scanToDropdownLabel')]]</span>
+  <span id="scanToLabel" slot="label" aria-hidden="true">
+    [[i18n('scanToDropdownLabel')]]
+  </span>
   <div slot="settings">
-    <!-- TODO(jschettler): Verify this meets a11y expecations (e.g. ChromeVox
-        should announce when a new option is focused). -->
-    <select id="scanToSelect" class="md-select" disabled="[[disabled]]" on-change="onSelectFolder_">
+    <select id="scanToSelect" class="md-select" disabled="[[disabled]]"
+        on-change="onSelectFolder_" aria-labelledby="scanToLabel">
       <option selected>
         [[displayText_]]
       </option>
diff --git a/chromeos/components/scanning/resources/scanner_select.html b/chromeos/components/scanning/resources/scanner_select.html
index e2ccc5f..4aa33bd 100644
--- a/chromeos/components/scanning/resources/scanner_select.html
+++ b/chromeos/components/scanning/resources/scanner_select.html
@@ -12,16 +12,16 @@
   }
 </style>
 <scan-settings-section>
-  <span id="scannerLabel" slot="label">[[i18n('scannerDropdownLabel')]]</span>
+  <span id="scannerLabel" slot="label" aria-hidden="true">
+    [[i18n('scannerDropdownLabel')]]
+  </span>
   <div slot="settings">
     <div class="throbber-container" hidden$="[[loaded]]">
       <div class="throbber"></div>
     </div>
-    <!-- TODO(jschettler): Verify this meets a11y expecations (e.g. ChromeVox
-        should announce when a new option is focused). -->
     <select id="scannerSelect" class="md-select"
         value="{{selectedScannerId::change}}" hidden$="[[!loaded]]"
-        disabled="[[disabled]]">
+        disabled="[[disabled]]" aria-labelledby="scannerLabel">
       <!-- TODO(jschettler): Figure out why hiding/disabling the option doesn't
           remove it from the dropdown. -->
       <template is="dom-if" if="[[!scanners.length]]" restamp>
diff --git a/chromeos/components/scanning/resources/source_select.html b/chromeos/components/scanning/resources/source_select.html
index 17e8a2b..27d8775 100644
--- a/chromeos/components/scanning/resources/source_select.html
+++ b/chromeos/components/scanning/resources/source_select.html
@@ -1,11 +1,12 @@
 <style include="scanning-shared"></style>
 <scan-settings-section>
-  <span id="sourceLabel" slot="label">[[i18n('sourceDropdownLabel')]]</span>
+  <span id="sourceLabel" slot="label" aria-hidden="true">
+    [[i18n('sourceDropdownLabel')]]
+  </span>
   <div slot="settings">
-    <!-- TODO(jschettler): Verify this meets a11y expecations (e.g. ChromeVox
-        should announce when a new option is focused). -->
     <select id="sourceSelect" class="md-select"
-        value="{{selectedSource::change}}" disabled="[[disabled]]">
+        value="{{selectedSource::change}}" disabled="[[disabled]]"
+        aria-labelledby="sourceLabel">
       <template is="dom-if" if="[[!sources.length]]" restamp>
         <option value="">
           [[i18n('defaultSourceOptionText')]]
diff --git a/components/BUILD.gn b/components/BUILD.gn
index 18d8d83..df0d0868 100644
--- a/components/BUILD.gn
+++ b/components/BUILD.gn
@@ -309,6 +309,7 @@
       "//components/visitedlink/test:unit_tests",
       "//components/web_cache/browser:unit_tests",
       "//components/web_package:unit_tests",
+      "//components/webapps:unit_tests",
       "//components/webcrypto:unit_tests",
       "//components/webrtc_logging/browser:unit_tests",
       "//components/webrtc_logging/common:unit_tests",
diff --git a/components/arc/enterprise/arc_data_snapshotd_manager.cc b/components/arc/enterprise/arc_data_snapshotd_manager.cc
index bcb66b55..ee8064b 100644
--- a/components/arc/enterprise/arc_data_snapshotd_manager.cc
+++ b/components/arc/enterprise/arc_data_snapshotd_manager.cc
@@ -479,6 +479,15 @@
                      weak_ptr_factory_.GetWeakPtr(), std::move(callback)));
 }
 
+void ArcDataSnapshotdManager::UpdateUi(int percent) {
+  if (!bridge_) {
+    OnUiUpdated(false /* success */);
+    return;
+  }
+  bridge_->Update(percent, base::BindOnce(&ArcDataSnapshotdManager::OnUiUpdated,
+                                          weak_ptr_factory_.GetWeakPtr()));
+}
+
 void ArcDataSnapshotdManager::OnSnapshotsCleared(bool success) {
   switch (state_) {
     case State::kBlockedUi:
@@ -554,7 +563,9 @@
 void ArcDataSnapshotdManager::Update(int percent) {
   DCHECK_EQ(state_, State::kMgsLaunched);
 
-  // TODO(pbond): wire up to arc-data-snapshotd.
+  EnsureDaemonStarted(base::BindOnce(&ArcDataSnapshotdManager::UpdateUi,
+                                     weak_ptr_factory_.GetWeakPtr(), percent));
+
   if (percent == 100) {
     // Stop tracking apps, 100% of required apps got installed.
     // The snapshot can be taken right away.
@@ -637,6 +648,11 @@
   OnSnapshotTaken(false /* success */);
 }
 
+void ArcDataSnapshotdManager::OnUiUpdated(bool success) {
+  if (!success)
+    LOG(ERROR) << "Failed to update UI progress bar.";
+}
+
 std::string ArcDataSnapshotdManager::GetCryptohomeAccountId() {
   // Take snapshots only for MGSs.
   if (user_manager::UserManager::Get() &&
diff --git a/components/arc/enterprise/arc_data_snapshotd_manager.h b/components/arc/enterprise/arc_data_snapshotd_manager.h
index 08c3eed3..11838fd 100644
--- a/components/arc/enterprise/arc_data_snapshotd_manager.h
+++ b/components/arc/enterprise/arc_data_snapshotd_manager.h
@@ -243,6 +243,7 @@
   void ClearSnapshot(bool last, base::OnceCallback<void(bool)> callback);
   void TakeSnapshot(const std::string& account_id);
   void LoadSnapshot(const std::string& account_id, base::OnceClosure callback);
+  void UpdateUi(int percent);
 
   // Called once the outdated snapshots were removed or ensured that there are
   // no outdated snapshots.
@@ -272,6 +273,9 @@
   // Called once unexpected ARC data removal is requested,
   void OnUnexpectedArcDataRemoveRequested();
 
+  // Called once a progress bar is updated.
+  void OnUiUpdated(bool success);
+
   // Returns non-empty account ID string if a MGS is active.
   // Otherwise returns an empty string.
   std::string GetCryptohomeAccountId();
diff --git a/components/arc/enterprise/arc_data_snapshotd_manager_unittest.cc b/components/arc/enterprise/arc_data_snapshotd_manager_unittest.cc
index a94cb5c..d61f5b3 100644
--- a/components/arc/enterprise/arc_data_snapshotd_manager_unittest.cc
+++ b/components/arc/enterprise/arc_data_snapshotd_manager_unittest.cc
@@ -503,13 +503,17 @@
   LoginAsPublicSession();
   manager->OnSessionStateChanged();
 
+  ExpectStartDaemon(true /* success */);
   ExpectStartTrackingApps();
   EXPECT_EQ(manager->state(), ArcDataSnapshotdManager::State::kMgsLaunched);
   // Installed 10% of tracking apps.
   apps_tracker()->update_callback().Run(10 /* percent */);
+  // Need to run until idle to ensure D-Bus bridge is set up and available.
+  task_environment_.RunUntilIdle();
+  EXPECT_TRUE(manager->bridge());
+
   EXPECT_EQ(manager->state(), ArcDataSnapshotdManager::State::kMgsLaunched);
   // Expect to stop ARC.
-  ExpectStartDaemon(true /*success */);
   // Expect daemon to stop once the snapshot is taken.
   ExpectStopDaemon(true /* success */);
   // Finished ARC tracking.
diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/LocationCategory.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/LocationCategory.java
index 3b88a73..0cf925f 100644
--- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/LocationCategory.java
+++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/LocationCategory.java
@@ -4,7 +4,6 @@
 
 package org.chromium.components.browser_ui.site_settings;
 
-import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
@@ -49,9 +48,9 @@
     }
 
     @Override
-    protected String getMessageForEnablingOsGlobalPermission(Activity activity) {
-        Resources resources = activity.getResources();
-        if (enabledForChrome(activity)) {
+    protected String getMessageForEnablingOsGlobalPermission(Context context) {
+        Resources resources = context.getResources();
+        if (enabledForChrome(context)) {
             return resources.getString(R.string.android_location_off_globally);
         }
         return resources.getString(R.string.android_location_also_off_globally);
diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/NfcCategory.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/NfcCategory.java
index 383794e..c6a577b 100644
--- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/NfcCategory.java
+++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/NfcCategory.java
@@ -4,7 +4,6 @@
 
 package org.chromium.components.browser_ui.site_settings;
 
-import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 
@@ -27,8 +26,8 @@
     }
 
     @Override
-    protected String getMessageIfNotSupported(Activity activity) {
-        return activity.getResources().getString(R.string.android_nfc_unsupported);
+    protected String getMessageIfNotSupported(Context context) {
+        return context.getResources().getString(R.string.android_nfc_unsupported);
     }
 
     @Override
@@ -42,7 +41,7 @@
     }
 
     @Override
-    protected String getMessageForEnablingOsGlobalPermission(Activity activity) {
-        return activity.getResources().getString(R.string.android_nfc_off_globally);
+    protected String getMessageForEnablingOsGlobalPermission(Context context) {
+        return context.getResources().getString(R.string.android_nfc_off_globally);
     }
 }
diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java
index e0a377e..239eeab 100644
--- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java
+++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java
@@ -587,7 +587,7 @@
                 mCategory.getContentSettingsType(), primaryPattern, secondaryPattern, setting);
 
         String hostname = primaryPattern.equals(SITE_WILDCARD) ? secondaryPattern : primaryPattern;
-        Toast.makeText(getActivity(),
+        Toast.makeText(getContext(),
                      String.format(getContext().getString(R.string.website_settings_add_site_toast),
                              hostname),
                      Toast.LENGTH_SHORT)
@@ -840,7 +840,7 @@
         PreferenceGroup allowedGroup = (PreferenceGroup) screen.findPreference(ALLOWED_GROUP);
         PreferenceGroup blockedGroup = (PreferenceGroup) screen.findPreference(BLOCKED_GROUP);
         PreferenceGroup managedGroup = (PreferenceGroup) screen.findPreference(MANAGED_GROUP);
-        boolean permissionBlockedByOs = mCategory.showPermissionBlockedMessage(getActivity());
+        boolean permissionBlockedByOs = mCategory.showPermissionBlockedMessage(getContext());
 
         if (mRequiresTriStateSetting) {
             screen.removePreference(binaryToggle);
@@ -936,8 +936,8 @@
         // Show the link to system settings since permission is disabled.
         ChromeBasePreference osWarning = new ChromeBasePreference(getStyledContext(), null);
         ChromeBasePreference osWarningExtra = new ChromeBasePreference(getStyledContext(), null);
-        mCategory.configurePermissionIsOffPreferences(osWarning, osWarningExtra, getActivity(),
-                true, getSiteSettingsClient().getAppName());
+        mCategory.configurePermissionIsOffPreferences(osWarning, osWarningExtra, getContext(), true,
+                getSiteSettingsClient().getAppName());
         if (osWarning.getTitle() != null) {
             osWarning.setKey(SingleWebsiteSettings.PREF_OS_PERMISSIONS_WARNING);
             screen.addPreference(osWarning);
@@ -1033,11 +1033,11 @@
 
     private void showManagedToast() {
         if (mCategory.isManagedByCustodian()) {
-            ManagedPreferencesUtils.showManagedByParentToast(getActivity(),
+            ManagedPreferencesUtils.showManagedByParentToast(getContext(),
                     new SingleCategoryManagedPreferenceDelegate(
                             getSiteSettingsClient().getManagedPreferenceDelegate()));
         } else {
-            ManagedPreferencesUtils.showManagedByAdministratorToast(getActivity());
+            ManagedPreferencesUtils.showManagedByAdministratorToast(getContext());
         }
     }
 
diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
index 8051bdf..f16d15bf 100644
--- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
+++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
@@ -751,7 +751,7 @@
             Preference osWarning = findPreference(PREF_OS_PERMISSIONS_WARNING);
             Preference osWarningExtra = findPreference(PREF_OS_PERMISSIONS_WARNING_EXTRA);
             categoryWithWarning.configurePermissionIsOffPreferences(osWarning, osWarningExtra,
-                    getActivity(), false, getSiteSettingsClient().getAppName());
+                    getContext(), false, getSiteSettingsClient().getAppName());
             if (osWarning.getTitle() == null) {
                 preferenceScreen.removePreference(osWarning);
             } else if (osWarningExtra.getTitle() == null) {
@@ -816,7 +816,7 @@
             return false;
         }
         return SiteSettingsCategory.createFromType(browserContextHandle, type)
-                .showPermissionBlockedMessage(getActivity());
+                .showPermissionBlockedMessage(getContext());
     }
 
     private boolean hasUsagePreferences() {
@@ -890,7 +890,7 @@
                 getSiteSettingsClient().getBrowserContextHandle(), contentType);
         if (category != null && value != null && value != ContentSettingValues.BLOCK
                 && !category.enabledInAndroid(getActivity())) {
-            preference.setIcon(category.getDisabledInAndroidIcon(getActivity()));
+            preference.setIcon(category.getDisabledInAndroidIcon(getContext()));
             preference.setEnabled(false);
         } else {
             preference.setIcon(getContentSettingsIcon(contentType, value, true));
diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java
index 23e7955..5c0f84d6 100644
--- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java
+++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java
@@ -4,7 +4,6 @@
 
 package org.chromium.components.browser_ui.site_settings;
 
-import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -343,21 +342,21 @@
      * @param osWarningExtra A preference to hold any additional permission warning (if any). After
      *                       calling this method, if osWarningExtra has no title, the preference
      *                       should not be added to the preference screen.
-     * @param activity The current activity.
+     * @param context The current context.
      * @param specificCategory Whether the warnings refer to a single category or is an aggregate
      *                         for many permissions.
      * @param appName The name of the app to use in warning strings.
      */
     public void configurePermissionIsOffPreferences(Preference osWarning, Preference osWarningExtra,
-            Activity activity, boolean specificCategory, String appName) {
-        Intent perAppIntent = getIntentToEnableOsPerAppPermission(activity);
-        Intent globalIntent = getIntentToEnableOsGlobalPermission(activity);
+            Context context, boolean specificCategory, String appName) {
+        Intent perAppIntent = getIntentToEnableOsPerAppPermission(context);
+        Intent globalIntent = getIntentToEnableOsGlobalPermission(context);
         String perAppMessage =
-                getMessageForEnablingOsPerAppPermission(activity, !specificCategory, appName);
-        String globalMessage = getMessageForEnablingOsGlobalPermission(activity);
-        String unsupportedMessage = getMessageIfNotSupported(activity);
+                getMessageForEnablingOsPerAppPermission(context, !specificCategory, appName);
+        String globalMessage = getMessageForEnablingOsGlobalPermission(context);
+        String unsupportedMessage = getMessageIfNotSupported(context);
 
-        Resources resources = activity.getResources();
+        Resources resources = context.getResources();
         int color = ApiCompatibilityUtils.getColor(resources, R.color.default_control_color_active);
         ForegroundColorSpan linkSpan = new ForegroundColorSpan(color);
 
@@ -368,13 +367,13 @@
             osWarning.setIntent(perAppIntent);
 
             if (!specificCategory) {
-                osWarning.setIcon(getDisabledInAndroidIcon(activity));
+                osWarning.setIcon(getDisabledInAndroidIcon(context));
             }
         }
 
         if (!supportedGlobally()) {
             osWarningExtra.setTitle(unsupportedMessage);
-            osWarningExtra.setIcon(getDisabledInAndroidIcon(activity));
+            osWarningExtra.setIcon(getDisabledInAndroidIcon(context));
         } else if (globalIntent != null) {
             SpannableString messageWithLink = SpanApplier.applySpans(
                     globalMessage, new SpanInfo("<link>", "</link>", linkSpan));
@@ -383,7 +382,7 @@
 
             if (!specificCategory) {
                 if (perAppIntent == null) {
-                    osWarningExtra.setIcon(getDisabledInAndroidIcon(activity));
+                    osWarningExtra.setIcon(getDisabledInAndroidIcon(context));
                 } else {
                     Drawable transparent = new ColorDrawable(Color.TRANSPARENT);
                     osWarningExtra.setIcon(transparent);
@@ -395,12 +394,12 @@
     /**
      * Returns the icon for permissions that have been disabled by Android.
      */
-    Drawable getDisabledInAndroidIcon(Activity activity) {
+    Drawable getDisabledInAndroidIcon(Context context) {
         Drawable icon = ApiCompatibilityUtils.getDrawable(
-                activity.getResources(), R.drawable.exclamation_triangle);
+                context.getResources(), R.drawable.exclamation_triangle);
         icon.mutate();
         int disabledColor = ApiCompatibilityUtils.getColor(
-                activity.getResources(), R.color.default_control_color_active);
+                context.getResources(), R.color.default_control_color_active);
         icon.setColorFilter(disabledColor, PorterDuff.Mode.SRC_IN);
         return icon;
     }
@@ -424,7 +423,7 @@
      * Returns the message to display when permission is not supported.
      */
     @Nullable
-    protected String getMessageIfNotSupported(Activity activity) {
+    protected String getMessageIfNotSupported(Context context) {
         return null;
     }
 
@@ -486,7 +485,7 @@
      * @param plural Whether it applies to one per-app permission or multiple.
      */
     protected String getMessageForEnablingOsPerAppPermission(
-            Activity activity, boolean plural, String appName) {
+            Context context, boolean plural, String appName) {
         @ContentSettingsType
         int type = this.getContentSettingsType();
         int permission_string = R.string.android_permission_off;
@@ -501,14 +500,14 @@
         } else if (type == ContentSettingsType.NOTIFICATIONS) {
             permission_string = R.string.android_notifications_permission_off;
         }
-        return activity.getResources().getString(
+        return context.getResources().getString(
                 plural ? R.string.android_permission_off_plural : permission_string, appName);
     }
 
     /**
      * Returns the message to display when per-app permission is blocked.
      */
-    protected String getMessageForEnablingOsGlobalPermission(Activity activity) {
+    protected String getMessageForEnablingOsGlobalPermission(Context context) {
         return null;
     }
 
diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
index c4c777cd..d823dfe 100644
--- a/components/content_settings/core/browser/content_settings_registry.cc
+++ b/components/content_settings/core/browser/content_settings_registry.cc
@@ -470,17 +470,6 @@
            ContentSettingsInfo::PERSISTENT,
            ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY);
 
-  Register(ContentSettingsType::PERIODIC_BACKGROUND_SYNC,
-           "periodic-background-sync", CONTENT_SETTING_ALLOW,
-           WebsiteSettingsInfo::UNSYNCABLE, AllowlistedSchemes(),
-           ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK),
-           WebsiteSettingsInfo::SINGLE_ORIGIN_ONLY_SCOPE,
-           WebsiteSettingsRegistry::DESKTOP |
-               WebsiteSettingsRegistry::PLATFORM_ANDROID,
-           ContentSettingsInfo::INHERIT_IN_INCOGNITO,
-           ContentSettingsInfo::EPHEMERAL,
-           ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY);
-
   Register(ContentSettingsType::BLUETOOTH_SCANNING, "bluetooth-scanning",
            CONTENT_SETTING_ASK, WebsiteSettingsInfo::UNSYNCABLE,
            AllowlistedSchemes(),
diff --git a/components/content_settings/core/common/content_settings_types.h b/components/content_settings/core/common/content_settings_types.h
index 27dbaba..61c2c418 100644
--- a/components/content_settings/core/common/content_settings_types.h
+++ b/components/content_settings/core/common/content_settings_types.h
@@ -126,6 +126,8 @@
   // Nothing is stored in this setting at present. Please refer to
   // PeriodicBackgroundSyncPermissionContext for details on how this permission
   // is ascertained.
+  // This content setting is not registered because it does not require access
+  // to any existing providers.
   PERIODIC_BACKGROUND_SYNC,
 
   // Content setting which stores whether to allow sites to ask for permission
diff --git a/components/discardable_memory/client/client_discardable_shared_memory_manager.cc b/components/discardable_memory/client/client_discardable_shared_memory_manager.cc
index 519600c..03951921a4 100644
--- a/components/discardable_memory/client/client_discardable_shared_memory_manager.cc
+++ b/components/discardable_memory/client/client_discardable_shared_memory_manager.cc
@@ -190,11 +190,11 @@
     mojo::PendingRemote<mojom::DiscardableSharedMemoryManager> manager,
     scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> periodic_purge_task_runner)
-    : heap_(std::make_unique<DiscardableSharedMemoryHeap>()),
-      periodic_purge_task_runner_(std::move(periodic_purge_task_runner)),
-      io_task_runner_(std::move(io_task_runner)),
-      manager_mojo_(std::make_unique<
-                    mojo::Remote<mojom::DiscardableSharedMemoryManager>>()) {
+    : ClientDiscardableSharedMemoryManager(
+          std::move(io_task_runner),
+          std::move(periodic_purge_task_runner)) {
+  manager_mojo_ =
+      std::make_unique<mojo::Remote<mojom::DiscardableSharedMemoryManager>>();
   base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider(
       this, "ClientDiscardableSharedMemoryManager",
       base::ThreadTaskRunnerHandle::Get());
@@ -206,7 +206,9 @@
 ClientDiscardableSharedMemoryManager::ClientDiscardableSharedMemoryManager(
     scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> periodic_purge_task_runner)
-    : heap_(std::make_unique<DiscardableSharedMemoryHeap>()),
+    : RefCountedDeleteOnSequence<ClientDiscardableSharedMemoryManager>(
+          base::ThreadTaskRunnerHandle::Get()),
+      heap_(std::make_unique<DiscardableSharedMemoryHeap>()),
       periodic_purge_task_runner_(std::move(periodic_purge_task_runner)),
       io_task_runner_(std::move(io_task_runner)) {}
 
diff --git a/components/discardable_memory/client/client_discardable_shared_memory_manager.h b/components/discardable_memory/client/client_discardable_shared_memory_manager.h
index 3de1d29..f0695afb 100644
--- a/components/discardable_memory/client/client_discardable_shared_memory_manager.h
+++ b/components/discardable_memory/client/client_discardable_shared_memory_manager.h
@@ -12,7 +12,7 @@
 
 #include "base/feature_list.h"
 #include "base/memory/discardable_memory_allocator.h"
-#include "base/memory/ref_counted.h"
+#include "base/memory/ref_counted_delete_on_sequence.h"
 #include "base/memory/unsafe_shared_memory_region.h"
 #include "base/synchronization/lock.h"
 #include "base/trace_event/memory_dump_provider.h"
@@ -35,7 +35,8 @@
 class DISCARDABLE_MEMORY_EXPORT ClientDiscardableSharedMemoryManager
     : public base::DiscardableMemoryAllocator,
       public base::trace_event::MemoryDumpProvider,
-      public base::RefCountedThreadSafe<ClientDiscardableSharedMemoryManager> {
+      public base::RefCountedDeleteOnSequence<
+          ClientDiscardableSharedMemoryManager> {
  public:
   ClientDiscardableSharedMemoryManager(
       mojo::PendingRemote<mojom::DiscardableSharedMemoryManager> manager,
@@ -96,7 +97,10 @@
   // These fields are only protected for testing, they would otherwise be
   // private. Everything else should be either public or private.
  protected:
-  friend class base::RefCountedThreadSafe<ClientDiscardableSharedMemoryManager>;
+  friend class base::RefCountedDeleteOnSequence<
+      ClientDiscardableSharedMemoryManager>;
+  friend class base::DeleteHelper<ClientDiscardableSharedMemoryManager>;
+
   ~ClientDiscardableSharedMemoryManager() override;
   ClientDiscardableSharedMemoryManager(
       scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
diff --git a/components/discardable_memory/client/client_discardable_shared_memory_manager_unittest.cc b/components/discardable_memory/client/client_discardable_shared_memory_manager_unittest.cc
index 002e627..8b5e5ba 100644
--- a/components/discardable_memory/client/client_discardable_shared_memory_manager_unittest.cc
+++ b/components/discardable_memory/client/client_discardable_shared_memory_manager_unittest.cc
@@ -78,18 +78,7 @@
 
 class ClientDiscardableSharedMemoryManagerTest : public testing::Test {
  public:
-  void SetUp() override {
-    client_ =
-        base::MakeRefCounted<TestClientDiscardableSharedMemoryManager>(nullptr);
-  }
-  scoped_refptr<TestClientDiscardableSharedMemoryManager> client_;
-  const size_t page_size_ = base::GetPageSize();
-};
-
-class ClientDiscardableSharedMemoryManagerPeriodicPurgingTest
-    : public ClientDiscardableSharedMemoryManagerTest {
- public:
-  ClientDiscardableSharedMemoryManagerPeriodicPurgingTest()
+  ClientDiscardableSharedMemoryManagerTest()
       : task_env_(base::test::TaskEnvironment::MainThreadType::UI,
                   base::test::TaskEnvironment::TimeSource::MOCK_TIME) {}
   void SetUp() override {
@@ -97,6 +86,8 @@
         task_env_.GetMainThreadTaskRunner());
   }
   base::test::TaskEnvironment task_env_;
+  scoped_refptr<TestClientDiscardableSharedMemoryManager> client_;
+  const size_t page_size_ = base::GetPageSize();
 };
 
 // This test allocates a single piece of memory, then verifies that calling
@@ -286,8 +277,7 @@
 // This tests that memory is actually removed by the periodic purging. We mock a
 // task runner for this test and fast forward to make sure that the memory is
 // purged at the right time.
-TEST_F(ClientDiscardableSharedMemoryManagerPeriodicPurgingTest,
-       ScheduledReleaseUnlocked) {
+TEST_F(ClientDiscardableSharedMemoryManagerTest, ScheduledReleaseUnlocked) {
   base::test::ScopedFeatureList fl;
   fl.InitAndEnableFeature(discardable_memory::kSchedulePeriodicPurge);
   ASSERT_EQ(client_->GetBytesAllocated(), 0u);
@@ -310,7 +300,7 @@
 
 // Same as the above test, but tests that multiple pieces of memory will be
 // handled properly.
-TEST_F(ClientDiscardableSharedMemoryManagerPeriodicPurgingTest,
+TEST_F(ClientDiscardableSharedMemoryManagerTest,
        ScheduledReleaseUnlockedMultiple) {
   base::test::ScopedFeatureList fl;
   fl.InitAndEnableFeature(discardable_memory::kSchedulePeriodicPurge);
@@ -395,8 +385,7 @@
 
 // Test that a repeating timer for background purging is created when we
 // allocate memory and discarded when we run out of allocated memory.
-TEST_F(ClientDiscardableSharedMemoryManagerPeriodicPurgingTest,
-       SchedulingProactivePurging) {
+TEST_F(ClientDiscardableSharedMemoryManagerTest, SchedulingProactivePurging) {
   base::test::ScopedFeatureList fl;
   fl.InitAndEnableFeature(discardable_memory::kSchedulePeriodicPurge);
   ASSERT_TRUE(client_->TimerIsNull());
@@ -428,7 +417,7 @@
 
 // This test is similar to the one above, but tests that creating and deleting
 // the timer still works with multiple pieces of allocated memory.
-TEST_F(ClientDiscardableSharedMemoryManagerPeriodicPurgingTest,
+TEST_F(ClientDiscardableSharedMemoryManagerTest,
        SchedulingProactivePurgingMultipleAllocations) {
   base::test::ScopedFeatureList fl;
   fl.InitAndEnableFeature(discardable_memory::kSchedulePeriodicPurge);
diff --git a/components/dom_distiller/core/android/BUILD.gn b/components/dom_distiller/core/android/BUILD.gn
index d8a624f..0d30b82 100644
--- a/components/dom_distiller/core/android/BUILD.gn
+++ b/components/dom_distiller/core/android/BUILD.gn
@@ -10,6 +10,7 @@
     "//base:jni_java",
     "//components/dom_distiller/core/mojom:mojom_java",
     "//third_party/android_deps:androidx_annotation_annotation_java",
+    "//url:gurl_java",
   ]
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
   sources = [
diff --git a/components/dom_distiller/core/android/java/src/org/chromium/components/dom_distiller/core/DomDistillerUrlUtils.java b/components/dom_distiller/core/android/java/src/org/chromium/components/dom_distiller/core/DomDistillerUrlUtils.java
index 4f1ed04..f9f731e 100644
--- a/components/dom_distiller/core/android/java/src/org/chromium/components/dom_distiller/core/DomDistillerUrlUtils.java
+++ b/components/dom_distiller/core/android/java/src/org/chromium/components/dom_distiller/core/DomDistillerUrlUtils.java
@@ -10,6 +10,7 @@
 
 import org.chromium.base.annotations.JNINamespace;
 import org.chromium.base.annotations.NativeMethods;
+import org.chromium.url.GURL;
 
 /**
  * Wrapper for the dom_distiller::url_utils.
@@ -45,15 +46,19 @@
         return DomDistillerUrlUtilsJni.get().getOriginalUrlFromDistillerUrl(url);
     }
 
+    public static boolean isDistilledPage(String url) {
+        if (TextUtils.isEmpty(url)) return false;
+        return DomDistillerUrlUtilsJni.get().isDistilledPage(url);
+    }
+
     /**
      * Returns whether the url is for a distilled page.
      *
      * @param url The url of the page.
      * @return whether the url is for a distilled page.
      */
-    public static boolean isDistilledPage(String url) {
-        if (TextUtils.isEmpty(url)) return false;
-        return DomDistillerUrlUtilsJni.get().isDistilledPage(url);
+    public static boolean isDistilledPage(GURL url) {
+        return isDistilledPage(url.getSpec());
     }
 
     public static String getValueForKeyInUrl(String url, String key) {
diff --git a/components/infobars/core/infobar_delegate.h b/components/infobars/core/infobar_delegate.h
index d32451e39..d79ba31 100644
--- a/components/infobars/core/infobar_delegate.h
+++ b/components/infobars/core/infobar_delegate.h
@@ -171,6 +171,7 @@
     SYSTEM_INFOBAR_DELEGATE_MAC = 101,
     EXPERIMENTAL_INFOBAR_DELEGATE_LACROS = 102,
     ROSETTA_REQUIRED_INFOBAR_DELEGATE = 103,
+    WEBID_PERMISSION_INFOBAR_DELEGATE = 104,
   };
 
   // Describes navigation events, used to decide whether infobars should be
diff --git a/components/ntp_tiles/most_visited_sites.cc b/components/ntp_tiles/most_visited_sites.cc
index a0f3bd99..f2125d1 100644
--- a/components/ntp_tiles/most_visited_sites.cc
+++ b/components/ntp_tiles/most_visited_sites.cc
@@ -401,10 +401,9 @@
   }
 
   if (repeatable_queries_) {
+    // Restoring repeatable queries is not supported as deletion is permanent.
     if (add_url)
       repeatable_queries_->DeleteQueryWithDestinationURL(url);
-    else
-      NOTREACHED() << "Deleted repeatable queries cannot be restored.";
   }
 
   if (top_sites_) {
diff --git a/components/omnibox/common/omnibox_features.cc b/components/omnibox/common/omnibox_features.cc
index 7389dc6..604da0d 100644
--- a/components/omnibox/common/omnibox_features.cc
+++ b/components/omnibox/common/omnibox_features.cc
@@ -274,6 +274,10 @@
 const base::Feature kDisableCGIParamMatching{"OmniboxDisableCGIParamMatching",
                                              base::FEATURE_DISABLED_BY_DEFAULT};
 
+// If enabled, uses the native VoiceSuggestProvider. Android-specific.
+const base::Feature kNativeVoiceSuggestProvider{
+    "OmniboxNativeVoiceSuggestProvider", base::FEATURE_DISABLED_BY_DEFAULT};
+
 // If enabled, inputs may match bookmark paths. These path matches won't
 // contribute to scoring. E.g. 'planets jupiter' can suggest a bookmark titled
 // 'Jupiter' with URL 'en.wikipedia.org/wiki/Jupiter' located in a path
diff --git a/components/omnibox/common/omnibox_features.h b/components/omnibox/common/omnibox_features.h
index ee075dc6..b71cff1 100644
--- a/components/omnibox/common/omnibox_features.h
+++ b/components/omnibox/common/omnibox_features.h
@@ -76,6 +76,7 @@
 extern const base::Feature kOmniboxExperimentalSuggestScoring;
 extern const base::Feature kHistoryQuickProviderAblateInMemoryURLIndexCacheFile;
 extern const base::Feature kDisableCGIParamMatching;
+extern const base::Feature kNativeVoiceSuggestProvider;
 
 // Suggestions UI - these affect the UI or function of the suggestions popup.
 extern const base::Feature kAdaptiveSuggestionsCount;
diff --git a/components/password_manager/core/browser/BUILD.gn b/components/password_manager/core/browser/BUILD.gn
index da116a3c..d3f8ec3 100644
--- a/components/password_manager/core/browser/BUILD.gn
+++ b/components/password_manager/core/browser/BUILD.gn
@@ -53,8 +53,6 @@
     "compromised_credentials_consumer.h",
     "compromised_credentials_observer.cc",
     "compromised_credentials_observer.h",
-    "compromised_credentials_table.cc",
-    "compromised_credentials_table.h",
     "credential_cache.cc",
     "credential_cache.h",
     "credential_manager_impl.cc",
@@ -106,6 +104,8 @@
     "http_password_store_migrator.h",
     "import/password_importer.cc",
     "import/password_importer.h",
+    "insecure_credentials_table.cc",
+    "insecure_credentials_table.h",
     "leak_detection_delegate.cc",
     "leak_detection_delegate.h",
     "leak_detection_delegate_helper.cc",
@@ -565,6 +565,7 @@
     "//components/test/data/password_manager/login_db_v26.sql",
     "//components/test/data/password_manager/login_db_v27.sql",
     "//components/test/data/password_manager/login_db_v28.sql",
+    "//components/test/data/password_manager/login_db_v29.sql",
     "//components/test/data/password_manager/login_db_v2_broken.sql",
     "//components/test/data/password_manager/login_db_v3.sql",
     "//components/test/data/password_manager/login_db_v3_broken.sql",
@@ -594,7 +595,6 @@
     "bulk_leak_check_service_unittest.cc",
     "change_password_url_service_impl_unittest.cc",
     "compromised_credentials_observer_unittest.cc",
-    "compromised_credentials_table_unittest.cc",
     "credential_cache_unittest.cc",
     "credential_manager_impl_unittest.cc",
     "credential_manager_logger_unittest.cc",
@@ -617,6 +617,7 @@
     "http_auth_manager_unittest.cc",
     "http_password_store_migrator_unittest.cc",
     "import/password_importer_unittest.cc",
+    "insecure_credentials_table_unittest.cc",
     "leak_detection_delegate_helper_unittest.cc",
     "leak_detection_delegate_unittest.cc",
     "leak_detection_dialog_utils_unittest.cc",
diff --git a/components/password_manager/core/browser/compromised_credentials_consumer.cc b/components/password_manager/core/browser/compromised_credentials_consumer.cc
index aa3d6b7d..5c8d914 100644
--- a/components/password_manager/core/browser/compromised_credentials_consumer.cc
+++ b/components/password_manager/core/browser/compromised_credentials_consumer.cc
@@ -4,7 +4,7 @@
 
 #include "components/password_manager/core/browser/compromised_credentials_consumer.h"
 
-#include "components/password_manager/core/browser/compromised_credentials_table.h"
+#include "components/password_manager/core/browser/insecure_credentials_table.h"
 
 namespace password_manager {
 
diff --git a/components/password_manager/core/browser/compromised_credentials_observer.cc b/components/password_manager/core/browser/compromised_credentials_observer.cc
index b73ded1c..b30700f 100644
--- a/components/password_manager/core/browser/compromised_credentials_observer.cc
+++ b/components/password_manager/core/browser/compromised_credentials_observer.cc
@@ -8,7 +8,7 @@
 
 #include "base/metrics/histogram_macros.h"
 #include "base/ranges/algorithm.h"
-#include "components/password_manager/core/browser/compromised_credentials_table.h"
+#include "components/password_manager/core/browser/insecure_credentials_table.h"
 
 namespace password_manager {
 
diff --git a/components/password_manager/core/browser/compromised_credentials_observer.h b/components/password_manager/core/browser/compromised_credentials_observer.h
index 70a95d9..4d9e754 100644
--- a/components/password_manager/core/browser/compromised_credentials_observer.h
+++ b/components/password_manager/core/browser/compromised_credentials_observer.h
@@ -6,7 +6,7 @@
 #define COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_COMPROMISED_CREDENTIALS_OBSERVER_H_
 
 #include "base/callback.h"
-#include "components/password_manager/core/browser/compromised_credentials_table.h"
+#include "components/password_manager/core/browser/insecure_credentials_table.h"
 #include "components/password_manager/core/browser/password_store_change.h"
 
 namespace password_manager {
diff --git a/components/password_manager/core/browser/compromised_credentials_table.cc b/components/password_manager/core/browser/compromised_credentials_table.cc
deleted file mode 100644
index c7acf1c..0000000
--- a/components/password_manager/core/browser/compromised_credentials_table.cc
+++ /dev/null
@@ -1,371 +0,0 @@
-// Copyright 2019 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "components/password_manager/core/browser/compromised_credentials_table.h"
-
-#include "base/bind.h"
-#include "base/logging.h"
-#include "base/metrics/histogram_functions.h"
-#include "components/password_manager/core/browser/sql_table_builder.h"
-#include "sql/database.h"
-#include "sql/statement.h"
-
-namespace password_manager {
-namespace {
-
-constexpr char kCompromisedCredentialsTableName[] = "compromised_credentials";
-
-// Represents columns of the compromised credentials table. Used with SQL
-// queries that use all the columns.
-enum class CompromisedCredentialsTableColumn {
-  kSignonRealm,
-  kUsername,
-  kCreateTime,
-  kCompromiseType,
-  kMaxValue = kCompromiseType
-};
-
-// Casts the compromised credentials table column enum to its integer value.
-int GetColumnNumber(CompromisedCredentialsTableColumn column) {
-  return static_cast<int>(column);
-}
-
-// Teaches |builder| about the different DB schemes in different versions.
-void InitializeCompromisedCredentialsBuilder(SQLTableBuilder* builder) {
-  // Version 0.
-  builder->AddColumnToUniqueKey("url", "VARCHAR NOT NULL");
-  builder->AddColumnToUniqueKey("username", "VARCHAR NOT NULL");
-  builder->AddColumn("create_time", "INTEGER NOT NULL");
-  builder->AddColumnToUniqueKey("compromise_type", "INTEGER NOT NULL");
-  builder->AddIndex("compromised_credentials_index",
-                    {"url", "username", "compromise_type"});
-  builder->SealVersion();
-}
-
-// Returns a compromised credentials vector from the SQL statement.
-std::vector<CompromisedCredentials> StatementToCompromisedCredentials(
-    sql::Statement* s) {
-  std::vector<CompromisedCredentials> results;
-  while (s->Step()) {
-    std::string signon_realm(s->ColumnString(
-        GetColumnNumber(CompromisedCredentialsTableColumn::kSignonRealm)));
-    base::string16 username = s->ColumnString16(
-        GetColumnNumber(CompromisedCredentialsTableColumn::kUsername));
-    base::Time create_time = base::Time::FromDeltaSinceWindowsEpoch(
-        (base::TimeDelta::FromMicroseconds(s->ColumnInt64(
-            GetColumnNumber(CompromisedCredentialsTableColumn::kCreateTime)))));
-    CompromiseType compromise_type = static_cast<CompromiseType>(s->ColumnInt64(
-        GetColumnNumber(CompromisedCredentialsTableColumn::kCompromiseType)));
-    results.push_back({std::move(signon_realm), std::move(username),
-                       create_time, compromise_type});
-  }
-  return results;
-}
-
-}  // namespace
-
-bool operator==(const CompromisedCredentials& lhs,
-                const CompromisedCredentials& rhs) {
-  return lhs.signon_realm == rhs.signon_realm && lhs.username == rhs.username &&
-         lhs.create_time == rhs.create_time &&
-         lhs.compromise_type == rhs.compromise_type;
-}
-
-void CompromisedCredentialsTable::Init(sql::Database* db) {
-  db_ = db;
-}
-
-bool CompromisedCredentialsTable::CreateTableIfNecessary() {
-  DCHECK(db_);
-  if (db_->DoesTableExist(kCompromisedCredentialsTableName))
-    return true;
-
-  SQLTableBuilder builder(kCompromisedCredentialsTableName);
-  InitializeCompromisedCredentialsBuilder(&builder);
-  return builder.CreateTable(db_);
-}
-
-bool CompromisedCredentialsTable::AddRow(
-    const CompromisedCredentials& compromised_credentials) {
-  DCHECK(db_);
-  if (compromised_credentials.signon_realm.empty())
-    return false;
-
-  DCHECK(db_->DoesTableExist(kCompromisedCredentialsTableName));
-
-  base::UmaHistogramEnumeration("PasswordManager.CompromisedCredentials.Add",
-                                compromised_credentials.compromise_type);
-
-  // In case there is an error, expect it to be a constraint violation.
-  db_->set_error_callback(base::BindRepeating([](int error, sql::Statement*) {
-    constexpr int kSqliteErrorMask = 0xFF;
-    constexpr int kSqliteConstraint = 19;
-    if ((error & kSqliteErrorMask) != kSqliteConstraint) {
-      DLOG(ERROR) << "Got unexpected SQL error code: " << error;
-    }
-  }));
-
-  sql::Statement s(db_->GetCachedStatement(
-      SQL_FROM_HERE,
-      "INSERT INTO compromised_credentials (url, username, create_time, "
-      "compromise_type) VALUES (?, ?, ?, ?)"));
-
-  s.BindString(GetColumnNumber(CompromisedCredentialsTableColumn::kSignonRealm),
-               compromised_credentials.signon_realm);
-  s.BindString16(GetColumnNumber(CompromisedCredentialsTableColumn::kUsername),
-                 compromised_credentials.username);
-  s.BindInt64(GetColumnNumber(CompromisedCredentialsTableColumn::kCreateTime),
-              compromised_credentials.create_time.ToDeltaSinceWindowsEpoch()
-                  .InMicroseconds());
-  s.BindInt64(
-      GetColumnNumber(CompromisedCredentialsTableColumn::kCompromiseType),
-      static_cast<int>(compromised_credentials.compromise_type));
-
-  bool result = s.Run();
-  db_->reset_error_callback();
-  return result;
-}
-
-std::vector<CompromisedCredentials> CompromisedCredentialsTable::GetRows(
-    const std::string& signon_realm,
-    const base::string16& username) const {
-  DCHECK(db_);
-  if (signon_realm.empty())
-    return std::vector<CompromisedCredentials>{};
-
-  DCHECK(db_->DoesTableExist(kCompromisedCredentialsTableName));
-
-  sql::Statement s(db_->GetCachedStatement(
-      SQL_FROM_HERE,
-      "SELECT * FROM compromised_credentials WHERE url = ? AND username = ? "));
-  s.BindString(0, signon_realm);
-  s.BindString16(1, username);
-  return StatementToCompromisedCredentials(&s);
-}
-
-std::vector<CompromisedCredentials> CompromisedCredentialsTable::GetRows(
-    const std::string& signon_realm) const {
-  DCHECK(db_);
-  if (signon_realm.empty())
-    return std::vector<CompromisedCredentials>{};
-
-  DCHECK(db_->DoesTableExist(kCompromisedCredentialsTableName));
-
-  sql::Statement s(db_->GetCachedStatement(
-      SQL_FROM_HERE, "SELECT * FROM compromised_credentials WHERE url = ? "));
-  s.BindString(0, signon_realm);
-  return StatementToCompromisedCredentials(&s);
-}
-
-bool CompromisedCredentialsTable::UpdateRow(
-    const std::string& new_signon_realm,
-    const base::string16& new_username,
-    const std::string& old_signon_realm,
-    const base::string16& old_username) const {
-  DCHECK(db_);
-  if (new_signon_realm.empty() || old_signon_realm.empty())
-    return false;
-
-  DCHECK(db_->DoesTableExist(kCompromisedCredentialsTableName));
-
-  // Retrieve the rows that are to be updated to log.
-  const std::vector<CompromisedCredentials> compromised_credentials =
-      GetRows(old_signon_realm, old_username);
-  if (compromised_credentials.empty())
-    return false;
-  for (const auto& compromised_credential : compromised_credentials) {
-    base::UmaHistogramEnumeration(
-        "PasswordManager.CompromisedCredentials.Update",
-        compromised_credential.compromise_type);
-  }
-
-  sql::Statement s(db_->GetCachedStatement(SQL_FROM_HERE,
-                                           "UPDATE compromised_credentials "
-                                           "SET url = ?, username = ? "
-                                           "WHERE url = ? and username = ?"));
-  s.BindString(0, new_signon_realm);
-  s.BindString16(1, new_username);
-  s.BindString(2, old_signon_realm);
-  s.BindString16(3, old_username);
-  return s.Run();
-}
-
-bool CompromisedCredentialsTable::RemoveRow(
-    const std::string& signon_realm,
-    const base::string16& username,
-    RemoveCompromisedCredentialsReason reason) {
-  DCHECK(db_);
-  if (signon_realm.empty())
-    return false;
-
-  DCHECK(db_->DoesTableExist(kCompromisedCredentialsTableName));
-
-  // Retrieve the rows that are to be removed to log.
-  const std::vector<CompromisedCredentials> compromised_credentials =
-      GetRows(signon_realm, username);
-  if (compromised_credentials.empty())
-    return false;
-  for (const auto& compromised_credential : compromised_credentials) {
-    base::UmaHistogramEnumeration(
-        "PasswordManager.CompromisedCredentials.Remove",
-        compromised_credential.compromise_type);
-    base::UmaHistogramEnumeration(
-        "PasswordManager.RemoveCompromisedCredentials.RemoveReason", reason);
-  }
-
-  sql::Statement s(
-      db_->GetCachedStatement(SQL_FROM_HERE,
-                              "DELETE FROM compromised_credentials WHERE "
-                              "url = ? AND username = ? "));
-  s.BindString(0, signon_realm);
-  s.BindString16(1, username);
-  return s.Run();
-}
-
-bool CompromisedCredentialsTable::RemoveRowByCompromiseType(
-    const std::string& signon_realm,
-    const base::string16& username,
-    const CompromiseType& compromise_type,
-    RemoveCompromisedCredentialsReason reason) {
-  DCHECK(db_);
-  if (signon_realm.empty())
-    return false;
-
-  DCHECK(db_->DoesTableExist(kCompromisedCredentialsTableName));
-
-  // Retrieve the rows that are to be removed to log.
-  const std::vector<CompromisedCredentials> compromised_credentials =
-      GetRowByCompromiseType(signon_realm, username, compromise_type);
-  if (compromised_credentials.empty())
-    return false;
-
-  for (const auto& compromised_credential : compromised_credentials) {
-    base::UmaHistogramEnumeration(
-        "PasswordManager.CompromisedCredentials.Remove",
-        compromised_credential.compromise_type);
-    base::UmaHistogramEnumeration(
-        "PasswordManager.RemoveCompromisedCredentials.RemoveReason", reason);
-  }
-
-  sql::Statement s(db_->GetCachedStatement(
-      SQL_FROM_HERE,
-      "DELETE FROM compromised_credentials WHERE "
-      "url = ? AND username = ? AND compromise_type = ?"));
-  s.BindString(0, signon_realm);
-  s.BindString16(1, username);
-  s.BindInt64(2, static_cast<int>(compromise_type));
-  return s.Run();
-}
-
-bool CompromisedCredentialsTable::RemoveRowsByUrlAndTime(
-    const base::RepeatingCallback<bool(const GURL&)>& url_filter,
-    base::Time remove_begin,
-    base::Time remove_end) {
-  DCHECK(db_);
-  DCHECK(db_->DoesTableExist(kCompromisedCredentialsTableName));
-
-  const int64_t remove_begin_us =
-      remove_begin.ToDeltaSinceWindowsEpoch().InMicroseconds();
-  const int64_t remove_end_us =
-      remove_end.ToDeltaSinceWindowsEpoch().InMicroseconds();
-
-  // If |url_filter| is null, remove all records in given date range.
-  if (!url_filter) {
-    sql::Statement s(
-        db_->GetCachedStatement(SQL_FROM_HERE,
-                                "DELETE FROM compromised_credentials WHERE "
-                                "create_time >= ? AND create_time < ?"));
-    s.BindInt64(0, remove_begin_us);
-    s.BindInt64(1, remove_end_us);
-    return s.Run();
-  }
-
-  // Otherwise, filter signon_realms.
-  sql::Statement s(db_->GetCachedStatement(
-      SQL_FROM_HERE,
-      "SELECT DISTINCT url FROM compromised_credentials WHERE "
-      "create_time >= ? AND create_time < ?"));
-  s.BindInt64(0, remove_begin_us);
-  s.BindInt64(1, remove_end_us);
-
-  std::vector<std::string> signon_realms;
-  while (s.Step()) {
-    std::string signon_realm = s.ColumnString(0);
-    if (url_filter.Run(GURL(signon_realm))) {
-      signon_realms.push_back(std::move(signon_realm));
-    }
-  }
-
-  bool success = true;
-  for (const std::string& signon_realm : signon_realms) {
-    sql::Statement s(db_->GetCachedStatement(
-        SQL_FROM_HERE,
-        "DELETE FROM compromised_credentials WHERE url = ? "
-        "AND create_time >= ? AND create_time < ?"));
-    s.BindString(0, signon_realm);
-    s.BindInt64(1, remove_begin_us);
-    s.BindInt64(2, remove_end_us);
-    success = success && s.Run();
-  }
-  return success;
-}
-
-std::vector<CompromisedCredentials> CompromisedCredentialsTable::GetAllRows() {
-  DCHECK(db_);
-  DCHECK(db_->DoesTableExist(kCompromisedCredentialsTableName));
-
-  static constexpr char query[] = "SELECT * FROM compromised_credentials";
-  sql::Statement s(db_->GetCachedStatement(SQL_FROM_HERE, query));
-  return StatementToCompromisedCredentials(&s);
-}
-
-void CompromisedCredentialsTable::ReportMetrics(BulkCheckDone bulk_check_done) {
-  DCHECK(db_);
-  sql::Statement s(
-      db_->GetCachedStatement(SQL_FROM_HERE,
-                              "SELECT COUNT(*) FROM compromised_credentials "
-                              "WHERE compromise_type = ? "));
-  s.BindInt(0, static_cast<int>(CompromiseType::kLeaked));
-  if (s.Step()) {
-    int count = s.ColumnInt(0);
-    base::UmaHistogramCounts100(
-        "PasswordManager.CompromisedCredentials.CountLeaked", count);
-    if (bulk_check_done) {
-      base::UmaHistogramCounts100(
-          "PasswordManager.CompromisedCredentials.CountLeakedAfterBulkCheck",
-          count);
-    }
-  }
-
-  s.Reset(true);
-  s.BindInt(0, static_cast<int>(CompromiseType::kPhished));
-  if (s.Step()) {
-    int count = s.ColumnInt(0);
-    base::UmaHistogramCounts100(
-        "PasswordManager.CompromisedCredentials.CountPhished", count);
-  }
-}
-
-std::vector<CompromisedCredentials>
-CompromisedCredentialsTable::GetRowByCompromiseType(
-    const std::string& signon_realm,
-    const base::string16& username,
-    const CompromiseType& compromise_type) const {
-  DCHECK(db_);
-  if (signon_realm.empty())
-    return std::vector<CompromisedCredentials>{};
-  DCHECK(db_->DoesTableExist(kCompromisedCredentialsTableName));
-
-  sql::Statement s(db_->GetCachedStatement(
-      SQL_FROM_HERE,
-      "SELECT url, username, create_time, compromise_type FROM "
-      "compromised_credentials WHERE url = ? AND username = ? AND "
-      "compromise_type = ?"));
-  s.BindString(0, signon_realm);
-  s.BindString16(1, username);
-  s.BindInt64(2, static_cast<int>(compromise_type));
-  return StatementToCompromisedCredentials(&s);
-}
-
-}  // namespace password_manager
diff --git a/components/password_manager/core/browser/compromised_credentials_table_unittest.cc b/components/password_manager/core/browser/compromised_credentials_table_unittest.cc
deleted file mode 100644
index deff04f..0000000
--- a/components/password_manager/core/browser/compromised_credentials_table_unittest.cc
+++ /dev/null
@@ -1,366 +0,0 @@
-// Copyright 2019 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include <memory>
-
-#include "components/password_manager/core/browser/compromised_credentials_table.h"
-
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
-#include "base/files/scoped_temp_dir.h"
-#include "base/strings/utf_string_conversions.h"
-#include "base/test/metrics/histogram_tester.h"
-#include "base/test/scoped_feature_list.h"
-#include "build/build_config.h"
-#include "components/password_manager/core/common/password_manager_features.h"
-#include "components/safe_browsing/core/features.h"
-#include "sql/database.h"
-#include "testing/gmock/include/gmock/gmock.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-namespace password_manager {
-namespace {
-
-const char kTestDomain[] = "http://example.com/";
-const char kTestDomain2[] = "http://test.com/";
-const char kTestDomain3[] = "http://google.com/";
-const char kUsername[] = "user";
-const char kUsername2[] = "user2";
-const char kUsername3[] = "user3";
-
-using testing::ElementsAre;
-using testing::IsEmpty;
-
-class CompromisedCredentialsTableTest : public testing::Test {
- protected:
-  void SetUp() override {
-    ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
-    feature_list_.InitWithFeatures({password_manager::features::kPasswordCheck},
-                                   {});
-    ReloadDatabase();
-  }
-
-  void ReloadDatabase() {
-    base::FilePath file = temp_dir_.GetPath().AppendASCII("TestDatabase");
-    db_ = std::make_unique<CompromisedCredentialsTable>();
-    connection_ = std::make_unique<sql::Database>();
-    connection_->set_exclusive_locking();
-    ASSERT_TRUE(connection_->Open(file));
-    db_->Init(connection_.get());
-    ASSERT_TRUE(db_->CreateTableIfNecessary());
-  }
-
-  void CheckDatabaseAccessibility() {
-    EXPECT_TRUE(db()->AddRow(test_data()));
-    EXPECT_THAT(db()->GetAllRows(), ElementsAre(test_data()));
-    EXPECT_THAT(db()->GetRows(test_data().signon_realm, test_data().username),
-                ElementsAre(test_data()));
-    EXPECT_THAT(db()->GetRows(test_data().signon_realm),
-                ElementsAre(test_data()));
-    EXPECT_TRUE(db()->RemoveRow(test_data().signon_realm, test_data().username,
-                                RemoveCompromisedCredentialsReason::kRemove));
-    EXPECT_THAT(db()->GetAllRows(), IsEmpty());
-    EXPECT_THAT(db()->GetRows(test_data().signon_realm, test_data().username),
-                IsEmpty());
-    EXPECT_THAT(db()->GetRows(test_data().signon_realm), IsEmpty());
-  }
-
-  CompromisedCredentials& test_data() { return test_data_; }
-  CompromisedCredentialsTable* db() { return db_.get(); }
-
-  base::test::ScopedFeatureList feature_list_;
-
- private:
-  base::ScopedTempDir temp_dir_;
-  std::unique_ptr<sql::Database> connection_;
-  std::unique_ptr<CompromisedCredentialsTable> db_;
-  CompromisedCredentials test_data_{kTestDomain, base::ASCIIToUTF16(kUsername),
-                                    base::Time::FromTimeT(1),
-                                    CompromiseType::kLeaked};
-};
-
-TEST_F(CompromisedCredentialsTableTest, Reload) {
-  EXPECT_TRUE(db()->AddRow(test_data()));
-  ReloadDatabase();
-  EXPECT_THAT(db()->GetAllRows(), ElementsAre(test_data()));
-}
-
-TEST_F(CompromisedCredentialsTableTest, DatabaseIsAccessible) {
-  // Checks that as long as one experiment is on, the database
-  // is accessible. |
-  feature_list_.Reset();
-  feature_list_.InitWithFeatures(
-      {safe_browsing::kPasswordProtectionForSignedInUsers},
-      {password_manager::features::kPasswordCheck});
-  CheckDatabaseAccessibility();
-
-  feature_list_.Reset();
-  feature_list_.InitWithFeatures(
-      {password_manager::features::kPasswordCheck},
-      {safe_browsing::kPasswordProtectionForSignedInUsers});
-  CheckDatabaseAccessibility();
-}
-
-TEST_F(CompromisedCredentialsTableTest, ExperimentOff) {
-  // If the needed experiments are not enabled, the database should not be
-  // accessible.
-  feature_list_.Reset();
-  feature_list_.InitWithFeatures({},
-                                 {password_manager::features::kPasswordCheck});
-  EXPECT_THAT(db()->GetAllRows(), IsEmpty());
-  EXPECT_THAT(db()->GetRows(test_data().signon_realm, test_data().username),
-              ElementsAre());
-  EXPECT_FALSE(db()->RemoveRow(test_data().signon_realm, test_data().username,
-                               RemoveCompromisedCredentialsReason::kRemove));
-  EXPECT_TRUE(db()->AddRow(test_data()));
-}
-
-TEST_F(CompromisedCredentialsTableTest, SameSignonRealmDifferentUsername) {
-  CompromisedCredentials compromised_credentials1 = test_data();
-  CompromisedCredentials compromised_credentials2 = test_data();
-  compromised_credentials2.username = base::ASCIIToUTF16(kUsername2);
-
-  EXPECT_TRUE(db()->AddRow(compromised_credentials1));
-  EXPECT_TRUE(db()->AddRow(compromised_credentials2));
-  EXPECT_THAT(db()->GetAllRows(),
-              ElementsAre(compromised_credentials1, compromised_credentials2));
-  EXPECT_THAT(db()->GetRows(test_data().signon_realm),
-              ElementsAre(compromised_credentials1, compromised_credentials2));
-  EXPECT_THAT(db()->GetRows(test_data().signon_realm, test_data().username),
-              ElementsAre(compromised_credentials1));
-}
-
-TEST_F(CompromisedCredentialsTableTest, SameUsernameDifferentSignonRealm) {
-  CompromisedCredentials compromised_credentials1 = test_data();
-  CompromisedCredentials compromised_credentials2 = test_data();
-  compromised_credentials2.signon_realm = kTestDomain2;
-
-  EXPECT_TRUE(db()->AddRow(compromised_credentials1));
-  EXPECT_TRUE(db()->AddRow(compromised_credentials2));
-  EXPECT_THAT(db()->GetAllRows(),
-              ElementsAre(compromised_credentials1, compromised_credentials2));
-  EXPECT_THAT(db()->GetRows(test_data().signon_realm),
-              ElementsAre(compromised_credentials1));
-  EXPECT_THAT(db()->GetRows(test_data().signon_realm, test_data().username),
-              ElementsAre(compromised_credentials1));
-}
-
-TEST_F(CompromisedCredentialsTableTest,
-       SameSignonRealmAndUsernameDifferentTime) {
-  CompromisedCredentials compromised_credentials1 = test_data();
-  CompromisedCredentials compromised_credentials2 = test_data();
-  compromised_credentials2.create_time = base::Time::FromTimeT(2);
-
-  EXPECT_TRUE(db()->AddRow(compromised_credentials1));
-  // It should return false because of unique constraints.
-  EXPECT_FALSE(db()->AddRow(compromised_credentials2));
-  EXPECT_THAT(db()->GetAllRows(), ElementsAre(compromised_credentials1));
-}
-
-TEST_F(CompromisedCredentialsTableTest,
-       SameSignonRealmAndUsernameAndDifferentCompromiseType) {
-  CompromisedCredentials compromised_credentials1 = test_data();
-  CompromisedCredentials compromised_credentials2 = test_data();
-  compromised_credentials2.compromise_type = CompromiseType::kPhished;
-
-  EXPECT_TRUE(db()->AddRow(compromised_credentials1));
-  EXPECT_TRUE(db()->AddRow(compromised_credentials2));
-  EXPECT_THAT(db()->GetAllRows(),
-              ElementsAre(compromised_credentials1, compromised_credentials2));
-  EXPECT_THAT(db()->GetRows(test_data().signon_realm),
-              ElementsAre(compromised_credentials1, compromised_credentials2));
-  EXPECT_THAT(db()->GetRows(test_data().signon_realm, test_data().username),
-              ElementsAre(compromised_credentials1, compromised_credentials2));
-}
-
-TEST_F(CompromisedCredentialsTableTest,
-       RemovePhishedCredentialByCompromiseType) {
-  CompromisedCredentials leaked_credentials = test_data();
-  CompromisedCredentials phished_credentials = test_data();
-  phished_credentials.compromise_type = CompromiseType::kPhished;
-
-  EXPECT_TRUE(db()->AddRow(leaked_credentials));
-  EXPECT_TRUE(db()->AddRow(phished_credentials));
-  EXPECT_TRUE(db()->RemoveRowByCompromiseType(
-      kTestDomain, base::ASCIIToUTF16(kUsername), CompromiseType::kPhished,
-      RemoveCompromisedCredentialsReason::kMarkSiteAsLegitimate));
-  EXPECT_THAT(db()->GetAllRows(), ElementsAre(leaked_credentials));
-}
-
-TEST_F(CompromisedCredentialsTableTest,
-       RemoveLeakedCredentialByCompromiseType) {
-  CompromisedCredentials leaked_credentials = test_data();
-  CompromisedCredentials phished_credentials = test_data();
-  phished_credentials.compromise_type = CompromiseType::kPhished;
-
-  EXPECT_TRUE(db()->AddRow(leaked_credentials));
-  EXPECT_TRUE(db()->AddRow(phished_credentials));
-  EXPECT_TRUE(db()->RemoveRowByCompromiseType(
-      kTestDomain, base::ASCIIToUTF16(kUsername), CompromiseType::kLeaked,
-      RemoveCompromisedCredentialsReason::kMarkSiteAsLegitimate));
-  EXPECT_THAT(db()->GetAllRows(), ElementsAre(phished_credentials));
-}
-
-TEST_F(CompromisedCredentialsTableTest, UpdateRow) {
-  CompromisedCredentials compromised_credentials1 = test_data();
-  CompromisedCredentials compromised_credentials2{
-      kTestDomain2, base::ASCIIToUTF16(kUsername2), base::Time::FromTimeT(1),
-      CompromiseType::kLeaked};
-
-  EXPECT_TRUE(db()->AddRow(compromised_credentials1));
-  EXPECT_TRUE(db()->UpdateRow(kTestDomain2, base::ASCIIToUTF16(kUsername2),
-                              compromised_credentials1.signon_realm,
-                              compromised_credentials1.username));
-  EXPECT_THAT(db()->GetAllRows(), ElementsAre(compromised_credentials2));
-}
-
-TEST_F(CompromisedCredentialsTableTest, RemoveRowsCreatedBetween) {
-  CompromisedCredentials compromised_credentials1 = test_data();
-  CompromisedCredentials compromised_credentials2 = test_data();
-  CompromisedCredentials compromised_credentials3 = test_data();
-  compromised_credentials2.username = base::ASCIIToUTF16(kUsername2);
-  compromised_credentials3.username = base::ASCIIToUTF16(kUsername3);
-  compromised_credentials1.create_time = base::Time::FromTimeT(10);
-  compromised_credentials2.create_time = base::Time::FromTimeT(20);
-  compromised_credentials3.create_time = base::Time::FromTimeT(30);
-
-  EXPECT_TRUE(db()->AddRow(compromised_credentials1));
-  EXPECT_TRUE(db()->AddRow(compromised_credentials2));
-  EXPECT_TRUE(db()->AddRow(compromised_credentials3));
-
-  EXPECT_THAT(db()->GetAllRows(),
-              ElementsAre(compromised_credentials1, compromised_credentials2,
-                          compromised_credentials3));
-
-  EXPECT_TRUE(db()->RemoveRowsByUrlAndTime(base::NullCallback(),
-                                           base::Time::FromTimeT(15),
-                                           base::Time::FromTimeT(25)));
-
-  EXPECT_THAT(db()->GetAllRows(),
-              ElementsAre(compromised_credentials1, compromised_credentials3));
-}
-
-TEST_F(CompromisedCredentialsTableTest, RemoveRowsCreatedBetweenEdgeCase) {
-  base::Time begin_time = base::Time::FromTimeT(10);
-  base::Time end_time = base::Time::FromTimeT(20);
-  CompromisedCredentials compromised_credentials_begin = test_data();
-  CompromisedCredentials compromised_credentials_end = test_data();
-  compromised_credentials_begin.create_time = begin_time;
-  compromised_credentials_end.create_time = end_time;
-  compromised_credentials_end.username = base::ASCIIToUTF16(kUsername2);
-
-  EXPECT_TRUE(db()->AddRow(compromised_credentials_begin));
-  EXPECT_TRUE(db()->AddRow(compromised_credentials_end));
-
-  EXPECT_THAT(db()->GetAllRows(), ElementsAre(compromised_credentials_begin,
-                                              compromised_credentials_end));
-
-  EXPECT_TRUE(
-      db()->RemoveRowsByUrlAndTime(base::NullCallback(), begin_time, end_time));
-  // RemoveRowsCreatedBetween takes |begin_time| inclusive and |end_time|
-  // exclusive, hence the credentials with |end_time| should remain in the
-  // database.
-  EXPECT_THAT(db()->GetAllRows(), ElementsAre(compromised_credentials_end));
-}
-
-TEST_F(CompromisedCredentialsTableTest, RemoveRowsCreatedUpUntilNow) {
-  CompromisedCredentials compromised_credentials1 = test_data();
-  CompromisedCredentials compromised_credentials2 = test_data();
-  CompromisedCredentials compromised_credentials3 = test_data();
-  compromised_credentials2.username = base::ASCIIToUTF16(kUsername2);
-  compromised_credentials3.username = base::ASCIIToUTF16(kUsername3);
-  compromised_credentials1.create_time = base::Time::FromTimeT(42);
-  compromised_credentials2.create_time = base::Time::FromTimeT(780);
-  compromised_credentials3.create_time = base::Time::FromTimeT(3000);
-
-  EXPECT_TRUE(db()->AddRow(compromised_credentials1));
-  EXPECT_TRUE(db()->AddRow(compromised_credentials2));
-  EXPECT_TRUE(db()->AddRow(compromised_credentials3));
-
-  EXPECT_THAT(db()->GetAllRows(),
-              ElementsAre(compromised_credentials1, compromised_credentials2,
-                          compromised_credentials3));
-
-  EXPECT_TRUE(db()->RemoveRowsByUrlAndTime(base::NullCallback(), base::Time(),
-                                           base::Time::Max()));
-
-  EXPECT_THAT(db()->GetAllRows(), IsEmpty());
-}
-
-TEST_F(CompromisedCredentialsTableTest, RemoveRowsByUrlAndTime) {
-  CompromisedCredentials compromised_credentials1 = test_data();
-  CompromisedCredentials compromised_credentials2 = test_data();
-  CompromisedCredentials compromised_credentials3 = test_data();
-  CompromisedCredentials compromised_credentials4 = test_data();
-  compromised_credentials2.username = base::ASCIIToUTF16(kUsername2);
-  compromised_credentials3.signon_realm = kTestDomain2;
-  compromised_credentials4.signon_realm = kTestDomain3;
-
-  EXPECT_TRUE(db()->AddRow(compromised_credentials1));
-  EXPECT_TRUE(db()->AddRow(compromised_credentials2));
-  EXPECT_TRUE(db()->AddRow(compromised_credentials3));
-  EXPECT_TRUE(db()->AddRow(compromised_credentials4));
-
-  EXPECT_THAT(db()->GetAllRows(),
-              ElementsAre(compromised_credentials1, compromised_credentials2,
-                          compromised_credentials3, compromised_credentials4));
-
-  EXPECT_TRUE(db()->RemoveRowsByUrlAndTime(
-      // Can't use the generic `std::not_equal_to<>` here, because BindRepeating
-      // does not support functors with an overloaded call operator.
-      // NOLINTNEXTLINE(modernize-use-transparent-functors)
-      base::BindRepeating(std::not_equal_to<GURL>(),
-                          GURL(compromised_credentials1.signon_realm)),
-      base::Time(), base::Time::Max()));
-  // With unbounded time range and given url filter all rows that are not
-  // matching the |compromised_credentials1.signon_realm| should be removed.
-  EXPECT_THAT(db()->GetAllRows(),
-              ElementsAre(compromised_credentials1, compromised_credentials2));
-}
-
-TEST_F(CompromisedCredentialsTableTest, EmptySignonRealm) {
-  test_data().signon_realm = "";
-  EXPECT_FALSE(db()->AddRow(test_data()));
-  EXPECT_THAT(db()->GetAllRows(), IsEmpty());
-  EXPECT_FALSE(db()->RemoveRow(test_data().signon_realm, test_data().username,
-                               RemoveCompromisedCredentialsReason::kRemove));
-}
-
-TEST_F(CompromisedCredentialsTableTest, ReportMetricsBeforeBulkCheck) {
-  EXPECT_TRUE(db()->AddRow(test_data()));
-  test_data().signon_realm = kTestDomain2;
-  test_data().username = base::ASCIIToUTF16(kUsername2);
-  EXPECT_TRUE(db()->AddRow(test_data()));
-  test_data().signon_realm = kTestDomain3;
-  test_data().username = base::ASCIIToUTF16(kUsername3);
-  test_data().compromise_type = CompromiseType::kPhished;
-  EXPECT_TRUE(db()->AddRow(test_data()));
-
-  base::HistogramTester histogram_tester;
-  db()->ReportMetrics(BulkCheckDone(false));
-  histogram_tester.ExpectUniqueSample(
-      "PasswordManager.CompromisedCredentials.CountLeaked", 2, 1);
-  histogram_tester.ExpectUniqueSample(
-      "PasswordManager.CompromisedCredentials.CountPhished", 1, 1);
-  histogram_tester.ExpectTotalCount(
-      "PasswordManager.CompromisedCredentials.CountLeakedAfterBulkCheck", 0);
-}
-
-TEST_F(CompromisedCredentialsTableTest, ReportMetricsAfterBulkCheck) {
-  EXPECT_TRUE(db()->AddRow(test_data()));
-  test_data().signon_realm = kTestDomain2;
-  test_data().username = base::ASCIIToUTF16(kUsername2);
-  EXPECT_TRUE(db()->AddRow(test_data()));
-
-  base::HistogramTester histogram_tester;
-  db()->ReportMetrics(BulkCheckDone(true));
-  histogram_tester.ExpectUniqueSample(
-      "PasswordManager.CompromisedCredentials.CountLeaked", 2, 1);
-  histogram_tester.ExpectUniqueSample(
-      "PasswordManager.CompromisedCredentials.CountLeakedAfterBulkCheck", 2, 1);
-}
-
-}  // namespace
-}  // namespace password_manager
diff --git a/components/password_manager/core/browser/form_fetcher_impl.h b/components/password_manager/core/browser/form_fetcher_impl.h
index e18b9b9..aeb60b3 100644
--- a/components/password_manager/core/browser/form_fetcher_impl.h
+++ b/components/password_manager/core/browser/form_fetcher_impl.h
@@ -12,9 +12,9 @@
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "components/password_manager/core/browser/compromised_credentials_consumer.h"
-#include "components/password_manager/core/browser/compromised_credentials_table.h"
 #include "components/password_manager/core/browser/form_fetcher.h"
 #include "components/password_manager/core/browser/http_password_store_migrator.h"
+#include "components/password_manager/core/browser/insecure_credentials_table.h"
 #include "components/password_manager/core/browser/password_store.h"
 #include "components/password_manager/core/browser/password_store_consumer.h"
 
diff --git a/components/password_manager/core/browser/form_fetcher_impl_unittest.cc b/components/password_manager/core/browser/form_fetcher_impl_unittest.cc
index 3c0deb49..d017928 100644
--- a/components/password_manager/core/browser/form_fetcher_impl_unittest.cc
+++ b/components/password_manager/core/browser/form_fetcher_impl_unittest.cc
@@ -419,8 +419,9 @@
   Fetch();
   form_fetcher_->AddConsumer(&consumer_);
   const std::vector<CompromisedCredentials> credentials = {
-      {form_digest_.signon_realm, base::ASCIIToUTF16("username_value"),
-       base::Time::FromTimeT(1), CompromiseType::kLeaked}};
+      CompromisedCredentials(
+          form_digest_.signon_realm, base::ASCIIToUTF16("username_value"),
+          base::Time::FromTimeT(1), CompromiseType::kLeaked, false)};
   static_cast<CompromisedCredentialsConsumer*>(form_fetcher_.get())
       ->OnGetCompromisedCredentials(credentials);
   EXPECT_THAT(form_fetcher_->GetCompromisedCredentials(),
@@ -488,9 +489,9 @@
 }
 
 TEST_P(FormFetcherImplTest, FetchCompromised) {
-  CompromisedCredentials credentials = {
+  CompromisedCredentials credentials(
       form_digest_.signon_realm, base::ASCIIToUTF16("username_value"),
-      base::Time::FromTimeT(1), CompromiseType::kLeaked};
+      base::Time::FromTimeT(1), CompromiseType::kLeaked, false);
   std::vector<CompromisedCredentials> list = {credentials};
   EXPECT_CALL(*mock_store_,
               GetMatchingCompromisedCredentialsImpl(form_digest_.signon_realm))
@@ -810,8 +811,9 @@
   store_consumer()->OnGetPasswordStoreResultsFrom(
       mock_store_.get(), std::vector<std::unique_ptr<PasswordForm>>());
   const std::vector<CompromisedCredentials> credentials = {
-      {form_digest_.signon_realm, base::ASCIIToUTF16("username_value"),
-       base::Time::FromTimeT(1), CompromiseType::kLeaked}};
+      CompromisedCredentials(
+          form_digest_.signon_realm, base::ASCIIToUTF16("username_value"),
+          base::Time::FromTimeT(1), CompromiseType::kLeaked, false)};
   static_cast<CompromisedCredentialsConsumer*>(form_fetcher_.get())
       ->OnGetCompromisedCredentials(credentials);
 
diff --git a/components/password_manager/core/browser/insecure_credentials_table.cc b/components/password_manager/core/browser/insecure_credentials_table.cc
new file mode 100644
index 0000000..83ad7c9
--- /dev/null
+++ b/components/password_manager/core/browser/insecure_credentials_table.cc
@@ -0,0 +1,280 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "components/password_manager/core/browser/insecure_credentials_table.h"
+
+#include "base/bind.h"
+#include "base/logging.h"
+#include "base/metrics/histogram_functions.h"
+#include "base/strings/stringprintf.h"
+#include "sql/database.h"
+#include "sql/statement.h"
+
+namespace password_manager {
+namespace {
+
+// Returns a compromised credentials vector from the SQL statement.
+std::vector<CompromisedCredentials> StatementToCompromisedCredentials(
+    sql::Statement* s) {
+  std::vector<CompromisedCredentials> results;
+  while (s->Step()) {
+    std::string signon_realm = s->ColumnString(0);
+    base::string16 username = s->ColumnString16(1);
+    CompromiseType insecurity_type =
+        static_cast<CompromiseType>(s->ColumnInt64(2));
+    base::Time create_time = base::Time::FromDeltaSinceWindowsEpoch(
+        (base::TimeDelta::FromMicroseconds(s->ColumnInt64(3))));
+    bool is_muted = !!s->ColumnInt64(4);
+
+    results.emplace_back(std::move(signon_realm), std::move(username),
+                         create_time, insecurity_type, is_muted);
+  }
+  return results;
+}
+
+}  // namespace
+
+CompromisedCredentials::CompromisedCredentials() = default;
+
+CompromisedCredentials::CompromisedCredentials(std::string signon_realm,
+                                               base::string16 username,
+                                               base::Time create_time,
+                                               CompromiseType insecurity_type,
+                                               bool is_muted)
+    : signon_realm(std::move(signon_realm)),
+      username(std::move(username)),
+      create_time(create_time),
+      compromise_type(insecurity_type),
+      is_muted(is_muted) {}
+
+CompromisedCredentials::CompromisedCredentials(
+    const CompromisedCredentials& rhs) = default;
+
+CompromisedCredentials::CompromisedCredentials(CompromisedCredentials&& rhs) =
+    default;
+
+CompromisedCredentials& CompromisedCredentials::operator=(
+    const CompromisedCredentials& rhs) = default;
+
+CompromisedCredentials& CompromisedCredentials::operator=(
+    CompromisedCredentials&& rhs) = default;
+
+CompromisedCredentials::~CompromisedCredentials() = default;
+
+bool operator==(const CompromisedCredentials& lhs,
+                const CompromisedCredentials& rhs) {
+  return lhs.signon_realm == rhs.signon_realm && lhs.username == rhs.username &&
+         lhs.create_time == rhs.create_time &&
+         lhs.compromise_type == rhs.compromise_type;
+}
+
+const char InsecureCredentialsTable::kTableName[] = "insecure_credentials";
+
+void InsecureCredentialsTable::Init(sql::Database* db) {
+  db_ = db;
+}
+
+bool InsecureCredentialsTable::AddRow(
+    const CompromisedCredentials& compromised_credentials) {
+  DCHECK(db_);
+  if (compromised_credentials.signon_realm.empty())
+    return false;
+
+  DCHECK(db_->DoesTableExist(kTableName));
+
+  base::UmaHistogramEnumeration("PasswordManager.CompromisedCredentials.Add",
+                                compromised_credentials.compromise_type);
+
+  // In case there is an error, expect it to be a constraint violation.
+  db_->set_error_callback(base::BindRepeating([](int error, sql::Statement*) {
+    constexpr int kSqliteErrorMask = 0xFF;
+    constexpr int kSqliteConstraint = 19;
+    if ((error & kSqliteErrorMask) != kSqliteConstraint) {
+      DLOG(ERROR) << "Got unexpected SQL error code: " << error;
+    }
+  }));
+
+  sql::Statement s(db_->GetCachedStatement(
+      SQL_FROM_HERE,
+      base::StringPrintf(
+          "INSERT INTO %s (parent_id, insecurity_type, create_time, is_muted) "
+          "SELECT id, ?, ?, ? FROM logins WHERE signon_realm=? AND "
+          "username_value=?",
+          kTableName)
+          .c_str()));
+
+  s.BindInt(0, static_cast<int>(compromised_credentials.compromise_type));
+  s.BindInt64(1, compromised_credentials.create_time.ToDeltaSinceWindowsEpoch()
+                     .InMicroseconds());
+  s.BindBool(2, compromised_credentials.is_muted);
+  s.BindString(3, compromised_credentials.signon_realm);
+  s.BindString16(4, compromised_credentials.username);
+
+  bool result = s.Run();
+  db_->reset_error_callback();
+  return result && db_->GetLastChangeCount();
+}
+
+bool InsecureCredentialsTable::RemoveRow(
+    const std::string& signon_realm,
+    const base::string16& username,
+    RemoveCompromisedCredentialsReason reason) {
+  DCHECK(db_);
+  if (signon_realm.empty())
+    return false;
+
+  DCHECK(db_->DoesTableExist(kTableName));
+
+  // Retrieve the rows that are to be removed to log.
+  const std::vector<CompromisedCredentials> compromised_credentials =
+      GetRows(signon_realm);
+  if (compromised_credentials.empty())
+    return false;
+  for (const auto& compromised_credential : compromised_credentials) {
+    if (username == compromised_credential.username) {
+      base::UmaHistogramEnumeration(
+          "PasswordManager.CompromisedCredentials.Remove",
+          compromised_credential.compromise_type);
+      base::UmaHistogramEnumeration(
+          "PasswordManager.RemoveCompromisedCredentials.RemoveReason", reason);
+    }
+  }
+
+  sql::Statement s(db_->GetCachedStatement(
+      SQL_FROM_HERE,
+      base::StringPrintf("DELETE FROM %s WHERE parent_id IN "
+                         "(SELECT id FROM logins WHERE signon_realm = ? AND "
+                         "username_value = ?)",
+                         kTableName)
+          .c_str()));
+  s.BindString(0, signon_realm);
+  s.BindString16(1, username);
+  return s.Run();
+}
+
+std::vector<CompromisedCredentials> InsecureCredentialsTable::GetRows(
+    const std::string& signon_realm) const {
+  DCHECK(db_);
+  if (signon_realm.empty())
+    return std::vector<CompromisedCredentials>{};
+
+  DCHECK(db_->DoesTableExist(kTableName));
+
+  sql::Statement s(db_->GetCachedStatement(
+      SQL_FROM_HERE,
+      base::StringPrintf("SELECT signon_realm, username_value, "
+                         "insecurity_type, create_time, is_muted FROM %s "
+                         "INNER JOIN logins ON parent_id = logins.id "
+                         "WHERE signon_realm = ? ",
+                         kTableName)
+          .c_str()));
+  s.BindString(0, signon_realm);
+  return StatementToCompromisedCredentials(&s);
+}
+
+bool InsecureCredentialsTable::RemoveRowsByUrlAndTime(
+    const base::RepeatingCallback<bool(const GURL&)>& url_filter,
+    base::Time remove_begin,
+    base::Time remove_end) {
+  DCHECK(db_);
+  DCHECK(db_->DoesTableExist(kTableName));
+
+  const int64_t remove_begin_us =
+      remove_begin.ToDeltaSinceWindowsEpoch().InMicroseconds();
+  const int64_t remove_end_us =
+      remove_end.ToDeltaSinceWindowsEpoch().InMicroseconds();
+
+  // If |url_filter| is null, remove all records in given date range.
+  if (!url_filter) {
+    sql::Statement s(db_->GetCachedStatement(
+        SQL_FROM_HERE,
+        base::StringPrintf("DELETE FROM %s WHERE "
+                           "create_time >= ? AND create_time < ?",
+                           kTableName)
+            .c_str()));
+    s.BindInt64(0, remove_begin_us);
+    s.BindInt64(1, remove_end_us);
+    return s.Run();
+  }
+
+  // Otherwise, filter signon_realms.
+  sql::Statement s(db_->GetCachedStatement(
+      SQL_FROM_HERE,
+      base::StringPrintf(
+          "SELECT DISTINCT signon_realm, id FROM logins INNER JOIN "
+          "%s ON parent_id = logins.id WHERE create_time >= ? AND create_time "
+          "< ?",
+          kTableName)
+          .c_str()));
+  s.BindInt64(0, remove_begin_us);
+  s.BindInt64(1, remove_end_us);
+
+  std::vector<int64_t> ids;
+  while (s.Step()) {
+    std::string signon_realm = s.ColumnString(0);
+    int64_t id = s.ColumnInt64(1);
+    if (url_filter.Run(GURL(signon_realm))) {
+      ids.push_back(id);
+    }
+  }
+
+  bool success = true;
+  for (int64_t id : ids) {
+    sql::Statement s(db_->GetCachedStatement(
+        SQL_FROM_HERE,
+        base::StringPrintf("DELETE FROM %s WHERE parent_id = ? "
+                           "AND create_time >= ? AND create_time < ?",
+                           kTableName)
+            .c_str()));
+    s.BindInt64(0, id);
+    s.BindInt64(1, remove_begin_us);
+    s.BindInt64(2, remove_end_us);
+    success = success && s.Run();
+  }
+  return success;
+}
+
+std::vector<CompromisedCredentials> InsecureCredentialsTable::GetAllRows() {
+  DCHECK(db_);
+  DCHECK(db_->DoesTableExist(kTableName));
+
+  sql::Statement s(db_->GetCachedStatement(
+      SQL_FROM_HERE,
+      base::StringPrintf("SELECT signon_realm, username_value, "
+                         "insecurity_type, create_time, is_muted FROM %s "
+                         "INNER JOIN logins ON parent_id = logins.id",
+                         kTableName)
+          .c_str()));
+  return StatementToCompromisedCredentials(&s);
+}
+
+void InsecureCredentialsTable::ReportMetrics(BulkCheckDone bulk_check_done) {
+  DCHECK(db_);
+  sql::Statement s(db_->GetCachedStatement(
+      SQL_FROM_HERE, base::StringPrintf("SELECT COUNT(*) FROM %s "
+                                        "WHERE insecurity_type = ? ",
+                                        kTableName)
+                         .c_str()));
+  s.BindInt(0, static_cast<int>(CompromiseType::kLeaked));
+  if (s.Step()) {
+    int count = s.ColumnInt(0);
+    base::UmaHistogramCounts100(
+        "PasswordManager.CompromisedCredentials.CountLeaked", count);
+    if (bulk_check_done) {
+      base::UmaHistogramCounts100(
+          "PasswordManager.CompromisedCredentials.CountLeakedAfterBulkCheck",
+          count);
+    }
+  }
+
+  s.Reset(true);
+  s.BindInt(0, static_cast<int>(CompromiseType::kPhished));
+  if (s.Step()) {
+    int count = s.ColumnInt(0);
+    base::UmaHistogramCounts100(
+        "PasswordManager.CompromisedCredentials.CountPhished", count);
+  }
+}
+
+}  // namespace password_manager
diff --git a/components/password_manager/core/browser/compromised_credentials_table.h b/components/password_manager/core/browser/insecure_credentials_table.h
similarity index 60%
rename from components/password_manager/core/browser/compromised_credentials_table.h
rename to components/password_manager/core/browser/insecure_credentials_table.h
index d5451e3..792fcb9 100644
--- a/components/password_manager/core/browser/compromised_credentials_table.h
+++ b/components/password_manager/core/browser/insecure_credentials_table.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_COMPROMISED_CREDENTIALS_TABLE_H_
-#define COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_COMPROMISED_CREDENTIALS_TABLE_H_
+#ifndef COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_INSECURE_CREDENTIALS_TABLE_H_
+#define COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_INSECURE_CREDENTIALS_TABLE_H_
 
 #include "base/callback.h"
 #include "base/macros.h"
@@ -20,12 +20,18 @@
 
 using BulkCheckDone = base::StrongAlias<class BulkCheckDoneTag, bool>;
 
+// These values are persisted to logs. Entries should not be renumbered and
+// numeric values should never be reused.
 enum class CompromiseType {
   // If the credentials was leaked by a data breach.
   kLeaked = 0,
-  // If the credentials was reused on a phishing site.
+  // If the credentials was entered on a phishing site.
   kPhished = 1,
-  kMaxValue = kPhished
+  // If the password is weak.
+  kWeak = 2,
+  // If the password is reused for other accounts.
+  kReused = 3,
+  kMaxValue = kReused
 };
 
 enum class RemoveCompromisedCredentialsReason {
@@ -40,6 +46,18 @@
 
 // Represents information about the particular compromised credentials.
 struct CompromisedCredentials {
+  CompromisedCredentials();
+  CompromisedCredentials(std::string signon_realm,
+                         base::string16 username,
+                         base::Time create_time,
+                         CompromiseType compromise_type,
+                         bool is_muted);
+  CompromisedCredentials(const CompromisedCredentials& rhs);
+  CompromisedCredentials(CompromisedCredentials&& rhs);
+  CompromisedCredentials& operator=(const CompromisedCredentials& rhs);
+  CompromisedCredentials& operator=(CompromisedCredentials&& rhs);
+  ~CompromisedCredentials();
+
   // The signon_realm of the website where the credentials were compromised.
   std::string signon_realm;
   // The value of the compromised username.
@@ -48,6 +66,8 @@
   base::Time create_time;
   // The type of the credentials that was compromised.
   CompromiseType compromise_type = CompromiseType::kLeaked;
+  // Whether the problem was explicitly muted by the user.
+  bool is_muted = false;
   // The store in which those credentials are stored.
   PasswordForm::Store in_store = PasswordForm::Store::kNotSet;
 };
@@ -56,30 +76,20 @@
                 const CompromisedCredentials& rhs);
 
 // Represents the 'compromised credentials' table in the Login Database.
-class CompromisedCredentialsTable {
+class InsecureCredentialsTable {
  public:
-  CompromisedCredentialsTable() = default;
-  ~CompromisedCredentialsTable() = default;
+  static const char kTableName[];
+
+  InsecureCredentialsTable() = default;
+  ~InsecureCredentialsTable() = default;
 
   // Initializes |db_|.
   void Init(sql::Database* db);
 
-  // Creates the compromised credentials table if it doesn't exist.
-  bool CreateTableIfNecessary();
-
-  // Adds information about the compromised credentials. Returns true if the SQL
-  // completed successfully.
+  // Adds information about the compromised credentials. Returns true
+  // if the SQL completed successfully and an item was created.
   bool AddRow(const CompromisedCredentials& compromised_credentials);
 
-  // Updates the row that has |old_signon_realm| and |old_username| with
-  // |new_signon_realm| and |new_username|. If the row does not exist, the
-  // method will not do anything. Returns true if the SQL completed
-  // successfully.
-  bool UpdateRow(const std::string& new_signon_realm,
-                 const base::string16& new_username,
-                 const std::string& old_signon_realm,
-                 const base::string16& old_username) const;
-
   // Removes information about the credentials compromised for |username| on
   // |signon_realm|. |reason| is the reason why the credentials is removed from
   // the table. Returns true if the SQL completed successfully.
@@ -88,20 +98,6 @@
                  const base::string16& username,
                  RemoveCompromisedCredentialsReason reason);
 
-  // Removes information about the credentials compromised for |username| and
-  // |compromise_type| on |signon_realm|. |reason| is the reason why the
-  // credentials is removed from the table. Returns true if the SQL completed
-  // successfully. Also logs the compromise type in UMA.
-  bool RemoveRowByCompromiseType(const std::string& signon_realm,
-                                 const base::string16& username,
-                                 const CompromiseType& compromise_type,
-                                 RemoveCompromisedCredentialsReason reason);
-
-  // Gets all the rows in the database for the |username| and |signon_realm|.
-  std::vector<CompromisedCredentials> GetRows(
-      const std::string& signon_realm,
-      const base::string16& username) const;
-
   // Gets all the rows in the database for |signon_realm|.
   std::vector<CompromisedCredentials> GetRows(
       const std::string& signon_realm) const;
@@ -110,6 +106,7 @@
   // inclusive and |remove_end| exclusive. If |url_filter| is not null, only
   // compromised credentials for matching signon_realms are removed. Returns
   // true if the SQL completed successfully.
+  // TODO(crbug/1137775): remove the method.
   bool RemoveRowsByUrlAndTime(
       const base::RepeatingCallback<bool(const GURL&)>& url_filter,
       base::Time remove_begin,
@@ -123,18 +120,11 @@
   void ReportMetrics(BulkCheckDone bulk_check_done);
 
  private:
-  // Gets the row in the database for the |username|, |signon_realm|, and
-  // |compromise_type|.
-  std::vector<CompromisedCredentials> GetRowByCompromiseType(
-      const std::string& signon_realm,
-      const base::string16& username,
-      const CompromiseType& compromise_type) const;
-
   sql::Database* db_ = nullptr;
 
-  DISALLOW_COPY_AND_ASSIGN(CompromisedCredentialsTable);
+  DISALLOW_COPY_AND_ASSIGN(InsecureCredentialsTable);
 };
 
 }  // namespace password_manager
 
-#endif  // COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_COMPROMISED_CREDENTIALS_TABLE_H_
+#endif  // COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_INSECURE_CREDENTIALS_TABLE_H_
diff --git a/components/password_manager/core/browser/insecure_credentials_table_unittest.cc b/components/password_manager/core/browser/insecure_credentials_table_unittest.cc
new file mode 100644
index 0000000..b4c2ddec
--- /dev/null
+++ b/components/password_manager/core/browser/insecure_credentials_table_unittest.cc
@@ -0,0 +1,357 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <memory>
+
+#include "components/password_manager/core/browser/insecure_credentials_table.h"
+
+#include "base/bind.h"
+#include "base/callback.h"
+#include "base/callback_helpers.h"
+#include "base/files/scoped_temp_dir.h"
+#include "base/strings/utf_string_conversions.h"
+#include "base/test/metrics/histogram_tester.h"
+#include "base/test/task_environment.h"
+#include "build/build_config.h"
+#include "components/os_crypt/os_crypt_mocker.h"
+#include "components/password_manager/core/browser/login_database.h"
+#include "components/password_manager/core/common/password_manager_features.h"
+#include "components/safe_browsing/core/features.h"
+#include "sql/database.h"
+#include "testing/gmock/include/gmock/gmock.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+namespace password_manager {
+namespace {
+
+constexpr char kTestDomain[] = "http://example.com/";
+constexpr char kTestDomain2[] = "http://test.com/";
+constexpr char kTestDomain3[] = "http://google.com/";
+constexpr char kUsername[] = "user";
+constexpr char kUsername2[] = "user2";
+constexpr char kUsername3[] = "user3";
+
+using testing::ElementsAre;
+using testing::IsEmpty;
+using testing::SizeIs;
+
+PasswordForm TestForm() {
+  PasswordForm form;
+  form.signon_realm = kTestDomain;
+  form.url = GURL(form.signon_realm);
+  form.username_value = base::ASCIIToUTF16(kUsername);
+  form.password_value = base::ASCIIToUTF16("1234");
+  return form;
+}
+
+class InsecureCredentialsTableTest : public testing::Test {
+ protected:
+  void SetUp() override {
+    ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
+    OSCryptMocker::SetUp();
+    ReloadDatabase();
+  }
+
+  void TearDown() override {
+    login_db_.reset();
+    OSCryptMocker::TearDown();
+  }
+
+  void ReloadDatabase() {
+    base::FilePath file = temp_dir_.GetPath().AppendASCII("TestDatabase");
+    login_db_ = std::make_unique<LoginDatabase>(file, IsAccountStore(false));
+    ASSERT_TRUE(login_db_->Init());
+  }
+
+  CompromisedCredentials& test_data() { return test_data_; }
+  PasswordForm& test_form() { return test_form_; }
+  InsecureCredentialsTable* db() {
+    return &login_db_->insecure_credentials_table();
+  }
+  LoginDatabase* login_db() { return login_db_.get(); }
+
+ private:
+  base::ScopedTempDir temp_dir_;
+  // Required for iOS.
+  base::test::TaskEnvironment task_environment_;
+  std::unique_ptr<LoginDatabase> login_db_;
+  CompromisedCredentials test_data_{kTestDomain, base::ASCIIToUTF16(kUsername),
+                                    base::Time::FromTimeT(1),
+                                    CompromiseType::kLeaked, false};
+  PasswordForm test_form_ = TestForm();
+};
+
+TEST_F(InsecureCredentialsTableTest, Reload) {
+  EXPECT_THAT(login_db()->AddLogin(test_form()), SizeIs(1));
+  EXPECT_TRUE(db()->AddRow(test_data()));
+  ReloadDatabase();
+  EXPECT_THAT(db()->GetAllRows(), ElementsAre(test_data()));
+}
+
+TEST_F(InsecureCredentialsTableTest, AddWithoutPassword) {
+  // The call fails because there is no password stored.
+  EXPECT_FALSE(db()->AddRow(test_data()));
+  EXPECT_THAT(db()->GetAllRows(), IsEmpty());
+}
+
+TEST_F(InsecureCredentialsTableTest, CascadeDelete) {
+  EXPECT_THAT(login_db()->AddLogin(test_form()), SizeIs(1));
+  EXPECT_TRUE(db()->AddRow(test_data()));
+  EXPECT_TRUE(login_db()->RemoveLogin(test_form(), nullptr));
+  // The compromised entry is also gone silently.
+  EXPECT_THAT(db()->GetAllRows(), IsEmpty());
+}
+
+TEST_F(InsecureCredentialsTableTest, SameSignonRealmDifferentUsername) {
+  EXPECT_THAT(login_db()->AddLogin(test_form()), SizeIs(1));
+  CompromisedCredentials compromised_credentials1 = test_data();
+  CompromisedCredentials compromised_credentials2 = test_data();
+  test_form().username_value = compromised_credentials2.username =
+      base::ASCIIToUTF16(kUsername2);
+  EXPECT_THAT(login_db()->AddLogin(test_form()), SizeIs(1));
+
+  EXPECT_TRUE(db()->AddRow(compromised_credentials1));
+  EXPECT_TRUE(db()->AddRow(compromised_credentials2));
+  EXPECT_THAT(db()->GetAllRows(),
+              ElementsAre(compromised_credentials1, compromised_credentials2));
+  EXPECT_THAT(db()->GetRows(test_data().signon_realm),
+              ElementsAre(compromised_credentials1, compromised_credentials2));
+}
+
+TEST_F(InsecureCredentialsTableTest, SameUsernameDifferentSignonRealm) {
+  EXPECT_THAT(login_db()->AddLogin(test_form()), SizeIs(1));
+  CompromisedCredentials compromised_credentials1 = test_data();
+  CompromisedCredentials compromised_credentials2 = test_data();
+  test_form().signon_realm = compromised_credentials2.signon_realm =
+      kTestDomain2;
+  test_form().url = GURL(test_form().signon_realm);
+  EXPECT_THAT(login_db()->AddLogin(test_form()), SizeIs(1));
+
+  EXPECT_TRUE(db()->AddRow(compromised_credentials1));
+  EXPECT_TRUE(db()->AddRow(compromised_credentials2));
+  EXPECT_THAT(db()->GetAllRows(),
+              ElementsAre(compromised_credentials1, compromised_credentials2));
+  EXPECT_THAT(db()->GetRows(test_data().signon_realm),
+              ElementsAre(compromised_credentials1));
+}
+
+TEST_F(InsecureCredentialsTableTest, SameSignonRealmAndUsernameDifferentTime) {
+  EXPECT_THAT(login_db()->AddLogin(test_form()), SizeIs(1));
+  CompromisedCredentials compromised_credentials1 = test_data();
+  CompromisedCredentials compromised_credentials2 = test_data();
+  compromised_credentials2.create_time = base::Time::FromTimeT(2);
+
+  EXPECT_TRUE(db()->AddRow(compromised_credentials1));
+  // It should return false because of unique constraints.
+  EXPECT_FALSE(db()->AddRow(compromised_credentials2));
+  EXPECT_THAT(db()->GetAllRows(), ElementsAre(compromised_credentials1));
+}
+
+TEST_F(InsecureCredentialsTableTest,
+       SameSignonRealmAndUsernameAndDifferentCompromiseType) {
+  EXPECT_THAT(login_db()->AddLogin(test_form()), SizeIs(1));
+  CompromisedCredentials compromised_credentials1 = test_data();
+  CompromisedCredentials compromised_credentials2 = test_data();
+  compromised_credentials2.compromise_type = CompromiseType::kPhished;
+  CompromisedCredentials compromised_credentials3 = test_data();
+  compromised_credentials3.compromise_type = CompromiseType::kWeak;
+
+  EXPECT_TRUE(db()->AddRow(compromised_credentials1));
+  EXPECT_TRUE(db()->AddRow(compromised_credentials2));
+  EXPECT_TRUE(db()->AddRow(compromised_credentials3));
+  EXPECT_THAT(db()->GetAllRows(),
+              ElementsAre(compromised_credentials1, compromised_credentials2,
+                          compromised_credentials3));
+  EXPECT_THAT(db()->GetRows(test_data().signon_realm),
+              ElementsAre(compromised_credentials1, compromised_credentials2,
+                          compromised_credentials3));
+}
+
+TEST_F(InsecureCredentialsTableTest, RemoveRow) {
+  EXPECT_THAT(login_db()->AddLogin(test_form()), SizeIs(1));
+  EXPECT_TRUE(db()->AddRow(test_data()));
+  EXPECT_THAT(db()->GetRows(test_data().signon_realm),
+              ElementsAre(test_data()));
+
+  EXPECT_TRUE(db()->RemoveRow(test_data().signon_realm, test_data().username,
+                              RemoveCompromisedCredentialsReason::kUpdate));
+
+  EXPECT_THAT(db()->GetAllRows(), IsEmpty());
+  EXPECT_THAT(db()->GetRows(test_data().signon_realm), IsEmpty());
+}
+
+TEST_F(InsecureCredentialsTableTest, RemoveRowsCreatedBetween) {
+  EXPECT_THAT(login_db()->AddLogin(test_form()), SizeIs(1));
+  test_form().username_value = base::ASCIIToUTF16(kUsername2);
+  EXPECT_THAT(login_db()->AddLogin(test_form()), SizeIs(1));
+  test_form().username_value = base::ASCIIToUTF16(kUsername3);
+  EXPECT_THAT(login_db()->AddLogin(test_form()), SizeIs(1));
+  CompromisedCredentials compromised_credentials1 = test_data();
+  CompromisedCredentials compromised_credentials2 = test_data();
+  CompromisedCredentials compromised_credentials3 = test_data();
+  compromised_credentials2.username = base::ASCIIToUTF16(kUsername2);
+  compromised_credentials3.username = base::ASCIIToUTF16(kUsername3);
+  compromised_credentials1.create_time = base::Time::FromTimeT(10);
+  compromised_credentials2.create_time = base::Time::FromTimeT(20);
+  compromised_credentials3.create_time = base::Time::FromTimeT(30);
+
+  EXPECT_TRUE(db()->AddRow(compromised_credentials1));
+  EXPECT_TRUE(db()->AddRow(compromised_credentials2));
+  EXPECT_TRUE(db()->AddRow(compromised_credentials3));
+
+  EXPECT_THAT(db()->GetAllRows(),
+              ElementsAre(compromised_credentials1, compromised_credentials2,
+                          compromised_credentials3));
+
+  EXPECT_TRUE(db()->RemoveRowsByUrlAndTime(base::NullCallback(),
+                                           base::Time::FromTimeT(15),
+                                           base::Time::FromTimeT(25)));
+
+  EXPECT_THAT(db()->GetAllRows(),
+              ElementsAre(compromised_credentials1, compromised_credentials3));
+}
+
+TEST_F(InsecureCredentialsTableTest, RemoveRowsCreatedBetweenEdgeCase) {
+  EXPECT_THAT(login_db()->AddLogin(test_form()), SizeIs(1));
+  test_form().username_value = base::ASCIIToUTF16(kUsername2);
+  EXPECT_THAT(login_db()->AddLogin(test_form()), SizeIs(1));
+  base::Time begin_time = base::Time::FromTimeT(10);
+  base::Time end_time = base::Time::FromTimeT(20);
+  CompromisedCredentials compromised_credentials_begin = test_data();
+  CompromisedCredentials compromised_credentials_end = test_data();
+  compromised_credentials_begin.create_time = begin_time;
+  compromised_credentials_end.create_time = end_time;
+  compromised_credentials_end.username = base::ASCIIToUTF16(kUsername2);
+
+  EXPECT_TRUE(db()->AddRow(compromised_credentials_begin));
+  EXPECT_TRUE(db()->AddRow(compromised_credentials_end));
+
+  EXPECT_THAT(db()->GetAllRows(), ElementsAre(compromised_credentials_begin,
+                                              compromised_credentials_end));
+
+  EXPECT_TRUE(
+      db()->RemoveRowsByUrlAndTime(base::NullCallback(), begin_time, end_time));
+  // RemoveRowsCreatedBetween takes |begin_time| inclusive and |end_time|
+  // exclusive, hence the credentials with |end_time| should remain in the
+  // database.
+  EXPECT_THAT(db()->GetAllRows(), ElementsAre(compromised_credentials_end));
+}
+
+TEST_F(InsecureCredentialsTableTest, RemoveRowsCreatedUpUntilNow) {
+  EXPECT_THAT(login_db()->AddLogin(test_form()), SizeIs(1));
+  test_form().username_value = base::ASCIIToUTF16(kUsername2);
+  EXPECT_THAT(login_db()->AddLogin(test_form()), SizeIs(1));
+  test_form().username_value = base::ASCIIToUTF16(kUsername3);
+  EXPECT_THAT(login_db()->AddLogin(test_form()), SizeIs(1));
+  CompromisedCredentials compromised_credentials1 = test_data();
+  CompromisedCredentials compromised_credentials2 = test_data();
+  CompromisedCredentials compromised_credentials3 = test_data();
+  compromised_credentials2.username = base::ASCIIToUTF16(kUsername2);
+  compromised_credentials3.username = base::ASCIIToUTF16(kUsername3);
+  compromised_credentials1.create_time = base::Time::FromTimeT(42);
+  compromised_credentials2.create_time = base::Time::FromTimeT(780);
+  compromised_credentials3.create_time = base::Time::FromTimeT(3000);
+
+  EXPECT_TRUE(db()->AddRow(compromised_credentials1));
+  EXPECT_TRUE(db()->AddRow(compromised_credentials2));
+  EXPECT_TRUE(db()->AddRow(compromised_credentials3));
+
+  EXPECT_THAT(db()->GetAllRows(),
+              ElementsAre(compromised_credentials1, compromised_credentials2,
+                          compromised_credentials3));
+
+  EXPECT_TRUE(db()->RemoveRowsByUrlAndTime(base::NullCallback(), base::Time(),
+                                           base::Time::Max()));
+
+  EXPECT_THAT(db()->GetAllRows(), IsEmpty());
+}
+
+TEST_F(InsecureCredentialsTableTest, RemoveRowsByUrlAndTime) {
+  EXPECT_THAT(login_db()->AddLogin(test_form()), SizeIs(1));
+  CompromisedCredentials compromised_credentials1 = test_data();
+  CompromisedCredentials compromised_credentials2 = test_data();
+  CompromisedCredentials compromised_credentials3 = test_data();
+  CompromisedCredentials compromised_credentials4 = test_data();
+  test_form().username_value = compromised_credentials2.username =
+      base::ASCIIToUTF16(kUsername2);
+  EXPECT_THAT(login_db()->AddLogin(test_form()), SizeIs(1));
+  test_form().username_value = compromised_credentials3.username;
+  test_form().signon_realm = compromised_credentials3.signon_realm =
+      kTestDomain2;
+  test_form().url = GURL(test_form().signon_realm);
+  EXPECT_THAT(login_db()->AddLogin(test_form()), SizeIs(1));
+  test_form().signon_realm = compromised_credentials4.signon_realm =
+      kTestDomain3;
+  test_form().url = GURL(test_form().signon_realm);
+  EXPECT_THAT(login_db()->AddLogin(test_form()), SizeIs(1));
+
+  EXPECT_TRUE(db()->AddRow(compromised_credentials1));
+  EXPECT_TRUE(db()->AddRow(compromised_credentials2));
+  EXPECT_TRUE(db()->AddRow(compromised_credentials3));
+  EXPECT_TRUE(db()->AddRow(compromised_credentials4));
+
+  EXPECT_THAT(db()->GetAllRows(),
+              ElementsAre(compromised_credentials1, compromised_credentials2,
+                          compromised_credentials3, compromised_credentials4));
+
+  EXPECT_TRUE(db()->RemoveRowsByUrlAndTime(
+      // Can't use the generic `std::not_equal_to<>` here, because BindRepeating
+      // does not support functors with an overloaded call operator.
+      // NOLINTNEXTLINE(modernize-use-transparent-functors)
+      base::BindRepeating(std::not_equal_to<GURL>(),
+                          GURL(compromised_credentials1.signon_realm)),
+      base::Time(), base::Time::Max()));
+  // With unbounded time range and given url filter all rows that are not
+  // matching the |compromised_credentials1.signon_realm| should be removed.
+  EXPECT_THAT(db()->GetAllRows(),
+              ElementsAre(compromised_credentials1, compromised_credentials2));
+}
+
+TEST_F(InsecureCredentialsTableTest, ReportMetricsBeforeBulkCheck) {
+  EXPECT_THAT(login_db()->AddLogin(test_form()), SizeIs(1));
+  EXPECT_TRUE(db()->AddRow(test_data()));
+  test_form().signon_realm = test_data().signon_realm = kTestDomain2;
+  test_form().url = GURL(test_form().signon_realm);
+  test_form().username_value = test_data().username =
+      base::ASCIIToUTF16(kUsername2);
+  EXPECT_THAT(login_db()->AddLogin(test_form()), SizeIs(1));
+  EXPECT_TRUE(db()->AddRow(test_data()));
+  test_form().signon_realm = test_data().signon_realm = kTestDomain3;
+  test_form().url = GURL(test_form().signon_realm);
+  test_form().username_value = test_data().username =
+      base::ASCIIToUTF16(kUsername3);
+  test_data().compromise_type = CompromiseType::kPhished;
+  EXPECT_THAT(login_db()->AddLogin(test_form()), SizeIs(1));
+  EXPECT_TRUE(db()->AddRow(test_data()));
+
+  base::HistogramTester histogram_tester;
+  db()->ReportMetrics(BulkCheckDone(false));
+  histogram_tester.ExpectUniqueSample(
+      "PasswordManager.CompromisedCredentials.CountLeaked", 2, 1);
+  histogram_tester.ExpectUniqueSample(
+      "PasswordManager.CompromisedCredentials.CountPhished", 1, 1);
+  histogram_tester.ExpectTotalCount(
+      "PasswordManager.CompromisedCredentials.CountLeakedAfterBulkCheck", 0);
+}
+
+TEST_F(InsecureCredentialsTableTest, ReportMetricsAfterBulkCheck) {
+  EXPECT_THAT(login_db()->AddLogin(test_form()), SizeIs(1));
+  EXPECT_TRUE(db()->AddRow(test_data()));
+  test_form().signon_realm = test_data().signon_realm = kTestDomain2;
+  test_form().url = GURL(test_form().signon_realm);
+  test_form().username_value = test_data().username =
+      base::ASCIIToUTF16(kUsername2);
+  EXPECT_THAT(login_db()->AddLogin(test_form()), SizeIs(1));
+  EXPECT_TRUE(db()->AddRow(test_data()));
+
+  base::HistogramTester histogram_tester;
+  db()->ReportMetrics(BulkCheckDone(true));
+  histogram_tester.ExpectUniqueSample(
+      "PasswordManager.CompromisedCredentials.CountLeaked", 2, 1);
+  histogram_tester.ExpectUniqueSample(
+      "PasswordManager.CompromisedCredentials.CountLeakedAfterBulkCheck", 2, 1);
+}
+
+}  // namespace
+}  // namespace password_manager
diff --git a/components/password_manager/core/browser/leak_detection_delegate.cc b/components/password_manager/core/browser/leak_detection_delegate.cc
index 5b28e6514..ca73ce7 100644
--- a/components/password_manager/core/browser/leak_detection_delegate.cc
+++ b/components/password_manager/core/browser/leak_detection_delegate.cc
@@ -9,8 +9,8 @@
 #include "base/metrics/histogram_functions.h"
 #include "build/build_config.h"
 #include "components/autofill/core/common/save_password_progress_logger.h"
-#include "components/password_manager/core/browser/compromised_credentials_table.h"
 #include "components/password_manager/core/browser/form_parsing/form_parser.h"
+#include "components/password_manager/core/browser/insecure_credentials_table.h"
 #include "components/password_manager/core/browser/leak_detection/leak_detection_check.h"
 #include "components/password_manager/core/browser/leak_detection/leak_detection_check_factory_impl.h"
 #include "components/password_manager/core/browser/leak_detection_delegate_helper.h"
diff --git a/components/password_manager/core/browser/leak_detection_delegate_helper.cc b/components/password_manager/core/browser/leak_detection_delegate_helper.cc
index d08cba56..f7afeac 100644
--- a/components/password_manager/core/browser/leak_detection_delegate_helper.cc
+++ b/components/password_manager/core/browser/leak_detection_delegate_helper.cc
@@ -60,9 +60,9 @@
         distinct_origins.insert(form->signon_realm);
         PasswordStore& store =
             form->IsUsingAccountStore() ? *account_store_ : *profile_store_;
-        store.AddCompromisedCredentials(
-            {form->signon_realm, form->username_value, base::Time::Now(),
-             CompromiseType::kLeaked});
+        store.AddCompromisedCredentials(CompromisedCredentials(
+            form->signon_realm, form->username_value, base::Time::Now(),
+            CompromiseType::kLeaked, false));
       }
     }
   }
diff --git a/components/password_manager/core/browser/leak_detection_delegate_helper_unittest.cc b/components/password_manager/core/browser/leak_detection_delegate_helper_unittest.cc
index e54e105..59eee41 100644
--- a/components/password_manager/core/browser/leak_detection_delegate_helper_unittest.cc
+++ b/components/password_manager/core/browser/leak_detection_delegate_helper_unittest.cc
@@ -211,14 +211,14 @@
        CreateForm(kLeakedOrigin, kOtherUsername, kLeakedPassword)});
   SetOnShowLeakDetectionNotificationExpectation(IsSaved(true), IsReused(true),
                                                 CompromisedSitesCount(2));
-  EXPECT_CALL(*store_, AddCompromisedCredentialsImpl(CompromisedCredentials{
+  EXPECT_CALL(*store_, AddCompromisedCredentialsImpl(CompromisedCredentials(
                            GetSignonRealm(GURL(kLeakedOrigin)),
                            ASCIIToUTF16(kLeakedUsername), base::Time::Now(),
-                           CompromiseType::kLeaked}));
-  EXPECT_CALL(*store_, AddCompromisedCredentialsImpl(CompromisedCredentials{
+                           CompromiseType::kLeaked, false)));
+  EXPECT_CALL(*store_, AddCompromisedCredentialsImpl(CompromisedCredentials(
                            GetSignonRealm(GURL(kOtherOrigin)),
                            ASCIIToUTF16(kLeakedUsername), base::Time::Now(),
-                           CompromiseType::kLeaked}));
+                           CompromiseType::kLeaked, false)));
   InitiateGetCredentialLeakType();
 }
 
@@ -232,10 +232,10 @@
   SetOnShowLeakDetectionNotificationExpectation(IsSaved(false), IsReused(true),
                                                 CompromisedSitesCount(1));
 
-  EXPECT_CALL(*store_, AddCompromisedCredentialsImpl(CompromisedCredentials{
+  EXPECT_CALL(*store_, AddCompromisedCredentialsImpl(CompromisedCredentials(
                            GetSignonRealm(GURL(kOtherOrigin)),
                            ASCIIToUTF16(kLeakedUsernameNonCanonicalized),
-                           base::Time::Now(), CompromiseType::kLeaked}));
+                           base::Time::Now(), CompromiseType::kLeaked, false)));
   InitiateGetCredentialLeakType();
 }
 
diff --git a/components/password_manager/core/browser/leak_detection_delegate_unittest.cc b/components/password_manager/core/browser/leak_detection_delegate_unittest.cc
index e6721a90..634e766 100644
--- a/components/password_manager/core/browser/leak_detection_delegate_unittest.cc
+++ b/components/password_manager/core/browser/leak_detection_delegate_unittest.cc
@@ -347,9 +347,9 @@
   delegate_interface->OnLeakDetectionDone(
       /*is_leaked=*/true, form.url, form.username_value, form.password_value);
 
-  const CompromisedCredentials compromised_credentials = {
+  const CompromisedCredentials compromised_credentials(
       GetSignonRealm(form.url), form.username_value, base::Time::Now(),
-      CompromiseType::kLeaked};
+      CompromiseType::kLeaked, false);
   EXPECT_CALL(*store(), AddCompromisedCredentialsImpl(compromised_credentials));
   WaitForPasswordStore();
 }
diff --git a/components/password_manager/core/browser/leak_detection_dialog_utils_unittest.cc b/components/password_manager/core/browser/leak_detection_dialog_utils_unittest.cc
index 963025b..5929032f 100644
--- a/components/password_manager/core/browser/leak_detection_dialog_utils_unittest.cc
+++ b/components/password_manager/core/browser/leak_detection_dialog_utils_unittest.cc
@@ -8,7 +8,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/scoped_feature_list.h"
 #include "build/build_config.h"
-#include "components/password_manager/core/browser/compromised_credentials_table.h"
+#include "components/password_manager/core/browser/insecure_credentials_table.h"
 #include "components/password_manager/core/common/password_manager_features.h"
 #include "components/strings/grit/components_strings.h"
 #include "components/url_formatter/elide_url.h"
diff --git a/components/password_manager/core/browser/login_database.cc b/components/password_manager/core/browser/login_database.cc
index f57a05f..3297b2c 100644
--- a/components/password_manager/core/browser/login_database.cc
+++ b/components/password_manager/core/browser/login_database.cc
@@ -58,10 +58,10 @@
 namespace password_manager {
 
 // The current version number of the login database schema.
-const int kCurrentVersionNumber = 28;
+constexpr int kCurrentVersionNumber = 29;
 // The oldest version of the schema such that a legacy Chrome client using that
 // version can still read/write the current database.
-const int kCompatibleVersionNumber = 28;
+constexpr int kCompatibleVersionNumber = 29;
 
 base::Pickle SerializeValueElementPairs(const ValueElementVector& vec) {
   base::Pickle p;
@@ -187,10 +187,11 @@
   DATABASE_INIT_ERROR_COUNT,
 };
 
-// Struct to hold table builder for "logins", "sync_entities_metadata", and
-// "sync_model_metadata" tables.
+// Struct to hold table builder for "logins", "insecure_credentials",
+// "sync_entities_metadata", and "sync_model_metadata" tables.
 struct SQLTableBuilders {
   SQLTableBuilder* logins;
+  SQLTableBuilder* insecure_credentials;
   SQLTableBuilder* sync_entities_metadata;
   SQLTableBuilder* sync_model_metadata;
 };
@@ -300,6 +301,10 @@
   unsigned logins_version = builders.logins->SealVersion();
   DCHECK_EQ(expected_version, logins_version);
 
+  unsigned insecure_credentials_version =
+      builders.insecure_credentials->SealVersion();
+  DCHECK_EQ(expected_version, insecure_credentials_version);
+
   unsigned sync_entities_metadata_version =
       builders.sync_entities_metadata->SealVersion();
   DCHECK_EQ(expected_version, sync_entities_metadata_version);
@@ -420,7 +425,7 @@
   SealVersion(builders, /*expected_version=*/24u);
 
   // Version 25. Introduce date_last_used column to replace the preferred
-  // column. MigrateLogins() will take care of migrating the data.
+  // column. MigrateDatabase() will take care of migrating the data.
   builders.logins->AddColumn("date_last_used", "INTEGER NOT NULL DEFAULT 0");
   SealVersion(builders, /*expected_version=*/25u);
 
@@ -437,6 +442,18 @@
   builders.logins->DropColumn("preferred");
   SealVersion(builders, /*expected_version=*/28u);
 
+  // Version 29.
+  // Migrate the compromised credentials from "compromised_credentials" to the
+  // new table "insecure credentials" with a foreign key to the logins table.
+  builders.insecure_credentials->AddColumnToUniqueKey("parent_id", "INTEGER",
+                                                      "logins");
+  builders.insecure_credentials->AddColumnToUniqueKey("insecurity_type",
+                                                      "INTEGER NOT NULL");
+  builders.insecure_credentials->AddColumn("create_time", "INTEGER NOT NULL");
+  builders.insecure_credentials->AddColumn("is_muted",
+                                           "INTEGER NOT NULL DEFAULT 0");
+  SealVersion(builders, /*expected_version=*/29u);
+
   DCHECK_EQ(static_cast<size_t>(COLUMN_NUM), builders.logins->NumberOfColumns())
       << "Adjust LoginDatabaseTableColumns if you change column definitions "
          "here.";
@@ -488,16 +505,57 @@
   return true;
 }
 
+bool InsecureCredentialsPostMigrationStepCallback(
+    SQLTableBuilder* insecure_credentials_builder,
+    sql::Database* db,
+    unsigned new_version) {
+  if (new_version == 29) {
+    if (!insecure_credentials_builder->CreateTable(db)) {
+      LOG(ERROR) << "Failed to create the 'insecure_credentials' table";
+      LogDatabaseInitError(INIT_COMPROMISED_CREDENTIALS_ERROR);
+      return false;
+    }
+    if (!db->DoesTableExist("compromised_credentials"))
+      return true;
+    // The 'compromised_credentials' table must be migrated to
+    // 'insecure_credentials'.
+    constexpr char select_compromised[] =
+        "SELECT "
+        "id, create_time, compromise_type FROM compromised_credentials "
+        "INNER JOIN logins ON "
+        "compromised_credentials.url = logins.signon_realm AND "
+        "compromised_credentials.username = logins.username_value";
+    const std::string insert_statement = base::StringPrintf(
+        "INSERT OR REPLACE INTO %s "
+        "(parent_id, create_time, insecurity_type) %s",
+        InsecureCredentialsTable::kTableName, select_compromised);
+    constexpr char drop_table_statement[] =
+        "DROP TABLE compromised_credentials";
+    sql::Transaction transaction(db);
+    if (!(transaction.Begin() && db->Execute(insert_statement.c_str()) &&
+          db->Execute(drop_table_statement) && transaction.Commit())) {
+      return false;
+    }
+  }
+  return true;
+}
+
 // Call this after having called InitializeBuilders(), to migrate the database
 // from the current version to kCurrentVersionNumber.
-bool MigrateLogins(unsigned current_version,
-                   SQLTableBuilders builders,
-                   sql::Database* db) {
+bool MigrateDatabase(unsigned current_version,
+                     SQLTableBuilders builders,
+                     sql::Database* db) {
   if (!builders.logins->MigrateFrom(
           current_version, db,
           base::BindRepeating(&LoginsTablePostMigrationStepCallback)))
     return false;
 
+  if (!builders.insecure_credentials->MigrateFrom(
+          current_version, db,
+          base::BindRepeating(&InsecureCredentialsPostMigrationStepCallback,
+                              builders.insecure_credentials)))
+    return false;
+
   if (!builders.sync_entities_metadata->MigrateFrom(current_version, db))
     return false;
 
@@ -655,42 +713,39 @@
   }
 
   SQLTableBuilder logins_builder("logins");
+  SQLTableBuilder insecure_credentials_builder(
+      InsecureCredentialsTable::kTableName);
   SQLTableBuilder sync_entities_metadata_builder("sync_entities_metadata");
   SQLTableBuilder sync_model_metadata_builder("sync_model_metadata");
-  SQLTableBuilders builders = {&logins_builder, &sync_entities_metadata_builder,
+  SQLTableBuilders builders = {&logins_builder, &insecure_credentials_builder,
+                               &sync_entities_metadata_builder,
                                &sync_model_metadata_builder};
   InitializeBuilders(builders);
   InitializeStatementStrings(logins_builder);
 
-  if (!db_.DoesTableExist("logins")) {
-    if (!logins_builder.CreateTable(&db_)) {
-      VLOG(0) << "Failed to create the 'logins' table";
-      transaction.Rollback();
-      db_.Close();
-      return false;
-    }
+  if (!logins_builder.CreateTable(&db_)) {
+    LOG(ERROR) << "Failed to create the 'logins' table";
+    transaction.Rollback();
+    db_.Close();
+    return false;
   }
 
-  if (!db_.DoesTableExist("sync_entities_metadata")) {
-    if (!sync_entities_metadata_builder.CreateTable(&db_)) {
-      VLOG(0) << "Failed to create the 'sync_entities_metadata' table";
-      transaction.Rollback();
-      db_.Close();
-      return false;
-    }
+  if (!sync_entities_metadata_builder.CreateTable(&db_)) {
+    LOG(ERROR) << "Failed to create the 'sync_entities_metadata' table";
+    transaction.Rollback();
+    db_.Close();
+    return false;
   }
 
-  if (!db_.DoesTableExist("sync_model_metadata")) {
-    if (!sync_model_metadata_builder.CreateTable(&db_)) {
-      VLOG(0) << "Failed to create the 'sync_model_metadata' table";
-      transaction.Rollback();
-      db_.Close();
-      return false;
-    }
+  if (!sync_model_metadata_builder.CreateTable(&db_)) {
+    LOG(ERROR) << "Failed to create the 'sync_model_metadata' table";
+    transaction.Rollback();
+    db_.Close();
+    return false;
   }
 
   stats_table_.Init(&db_);
-  compromised_credentials_table_.Init(&db_);
+  insecure_credentials_table_.Init(&db_);
   field_info_table_.Init(&db_);
 
   int current_version = meta_table_.GetVersionNumber();
@@ -698,9 +753,22 @@
 
   // If the file on disk is an older database version, bring it up to date.
   if (migration_success && current_version < kCurrentVersionNumber) {
-    migration_success = MigrateLogins(
+    migration_success = MigrateDatabase(
         base::checked_cast<unsigned>(current_version), builders, &db_);
   }
+  // Enforce that 'insecure_credentials' is created only after the 'logins'
+  // table was created and migrated to the latest version. This guarantees the
+  // existence of the `id` column in the `logins` table which was introduced
+  // only in version 20 and is referenced by `insecure_credentials` table. The
+  // table will be created here for a new profile. For an old profile it's
+  // created in MigrateDatabase above.
+  if (migration_success && !insecure_credentials_builder.CreateTable(&db_)) {
+    LOG(ERROR) << "Failed to create the 'insecure_credentials' table";
+    LogDatabaseInitError(INIT_COMPROMISED_CREDENTIALS_ERROR);
+    transaction.Rollback();
+    db_.Close();
+    return false;
+  }
   if (migration_success && current_version <= 15) {
     migration_success = stats_table_.MigrateToVersion(16);
   }
@@ -742,19 +810,6 @@
     }
   }
 
-  if (base::FeatureList::IsEnabled(
-          password_manager::features::kPasswordCheck) ||
-      base::FeatureList::IsEnabled(
-          safe_browsing::kPasswordProtectionShowDomainsForSavedPasswords)) {
-    if (!compromised_credentials_table_.CreateTableIfNecessary()) {
-      LogDatabaseInitError(INIT_COMPROMISED_CREDENTIALS_ERROR);
-      LOG(ERROR) << "Unable to create the compromised credentials table.";
-      transaction.Rollback();
-      db_.Close();
-      return false;
-    }
-  }
-
   if (!field_info_table_.CreateTableIfNecessary()) {
     LogDatabaseInitError(INIT_FIELD_INFO_ERROR);
     LOG(ERROR) << "Unable to create the field info table.";
@@ -1092,7 +1147,7 @@
   ReportBubbleSuppressionMetrics();
   ReportDuplicateCredentialsMetrics();
 
-  compromised_credentials_table_.ReportMetrics(bulk_check_done);
+  insecure_credentials_table_.ReportMetrics(bulk_check_done);
 }
 
 PasswordStoreChangeList LoginDatabase::AddLogin(const PasswordForm& form,
diff --git a/components/password_manager/core/browser/login_database.h b/components/password_manager/core/browser/login_database.h
index ee41933e..2263db8 100644
--- a/components/password_manager/core/browser/login_database.h
+++ b/components/password_manager/core/browser/login_database.h
@@ -16,8 +16,8 @@
 #include "base/pickle.h"
 #include "base/strings/string16.h"
 #include "build/build_config.h"
-#include "components/password_manager/core/browser/compromised_credentials_table.h"
 #include "components/password_manager/core/browser/field_info_table.h"
+#include "components/password_manager/core/browser/insecure_credentials_table.h"
 #include "components/password_manager/core/browser/password_store.h"
 #include "components/password_manager/core/browser/password_store_change.h"
 #include "components/password_manager/core/browser/password_store_sync.h"
@@ -203,8 +203,8 @@
   bool CommitTransaction();
 
   StatisticsTable& stats_table() { return stats_table_; }
-  CompromisedCredentialsTable& compromised_credentials_table() {
-    return compromised_credentials_table_;
+  InsecureCredentialsTable& insecure_credentials_table() {
+    return insecure_credentials_table_;
   }
 
   FieldInfoTable& field_info_table() { return field_info_table_; }
@@ -339,7 +339,7 @@
   sql::MetaTable meta_table_;
   StatisticsTable stats_table_;
   FieldInfoTable field_info_table_;
-  CompromisedCredentialsTable compromised_credentials_table_;
+  InsecureCredentialsTable insecure_credentials_table_;
 
   // These cached strings are used to build SQL statements.
   std::string add_statement_;
diff --git a/components/password_manager/core/browser/mock_password_form_manager_for_ui.h b/components/password_manager/core/browser/mock_password_form_manager_for_ui.h
index cd1319a..74b5a63f 100644
--- a/components/password_manager/core/browser/mock_password_form_manager_for_ui.h
+++ b/components/password_manager/core/browser/mock_password_form_manager_for_ui.h
@@ -6,7 +6,7 @@
 #define COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_MOCK_PASSWORD_FORM_MANAGER_FOR_UI_H_
 
 #include "base/macros.h"
-#include "components/password_manager/core/browser/compromised_credentials_table.h"
+#include "components/password_manager/core/browser/insecure_credentials_table.h"
 #include "components/password_manager/core/browser/password_form_manager_for_ui.h"
 #include "components/password_manager/core/browser/statistics_table.h"
 #include "testing/gmock/include/gmock/gmock.h"
diff --git a/components/password_manager/core/browser/mock_password_store.h b/components/password_manager/core/browser/mock_password_store.h
index 41db3f95..24c20a7a 100644
--- a/components/password_manager/core/browser/mock_password_store.h
+++ b/components/password_manager/core/browser/mock_password_store.h
@@ -9,8 +9,8 @@
 #include <string>
 #include <vector>
 
-#include "components/password_manager/core/browser/compromised_credentials_table.h"
 #include "components/password_manager/core/browser/field_info_table.h"
+#include "components/password_manager/core/browser/insecure_credentials_table.h"
 #include "components/password_manager/core/browser/password_form.h"
 #include "components/password_manager/core/browser/password_store.h"
 #include "components/password_manager/core/browser/statistics_table.h"
diff --git a/components/password_manager/core/browser/multi_store_form_fetcher_unittest.cc b/components/password_manager/core/browser/multi_store_form_fetcher_unittest.cc
index 05f1419..3471435 100644
--- a/components/password_manager/core/browser/multi_store_form_fetcher_unittest.cc
+++ b/components/password_manager/core/browser/multi_store_form_fetcher_unittest.cc
@@ -441,15 +441,17 @@
 
 TEST_F(MultiStoreFormFetcherTest, CompromisedCredentials) {
   Fetch();
-  const CompromisedCredentials profile_store_compromised_credentials{
+  CompromisedCredentials profile_store_compromised_credentials(
       form_digest_.signon_realm, base::ASCIIToUTF16("profile_username"),
-      base::Time::FromTimeT(1), CompromiseType::kLeaked,
-      PasswordForm::Store::kProfileStore};
+      base::Time::FromTimeT(1), CompromiseType::kLeaked, false);
+  profile_store_compromised_credentials.in_store =
+      PasswordForm::Store::kProfileStore;
 
-  const CompromisedCredentials account_store_compromised_credentials{
+  CompromisedCredentials account_store_compromised_credentials(
       form_digest_.signon_realm, base::ASCIIToUTF16("account_username"),
-      base::Time::FromTimeT(1), CompromiseType::kLeaked,
-      PasswordForm::Store::kAccountStore};
+      base::Time::FromTimeT(1), CompromiseType::kLeaked, false);
+  account_store_compromised_credentials.in_store =
+      PasswordForm::Store::kAccountStore;
 
   static_cast<CompromisedCredentialsConsumer*>(form_fetcher_.get())
       ->OnGetCompromisedCredentials({profile_store_compromised_credentials});
diff --git a/components/password_manager/core/browser/password_store.cc b/components/password_manager/core/browser/password_store.cc
index 8084446..e3f2a96 100644
--- a/components/password_manager/core/browser/password_store.cc
+++ b/components/password_manager/core/browser/password_store.cc
@@ -30,8 +30,8 @@
 #include "components/password_manager/core/browser/android_affiliation/affiliated_match_helper.h"
 #include "components/password_manager/core/browser/compromised_credentials_consumer.h"
 #include "components/password_manager/core/browser/compromised_credentials_observer.h"
-#include "components/password_manager/core/browser/compromised_credentials_table.h"
 #include "components/password_manager/core/browser/field_info_table.h"
+#include "components/password_manager/core/browser/insecure_credentials_table.h"
 #include "components/password_manager/core/browser/password_form.h"
 #include "components/password_manager/core/browser/password_manager_metrics_util.h"
 #include "components/password_manager/core/browser/password_manager_util.h"
@@ -399,20 +399,6 @@
       std::move(callback)));
 }
 
-void PasswordStore::RemoveCompromisedCredentialsByCompromiseType(
-    const std::string& signon_realm,
-    const base::string16& username,
-    const CompromiseType& compromise_type,
-    RemoveCompromisedCredentialsReason reason) {
-  DCHECK(main_task_runner_->RunsTasksInCurrentSequence());
-  auto callback = base::BindOnce(
-      &PasswordStore::RemoveCompromisedCredentialsByCompromiseTypeImpl, this,
-      signon_realm, username, compromise_type, reason);
-  ScheduleTask(base::BindOnce(
-      &PasswordStore::InvokeAndNotifyAboutCompromisedPasswordsChange, this,
-      std::move(callback)));
-}
-
 void PasswordStore::GetAllCompromisedCredentials(
     CompromisedCredentialsConsumer* consumer) {
   DCHECK(main_task_runner_->RunsTasksInCurrentSequence());
diff --git a/components/password_manager/core/browser/password_store.h b/components/password_manager/core/browser/password_store.h
index aacd0f0..d9ad10f 100644
--- a/components/password_manager/core/browser/password_store.h
+++ b/components/password_manager/core/browser/password_store.h
@@ -23,8 +23,8 @@
 #include "base/types/strong_alias.h"
 #include "build/build_config.h"
 #include "components/keyed_service/core/refcounted_keyed_service.h"
-#include "components/password_manager/core/browser/compromised_credentials_table.h"
 #include "components/password_manager/core/browser/hash_password_manager.h"
+#include "components/password_manager/core/browser/insecure_credentials_table.h"
 #include "components/password_manager/core/browser/password_manager_metrics_util.h"
 #include "components/password_manager/core/browser/password_reuse_detector.h"
 #include "components/password_manager/core/browser/password_reuse_detector_consumer.h"
@@ -288,14 +288,6 @@
                                     const base::string16& username,
                                     RemoveCompromisedCredentialsReason reason);
 
-  // Removes information about credentials compromised on |signon_realm| for
-  // |username| and |compromise_type|.
-  void RemoveCompromisedCredentialsByCompromiseType(
-      const std::string& signon_realm,
-      const base::string16& username,
-      const CompromiseType& compromise_type,
-      RemoveCompromisedCredentialsReason reason);
-
   // Retrieves all compromised credentials and notifies |consumer| on
   // completion. The request will be cancelled if the consumer is destroyed.
   void GetAllCompromisedCredentials(CompromisedCredentialsConsumer* consumer);
@@ -567,11 +559,6 @@
       const std::string& signon_realm,
       const base::string16& username,
       RemoveCompromisedCredentialsReason reason) = 0;
-  virtual bool RemoveCompromisedCredentialsByCompromiseTypeImpl(
-      const std::string& signon_realm,
-      const base::string16& username,
-      const CompromiseType& compromised_type,
-      RemoveCompromisedCredentialsReason reason) = 0;
   virtual std::vector<CompromisedCredentials>
   GetAllCompromisedCredentialsImpl() = 0;
   virtual std::vector<CompromisedCredentials>
diff --git a/components/password_manager/core/browser/password_store_default.cc b/components/password_manager/core/browser/password_store_default.cc
index c4e8109..da9a9a9 100644
--- a/components/password_manager/core/browser/password_store_default.cc
+++ b/components/password_manager/core/browser/password_store_default.cc
@@ -228,18 +228,7 @@
     const CompromisedCredentials& credentials) {
   DCHECK(background_task_runner()->RunsTasksInCurrentSequence());
   return login_db_ &&
-         login_db_->compromised_credentials_table().AddRow(credentials);
-}
-
-bool PasswordStoreDefault::RemoveCompromisedCredentialsByCompromiseTypeImpl(
-    const std::string& signon_realm,
-    const base::string16& username,
-    const CompromiseType& compromise_type,
-    RemoveCompromisedCredentialsReason reason) {
-  DCHECK(background_task_runner()->RunsTasksInCurrentSequence());
-  return login_db_ &&
-         login_db_->compromised_credentials_table().RemoveRowByCompromiseType(
-             signon_realm, username, compromise_type, reason);
+         login_db_->insecure_credentials_table().AddRow(credentials);
 }
 
 bool PasswordStoreDefault::RemoveCompromisedCredentialsImpl(
@@ -247,7 +236,7 @@
     const base::string16& username,
     RemoveCompromisedCredentialsReason reason) {
   DCHECK(background_task_runner()->RunsTasksInCurrentSequence());
-  return login_db_ && login_db_->compromised_credentials_table().RemoveRow(
+  return login_db_ && login_db_->insecure_credentials_table().RemoveRow(
                           signon_realm, username, reason);
 }
 
@@ -255,7 +244,7 @@
 PasswordStoreDefault::GetAllCompromisedCredentialsImpl() {
   DCHECK(background_task_runner()->RunsTasksInCurrentSequence());
   std::vector<CompromisedCredentials> compromised_credentials =
-      login_db_ ? login_db_->compromised_credentials_table().GetAllRows()
+      login_db_ ? login_db_->insecure_credentials_table().GetAllRows()
                 : std::vector<CompromisedCredentials>();
   PasswordForm::Store store = IsAccountStore()
                                   ? PasswordForm::Store::kAccountStore
@@ -270,9 +259,8 @@
     const std::string& signon_realm) {
   DCHECK(background_task_runner()->RunsTasksInCurrentSequence());
   std::vector<CompromisedCredentials> compromised_credentials =
-      login_db_
-          ? login_db_->compromised_credentials_table().GetRows(signon_realm)
-          : std::vector<CompromisedCredentials>();
+      login_db_ ? login_db_->insecure_credentials_table().GetRows(signon_realm)
+                : std::vector<CompromisedCredentials>();
   PasswordForm::Store store = IsAccountStore()
                                   ? PasswordForm::Store::kAccountStore
                                   : PasswordForm::Store::kProfileStore;
@@ -287,7 +275,7 @@
     base::Time remove_end) {
   DCHECK(background_task_runner()->RunsTasksInCurrentSequence());
   return login_db_ &&
-         login_db_->compromised_credentials_table().RemoveRowsByUrlAndTime(
+         login_db_->insecure_credentials_table().RemoveRowsByUrlAndTime(
              url_filter, remove_begin, remove_end);
 }
 
diff --git a/components/password_manager/core/browser/password_store_default.h b/components/password_manager/core/browser/password_store_default.h
index 7528845..6b7d826 100644
--- a/components/password_manager/core/browser/password_store_default.h
+++ b/components/password_manager/core/browser/password_store_default.h
@@ -10,7 +10,7 @@
 #include <vector>
 
 #include "base/macros.h"
-#include "components/password_manager/core/browser/compromised_credentials_table.h"
+#include "components/password_manager/core/browser/insecure_credentials_table.h"
 #include "components/password_manager/core/browser/login_database.h"
 #include "components/password_manager/core/browser/password_store.h"
 
@@ -77,11 +77,6 @@
       const std::string& signon_realm,
       const base::string16& username,
       RemoveCompromisedCredentialsReason reason) override;
-  bool RemoveCompromisedCredentialsByCompromiseTypeImpl(
-      const std::string& signon_realm,
-      const base::string16& username,
-      const CompromiseType& compromise_type,
-      RemoveCompromisedCredentialsReason reason) override;
   std::vector<CompromisedCredentials> GetAllCompromisedCredentialsImpl()
       override;
   std::vector<CompromisedCredentials> GetMatchingCompromisedCredentialsImpl(
diff --git a/components/password_manager/core/browser/password_store_unittest.cc b/components/password_manager/core/browser/password_store_unittest.cc
index 4125f49..dab2a58 100644
--- a/components/password_manager/core/browser/password_store_unittest.cc
+++ b/components/password_manager/core/browser/password_store_unittest.cc
@@ -363,17 +363,13 @@
 // Verify that when a login is removed that the corresponding row is also
 // removed from the compromised credentials table.
 TEST_F(PasswordStoreTest, CompromisedCredentialsObserverOnRemoveLogin) {
-  base::test::ScopedFeatureList feature_list;
-  feature_list.InitAndEnableFeature(password_manager::features::kPasswordCheck);
-  CompromisedCredentials compromised_credentials = {
+  CompromisedCredentials compromised_credentials(
       kTestWebRealm1, base::ASCIIToUTF16("username_value_1"),
-      base::Time::FromTimeT(1), CompromiseType::kLeaked};
+      base::Time::FromTimeT(1), CompromiseType::kLeaked, false);
 
   scoped_refptr<PasswordStoreDefault> store = CreatePasswordStore();
   store->Init(nullptr);
 
-  store->AddCompromisedCredentials(compromised_credentials);
-
   /* clang-format off */
   static const PasswordFormData kTestCredential =
       {PasswordForm::Scheme::kHtml,
@@ -387,6 +383,7 @@
   std::unique_ptr<PasswordForm> test_form(
       FillPasswordFormWithData(kTestCredential));
   store->AddLogin(*test_form);
+  store->AddCompromisedCredentials(compromised_credentials);
   WaitForPasswordStore();
 
   MockCompromisedCredentialsConsumer consumer;
@@ -406,16 +403,12 @@
 // Verify that when a login password is updated that the corresponding row is
 // removed from the compromised credentials table.
 TEST_F(PasswordStoreTest, CompromisedCredentialsObserverOnLoginUpdated) {
-  base::test::ScopedFeatureList feature_list;
-  feature_list.InitAndEnableFeature(password_manager::features::kPasswordCheck);
-  CompromisedCredentials compromised_credentials = {
+  CompromisedCredentials compromised_credentials(
       kTestWebRealm1, base::ASCIIToUTF16("username_value_1"),
-      base::Time::FromTimeT(1), CompromiseType::kLeaked};
+      base::Time::FromTimeT(1), CompromiseType::kLeaked, false);
   scoped_refptr<PasswordStoreDefault> store = CreatePasswordStore();
   store->Init(nullptr);
 
-  store->AddCompromisedCredentials(compromised_credentials);
-
   /* clang-format off */
   PasswordFormData kTestCredential =
       {PasswordForm::Scheme::kHtml,
@@ -429,6 +422,7 @@
   std::unique_ptr<PasswordForm> test_form(
       FillPasswordFormWithData(kTestCredential));
   store->AddLogin(*test_form);
+  store->AddCompromisedCredentials(compromised_credentials);
   WaitForPasswordStore();
 
   MockCompromisedCredentialsConsumer consumer;
@@ -448,16 +442,12 @@
 // Verify that when a login password is added with the password changed that the
 // corresponding row is removed from the compromised credentials table.
 TEST_F(PasswordStoreTest, CompromisedCredentialsObserverOnLoginAdded) {
-  base::test::ScopedFeatureList feature_list;
-  feature_list.InitAndEnableFeature(password_manager::features::kPasswordCheck);
-  CompromisedCredentials compromised_credentials = {
+  CompromisedCredentials compromised_credentials(
       kTestWebRealm1, base::ASCIIToUTF16("username_value_1"),
-      base::Time::FromTimeT(1), CompromiseType::kLeaked};
+      base::Time::FromTimeT(1), CompromiseType::kLeaked, false);
   scoped_refptr<PasswordStoreDefault> store = CreatePasswordStore();
   store->Init(nullptr);
 
-  store->AddCompromisedCredentials(compromised_credentials);
-
   /* clang-format off */
   PasswordFormData kTestCredential =
       {PasswordForm::Scheme::kHtml,
@@ -471,6 +461,7 @@
   std::unique_ptr<PasswordForm> test_form(
       FillPasswordFormWithData(kTestCredential));
   store->AddLogin(*test_form);
+  store->AddCompromisedCredentials(compromised_credentials);
   WaitForPasswordStore();
 
   MockCompromisedCredentialsConsumer consumer;
@@ -489,16 +480,26 @@
 
 TEST_F(PasswordStoreTest,
        CompromisedPasswordObserverOnCompromisedCredentialAdded) {
-  base::test::ScopedFeatureList feature_list;
-  feature_list.InitAndEnableFeature(features::kPasswordCheck);
   MockDatabaseCompromisedCredentialsObserver observer;
 
-  CompromisedCredentials compromised_credentials = {
+  constexpr PasswordFormData kTestCredentials = {PasswordForm::Scheme::kHtml,
+                                                 kTestWebRealm1,
+                                                 kTestWebRealm1,
+                                                 "",
+                                                 L"",
+                                                 L"",
+                                                 L"",
+                                                 L"username_value_1",
+                                                 L"password",
+                                                 kTestLastUsageTime,
+                                                 1};
+  CompromisedCredentials compromised_credentials(
       kTestWebRealm1, base::ASCIIToUTF16("username_value_1"),
-      base::Time::FromTimeT(1), CompromiseType::kLeaked};
+      base::Time::FromTimeT(1), CompromiseType::kLeaked, false);
 
   scoped_refptr<PasswordStoreDefault> store = CreatePasswordStore();
   store->Init(nullptr);
+  store->AddLogin(*FillPasswordFormWithData(kTestCredentials));
   store->AddDatabaseCompromisedCredentialsObserver(&observer);
 
   // Expect a notification after adding a credential.
@@ -516,16 +517,27 @@
 
 TEST_F(PasswordStoreTest,
        CompromisedPasswordObserverOnCompromisedCredentialRemoved) {
-  base::test::ScopedFeatureList feature_list;
-  feature_list.InitAndEnableFeature(features::kPasswordCheck);
   MockDatabaseCompromisedCredentialsObserver observer;
 
-  CompromisedCredentials compromised_credentials = {
+  constexpr PasswordFormData kTestCredentials = {PasswordForm::Scheme::kHtml,
+                                                 kTestWebRealm1,
+                                                 kTestWebRealm1,
+                                                 "",
+                                                 L"",
+                                                 L"",
+                                                 L"",
+                                                 L"username_value_1",
+                                                 L"password",
+                                                 kTestLastUsageTime,
+                                                 1};
+
+  CompromisedCredentials compromised_credentials(
       kTestWebRealm1, base::ASCIIToUTF16("username_value_1"),
-      base::Time::FromTimeT(1), CompromiseType::kLeaked};
+      base::Time::FromTimeT(1), CompromiseType::kLeaked, false);
 
   scoped_refptr<PasswordStoreDefault> store = CreatePasswordStore();
   store->Init(nullptr);
+  store->AddLogin(*FillPasswordFormWithData(kTestCredentials));
   store->AddCompromisedCredentials(compromised_credentials);
   WaitForPasswordStore();
 
@@ -550,16 +562,26 @@
 
 TEST_F(PasswordStoreTest,
        CompromisedPasswordObserverOnCompromisedCredentialRemovedByTime) {
-  base::test::ScopedFeatureList feature_list;
-  feature_list.InitAndEnableFeature(features::kPasswordCheck);
   MockDatabaseCompromisedCredentialsObserver observer;
 
-  CompromisedCredentials compromised_credentials = {
+  CompromisedCredentials compromised_credentials(
       kTestWebRealm1, base::ASCIIToUTF16("username_value_1"),
-      base::Time::FromTimeT(1), CompromiseType::kLeaked};
+      base::Time::FromTimeT(1), CompromiseType::kLeaked, false);
+  constexpr PasswordFormData kTestCredentials = {PasswordForm::Scheme::kHtml,
+                                                 kTestWebRealm1,
+                                                 kTestWebRealm1,
+                                                 "",
+                                                 L"",
+                                                 L"",
+                                                 L"",
+                                                 L"username_value_1",
+                                                 L"password",
+                                                 kTestLastUsageTime,
+                                                 1};
 
   scoped_refptr<PasswordStoreDefault> store = CreatePasswordStore();
   store->Init(nullptr);
+  store->AddLogin(*FillPasswordFormWithData(kTestCredentials));
   store->AddCompromisedCredentials(compromised_credentials);
   WaitForPasswordStore();
 
@@ -1468,18 +1490,25 @@
 }
 
 TEST_F(PasswordStoreTest, GetAllCompromisedCredentials) {
-  base::test::ScopedFeatureList feature_list;
-  feature_list.InitAndEnableFeature(password_manager::features::kPasswordCheck);
-  CompromisedCredentials compromised_credentials = {
-      "https://example.com/", base::ASCIIToUTF16("username"),
-      base::Time::FromTimeT(1), CompromiseType::kLeaked};
-  CompromisedCredentials compromised_credentials2 = {
-      "https://2.example.com/", base::ASCIIToUTF16("username2"),
-      base::Time::FromTimeT(2), CompromiseType::kLeaked};
-
+  constexpr PasswordFormData kTestCredentials[] = {
+      {PasswordForm::Scheme::kHtml, "https://example.com/",
+       "https://example.com/", "", L"", L"", L"", L"username", L"password",
+       kTestLastUsageTime, 1},
+      {PasswordForm::Scheme::kHtml, "https://2.example.com/",
+       "https://2.example.com/", "", L"", L"", L"", L"username2", L"topsecret",
+       kTestLastUsageTime, 1}};
   scoped_refptr<PasswordStoreDefault> store = CreatePasswordStore();
   store->Init(nullptr);
 
+  for (const auto& data : kTestCredentials)
+    store->AddLogin(*FillPasswordFormWithData(data));
+  CompromisedCredentials compromised_credentials(
+      "https://example.com/", base::ASCIIToUTF16("username"),
+      base::Time::FromTimeT(1), CompromiseType::kLeaked, false);
+  CompromisedCredentials compromised_credentials2(
+      "https://2.example.com/", base::ASCIIToUTF16("username2"),
+      base::Time::FromTimeT(2), CompromiseType::kLeaked, false);
+
   store->AddCompromisedCredentials(compromised_credentials);
   store->AddCompromisedCredentials(compromised_credentials2);
   MockCompromisedCredentialsConsumer consumer;
@@ -1504,17 +1533,23 @@
 // Test GetMatchingCompromisedCredentials when affiliation service isn't
 // available.
 TEST_F(PasswordStoreTest, GetMatchingCompromisedWithoutAffiliations) {
-  base::test::ScopedFeatureList feature_list;
-  feature_list.InitAndEnableFeature(password_manager::features::kPasswordCheck);
   scoped_refptr<PasswordStoreDefault> store = CreatePasswordStore();
   store->Init(nullptr);
 
-  CompromisedCredentials credentials1 = {
+  constexpr PasswordFormData kTestCredentials[] = {
+      {PasswordForm::Scheme::kHtml, kTestWebRealm1, kTestWebRealm1, "", L"",
+       L"", L"", L"username_value", L"password", kTestLastUsageTime, 1},
+      {PasswordForm::Scheme::kHtml, kTestWebRealm2, kTestWebRealm2, "", L"",
+       L"", L"", L"username_value", L"topsecret", kTestLastUsageTime, 1}};
+  for (const auto& data : kTestCredentials)
+    store->AddLogin(*FillPasswordFormWithData(data));
+
+  CompromisedCredentials credentials1(
       kTestWebRealm1, base::ASCIIToUTF16("username_value"),
-      base::Time::FromTimeT(1), CompromiseType::kLeaked};
-  CompromisedCredentials credentials2 = {
+      base::Time::FromTimeT(1), CompromiseType::kLeaked, false);
+  CompromisedCredentials credentials2(
       kTestWebRealm2, base::ASCIIToUTF16("username_value"),
-      base::Time::FromTimeT(2), CompromiseType::kLeaked};
+      base::Time::FromTimeT(2), CompromiseType::kLeaked, false);
   for (const auto& credentials : {credentials1, credentials2})
     store->AddCompromisedCredentials(credentials);
 
@@ -1530,20 +1565,28 @@
 // Test GetMatchingCompromisedCredentials with some matching Android
 // credentials.
 TEST_F(PasswordStoreTest, GetMatchingCompromisedWithAffiliations) {
-  base::test::ScopedFeatureList feature_list;
-  feature_list.InitAndEnableFeature(password_manager::features::kPasswordCheck);
   scoped_refptr<PasswordStoreDefault> store = CreatePasswordStore();
   store->Init(nullptr);
 
-  CompromisedCredentials credentials1 = {
+  constexpr PasswordFormData kTestCredentials[] = {
+      {PasswordForm::Scheme::kHtml, kTestWebRealm1, kTestWebRealm1, "", L"",
+       L"", L"", L"username_value", L"password", kTestLastUsageTime, 1},
+      {PasswordForm::Scheme::kHtml, kTestAndroidRealm1, kTestAndroidRealm1, "",
+       L"", L"", L"", L"username_value_1", L"topsecret", kTestLastUsageTime, 1},
+      {PasswordForm::Scheme::kHtml, kTestWebRealm2, kTestWebRealm2, "", L"",
+       L"", L"", L"username_value_2", L"topsecret2", kTestLastUsageTime, 1}};
+  for (const auto& data : kTestCredentials)
+    store->AddLogin(*FillPasswordFormWithData(data));
+
+  CompromisedCredentials credentials1(
       kTestWebRealm1, base::ASCIIToUTF16("username_value"),
-      base::Time::FromTimeT(1), CompromiseType::kLeaked};
-  CompromisedCredentials credentials2 = {
+      base::Time::FromTimeT(1), CompromiseType::kLeaked, false);
+  CompromisedCredentials credentials2(
       kTestAndroidRealm1, base::ASCIIToUTF16("username_value_1"),
-      base::Time::FromTimeT(2), CompromiseType::kPhished};
-  CompromisedCredentials credentials3 = {
+      base::Time::FromTimeT(2), CompromiseType::kPhished, false);
+  CompromisedCredentials credentials3(
       kTestWebRealm2, base::ASCIIToUTF16("username_value_2"),
-      base::Time::FromTimeT(3), CompromiseType::kLeaked};
+      base::Time::FromTimeT(3), CompromiseType::kLeaked, false);
   for (const auto& credentials : {credentials1, credentials2, credentials3})
     store->AddCompromisedCredentials(credentials);
 
@@ -1564,94 +1607,31 @@
   store->ShutdownOnUIThread();
 }
 
-TEST_F(PasswordStoreTest, RemovePhishedCredentialsByCompromiseType) {
-  base::test::ScopedFeatureList feature_list;
-  feature_list.InitAndEnableFeature(password_manager::features::kPasswordCheck);
-  CompromisedCredentials leaked_credentials = {
-      "https://example.com/", base::ASCIIToUTF16("username"),
-      base::Time::FromTimeT(100), CompromiseType::kLeaked};
-  CompromisedCredentials phished_credentials = {
-      "https://example.com/", base::ASCIIToUTF16("username"),
-      base::Time::FromTimeT(200), CompromiseType::kPhished};
-
-  scoped_refptr<PasswordStoreDefault> store = CreatePasswordStore();
-  store->Init(nullptr);
-
-  store->AddCompromisedCredentials(leaked_credentials);
-  store->AddCompromisedCredentials(phished_credentials);
-
-  MockCompromisedCredentialsConsumer consumer;
-  EXPECT_CALL(consumer, OnGetCompromisedCredentials(UnorderedElementsAre(
-                            leaked_credentials, phished_credentials)));
-  store->GetAllCompromisedCredentials(&consumer);
-  WaitForPasswordStore();
-  testing::Mock::VerifyAndClearExpectations(&consumer);
-
-  store->RemoveCompromisedCredentialsByCompromiseType(
-      "https://example.com/", base::ASCIIToUTF16("username"),
-      CompromiseType::kPhished,
-      RemoveCompromisedCredentialsReason::kMarkSiteAsLegitimate);
-  WaitForPasswordStore();
-
-  EXPECT_CALL(consumer,
-              OnGetCompromisedCredentials(ElementsAre(leaked_credentials)));
-  store->GetAllCompromisedCredentials(&consumer);
-  WaitForPasswordStore();
-
-  store->ShutdownOnUIThread();
-}
-
-TEST_F(PasswordStoreTest, RemoveLeakedCredentialsByCompromiseType) {
-  base::test::ScopedFeatureList feature_list;
-  feature_list.InitAndEnableFeature(password_manager::features::kPasswordCheck);
-  CompromisedCredentials leaked_credentials = {
-      "https://example.com/", base::ASCIIToUTF16("username"),
-      base::Time::FromTimeT(100), CompromiseType::kLeaked};
-  CompromisedCredentials phished_credentials = {
-      "https://example.com/", base::ASCIIToUTF16("username"),
-      base::Time::FromTimeT(200), CompromiseType::kPhished};
-
-  scoped_refptr<PasswordStoreDefault> store = CreatePasswordStore();
-  store->Init(nullptr);
-
-  store->AddCompromisedCredentials(leaked_credentials);
-  store->AddCompromisedCredentials(phished_credentials);
-
-  MockCompromisedCredentialsConsumer consumer;
-  EXPECT_CALL(consumer, OnGetCompromisedCredentials(UnorderedElementsAre(
-                            leaked_credentials, phished_credentials)));
-  store->GetAllCompromisedCredentials(&consumer);
-  WaitForPasswordStore();
-  testing::Mock::VerifyAndClearExpectations(&consumer);
-
-  store->RemoveCompromisedCredentialsByCompromiseType(
-      "https://example.com/", base::ASCIIToUTF16("username"),
-      CompromiseType::kLeaked,
-      RemoveCompromisedCredentialsReason::kMarkSiteAsLegitimate);
-
-  EXPECT_CALL(consumer,
-              OnGetCompromisedCredentials(ElementsAre(phished_credentials)));
-  store->GetAllCompromisedCredentials(&consumer);
-  WaitForPasswordStore();
-
-  store->ShutdownOnUIThread();
-}
-
 TEST_F(PasswordStoreTest, RemoveCompromisedCredentialsCreatedBetween) {
-  base::test::ScopedFeatureList feature_list;
-  feature_list.InitAndEnableFeature(password_manager::features::kPasswordCheck);
-  CompromisedCredentials compromised_credentials1 = {
+  CompromisedCredentials compromised_credentials1(
       "https://example1.com/", base::ASCIIToUTF16("username1"),
-      base::Time::FromTimeT(100), CompromiseType::kLeaked};
-  CompromisedCredentials compromised_credentials2 = {
+      base::Time::FromTimeT(100), CompromiseType::kLeaked, false);
+  CompromisedCredentials compromised_credentials2(
       "https://2.example.com/", base::ASCIIToUTF16("username2"),
-      base::Time::FromTimeT(200), CompromiseType::kLeaked};
-  CompromisedCredentials compromised_credentials3 = {
+      base::Time::FromTimeT(200), CompromiseType::kLeaked, false);
+  CompromisedCredentials compromised_credentials3(
       "https://example3.com/", base::ASCIIToUTF16("username3"),
-      base::Time::FromTimeT(300), CompromiseType::kLeaked};
+      base::Time::FromTimeT(300), CompromiseType::kLeaked, false);
 
   scoped_refptr<PasswordStoreDefault> store = CreatePasswordStore();
   store->Init(nullptr);
+  constexpr PasswordFormData kTestCredentials[] = {
+      {PasswordForm::Scheme::kHtml, "https://example1.com/",
+       "https://example1.com/", "", L"", L"", L"", L"username1", L"password",
+       kTestLastUsageTime, 1},
+      {PasswordForm::Scheme::kHtml, "https://2.example.com/",
+       "https://2.example.com/", "", L"", L"", L"", L"username2", L"topsecret",
+       kTestLastUsageTime, 1},
+      {PasswordForm::Scheme::kHtml, "https://example3.com/",
+       "https://example3.com/", "", L"", L"", L"", L"username3", L"topsecret2",
+       kTestLastUsageTime, 1}};
+  for (const auto& data : kTestCredentials)
+    store->AddLogin(*FillPasswordFormWithData(data));
 
   store->AddCompromisedCredentials(compromised_credentials1);
   store->AddCompromisedCredentials(compromised_credentials2);
@@ -1686,15 +1666,12 @@
 // Test that updating a password in the store deletes the corresponding
 // compromised record synchronously.
 TEST_F(PasswordStoreTest, RemoveCompromisedCredentialsSyncOnUpdate) {
-  base::test::ScopedFeatureList feature_list;
-  feature_list.InitAndEnableFeature(password_manager::features::kPasswordCheck);
-
   scoped_refptr<PasswordStoreDefault> store = CreatePasswordStore();
   store->Init(nullptr);
 
-  CompromisedCredentials compromised_credentials = {
+  CompromisedCredentials compromised_credentials(
       kTestWebRealm1, base::ASCIIToUTF16("username1"),
-      base::Time::FromTimeT(100), CompromiseType::kLeaked};
+      base::Time::FromTimeT(100), CompromiseType::kLeaked, false);
   constexpr PasswordFormData kTestCredential = {PasswordForm::Scheme::kHtml,
                                                 kTestWebRealm1,
                                                 kTestWebOrigin1,
@@ -1707,8 +1684,8 @@
                                                 10,
                                                 5};
   std::unique_ptr<PasswordForm> form(FillPasswordFormWithData(kTestCredential));
-  store->AddCompromisedCredentials(compromised_credentials);
   store->AddLogin(*form);
+  store->AddCompromisedCredentials(compromised_credentials);
   WaitForPasswordStore();
 
   // Update the password value and immediately get the compromised passwords.
@@ -1725,15 +1702,12 @@
 // Test that deleting a password in the store deletes the corresponding
 // compromised record synchronously.
 TEST_F(PasswordStoreTest, RemoveCompromisedCredentialsSyncOnDelete) {
-  base::test::ScopedFeatureList feature_list;
-  feature_list.InitAndEnableFeature(password_manager::features::kPasswordCheck);
-
   scoped_refptr<PasswordStoreDefault> store = CreatePasswordStore();
   store->Init(nullptr);
 
-  CompromisedCredentials compromised_credentials = {
+  CompromisedCredentials compromised_credentials(
       kTestWebRealm1, base::ASCIIToUTF16("username1"),
-      base::Time::FromTimeT(100), CompromiseType::kLeaked};
+      base::Time::FromTimeT(100), CompromiseType::kLeaked, false);
   constexpr PasswordFormData kTestCredential = {PasswordForm::Scheme::kHtml,
                                                 kTestWebRealm1,
                                                 kTestWebOrigin1,
@@ -1746,8 +1720,8 @@
                                                 10,
                                                 5};
   std::unique_ptr<PasswordForm> form(FillPasswordFormWithData(kTestCredential));
-  store->AddCompromisedCredentials(compromised_credentials);
   store->AddLogin(*form);
+  store->AddCompromisedCredentials(compromised_credentials);
   WaitForPasswordStore();
 
   // Delete the password and immediately get the compromised passwords.
diff --git a/components/password_manager/core/browser/sql_table_builder.cc b/components/password_manager/core/browser/sql_table_builder.cc
index 5cb70db0..4980b68 100644
--- a/components/password_manager/core/browser/sql_table_builder.cc
+++ b/components/password_manager/core/browser/sql_table_builder.cc
@@ -58,7 +58,8 @@
     DCHECK(!is_primary_key);
     suffix += " REFERENCES ";
     suffix += parent_table;
-    suffix += " ON UPDATE CASCADE ON DELETE CASCADE";
+    suffix +=
+        " ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED";
   }
   return suffix;
 }
@@ -456,7 +457,6 @@
             : base::StringPrintf(
                   "CREATE TABLE %s (%s, %s)", temp_table_name.c_str(),
                   names_of_all_columns.c_str(), constraints.c_str());
-
     sql::Transaction transaction(db);
     if (!(transaction.Begin() && db->Execute(create_table_statement.c_str()) &&
           db->Execute(base::StringPrintf(
diff --git a/components/password_manager/core/browser/test_password_store.cc b/components/password_manager/core/browser/test_password_store.cc
index c9c2a4f..3c6dd521 100644
--- a/components/password_manager/core/browser/test_password_store.cc
+++ b/components/password_manager/core/browser/test_password_store.cc
@@ -12,7 +12,7 @@
 #include "base/notreached.h"
 #include "base/stl_util.h"
 #include "base/threading/sequenced_task_runner_handle.h"
-#include "components/password_manager/core/browser/compromised_credentials_table.h"
+#include "components/password_manager/core/browser/insecure_credentials_table.h"
 #include "components/password_manager/core/browser/login_database.h"
 #include "components/password_manager/core/browser/password_form.h"
 #include "components/password_manager/core/browser/psl_matching_helper.h"
@@ -352,20 +352,6 @@
   return old_size != compromised_credentials_.size();
 }
 
-bool TestPasswordStore::RemoveCompromisedCredentialsByCompromiseTypeImpl(
-    const std::string& signon_realm,
-    const base::string16& username,
-    const CompromiseType& compromise_type,
-    RemoveCompromisedCredentialsReason reason) {
-  const size_t old_size = compromised_credentials_.size();
-  base::EraseIf(compromised_credentials_, [&](const auto& credential) {
-    return credential.signon_realm == signon_realm &&
-           credential.username == username &&
-           credential.compromise_type == compromise_type;
-  });
-  return old_size != compromised_credentials_.size();
-}
-
 std::vector<CompromisedCredentials>
 TestPasswordStore::GetAllCompromisedCredentialsImpl() {
   return std::vector<CompromisedCredentials>(compromised_credentials_.begin(),
diff --git a/components/password_manager/core/browser/test_password_store.h b/components/password_manager/core/browser/test_password_store.h
index 112c37d..e795ca3 100644
--- a/components/password_manager/core/browser/test_password_store.h
+++ b/components/password_manager/core/browser/test_password_store.h
@@ -15,7 +15,7 @@
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/sequenced_task_runner.h"
-#include "components/password_manager/core/browser/compromised_credentials_table.h"
+#include "components/password_manager/core/browser/insecure_credentials_table.h"
 #include "components/password_manager/core/browser/password_store.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
@@ -118,11 +118,6 @@
   std::vector<InteractionsStats> GetAllSiteStatsImpl() override;
   bool AddCompromisedCredentialsImpl(
       const CompromisedCredentials& compromised_credentials) override;
-  bool RemoveCompromisedCredentialsByCompromiseTypeImpl(
-      const std::string& signon_realm,
-      const base::string16& username,
-      const CompromiseType& compromise_type,
-      RemoveCompromisedCredentialsReason reason) override;
   bool RemoveCompromisedCredentialsImpl(
       const std::string& signon_realm,
       const base::string16& username,
diff --git a/components/password_manager/core/browser/ui/insecure_credentials_manager.cc b/components/password_manager/core/browser/ui/insecure_credentials_manager.cc
index 131f87b..2ec0103e 100644
--- a/components/password_manager/core/browser/ui/insecure_credentials_manager.cc
+++ b/components/password_manager/core/browser/ui/insecure_credentials_manager.cc
@@ -17,7 +17,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/task/post_task.h"
 #include "build/build_config.h"
-#include "components/password_manager/core/browser/compromised_credentials_table.h"
+#include "components/password_manager/core/browser/insecure_credentials_table.h"
 #include "components/password_manager/core/browser/password_form.h"
 #include "components/password_manager/core/browser/password_list_sorter.h"
 #include "components/password_manager/core/browser/ui/credential_utils.h"
@@ -67,6 +67,10 @@
       return InsecureCredentialTypeFlags::kCredentialLeaked;
     case CompromiseType::kPhished:
       return InsecureCredentialTypeFlags::kCredentialPhished;
+    case CompromiseType::kWeak:
+      return InsecureCredentialTypeFlags::kWeakCredential;
+    case CompromiseType::kReused:
+      return InsecureCredentialTypeFlags::kReusedCredential;
   }
   NOTREACHED();
 }
@@ -261,12 +265,9 @@
         CanonicalizeUsername(saved_password.username_value) ==
             canonicalized_username) {
       GetStoreFor(saved_password)
-          .AddCompromisedCredentials({
-              .signon_realm = saved_password.signon_realm,
-              .username = saved_password.username_value,
-              .create_time = base::Time::Now(),
-              .compromise_type = CompromiseType::kLeaked,
-          });
+          .AddCompromisedCredentials(CompromisedCredentials(
+              saved_password.signon_realm, saved_password.username_value,
+              base::Time::Now(), CompromiseType::kLeaked, false));
     }
   }
 }
diff --git a/components/password_manager/core/browser/ui/insecure_credentials_manager.h b/components/password_manager/core/browser/ui/insecure_credentials_manager.h
index f1e21e5..c390e49 100644
--- a/components/password_manager/core/browser/ui/insecure_credentials_manager.h
+++ b/components/password_manager/core/browser/ui/insecure_credentials_manager.h
@@ -19,7 +19,7 @@
 #include "base/timer/elapsed_timer.h"
 #include "base/types/strong_alias.h"
 #include "components/password_manager/core/browser/compromised_credentials_consumer.h"
-#include "components/password_manager/core/browser/compromised_credentials_table.h"
+#include "components/password_manager/core/browser/insecure_credentials_table.h"
 #include "components/password_manager/core/browser/leak_detection/bulk_leak_check.h"
 #include "components/password_manager/core/browser/password_store.h"
 #include "components/password_manager/core/browser/ui/compromised_credentials_reader.h"
@@ -39,6 +39,8 @@
   kCredentialPhished = 1 << 1,
   // If the credential has a weak password.
   kWeakCredential = 1 << 2,
+  // If the credentials has the same password as another credentials.
+  kReusedCredential = 1 << 3,
 };
 
 constexpr InsecureCredentialTypeFlags operator&(
diff --git a/components/password_manager/core/browser/ui/insecure_credentials_manager_unittest.cc b/components/password_manager/core/browser/ui/insecure_credentials_manager_unittest.cc
index 9ef6d5b..63ff837 100644
--- a/components/password_manager/core/browser/ui/insecure_credentials_manager_unittest.cc
+++ b/components/password_manager/core/browser/ui/insecure_credentials_manager_unittest.cc
@@ -12,7 +12,7 @@
 #include "base/test/task_environment.h"
 #include "base/timer/elapsed_timer.h"
 #include "build/build_config.h"
-#include "components/password_manager/core/browser/compromised_credentials_table.h"
+#include "components/password_manager/core/browser/insecure_credentials_table.h"
 #include "components/password_manager/core/browser/password_form.h"
 #include "components/password_manager/core/browser/test_password_store.h"
 #include "components/password_manager/core/browser/ui/saved_passwords_presenter.h"
@@ -58,12 +58,12 @@
     ::testing::StrictMock<MockInsecureCredentialsManagerObserver>;
 
 CompromisedCredentials MakeCompromised(
-    base::StringPiece signon_realm,
+    std::string signon_realm,
     base::StringPiece username,
     CompromiseType type = CompromiseType::kLeaked) {
-  return {.signon_realm = std::string(signon_realm),
-          .username = base::ASCIIToUTF16(username),
-          .compromise_type = type};
+  return CompromisedCredentials(std::move(signon_realm),
+                                base::ASCIIToUTF16(username), base::Time(),
+                                type, false);
 }
 
 PasswordForm MakeSavedPassword(base::StringPiece signon_realm,
@@ -220,41 +220,6 @@
   EXPECT_THAT(store().compromised_credentials(), ElementsAreArray(credentials));
 }
 
-// Tests removing a compromised credentials by compromise type triggers an
-// observer works as expected.
-TEST_F(InsecureCredentialsManagerTest,
-       NotifyObserversAboutRemovingCompromisedCredentialsByCompromisedType) {
-  CompromisedCredentials phished_credentials =
-      MakeCompromised(kExampleCom, kUsername1, CompromiseType::kPhished);
-  CompromisedCredentials leaked_credentials =
-      MakeCompromised(kExampleCom, kUsername1, CompromiseType::kLeaked);
-
-  StrictMockInsecureCredentialsManagerObserver observer;
-  provider().AddObserver(&observer);
-  EXPECT_CALL(observer, OnCompromisedCredentialsChanged);
-  store().AddCompromisedCredentials(phished_credentials);
-  RunUntilIdle();
-  EXPECT_CALL(observer, OnCompromisedCredentialsChanged);
-  store().AddCompromisedCredentials(leaked_credentials);
-  RunUntilIdle();
-
-  EXPECT_CALL(observer, OnCompromisedCredentialsChanged).Times(1);
-  store().RemoveCompromisedCredentialsByCompromiseType(
-      phished_credentials.signon_realm, phished_credentials.username,
-      CompromiseType::kPhished, RemoveCompromisedCredentialsReason::kRemove);
-  RunUntilIdle();
-  EXPECT_THAT(store().compromised_credentials(),
-              ElementsAre(leaked_credentials));
-
-  EXPECT_CALL(observer, OnCompromisedCredentialsChanged).Times(1);
-  store().RemoveCompromisedCredentialsByCompromiseType(
-      leaked_credentials.signon_realm, leaked_credentials.username,
-      CompromiseType::kLeaked, RemoveCompromisedCredentialsReason::kRemove);
-  RunUntilIdle();
-  EXPECT_THAT(store().compromised_credentials(), IsEmpty());
-  provider().RemoveObserver(&observer);
-}
-
 // Tests whether adding and removing an observer works as expected.
 TEST_F(InsecureCredentialsManagerTest,
        NotifyObserversAboutSavedPasswordsChanges) {
diff --git a/components/password_manager/core/browser/ui/post_save_compromised_helper.h b/components/password_manager/core/browser/ui/post_save_compromised_helper.h
index fbce347..3d0d224a 100644
--- a/components/password_manager/core/browser/ui/post_save_compromised_helper.h
+++ b/components/password_manager/core/browser/ui/post_save_compromised_helper.h
@@ -10,7 +10,7 @@
 #include "base/optional.h"
 #include "base/strings/string16.h"
 #include "base/time/time.h"
-#include "components/password_manager/core/browser/compromised_credentials_table.h"
+#include "components/password_manager/core/browser/insecure_credentials_table.h"
 #include "components/password_manager/core/browser/ui/compromised_credentials_reader.h"
 
 class PrefService;
diff --git a/components/password_manager/core/browser/ui/post_save_compromised_helper_unittest.cc b/components/password_manager/core/browser/ui/post_save_compromised_helper_unittest.cc
index 79d4b73..48103ac 100644
--- a/components/password_manager/core/browser/ui/post_save_compromised_helper_unittest.cc
+++ b/components/password_manager/core/browser/ui/post_save_compromised_helper_unittest.cc
@@ -29,12 +29,11 @@
 CompromisedCredentials CreateCompromised(
     base::StringPiece username,
     PasswordForm::Store store = PasswordForm::Store::kProfileStore) {
-  return CompromisedCredentials{
-      .signon_realm = kSignonRealm,
-      .username = base::ASCIIToUTF16(username),
-      .compromise_type = CompromiseType::kLeaked,
-      .in_store = store,
-  };
+  CompromisedCredentials compromised(kSignonRealm, base::ASCIIToUTF16(username),
+                                     base::Time(), CompromiseType::kLeaked,
+                                     false);
+  compromised.in_store = store;
+  return compromised;
 }
 
 }  // namespace
diff --git a/components/performance_manager/features.cc b/components/performance_manager/features.cc
index 8c757442..747889e 100644
--- a/components/performance_manager/features.cc
+++ b/components/performance_manager/features.cc
@@ -47,7 +47,7 @@
 }
 
 const base::Feature kServiceWorkerRelationshipsInGraph{
-    "ServiceWorkerRelationshipsInGraph", base::FEATURE_ENABLED_BY_DEFAULT};
+    "ServiceWorkerRelationshipsInGraph", base::FEATURE_DISABLED_BY_DEFAULT};
 
 }  // namespace features
 }  // namespace performance_manager
diff --git a/components/performance_manager/mechanisms/tab_loading_frame_navigation_scheduler.cc b/components/performance_manager/mechanisms/tab_loading_frame_navigation_scheduler.cc
index 5a631a4..deb1335 100644
--- a/components/performance_manager/mechanisms/tab_loading_frame_navigation_scheduler.cc
+++ b/components/performance_manager/mechanisms/tab_loading_frame_navigation_scheduler.cc
@@ -5,6 +5,7 @@
 #include "components/performance_manager/public/mechanisms/tab_loading_frame_navigation_scheduler.h"
 
 #include "base/no_destructor.h"
+#include "base/trace_event/trace_event.h"
 #include "components/performance_manager/public/graph/policies/tab_loading_frame_navigation_policy.h"
 #include "components/performance_manager/public/performance_manager.h"
 #include "components/performance_manager/public/performance_manager_main_thread_mechanism.h"
@@ -97,11 +98,16 @@
   Throttle(content::NavigationHandle* handle,
            TabLoadingFrameNavigationScheduler* scheduler)
       : content::NavigationThrottle(handle), scheduler_(scheduler) {
+    TRACE_EVENT_NESTABLE_ASYNC_BEGIN1(
+        "navigation", "TabLoadingFrameNavigationScheduler::Throttle", this,
+        "url", handle->GetURL().spec());
     DCHECK(scheduler);
   }
   ~Throttle() override {
     if (scheduler_)
       scheduler_->NotifyThrottleDestroyed(this);
+    TRACE_EVENT_NESTABLE_ASYNC_END0(
+        "navigation", "TabLoadingFrameNavigationScheduler::Throttle", this);
   }
 
   // content::NavigationThrottle implementation
diff --git a/components/policy/core/common/cloud/cloud_policy_client.cc b/components/policy/core/common/cloud/cloud_policy_client.cc
index 1129796..5c457de 100644
--- a/components/policy/core/common/cloud/cloud_policy_client.cc
+++ b/components/policy/core/common/cloud/cloud_policy_client.cc
@@ -228,7 +228,7 @@
 void CloudPolicyClient::RegisterWithCertificate(
     const RegistrationParameters& parameters,
     const std::string& client_id,
-    std::unique_ptr<DMAuth> auth,
+    DMAuth auth,
     const std::string& pem_certificate_chain,
     const std::string& sub_organization) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
@@ -288,7 +288,7 @@
 }
 
 void CloudPolicyClient::OnRegisterWithCertificateRequestSigned(
-    std::unique_ptr<DMAuth> auth,
+    DMAuth auth,
     bool success,
     em::SignedData signed_data) {
   if (!success) {
@@ -434,14 +434,14 @@
 }
 
 void CloudPolicyClient::FetchRobotAuthCodes(
-    std::unique_ptr<DMAuth> auth,
+    DMAuth auth,
     enterprise_management::DeviceServiceApiAccessRequest::DeviceType
         device_type,
     const std::set<std::string>& oauth_scopes,
     RobotAuthCodeCallback callback) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   CHECK(is_registered());
-  DCHECK(auth->has_dm_token());
+  DCHECK(auth.has_dm_token());
 
   std::unique_ptr<DMServerJobConfiguration> config =
       std::make_unique<DMServerJobConfiguration>(
@@ -718,18 +718,18 @@
 }
 
 void CloudPolicyClient::GetDeviceAttributeUpdatePermission(
-    std::unique_ptr<DMAuth> auth,
+    DMAuth auth,
     CloudPolicyClient::StatusCallback callback) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   CHECK(is_registered());
   // This request only works with an OAuth token identifying a user, because
   // DMServer will resolve that user and check if they have permissions to
   // update the device's attributes.
-  DCHECK(auth->has_oauth_token());
+  DCHECK(auth.has_oauth_token());
 
-  const bool has_oauth_token = auth->has_oauth_token();
+  const bool has_oauth_token = auth.has_oauth_token();
   const std::string oauth_token =
-      has_oauth_token ? auth->oauth_token() : std::string();
+      has_oauth_token ? auth.oauth_token() : std::string();
   std::unique_ptr<DMServerJobConfiguration> config =
       std::make_unique<DMServerJobConfiguration>(
           DeviceManagementService::JobConfiguration::
@@ -747,17 +747,17 @@
 }
 
 void CloudPolicyClient::UpdateDeviceAttributes(
-    std::unique_ptr<DMAuth> auth,
+    DMAuth auth,
     const std::string& asset_id,
     const std::string& location,
     CloudPolicyClient::StatusCallback callback) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   CHECK(is_registered());
-  DCHECK(auth->has_oauth_token() || auth->has_enrollment_token());
+  DCHECK(auth.has_oauth_token() || auth.has_enrollment_token());
 
-  const bool has_oauth_token = auth->has_oauth_token();
+  const bool has_oauth_token = auth.has_oauth_token();
   const std::string oauth_token =
-      has_oauth_token ? auth->oauth_token() : std::string();
+      has_oauth_token ? auth.oauth_token() : std::string();
   std::unique_ptr<DMServerJobConfiguration> config =
       std::make_unique<DMServerJobConfiguration>(
           DeviceManagementService::JobConfiguration::TYPE_ATTRIBUTE_UPDATE,
diff --git a/components/policy/core/common/cloud/cloud_policy_client.h b/components/policy/core/common/cloud/cloud_policy_client.h
index 5c8ac380..5d2dca8 100644
--- a/components/policy/core/common/cloud/cloud_policy_client.h
+++ b/components/policy/core/common/cloud/cloud_policy_client.h
@@ -24,6 +24,7 @@
 #include "components/policy/core/common/cloud/cloud_policy_constants.h"
 #include "components/policy/core/common/cloud/cloud_policy_validator.h"
 #include "components/policy/core/common/cloud/device_management_service.h"
+#include "components/policy/core/common/cloud/dm_auth.h"
 #include "components/policy/core/common/remote_commands/remote_command_job.h"
 #include "components/policy/policy_export.h"
 #include "components/policy/proto/device_management_backend.pb.h"
@@ -40,7 +41,6 @@
 namespace policy {
 
 class SigningService;
-class DMAuth;
 class DMServerJobConfiguration;
 
 // Implements the core logic required to talk to the device management service.
@@ -203,7 +203,7 @@
   // error notification.
   virtual void RegisterWithCertificate(const RegistrationParameters& parameters,
                                        const std::string& client_id,
-                                       std::unique_ptr<DMAuth> auth,
+                                       DMAuth auth,
                                        const std::string& pem_certificate_chain,
                                        const std::string& sub_organization);
 
@@ -255,7 +255,7 @@
   // the type of the robot account associated with this request.
   // The |callback| will be called when the operation completes.
   virtual void FetchRobotAuthCodes(
-      std::unique_ptr<DMAuth> auth,
+      DMAuth auth,
       enterprise_management::DeviceServiceApiAccessRequest::DeviceType
           device_type,
       const std::set<std::string>& oauth_scopes,
@@ -367,13 +367,12 @@
   // |auth| to identify user who requests a permission to name a device, calls
   // a |callback| from the enrollment screen to indicate whether the device
   // naming prompt should be shown.
-  void GetDeviceAttributeUpdatePermission(std::unique_ptr<DMAuth> auth,
-                                          StatusCallback callback);
+  void GetDeviceAttributeUpdatePermission(DMAuth auth, StatusCallback callback);
 
   // Sends a device naming information (Asset Id and Location) to the
   // device management server, uses |auth| to identify user who names a device,
   // the |callback| will be called when the operation completes.
-  void UpdateDeviceAttributes(std::unique_ptr<DMAuth> auth,
+  void UpdateDeviceAttributes(DMAuth auth,
                               const std::string& asset_id,
                               const std::string& location,
                               StatusCallback callback);
@@ -595,7 +594,7 @@
 
   // Callback for siganture of requests.
   void OnRegisterWithCertificateRequestSigned(
-      std::unique_ptr<DMAuth> auth,
+      DMAuth auth,
       bool success,
       enterprise_management::SignedData signed_data);
 
diff --git a/components/policy/core/common/cloud/device_management_service.cc b/components/policy/core/common/cloud/device_management_service.cc
index 3d65506..73816704 100644
--- a/components/policy/core/common/cloud/device_management_service.cc
+++ b/components/policy/core/common/cloud/device_management_service.cc
@@ -15,7 +15,6 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/threading/thread_task_runner_handle.h"
-#include "components/policy/core/common/cloud/dm_auth.h"
 #include "net/base/escape.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
@@ -204,15 +203,14 @@
 
 JobConfigurationBase::JobConfigurationBase(
     JobType type,
-    std::unique_ptr<DMAuth> auth_data,
+    DMAuth auth_data,
     base::Optional<std::string> oauth_token,
     scoped_refptr<network::SharedURLLoaderFactory> factory)
     : type_(type),
       factory_(factory),
       auth_data_(std::move(auth_data)),
       oauth_token_(std::move(oauth_token)) {
-  CHECK(auth_data_ || oauth_token_);
-  CHECK(!auth_data_->has_oauth_token()) << "Use |oauth_token| instead";
+  CHECK(!auth_data_.has_oauth_token()) << "Use |oauth_token| instead";
 
   if (oauth_token_)
     AddParameter(dm_protocol::kParamOAuthToken, *oauth_token_);
@@ -297,24 +295,22 @@
   rr->trusted_params->disable_secure_dns = true;
 
   // If auth data is specified, use it to build the request.
-  if (auth_data_) {
-    if (auth_data_->has_gaia_token()) {
-      rr->headers.SetHeader(
-          dm_protocol::kAuthHeader,
-          std::string(dm_protocol::kServiceTokenAuthHeaderPrefix) +
-              auth_data_->gaia_token());
-    }
-    if (auth_data_->has_dm_token()) {
-      rr->headers.SetHeader(dm_protocol::kAuthHeader,
-                            std::string(dm_protocol::kDMTokenAuthHeaderPrefix) +
-                                auth_data_->dm_token());
-    }
-    if (auth_data_->has_enrollment_token()) {
-      rr->headers.SetHeader(
-          dm_protocol::kAuthHeader,
-          std::string(dm_protocol::kEnrollmentTokenAuthHeaderPrefix) +
-              auth_data_->enrollment_token());
-    }
+  if (auth_data_.has_gaia_token()) {
+    rr->headers.SetHeader(
+        dm_protocol::kAuthHeader,
+        std::string(dm_protocol::kServiceTokenAuthHeaderPrefix) +
+            auth_data_.gaia_token());
+  }
+  if (auth_data_.has_dm_token()) {
+    rr->headers.SetHeader(dm_protocol::kAuthHeader,
+                          std::string(dm_protocol::kDMTokenAuthHeaderPrefix) +
+                              auth_data_.dm_token());
+  }
+  if (auth_data_.has_enrollment_token()) {
+    rr->headers.SetHeader(
+        dm_protocol::kAuthHeader,
+        std::string(dm_protocol::kEnrollmentTokenAuthHeaderPrefix) +
+            auth_data_.enrollment_token());
   }
 
   return rr;
diff --git a/components/policy/core/common/cloud/device_management_service.h b/components/policy/core/common/cloud/device_management_service.h
index 37cf002..8b392d0 100644
--- a/components/policy/core/common/cloud/device_management_service.h
+++ b/components/policy/core/common/cloud/device_management_service.h
@@ -24,6 +24,7 @@
 #include "base/strings/string_split.h"
 #include "base/threading/thread_checker.h"
 #include "components/policy/core/common/cloud/cloud_policy_constants.h"
+#include "components/policy/core/common/cloud/dm_auth.h"
 #include "components/policy/policy_export.h"
 #include "components/policy/proto/device_management_backend.pb.h"
 #include "services/network/public/cpp/simple_url_loader.h"
@@ -42,8 +43,6 @@
 
 namespace policy {
 
-class DMAuth;
-
 // Used in the Enterprise.DMServerRequestSuccess histogram, shows how many
 // retries we had to do to execute the DeviceManagementRequestJob.
 enum class DMServerRequestSuccess {
@@ -375,7 +374,7 @@
     : public DeviceManagementService::JobConfiguration {
  protected:
   JobConfigurationBase(JobType type,
-                       std::unique_ptr<DMAuth> auth_data,
+                       DMAuth auth_data,
                        base::Optional<std::string> oauth_token,
                        scoped_refptr<network::SharedURLLoaderFactory> factory);
   ~JobConfigurationBase() override;
@@ -384,7 +383,7 @@
   // already exists its value is replaced.
   void AddParameter(const std::string& name, const std::string& value);
 
-  const DMAuth& GetAuth() { return *auth_data_.get(); }
+  const DMAuth& GetAuth() { return auth_data_; }
 
   // DeviceManagementService::JobConfiguration.
   JobType GetType() override;
@@ -407,7 +406,7 @@
 
   // Auth data that will be passed as 'Authorization' header. Both |auth_data_|
   // and |oauth_token_| can be specified for one request.
-  std::unique_ptr<DMAuth> auth_data_;
+  DMAuth auth_data_;
 
   // OAuth token that will be passed as a query parameter. Both |auth_data_|
   // and |oauth_token_| can be specified for one request.
diff --git a/components/policy/core/common/cloud/device_management_service_unittest.cc b/components/policy/core/common/cloud/device_management_service_unittest.cc
index 5b3aac4..763a9e32 100644
--- a/components/policy/core/common/cloud/device_management_service_unittest.cc
+++ b/components/policy/core/common/cloud/device_management_service_unittest.cc
@@ -114,7 +114,7 @@
   std::unique_ptr<DeviceManagementService::Job> StartJob(
       DeviceManagementService::JobConfiguration::JobType type,
       bool critical,
-      std::unique_ptr<DMAuth> auth_data,
+      DMAuth auth_data,
       base::Optional<std::string> oauth_token,
       const std::string& payload = std::string(),
       DeviceManagementService::Job::RetryMethod method =
@@ -1044,7 +1044,7 @@
   ~DeviceManagementRequestAuthTest() override = default;
 
   std::unique_ptr<DeviceManagementService::Job> StartJobWithAuthData(
-      std::unique_ptr<DMAuth> auth,
+      DMAuth auth,
       base::Optional<std::string> oauth_token) {
     EXPECT_CALL(*this, OnJobDone(_, DM_STATUS_SUCCESS, _, _));
     EXPECT_CALL(*this, OnJobRetry(_, _)).Times(0);
@@ -1052,7 +1052,7 @@
     // Job type is not really relevant for the test.
     std::unique_ptr<DeviceManagementService::Job> job =
         StartJob(DeviceManagementService::JobConfiguration::TYPE_POLICY_FETCH,
-                 /*critical=*/false, auth ? std::move(auth) : DMAuth::NoAuth(),
+                 /*critical=*/false, std::move(auth),
                  oauth_token ? *oauth_token : base::Optional<std::string>());
     return job;
   }
@@ -1079,7 +1079,7 @@
 
 TEST_F(DeviceManagementRequestAuthTest, OnlyOAuthToken) {
   std::unique_ptr<DeviceManagementService::Job> request_job(
-      StartJobWithAuthData(nullptr /* auth */, kOAuthToken));
+      StartJobWithAuthData(DMAuth::NoAuth(), kOAuthToken));
   EXPECT_CALL(*this, OnShouldJobRetry(200, std::string()));
 
   const network::TestURLLoaderFactory::PendingRequest* request =
diff --git a/components/policy/core/common/cloud/dm_auth.cc b/components/policy/core/common/cloud/dm_auth.cc
index 03fa291..ae2d6b8f 100644
--- a/components/policy/core/common/cloud/dm_auth.cc
+++ b/components/policy/core/common/cloud/dm_auth.cc
@@ -11,44 +11,47 @@
 DMAuth::DMAuth() = default;
 DMAuth::~DMAuth() = default;
 
+DMAuth::DMAuth(DMAuth&& other) = default;
+DMAuth& DMAuth::operator=(DMAuth&& other) = default;
+
 // static
-std::unique_ptr<DMAuth> DMAuth::FromDMToken(const std::string& dm_token) {
-  return base::WrapUnique(new DMAuth(dm_token, DMAuthTokenType::kDm));
+DMAuth DMAuth::FromDMToken(const std::string& dm_token) {
+  return DMAuth(dm_token, DMAuthTokenType::kDm);
 }
 
 // static
-std::unique_ptr<DMAuth> DMAuth::FromGaiaToken(const std::string& gaia_token) {
-  return base::WrapUnique(new DMAuth(gaia_token, DMAuthTokenType::kGaia));
+DMAuth DMAuth::FromGaiaToken(const std::string& gaia_token) {
+  return DMAuth(gaia_token, DMAuthTokenType::kGaia);
 }
 
 // static
-std::unique_ptr<DMAuth> DMAuth::FromOAuthToken(const std::string& oauth_token) {
-  return base::WrapUnique(new DMAuth(oauth_token, DMAuthTokenType::kOauth));
+DMAuth DMAuth::FromOAuthToken(const std::string& oauth_token) {
+  return DMAuth(oauth_token, DMAuthTokenType::kOauth);
 }
 
 // static
-std::unique_ptr<DMAuth> DMAuth::FromEnrollmentToken(
-    const std::string& enrollment_token) {
-  return base::WrapUnique(
-      new DMAuth(enrollment_token, DMAuthTokenType::kEnrollment));
+DMAuth DMAuth::FromEnrollmentToken(const std::string& enrollment_token) {
+  return DMAuth(enrollment_token, DMAuthTokenType::kEnrollment);
 }
 
 // static
-std::unique_ptr<DMAuth> DMAuth::NoAuth() {
-  return std::make_unique<DMAuth>();
+DMAuth DMAuth::NoAuth() {
+  return {};
 }
 
 DMAuth::DMAuth(const std::string& token, DMAuthTokenType token_type)
     : token_(token), token_type_(token_type) {}
 
-std::unique_ptr<DMAuth> DMAuth::Clone() const {
-  std::unique_ptr<DMAuth> result = std::make_unique<DMAuth>();
-  *result = *this;
-  return result;
+bool DMAuth::operator==(const DMAuth& other) const {
+  return token_ == other.token_ && token_type_ == other.token_type_;
 }
 
-bool DMAuth::Equals(const DMAuth& other) const {
-  return token_ == other.token_ && token_type_ == other.token_type_;
+bool DMAuth::operator!=(const DMAuth& other) const {
+  return !(*this == other);
+}
+
+DMAuth DMAuth::Clone() const {
+  return DMAuth(token_, token_type_);
 }
 
 }  // namespace policy
diff --git a/components/policy/core/common/cloud/dm_auth.h b/components/policy/core/common/cloud/dm_auth.h
index 3dcf446..ed84286 100644
--- a/components/policy/core/common/cloud/dm_auth.h
+++ b/components/policy/core/common/cloud/dm_auth.h
@@ -36,21 +36,29 @@
 class POLICY_EXPORT DMAuth {
  public:
   // Static methods for creating DMAuth instances:
-  static std::unique_ptr<DMAuth> FromDMToken(const std::string& dm_token);
-  static std::unique_ptr<DMAuth> FromGaiaToken(const std::string& gaia_token);
-  static std::unique_ptr<DMAuth> FromOAuthToken(const std::string& oauth_token);
-  static std::unique_ptr<DMAuth> FromEnrollmentToken(const std::string& token);
-  static std::unique_ptr<DMAuth> NoAuth();
+  static DMAuth FromDMToken(const std::string& dm_token);
+  static DMAuth FromGaiaToken(const std::string& gaia_token);
+  static DMAuth FromOAuthToken(const std::string& oauth_token);
+  static DMAuth FromEnrollmentToken(const std::string& token);
+  static DMAuth NoAuth();
 
   DMAuth();
   ~DMAuth();
 
+  DMAuth(const DMAuth& other) = delete;
+  DMAuth& operator=(const DMAuth& other) = delete;
+
+  DMAuth(DMAuth&& other);
+  DMAuth& operator=(DMAuth&& other);
+
+  bool operator==(const DMAuth& other) const;
+  bool operator!=(const DMAuth& other) const;
+
   // Creates a copy of DMAuth.
-  std::unique_ptr<DMAuth> Clone() const;
+  DMAuth Clone() const;
 
   // Checks if no authentication is provided.
   bool empty() const { return token_type_ == DMAuthTokenType::kNoAuth; }
-  bool Equals(const DMAuth& other) const;
 
   std::string gaia_token() const {
     DCHECK_EQ(DMAuthTokenType::kGaia, token_type_);
@@ -80,12 +88,9 @@
 
  private:
   DMAuth(const std::string& token, DMAuthTokenType token_type);
-  DMAuth& operator=(const DMAuth&) = default;
 
   std::string token_;
   DMAuthTokenType token_type_ = DMAuthTokenType::kNoAuth;
-
-  DISALLOW_COPY(DMAuth);
 };
 
 }  // namespace policy
diff --git a/components/policy/core/common/cloud/dmserver_job_configurations.cc b/components/policy/core/common/cloud/dmserver_job_configurations.cc
index 038a6bc9..f38b502 100644
--- a/components/policy/core/common/cloud/dmserver_job_configurations.cc
+++ b/components/policy/core/common/cloud/dmserver_job_configurations.cc
@@ -8,7 +8,6 @@
 #include "base/strings/stringprintf.h"
 #include "components/policy/core/common/cloud/cloud_policy_client.h"
 #include "components/policy/core/common/cloud/cloud_policy_constants.h"
-#include "components/policy/core/common/cloud/dm_auth.h"
 #include "net/base/url_util.h"
 #include "services/network/public/cpp/shared_url_loader_factory.h"
 
@@ -101,7 +100,7 @@
     JobType type,
     const std::string& client_id,
     bool critical,
-    std::unique_ptr<DMAuth> auth_data,
+    DMAuth auth_data,
     base::Optional<std::string> oauth_token,
     scoped_refptr<network::SharedURLLoaderFactory> factory,
     Callback callback)
@@ -126,7 +125,7 @@
     JobType type,
     CloudPolicyClient* client,
     bool critical,
-    std::unique_ptr<DMAuth> auth_data,
+    DMAuth auth_data,
     base::Optional<std::string> oauth_token,
     Callback callback)
     : DMServerJobConfiguration(client->service(),
@@ -282,7 +281,7 @@
 RegistrationJobConfiguration::RegistrationJobConfiguration(
     JobType type,
     CloudPolicyClient* client,
-    std::unique_ptr<DMAuth> auth_data,
+    DMAuth auth_data,
     base::Optional<std::string> oauth_token,
     Callback callback)
     : DMServerJobConfiguration(type,
diff --git a/components/policy/core/common/cloud/dmserver_job_configurations.h b/components/policy/core/common/cloud/dmserver_job_configurations.h
index 4c286d93..f6b5055 100644
--- a/components/policy/core/common/cloud/dmserver_job_configurations.h
+++ b/components/policy/core/common/cloud/dmserver_job_configurations.h
@@ -13,6 +13,7 @@
 #include "base/memory/scoped_refptr.h"
 #include "base/optional.h"
 #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"
 
@@ -23,7 +24,6 @@
 namespace policy {
 
 class CloudPolicyClient;
-class DMAuth;
 
 // A configuration for sending enterprise_management::DeviceManagementRequest to
 // the DM server.
@@ -41,7 +41,7 @@
       JobType type,
       const std::string& cliend_id,
       bool critical,
-      std::unique_ptr<DMAuth> auth_data,
+      DMAuth auth_data,
       base::Optional<std::string> oauth_token,
       scoped_refptr<network::SharedURLLoaderFactory> factory,
       Callback callback);
@@ -51,7 +51,7 @@
   DMServerJobConfiguration(JobType type,
                            CloudPolicyClient* client,
                            bool critical,
-                           std::unique_ptr<DMAuth> auth_data,
+                           DMAuth auth_data,
                            base::Optional<std::string> oauth_token,
                            Callback callback);
 
@@ -97,7 +97,7 @@
  public:
   RegistrationJobConfiguration(JobType type,
                                CloudPolicyClient* client,
-                               std::unique_ptr<DMAuth> auth_data,
+                               DMAuth auth_data,
                                base::Optional<std::string> oauth_token,
                                Callback callback);
 
diff --git a/components/policy/core/common/cloud/mock_device_management_service.cc b/components/policy/core/common/cloud/mock_device_management_service.cc
index cf74229..2f3dcd0 100644
--- a/components/policy/core/common/cloud/mock_device_management_service.cc
+++ b/components/policy/core/common/cloud/mock_device_management_service.cc
@@ -242,7 +242,7 @@
     JobType type,
     const std::string& client_id,
     bool critical,
-    std::unique_ptr<DMAuth> auth_data,
+    DMAuth auth_data,
     base::Optional<std::string> oauth_token,
     scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
     FakeCallback callback,
diff --git a/components/policy/core/common/cloud/mock_device_management_service.h b/components/policy/core/common/cloud/mock_device_management_service.h
index 694eabf..d0a0563 100644
--- a/components/policy/core/common/cloud/mock_device_management_service.h
+++ b/components/policy/core/common/cloud/mock_device_management_service.h
@@ -175,7 +175,7 @@
       JobType type,
       const std::string& client_id,
       bool critical,
-      std::unique_ptr<DMAuth> auth_data,
+      DMAuth auth_data,
       base::Optional<std::string> oauth_token,
       scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
       FakeCallback callback,
diff --git a/components/privacy_sandbox/BUILD.gn b/components/privacy_sandbox/BUILD.gn
new file mode 100644
index 0000000..524bfb6
--- /dev/null
+++ b/components/privacy_sandbox/BUILD.gn
@@ -0,0 +1,17 @@
+# Copyright 2020 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+static_library("privacy_sandbox_prefs") {
+  sources = [
+    "privacy_sandbox_prefs.cc",
+    "privacy_sandbox_prefs.h",
+  ]
+
+  deps = [
+    "//components/pref_registry:pref_registry",
+    "//components/prefs",
+  ]
+
+  public_deps = [ "//base" ]
+}
diff --git a/components/privacy_sandbox/DEPS b/components/privacy_sandbox/DEPS
new file mode 100644
index 0000000..4876dc70
--- /dev/null
+++ b/components/privacy_sandbox/DEPS
@@ -0,0 +1,4 @@
+include_rules = [
+  "+components/pref_registry",
+  "+components/prefs",
+]
diff --git a/components/privacy_sandbox/DIR_METADATA b/components/privacy_sandbox/DIR_METADATA
new file mode 100644
index 0000000..669e5c9
--- /dev/null
+++ b/components/privacy_sandbox/DIR_METADATA
@@ -0,0 +1,5 @@
+monorail {
+  component: "UI>Settings>Privacy"
+}
+
+team_email: "chrome-friendly-settings@google.com"
diff --git a/components/privacy_sandbox/OWNERS b/components/privacy_sandbox/OWNERS
new file mode 100644
index 0000000..4ef0333e
--- /dev/null
+++ b/components/privacy_sandbox/OWNERS
@@ -0,0 +1,4 @@
+andzaytsev@google.com
+harrisonsean@chromium.org
+msramek@chromium.org
+sauski@google.com
diff --git a/components/privacy_sandbox/README.md b/components/privacy_sandbox/README.md
new file mode 100644
index 0000000..afd1797
--- /dev/null
+++ b/components/privacy_sandbox/README.md
@@ -0,0 +1,3 @@
+# Privacy Sandbox
+
+This component contains code common to desktop, Android, and embedders for the settings to control privacy sandbox (at chrome://settings/privacy_sandbox), as well as its usage.
diff --git a/chrome/browser/privacy_sandbox/privacy_sandbox_prefs.cc b/components/privacy_sandbox/privacy_sandbox_prefs.cc
similarity index 73%
rename from chrome/browser/privacy_sandbox/privacy_sandbox_prefs.cc
rename to components/privacy_sandbox/privacy_sandbox_prefs.cc
index 6837be8..5629bf8d 100644
--- a/chrome/browser/privacy_sandbox/privacy_sandbox_prefs.cc
+++ b/components/privacy_sandbox/privacy_sandbox_prefs.cc
@@ -2,9 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/privacy_sandbox/privacy_sandbox_prefs.h"
+#include "components/privacy_sandbox/privacy_sandbox_prefs.h"
 
-#include "chrome/common/pref_names.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/pref_service.h"
@@ -16,7 +15,8 @@
 const char kPrivacySandboxManuallyControlled[] =
     "privacy_sandbox.manually_controlled";
 
-const char kPrivacySandboxUiAvailable[] = "privacy_sandbox.ui_available";
+const char kPrivacySandboxPreferencesReconciled[] =
+    "privacy_sandbox.preferences_reconciled";
 
 }  // namespace prefs
 
@@ -24,12 +24,13 @@
 
 void RegisterProfilePrefs(PrefRegistrySimple* registry) {
   registry->RegisterBooleanPref(
-      prefs::kPrivacySandboxApisEnabled, false,
+      prefs::kPrivacySandboxApisEnabled, true,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
   registry->RegisterBooleanPref(
       prefs::kPrivacySandboxManuallyControlled, false,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
-  registry->RegisterBooleanPref(prefs::kPrivacySandboxUiAvailable, false);
+  registry->RegisterBooleanPref(prefs::kPrivacySandboxPreferencesReconciled,
+                                false);
 }
 
 }  // namespace privacy_sandbox
diff --git a/chrome/browser/privacy_sandbox/privacy_sandbox_prefs.h b/components/privacy_sandbox/privacy_sandbox_prefs.h
similarity index 68%
rename from chrome/browser/privacy_sandbox/privacy_sandbox_prefs.h
rename to components/privacy_sandbox/privacy_sandbox_prefs.h
index fc60498..f5e937e 100644
--- a/chrome/browser/privacy_sandbox/privacy_sandbox_prefs.h
+++ b/components/privacy_sandbox/privacy_sandbox_prefs.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_PRIVACY_SANDBOX_PRIVACY_SANDBOX_PREFS_H_
-#define CHROME_BROWSER_PRIVACY_SANDBOX_PRIVACY_SANDBOX_PREFS_H_
+#ifndef COMPONENTS_PRIVACY_SANDBOX_PRIVACY_SANDBOX_PREFS_H_
+#define COMPONENTS_PRIVACY_SANDBOX_PRIVACY_SANDBOX_PREFS_H_
 
 class PrefRegistrySimple;
 
@@ -19,9 +19,10 @@
 // associated with the PrivacySandboxSettings feature.
 extern const char kPrivacySandboxManuallyControlled[];
 
-// Boolean to indicate whether or not the UI for Privacy Sandbox settings has
-// been made available on the device.
-extern const char kPrivacySandboxUiAvailable[];
+// Boolean to indicate whether or not the preferecnes have been reconciled for
+// this device. This occurs for each device once when privacy sandbox is first
+// enabled.
+extern const char kPrivacySandboxPreferencesReconciled[];
 
 }  // namespace prefs
 
@@ -32,4 +33,4 @@
 
 }  // namespace privacy_sandbox
 
-#endif  // CHROME_BROWSER_PRIVACY_SANDBOX_PRIVACY_SANDBOX_PREFS_H_
+#endif  // COMPONENTS_PRIVACY_SANDBOX_PRIVACY_SANDBOX_PREFS_H_
diff --git a/components/profile_metrics/browser_profile_type.h b/components/profile_metrics/browser_profile_type.h
index bde7ef7c..fbd8275 100644
--- a/components/profile_metrics/browser_profile_type.h
+++ b/components/profile_metrics/browser_profile_type.h
@@ -15,7 +15,8 @@
   kGuest = 2,
   kSystem = 3,
   kOtherOffTheRecordProfile = 4,
-  kMaxValue = kOtherOffTheRecordProfile,
+  kEphemeralGuest = 5,
+  kMaxValue = kEphemeralGuest,
 };
 
 }  // namespace profile_metrics
diff --git a/components/sync/model/sync_data.cc b/components/sync/model/sync_data.cc
index 5c856c1..a13a908 100644
--- a/components/sync/model/sync_data.cc
+++ b/components/sync/model/sync_data.cc
@@ -102,8 +102,6 @@
 }
 
 const std::string& SyncData::GetTitle() const {
-  // TODO(zea): set this for data coming from the syncer too.
-  DCHECK(immutable_entity_.Get().has_non_unique_name());
   return immutable_entity_.Get().non_unique_name();
 }
 
diff --git a/components/sync/model/sync_data_unittest.cc b/components/sync/model/sync_data_unittest.cc
index d1672a3..39b85e1 100644
--- a/components/sync/model/sync_data_unittest.cc
+++ b/components/sync/model/sync_data_unittest.cc
@@ -54,6 +54,7 @@
   EXPECT_EQ(kDatatype, data.GetDataType());
   EXPECT_EQ(kNonUniqueTitle, data.GetTitle());
   EXPECT_TRUE(data.GetSpecifics().has_preference());
+  EXPECT_FALSE(data.ToString().empty());
 }
 
 TEST_F(SyncDataTest, CreateRemoteData) {
@@ -65,6 +66,7 @@
   EXPECT_EQ(ClientTagHash::FromUnhashed(PREFERENCES, kSyncTag),
             data.GetClientTagHash());
   EXPECT_TRUE(data.GetSpecifics().has_preference());
+  EXPECT_FALSE(data.ToString().empty());
 }
 
 }  // namespace
diff --git a/components/sync/model_impl/syncable_service_based_bridge.cc b/components/sync/model_impl/syncable_service_based_bridge.cc
index f4bb3b8..63da29e 100644
--- a/components/sync/model_impl/syncable_service_based_bridge.cc
+++ b/components/sync/model_impl/syncable_service_based_bridge.cc
@@ -42,7 +42,7 @@
   return entity_data;
 }
 
-sync_pb::PersistedEntityData CreatePersistedFromEntityData(
+sync_pb::PersistedEntityData CreatePersistedFromRemoteData(
     const EntityData& entity_data) {
   sync_pb::PersistedEntityData persisted;
   persisted.set_name(entity_data.name);
@@ -50,10 +50,12 @@
   return persisted;
 }
 
-sync_pb::PersistedEntityData CreatePersistedFromSyncData(
+sync_pb::PersistedEntityData CreatePersistedFromLocalData(
     const SyncData& sync_data) {
   DCHECK(sync_data.IsLocal());
+  DCHECK(sync_data.IsValid());
   DCHECK(!sync_data.GetTitle().empty());
+
   sync_pb::PersistedEntityData persisted;
   persisted.set_name(sync_data.GetTitle());
   *persisted.mutable_specifics() = sync_data.GetSpecifics();
@@ -149,7 +151,7 @@
 
           (*in_memory_store_)[storage_key] = change.sync_data().GetSpecifics();
           sync_pb::PersistedEntityData persisted_entity =
-              CreatePersistedFromSyncData(change.sync_data());
+              CreatePersistedFromLocalData(change.sync_data());
           batch->WriteData(storage_key, persisted_entity.SerializeAsString());
 
           other_->Put(storage_key,
@@ -564,7 +566,7 @@
 
         batch->WriteData(
             storage_key,
-            CreatePersistedFromEntityData(change->data()).SerializeAsString());
+            CreatePersistedFromRemoteData(change->data()).SerializeAsString());
         in_memory_store_[storage_key] = change->data().specifics;
         break;
       }
diff --git a/components/sync/nigori/nigori_model_type_processor.cc b/components/sync/nigori/nigori_model_type_processor.cc
index c0a85bb..e90d56f 100644
--- a/components/sync/nigori/nigori_model_type_processor.cc
+++ b/components/sync/nigori/nigori_model_type_processor.cc
@@ -111,13 +111,6 @@
   bridge_->ApplySyncChanges(/*data=*/base::nullopt);
 }
 
-void NigoriModelTypeProcessor::OnCommitFailed(SyncCommitError commit_error) {
-  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-  DCHECK(entity_);
-
-  entity_->ClearTransientSyncState();
-}
-
 void NigoriModelTypeProcessor::OnUpdateReceived(
     const sync_pb::ModelTypeState& type_state,
     UpdateResponseDataList updates) {
diff --git a/components/sync/nigori/nigori_model_type_processor.h b/components/sync/nigori/nigori_model_type_processor.h
index f123ba75..2ac6a38 100644
--- a/components/sync/nigori/nigori_model_type_processor.h
+++ b/components/sync/nigori/nigori_model_type_processor.h
@@ -37,7 +37,6 @@
       const sync_pb::ModelTypeState& type_state,
       const CommitResponseDataList& committed_response_list,
       const FailedCommitResponseDataList& error_response_list) override;
-  void OnCommitFailed(SyncCommitError commit_error) override;
   void OnUpdateReceived(const sync_pb::ModelTypeState& type_state,
                         UpdateResponseDataList updates) override;
 
diff --git a/components/sync/nigori/nigori_model_type_processor_unittest.cc b/components/sync/nigori/nigori_model_type_processor_unittest.cc
index 1fc08c45..7e388fa2b 100644
--- a/components/sync/nigori/nigori_model_type_processor_unittest.cc
+++ b/components/sync/nigori/nigori_model_type_processor_unittest.cc
@@ -25,11 +25,9 @@
 namespace {
 
 using testing::_;
-using testing::ByMove;
 using testing::Eq;
 using testing::Ne;
 using testing::NotNull;
-using testing::Return;
 
 // TODO(mamir): remove those and adjust the code accordingly.
 const char kRawNigoriClientTagHash[] = "NigoriClientTagHash";
@@ -56,29 +54,22 @@
   return model_type_state;
 }
 
-std::unique_ptr<EntityData> CreateDummyNigoriEntityData() {
-  auto entity_data = std::make_unique<EntityData>();
-  // Set empty nigori specifics.
-  entity_data->specifics.mutable_nigori();
-  entity_data->name = kNigoriNonUniqueName;
-  entity_data->is_folder = true;
-  return entity_data;
-}
-
 // Creates a dummy Nigori UpdateResponseData that has the keystore decryptor
 // token key name set.
 syncer::UpdateResponseData CreateDummyNigoriUpdateResponseData(
     const std::string keystore_decryptor_token_key_name,
     int response_version) {
-  std::unique_ptr<EntityData> entity_data = CreateDummyNigoriEntityData();
-  entity_data->id = kNigoriServerId;
+  syncer::EntityData entity_data;
+  entity_data.is_folder = true;
+  entity_data.id = kNigoriServerId;
   sync_pb::NigoriSpecifics* nigori_specifics =
-      entity_data->specifics.mutable_nigori();
+      entity_data.specifics.mutable_nigori();
   nigori_specifics->mutable_keystore_decryptor_token()->set_key_name(
       keystore_decryptor_token_key_name);
+  entity_data.name = kNigoriNonUniqueName;
 
   syncer::UpdateResponseData response_data;
-  response_data.entity = std::move(*entity_data);
+  response_data.entity = std::move(entity_data);
   response_data.response_version = response_version;
   return response_data;
 }
@@ -211,7 +202,12 @@
       processor()->GetMetadata().entity_metadata;
   ASSERT_TRUE(entity_metadata1);
 
-  processor()->Put(CreateDummyNigoriEntityData());
+  auto entity_data = std::make_unique<syncer::EntityData>();
+  entity_data->specifics.mutable_nigori();
+  entity_data->name = kNigoriNonUniqueName;
+  entity_data->is_folder = true;
+
+  processor()->Put(std::move(entity_data));
 
   base::Optional<sync_pb::EntityMetadata> entity_metadata2 =
       processor()->GetMetadata().entity_metadata;
@@ -233,7 +229,12 @@
 TEST_F(NigoriModelTypeProcessorTest, ShouldGetLocalChangesWhenPut) {
   SimulateModelReadyToSync(/*initial_sync_done=*/true);
 
-  processor()->Put(CreateDummyNigoriEntityData());
+  auto entity_data = std::make_unique<syncer::EntityData>();
+  entity_data->specifics.mutable_nigori();
+  entity_data->name = kNigoriNonUniqueName;
+  entity_data->is_folder = true;
+
+  processor()->Put(std::move(entity_data));
   CommitRequestDataList commit_request;
   processor()->GetLocalChanges(
       /*max_entries=*/10,
@@ -246,7 +247,12 @@
        ShouldSquashCommitRequestUponCommitCompleted) {
   SimulateModelReadyToSync(/*initial_sync_done=*/true);
 
-  processor()->Put(CreateDummyNigoriEntityData());
+  auto entity_data = std::make_unique<syncer::EntityData>();
+  entity_data->specifics.mutable_nigori();
+  entity_data->name = kNigoriNonUniqueName;
+  entity_data->is_folder = true;
+
+  processor()->Put(std::move(entity_data));
   CommitRequestDataList commit_request_list;
   processor()->GetLocalChanges(
       /*max_entries=*/10,
@@ -278,7 +284,12 @@
        ShouldNotSquashCommitRequestUponEmptyCommitResponse) {
   SimulateModelReadyToSync(/*initial_sync_done=*/true);
 
-  processor()->Put(CreateDummyNigoriEntityData());
+  auto entity_data = std::make_unique<syncer::EntityData>();
+  entity_data->specifics.mutable_nigori();
+  entity_data->name = kNigoriNonUniqueName;
+  entity_data->is_folder = true;
+
+  processor()->Put(std::move(entity_data));
   CommitRequestDataList commit_request_list;
   processor()->GetLocalChanges(
       /*max_entries=*/10,
@@ -294,8 +305,13 @@
 
   // Data has been moved into the previous request, so the processor will ask
   // for the commit data once more.
-  EXPECT_CALL(*mock_nigori_sync_bridge(), GetData)
-      .WillOnce(Return(ByMove(CreateDummyNigoriEntityData())));
+  ON_CALL(*mock_nigori_sync_bridge(), GetData()).WillByDefault([&]() {
+    auto entity_data = std::make_unique<syncer::EntityData>();
+    entity_data->specifics.mutable_nigori();
+    entity_data->name = kNigoriNonUniqueName;
+    entity_data->is_folder = true;
+    return entity_data;
+  });
 
   // The commit should still be pending.
   CommitResponseDataList commit_response_list;
@@ -309,10 +325,12 @@
        ShouldKeepAnotherCommitRequestUponCommitCompleted) {
   SimulateModelReadyToSync(/*initial_sync_done=*/true);
 
-  std::unique_ptr<EntityData> entity_data = CreateDummyNigoriEntityData();
+  auto entity_data = std::make_unique<syncer::EntityData>();
   sync_pb::NigoriSpecifics* nigori_specifics =
       entity_data->specifics.mutable_nigori();
   nigori_specifics->set_encrypt_bookmarks(true);
+  entity_data->name = kNigoriNonUniqueName;
+  entity_data->is_folder = true;
 
   processor()->Put(std::move(entity_data));
   CommitRequestDataList commit_request_list;
@@ -329,8 +347,10 @@
                                    1));
 
   // Make another local change before the commit response is received.
-  entity_data = CreateDummyNigoriEntityData();
+  entity_data = std::make_unique<syncer::EntityData>();
   nigori_specifics = entity_data->specifics.mutable_nigori();
+  entity_data->name = kNigoriNonUniqueName;
+  entity_data->is_folder = true;
   nigori_specifics->set_encrypt_preferences(true);
   processor()->Put(std::move(entity_data));
 
@@ -349,44 +369,16 @@
   EXPECT_EQ(1U, commit_request_list.size());
 }
 
-TEST_F(NigoriModelTypeProcessorTest, ShouldRetryCommitAfterCommitFailed) {
-  SimulateModelReadyToSync(/*initial_sync_done=*/true);
-
-  std::unique_ptr<EntityData> entity_data = CreateDummyNigoriEntityData();
-  entity_data->specifics.mutable_nigori()->set_encrypt_everything(true);
-
-  processor()->Put(std::move(entity_data));
-  CommitRequestDataList commit_request_list;
-  processor()->GetLocalChanges(
-      /*max_entries=*/10,
-      base::BindOnce(&CaptureCommitRequest, &commit_request_list));
-  ASSERT_EQ(1U, commit_request_list.size());
-
-  // Next call for local changes should return nothing.
-  commit_request_list.clear();
-  processor()->GetLocalChanges(
-      /*max_entries=*/10,
-      base::BindOnce(&CaptureCommitRequest, &commit_request_list));
-  ASSERT_EQ(0U, commit_request_list.size());
-
-  processor()->OnCommitFailed(SyncCommitError::kBadServerResponse);
-
-  // Data has been moved into the previous request, so the processor will ask
-  // for the commit data once more.
-  EXPECT_CALL(*mock_nigori_sync_bridge(), GetData)
-      .WillOnce(Return(ByMove(CreateDummyNigoriEntityData())));
-
-  processor()->GetLocalChanges(
-      /*max_entries=*/10,
-      base::BindOnce(&CaptureCommitRequest, &commit_request_list));
-  EXPECT_EQ(1U, commit_request_list.size());
-}
-
 TEST_F(NigoriModelTypeProcessorTest,
        ShouldNudgeForCommitUponConnectSyncIfReadyToSyncAndLocalChanges) {
   SimulateModelReadyToSync(/*initial_sync_done=*/true);
 
-  processor()->Put(CreateDummyNigoriEntityData());
+  auto entity_data = std::make_unique<syncer::EntityData>();
+  entity_data->specifics.mutable_nigori();
+  entity_data->name = kNigoriNonUniqueName;
+  entity_data->is_folder = true;
+
+  processor()->Put(std::move(entity_data));
 
   EXPECT_CALL(*mock_commit_queue(), NudgeForCommit());
   SimulateConnectSync();
@@ -396,8 +388,13 @@
   SimulateModelReadyToSync(/*initial_sync_done=*/true);
   SimulateConnectSync();
 
+  auto entity_data = std::make_unique<syncer::EntityData>();
+  entity_data->specifics.mutable_nigori();
+  entity_data->name = kNigoriNonUniqueName;
+  entity_data->is_folder = true;
+
   EXPECT_CALL(*mock_commit_queue(), NudgeForCommit());
-  processor()->Put(CreateDummyNigoriEntityData());
+  processor()->Put(std::move(entity_data));
 }
 
 TEST_F(NigoriModelTypeProcessorTest, ShouldInvokeSyncStartCallback) {
diff --git a/components/test/data/password_manager/login_db_v28.sql b/components/test/data/password_manager/login_db_v28.sql
index 97bada66..2301d577 100644
--- a/components/test/data/password_manager/login_db_v28.sql
+++ b/components/test/data/password_manager/login_db_v28.sql
@@ -120,4 +120,19 @@
   id INTEGER PRIMARY KEY AUTOINCREMENT,
   metadata VARCHAR NOT NULL
 );
+CREATE TABLE compromised_credentials (
+  url VARCHAR NOT NULL,
+  username VARCHAR NOT NULL,
+  create_time INTEGER NOT NULL,
+  compromise_type INTEGER NOT NULL,
+  UNIQUE (url, username, compromise_type));
+CREATE INDEX compromised_credentials_index ON compromised_credentials (url,
+  username, compromise_type);
+INSERT INTO "compromised_credentials"
+ (url,username,create_time,compromise_type) VALUES(
+'http://example.com', /* url */
+'user', /* username */
+13047423600000000, /* create_time */
+0 /* compromise_type */
+);
 COMMIT;
diff --git a/components/test/data/password_manager/login_db_v29.sql b/components/test/data/password_manager/login_db_v29.sql
new file mode 100644
index 0000000..4d310ce
--- /dev/null
+++ b/components/test/data/password_manager/login_db_v29.sql
@@ -0,0 +1,144 @@
+BEGIN TRANSACTION;
+CREATE TABLE meta(key LONGVARCHAR NOT NULL UNIQUE PRIMARY KEY, value LONGVARCHAR);
+INSERT INTO "meta" VALUES('last_compatible_version','29');
+INSERT INTO "meta" VALUES('version','29');
+CREATE TABLE logins (
+origin_url VARCHAR NOT NULL,
+action_url VARCHAR,
+username_element VARCHAR,
+username_value VARCHAR,
+password_element VARCHAR,
+password_value BLOB,
+submit_element VARCHAR,
+signon_realm VARCHAR NOT NULL,
+date_created INTEGER NOT NULL,
+blacklisted_by_user INTEGER NOT NULL,
+scheme INTEGER NOT NULL,
+password_type INTEGER,
+times_used INTEGER,
+form_data BLOB,
+date_synced INTEGER,
+display_name VARCHAR,
+icon_url VARCHAR,
+federation_url VARCHAR,
+skip_zero_click INTEGER,
+generation_upload_status INTEGER,
+possible_username_pairs BLOB,
+id INTEGER PRIMARY KEY AUTOINCREMENT,
+date_last_used INTEGER,
+moving_blocked_for BLOB,
+UNIQUE (origin_url, username_element, username_value, password_element, signon_realm));
+INSERT INTO "logins" (origin_url,action_url,username_element,username_value,password_element,password_value,submit_element,signon_realm,date_created,blacklisted_by_user,scheme,password_type,times_used,form_data,date_synced,display_name,icon_url,federation_url,skip_zero_click,generation_upload_status,possible_username_pairs,date_last_used,moving_blocked_for) VALUES(
+'https://accounts.google.com/ServiceLogin', /* origin_url */
+'https://accounts.google.com/ServiceLoginAuth', /* action_url */
+'Email', /* username_element */
+'theerikchen', /* username_value */
+'Passwd', /* password_element */
+X'', /* password_value */
+'', /* submit_element */
+'https://accounts.google.com/', /* signon_realm */
+13047429345000000, /* date_created */
+0, /* blacklisted_by_user */
+0, /* scheme */
+0, /* password_type */
+1, /* times_used */
+X'18000000020000000000000000000000000000000000000000000000', /* form_data */
+0, /* date_synced */
+'', /* display_name */
+'', /* icon_url */
+'', /* federation_url */
+1,  /* skip_zero_click */
+0,  /* generation_upload_status */
+X'00000000', /* possible_username_pairs */
+0, /* date_last_used */
+X'' /* moving_blocked_for */
+);
+INSERT INTO "logins" (origin_url,action_url,username_element,username_value,password_element,password_value,submit_element,signon_realm,date_created,blacklisted_by_user,scheme,password_type,times_used,form_data,date_synced,display_name,icon_url,federation_url,skip_zero_click,generation_upload_status,possible_username_pairs,date_last_used,moving_blocked_for) VALUES(
+'https://accounts.google.com/ServiceLogin', /* origin_url */
+'https://accounts.google.com/ServiceLoginAuth', /* action_url */
+'Email', /* username_element */
+'theerikchen2', /* username_value */
+'Passwd', /* password_element */
+X'', /* password_value */
+'non-empty', /* submit_element */
+'https://accounts.google.com/', /* signon_realm */
+13047423600000000, /* date_created */
+0, /* blacklisted_by_user */
+0, /* scheme */
+0, /* password_type */
+1, /* times_used */
+X'18000000020000000000000000000000000000000000000000000000', /* form_data */
+0, /* date_synced */
+'', /* display_name */
+'https://www.google.com/icon', /* icon_url */
+'', /* federation_url */
+1,  /* skip_zero_click */
+0,  /* generation_upload_status */
+X'00000000', /* possible_username_pairs */
+0, /* date_last_used */
+X'2400000020000000931DDD1C53CCD2CE11C30C3027798FF7E31CCFE83FB086F3A7797F404D647332' /* moving_blocked_for */
+);
+INSERT INTO "logins" (origin_url,action_url,username_element,username_value,password_element,password_value,submit_element,signon_realm,date_created,blacklisted_by_user,scheme,password_type,times_used,form_data,date_synced,display_name,icon_url,federation_url,skip_zero_click,generation_upload_status,possible_username_pairs,date_last_used,moving_blocked_for) VALUES(
+'http://example.com', /* origin_url */
+'http://example.com/landing', /* action_url */
+'', /* username_element */
+'user', /* username_value */
+'', /* password_element */
+X'', /* password_value */
+'non-empty', /* submit_element */
+'http://example.com', /* signon_realm */
+13047423600000000, /* date_created */
+0, /* blacklisted_by_user */
+1, /* scheme */
+0, /* password_type */
+1, /* times_used */
+X'18000000020000000000000000000000000000000000000000000000', /* form_data */
+0, /* date_synced */
+'', /* display_name */
+'https://www.google.com/icon', /* icon_url */
+'', /* federation_url */
+1,  /* skip_zero_click */
+0,  /* generation_upload_status */
+X'00000000', /* possible_username_pairs */
+0, /* date_last_used */
+X'' /* moving_blocked_for */
+);
+CREATE INDEX logins_signon ON logins (signon_realm);
+CREATE TABLE stats (
+origin_domain VARCHAR NOT NULL,
+username_value VARCHAR,
+dismissal_count INTEGER,
+update_time INTEGER NOT NULL,
+UNIQUE(origin_domain, username_value));
+CREATE INDEX stats_origin ON stats(origin_domain);
+CREATE TABLE sync_entities_metadata (
+  storage_key INTEGER PRIMARY KEY AUTOINCREMENT,
+  metadata VARCHAR NOT NULL
+);
+CREATE TABLE sync_model_metadata (
+  id INTEGER PRIMARY KEY AUTOINCREMENT,
+  metadata VARCHAR NOT NULL
+);
+CREATE TABLE insecure_credentials (
+parent_id INTEGER REFERENCES logins ON UPDATE CASCADE ON DELETE CASCADE
+  DEFERRABLE INITIALLY DEFERRED,
+compromise_type INTEGER NOT NULL,
+create_time INTEGER NOT NULL,
+is_muted INTEGER NOT NULL DEFAULT 0,
+UNIQUE (parent_id, compromise_type));
+CREATE INDEX foreign_key_index ON insecure_credentials (parent_id);
+INSERT INTO "insecure_credentials"
+  (parent_id,compromise_type,create_time,is_muted) VALUES(
+1, /* parent_id */
+0, /* compromise_type */
+13047423600000000, /* create_time */
+0 /* is_muted */
+);
+INSERT INTO "insecure_credentials"
+  (parent_id,compromise_type,create_time,is_muted) VALUES(
+1, /* parent_id */
+1, /* compromise_type */
+13047423600000000, /* create_time */
+0 /* is_muted */
+);
+COMMIT;
diff --git a/components/translate/core/browser/translate_infobar_delegate.cc b/components/translate/core/browser/translate_infobar_delegate.cc
index efceba2..f0872e97 100644
--- a/components/translate/core/browser/translate_infobar_delegate.cc
+++ b/components/translate/core/browser/translate_infobar_delegate.cc
@@ -191,12 +191,13 @@
   ui_delegate_.SetLanguageBlocked(!ui_delegate_.IsLanguageBlocked());
 }
 
+// TODO(crbug.com/1028966): Update this name to use inclusive language.
 bool TranslateInfoBarDelegate::IsSiteBlacklisted() const {
-  return ui_delegate_.IsSiteBlacklisted();
+  return ui_delegate_.IsSiteOnNeverPromptList();
 }
 
 void TranslateInfoBarDelegate::ToggleSiteBlacklist() {
-  ui_delegate_.SetSiteBlacklist(!ui_delegate_.IsSiteBlacklisted());
+  ui_delegate_.SetNeverPrompt(!ui_delegate_.IsSiteOnNeverPromptList());
 }
 
 bool TranslateInfoBarDelegate::ShouldAlwaysTranslate() const {
diff --git a/components/translate/core/browser/translate_ui_delegate.cc b/components/translate/core/browser/translate_ui_delegate.cc
index b1dac8c..d37824a 100644
--- a/components/translate/core/browser/translate_ui_delegate.cc
+++ b/components/translate/core/browser/translate_ui_delegate.cc
@@ -314,17 +314,16 @@
   UMA_HISTOGRAM_BOOLEAN(kNeverTranslateLang, value);
 }
 
-// TODO(crbug.com/1028966): Update this name to use inclusive language.
-bool TranslateUIDelegate::IsSiteBlacklisted() const {
+bool TranslateUIDelegate::IsSiteOnNeverPromptList() const {
   std::string host = GetPageHost();
   return !host.empty() && prefs_->IsSiteOnNeverPromptList(host);
 }
 
-bool TranslateUIDelegate::CanBlacklistSite() const {
+bool TranslateUIDelegate::CanAddToNeverPromptList() const {
   return !GetPageHost().empty();
 }
 
-void TranslateUIDelegate::SetSiteBlacklist(bool value) {
+void TranslateUIDelegate::SetNeverPrompt(bool value) {
   std::string host = GetPageHost();
   if (host.empty())
     return;
diff --git a/components/translate/core/browser/translate_ui_delegate.h b/components/translate/core/browser/translate_ui_delegate.h
index d9015c20..1b9aa9f 100644
--- a/components/translate/core/browser/translate_ui_delegate.h
+++ b/components/translate/core/browser/translate_ui_delegate.h
@@ -104,16 +104,18 @@
   // Sets the value if the current language is blocked.
   void SetLanguageBlocked(bool value);
 
-  // Returns true if the current webpage is blacklisted.
-  bool IsSiteBlacklisted() const;
+  // Returns true if the current webpage should never be prompted for
+  // translation.
+  bool IsSiteOnNeverPromptList() const;
 
-  // Returns true if the site of the current webpage can be blacklisted.
-  bool CanBlacklistSite() const;
+  // Returns true if the site of the current webpage can be put on the never
+  // prompt list.
+  bool CanAddToNeverPromptList() const;
 
-  // Sets the blacklisted state for the host of the current page. If
-  // value is true, the current host will be blacklisted and translations
-  // will not be offered for that site.
-  void SetSiteBlacklist(bool value);
+  // Sets the never-prompt state for the host of the current page. If
+  // value is true, the current host will be blocklisted and translation
+  // prompts will not show for that site.
+  void SetNeverPrompt(bool value);
 
   // Returns true if the webpage in the current original language should be
   // translated into the current target language automatically.
diff --git a/components/viz/host/gpu_host_impl.cc b/components/viz/host/gpu_host_impl.cc
index 695fef42..851169e 100644
--- a/components/viz/host/gpu_host_impl.cc
+++ b/components/viz/host/gpu_host_impl.cc
@@ -507,6 +507,10 @@
   delegate_->DisableGpuCompositing();
 }
 
+void GpuHostImpl::DidUpdateGPUInfo(const gpu::GPUInfo& gpu_info) {
+  delegate_->DidUpdateGPUInfo(gpu_info);
+}
+
 #if defined(OS_WIN)
 void GpuHostImpl::DidUpdateOverlayInfo(const gpu::OverlayInfo& overlay_info) {
   delegate_->DidUpdateOverlayInfo(overlay_info);
diff --git a/components/viz/host/gpu_host_impl.h b/components/viz/host/gpu_host_impl.h
index e131324..08dac27 100644
--- a/components/viz/host/gpu_host_impl.h
+++ b/components/viz/host/gpu_host_impl.h
@@ -71,6 +71,7 @@
     virtual void DidFailInitialize() = 0;
     virtual void DidCreateContextSuccessfully() = 0;
     virtual void MaybeShutdownGpuProcess() = 0;
+    virtual void DidUpdateGPUInfo(const gpu::GPUInfo& gpu_info) = 0;
 #if defined(OS_WIN)
     virtual void DidUpdateOverlayInfo(const gpu::OverlayInfo& overlay_info) = 0;
     virtual void DidUpdateHDRStatus(bool hdr_enabled) = 0;
@@ -225,6 +226,7 @@
                       gpu::error::ContextLostReason reason,
                       const GURL& active_url) override;
   void DisableGpuCompositing() override;
+  void DidUpdateGPUInfo(const gpu::GPUInfo& gpu_info) override;
 #if defined(OS_WIN)
   void DidUpdateOverlayInfo(const gpu::OverlayInfo& overlay_info) override;
   void DidUpdateHDRStatus(bool hdr_enabled) override;
diff --git a/components/viz/service/display_embedder/output_presenter_x11.cc b/components/viz/service/display_embedder/output_presenter_x11.cc
index 926f5f0..4d5d602d 100644
--- a/components/viz/service/display_embedder/output_presenter_x11.cc
+++ b/components/viz/service/display_embedder/output_presenter_x11.cc
@@ -9,10 +9,11 @@
 }
 
 #include <algorithm>
-#include <memory>
 #include <utility>
-#include <vector>
 
+#include "base/memory/ref_counted.h"
+#include "base/threading/thread.h"
+#include "base/threading/thread_checker.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/types/pass_key.h"
 #include "build/build_config.h"
@@ -21,17 +22,15 @@
 #include "gpu/command_buffer/service/external_vk_image_backing.h"
 #include "gpu/command_buffer/service/external_vk_image_skia_representation.h"
 #include "gpu/command_buffer/service/shared_context_state.h"
-#include "gpu/ipc/common/gpu_surface_lookup.h"
 #include "gpu/vulkan/vulkan_function_pointers.h"
 #include "gpu/vulkan/vulkan_image.h"
 #include "gpu/vulkan/vulkan_util.h"
 #include "third_party/skia/include/gpu/GrBackendSemaphore.h"
-#include "ui/display/types/display_snapshot.h"
-#include "ui/gfx/buffer_format_util.h"
-#include "ui/gfx/geometry/rect_conversions.h"
-#include "ui/gfx/overlay_transform.h"
+#include "ui/events/platform/x11/x11_event_source.h"
+#include "ui/gfx/x/connection.h"
+#include "ui/gfx/x/dri3.h"
 #include "ui/gfx/x/future.h"
-#include "ui/gl/gl_fence.h"
+#include "ui/gfx/x/present.h"
 
 #define VK_STRUCTURE_TYPE_WSI_IMAGE_CREATE_INFO_MESA (VkStructureType)1000001002
 struct wsi_image_create_info {
@@ -44,10 +43,17 @@
 
 namespace {
 
+std::vector<VkSemaphore> ToVkSemaphores(
+    std::vector<GrBackendSemaphore>& semaphores) {
+  std::vector<VkSemaphore> vk_semaphores(semaphores.size());
+  for (size_t i = 0; i < semaphores.size(); ++i)
+    vk_semaphores[i] = semaphores[i].vkSemaphore();
+  return vk_semaphores;
+}
+
 class Fence {
  public:
-  static std::unique_ptr<Fence> Create(x11::Connection* connection,
-                                       x11::Pixmap pixmap) {
+  static std::unique_ptr<Fence> Create(x11::Pixmap pixmap) {
     base::ScopedFD fence_fd(xshmfence_alloc_shm());
     if (!fence_fd.is_valid()) {
       DLOG(ERROR) << "xshmfence_alloc_shm() failed!";
@@ -60,49 +66,39 @@
       return {};
     }
 
+    auto* connection = x11::Connection::Get();
     auto* dri3 = &connection->dri3();
     auto fence = connection->GenerateId<x11::Sync::Fence>();
     dri3->FenceFromFD(
         {pixmap, static_cast<uint32_t>(fence), 1, std::move(fence_fd)});
-    return std::make_unique<Fence>(connection, base::PassKey<Fence>(),
-                                   shm_fence, fence);
+    return std::make_unique<Fence>(base::PassKey<Fence>(), shm_fence, fence);
   }
 
-  Fence(x11::Connection* connection,
-        base::PassKey<Fence>,
-        xshmfence* shm_fence,
-        x11::Sync::Fence fence)
-      : connection_(connection), shm_fence_(shm_fence), fence_(fence) {}
+  Fence(base::PassKey<Fence>, xshmfence* shm_fence, x11::Sync::Fence fence)
+      : shm_fence_(shm_fence), fence_(fence) {}
 
   ~Fence() {
+    auto* connection = x11::Connection::Get();
     xshmfence_unmap_shm(shm_fence_);
-    connection_->sync().DestroyFence({fence_});
+    connection->sync().DestroyFence({fence_});
   }
 
   void Reset() { xshmfence_reset(shm_fence_); }
-  void Trigger() { xshmfence_trigger(shm_fence_); }
   void Wait() { xshmfence_await(shm_fence_); }
 
   x11::Sync::Fence fence() const { return fence_; }
 
  private:
-  x11::Connection* const connection_;
   xshmfence* const shm_fence_;
   const x11::Sync::Fence fence_;
 };
 
 class PresenterImageX11 : public OutputPresenter::Image {
  public:
-  PresenterImageX11() = default;
-  ~PresenterImageX11() override {
-    if (vk_fence_ != VK_NULL_HANDLE)
-      vkDestroyFence(device_queue_->GetVulkanDevice(), vk_fence_, nullptr);
-    if (pixmap_ != x11::Pixmap::None)
-      x11::Connection::Get()->FreePixmap({pixmap_});
-  }
+  PresenterImageX11();
+  ~PresenterImageX11() override;
 
-  bool Initialize(x11::Connection* connection,
-                  x11::Window window,
+  bool Initialize(x11::Window window,
                   gpu::SharedImageFactory* factory,
                   gpu::SharedImageRepresentationFactory* representation_factory,
                   SkiaOutputSurfaceDependency* deps,
@@ -111,178 +107,422 @@
                   ResourceFormat format,
                   int depth,
                   uint32_t shared_image_usage,
-                  const std::vector<std::vector<uint64_t>>& modifier_vectors) {
-    device_queue_ = deps->GetVulkanContextProvider()->GetDeviceQueue();
+                  const std::vector<std::vector<uint64_t>>& modifier_vectors,
+                  scoped_refptr<base::SingleThreadTaskRunner> x11_task_runner);
+  // OutputPresenterX11::Image:
+  void BeginPresent() final;
+  void EndPresent() final;
+  int GetPresentCount() const final;
+  void OnContextLost() final;
 
-    // OutputPresenterX11 only supports MESA vulkan driver.
-    switch (device_queue_->vk_physical_device_driver_properties().driverID) {
-      case VK_DRIVER_ID_MESA_RADV:
-      case VK_DRIVER_ID_INTEL_OPEN_SOURCE_MESA:
-        break;
-      default:
-        return false;
+  class OnX11 : public base::RefCountedThreadSafe<OnX11> {
+   public:
+    OnX11(gpu::VulkanDeviceQueue* device_queue, VkFence vk_fence);
+
+    void Initialize(x11::Dri3::PixmapFromBuffersRequest request);
+    void WaitForVkFence();
+    VkFence vk_fence() const { return vk_fence_; }
+    x11::Pixmap pixmap() const {
+      DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
+      return pixmap_;
+    }
+    Fence* idle_fence() const { return idle_fence_.get(); }
+    bool busy() const {
+      DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
+      return busy_;
+    }
+    void set_busy(bool busy) {
+      DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
+      busy_ = busy;
     }
 
-    const auto vk_format = ToVkFormat(format);
-    std::unique_ptr<gpu::VulkanImage> vulkan_image;
-    if (modifier_vectors.empty()) {
-      // If DRM modifier is not supported, lagecy wsi_image_create_info will be
-      // used for scanout.
-      wsi_image_create_info create_info = {
-          .sType = VK_STRUCTURE_TYPE_WSI_IMAGE_CREATE_INFO_MESA,
-          .scanout = true,
-      };
-      vulkan_image = gpu::VulkanImage::CreateWithExternalMemory(
-          device_queue_, size, vk_format, shared_image_usage, /*flags=*/0,
-          VK_IMAGE_TILING_OPTIMAL, &create_info);
-    } else {
-      for (auto& modifiers : modifier_vectors) {
-        vulkan_image = gpu::VulkanImage::CreateWithExternalMemoryAndModifiers(
-            device_queue_, size, vk_format, modifiers, shared_image_usage,
-            /*flags=*/0);
-        if (vulkan_image)
-          break;
-      }
-    }
+   private:
+    friend base::RefCountedThreadSafe<OnX11>;
+    ~OnX11();
 
-    if (!vulkan_image)
-      return false;
+    gpu::VulkanDeviceQueue* const device_queue_;
+    const VkFence vk_fence_;
+    x11::Pixmap pixmap_ GUARDED_BY_CONTEXT(thread_checker_){};
+    std::unique_ptr<Fence> idle_fence_;
+    bool busy_ GUARDED_BY_CONTEXT(thread_checker_) = false;
+    THREAD_CHECKER(thread_checker_);
+  };
 
-    // Destroy the |vulkan_image| when this function returns. The |vulkan_image|
-    // will be imported as a SharedImage, and the original |vulkan_image| will
-    // not be used after returning of this function.
-    // TODO(penghuang): maybe creating the shared image directly.
-    base::ScopedClosureRunner vulkan_image_destructor(base::BindOnce(
-        &gpu::VulkanImage::Destroy, base::Unretained(vulkan_image.get())));
-
-    const auto& layouts = vulkan_image->layouts();
-
-    gfx::GpuMemoryBufferHandle gmb_handle;
-    gmb_handle.type = gfx::GpuMemoryBufferType::NATIVE_PIXMAP;
-    gmb_handle.native_pixmap_handle.modifier = vulkan_image->modifier();
-    for (size_t i = 0; i < vulkan_image->plane_count(); ++i) {
-      gmb_handle.native_pixmap_handle.planes.emplace_back(
-          layouts[i].rowPitch, layouts[i].offset, layouts[i].size,
-          vulkan_image->GetMemoryFd());
-    }
-
-    auto mailbox = gpu::Mailbox::GenerateForSharedImage();
-    if (!factory->CreateSharedImage(mailbox, 0, std::move(gmb_handle),
-                                    BufferFormat(format),
-                                    deps->GetSurfaceHandle(), size, color_space,
-                                    kTopLeft_GrSurfaceOrigin,
-                                    kPremul_SkAlphaType, shared_image_usage)) {
-      DLOG(ERROR) << "CreateSharedImage failed.";
-      return false;
-    }
-
-    if (!Image::Initialize(factory, representation_factory, mailbox, deps))
-      return false;
-
-    auto* dri3 = &connection->dri3();
-
-    DCHECK(format == RGBA_8888 || format == BGRA_8888);
-    pixmap_ = connection->GenerateId<x11::Pixmap>();
-    std::vector<base::ScopedFD> buffers(vulkan_image->plane_count());
-    for (size_t i = 0; i < vulkan_image->plane_count(); ++i)
-      buffers[i] = vulkan_image->GetMemoryFd();
-    dri3->PixmapFromBuffers({.pixmap = pixmap_,
-                             .window = window,
-                             .width = size.width(),
-                             .height = size.height(),
-                             .stride0 = layouts[0].rowPitch,
-                             .offset0 = layouts[0].offset,
-                             .stride1 = layouts[1].rowPitch,
-                             .offset1 = layouts[1].offset,
-                             .stride2 = layouts[2].rowPitch,
-                             .offset2 = layouts[2].offset,
-                             .stride3 = layouts[3].rowPitch,
-                             .offset3 = layouts[3].offset,
-                             .depth = depth,
-                             .bpp = 32,
-                             .modifier = vulkan_image->modifier(),
-                             .buffers = std::move(buffers)});
-
-    VkFenceCreateInfo create_info = {
-        .sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO,
-    };
-    if (vkCreateFence(device_queue_->GetVulkanDevice(), &create_info, nullptr,
-                      &vk_fence_) != VK_SUCCESS)
-      return false;
-
-    wait_fence_ = Fence::Create(connection, pixmap_);
-    if (!wait_fence_)
-      return false;
-
-    idle_fence_ = Fence::Create(connection, pixmap_);
-    if (!idle_fence_)
-      return false;
-
-    return true;
-  }
-
-  void BeginPresent() final {
-    if (++present_count_ != 1) {
-      DCHECK(scoped_read_access_);
-      return;
-    }
-
-    DCHECK(!sk_surface());
-    DCHECK(!scoped_read_access_);
-
-    std::vector<GrBackendSemaphore> begin_read_semaphores;
-    scoped_read_access_ = skia_representation()->BeginScopedReadAccess(
-        &begin_read_semaphores, &end_read_semaphores_);
-    DCHECK(scoped_read_access_);
-    vkResetFences(device_queue_->GetVulkanDevice(), 1, &vk_fence_);
-    std::vector<VkSemaphore> vk_semaphores;
-    for (auto semaphore : begin_read_semaphores)
-      vk_semaphores.push_back(semaphore.vkSemaphore());
-    if (!gpu::SubmitWaitVkSemaphores(device_queue_->GetVulkanQueue(),
-                                     vk_semaphores, vk_fence_)) {
-      NOTREACHED();
-    }
-    // TODO(penghuang): wait |vk_fence_| and then trigger the |wait_fence_|.
-  }
-
-  void EndPresent() final {
-    DCHECK(present_count_);
-    if (--present_count_)
-      return;
-    std::vector<VkSemaphore> vk_semaphores;
-    for (auto semaphore : end_read_semaphores_)
-      vk_semaphores.push_back(semaphore.vkSemaphore());
-    end_read_semaphores_.clear();
-    gpu::SubmitSignalVkSemaphores(device_queue_->GetVulkanQueue(),
-                                  vk_semaphores);
-    scoped_read_access_.reset();
-  }
-
-  int GetPresentCount() const final { return present_count_; }
-
-  void OnContextLost() final {}
-
-  x11::Pixmap pixmap() const { return pixmap_; }
-  Fence* wait_fence() const { return wait_fence_.get(); }
-  Fence* idle_fence() const { return idle_fence_.get(); }
-  bool busy() const { return busy_; }
-  void set_busy(bool busy) { busy_ = busy; }
+  scoped_refptr<OnX11> on_x11() const { return on_x11_; }
 
  private:
+  scoped_refptr<base::SingleThreadTaskRunner> x11_task_runner_;
   std::unique_ptr<gpu::SharedImageRepresentationSkia::ScopedReadAccess>
       scoped_read_access_;
   int present_count_ = 0;
-  std::vector<GrBackendSemaphore> end_read_semaphores_;
-  x11::Pixmap pixmap_{};
   gpu::VulkanDeviceQueue* device_queue_ = nullptr;
-  VkFence vk_fence_ = VK_NULL_HANDLE;
-  std::unique_ptr<Fence> wait_fence_;
-  std::unique_ptr<Fence> idle_fence_;
-  bool busy_ = false;
+  std::vector<GrBackendSemaphore> end_read_semaphores_;
+  scoped_refptr<OnX11> on_x11_;
 };
 
+PresenterImageX11::OnX11::OnX11(gpu::VulkanDeviceQueue* device_queue,
+                                VkFence vk_fence)
+    : device_queue_(device_queue), vk_fence_(vk_fence) {
+  DETACH_FROM_THREAD(thread_checker_);
+}
+
+PresenterImageX11::OnX11::~OnX11() {
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
+  if (vk_fence_ != VK_NULL_HANDLE)
+    vkDestroyFence(device_queue_->GetVulkanDevice(), vk_fence_, nullptr);
+  if (pixmap_ != x11::Pixmap::None)
+    x11::Connection::Get()->FreePixmap({pixmap_});
+}
+
+void PresenterImageX11::OnX11::Initialize(
+    x11::Dri3::PixmapFromBuffersRequest request) {
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
+  auto* connection = x11::Connection::Get();
+  auto* dri3 = &connection->dri3();
+
+  pixmap_ = connection->GenerateId<x11::Pixmap>();
+  request.pixmap = pixmap_;
+  dri3->PixmapFromBuffers(request);
+  idle_fence_ = Fence::Create(pixmap_);
+  CHECK(idle_fence_);
+}
+
+void PresenterImageX11::OnX11::WaitForVkFence() {
+  auto result = vkWaitForFences(device_queue_->GetVulkanDevice(), 1, &vk_fence_,
+                                VK_TRUE, UINT64_MAX);
+  DCHECK_EQ(result, VK_SUCCESS);
+}
+
+PresenterImageX11::PresenterImageX11() = default;
+
+PresenterImageX11::~PresenterImageX11() {
+  if (on_x11_)
+    x11_task_runner_->ReleaseSoon(FROM_HERE, std::move(on_x11_));
+}
+
+bool PresenterImageX11::Initialize(
+    x11::Window window,
+    gpu::SharedImageFactory* factory,
+    gpu::SharedImageRepresentationFactory* representation_factory,
+    SkiaOutputSurfaceDependency* deps,
+    const gfx::Size& size,
+    const gfx::ColorSpace& color_space,
+    ResourceFormat format,
+    int depth,
+    uint32_t shared_image_usage,
+    const std::vector<std::vector<uint64_t>>& modifier_vectors,
+    scoped_refptr<base::SingleThreadTaskRunner> x11_task_runner) {
+  DCHECK(format == RGBA_8888 || format == BGRA_8888);
+
+  device_queue_ = deps->GetVulkanContextProvider()->GetDeviceQueue();
+  x11_task_runner_ = std::move(x11_task_runner);
+
+  // OutputPresenterX11 only supports MESA vulkan driver.
+  switch (device_queue_->vk_physical_device_driver_properties().driverID) {
+    case VK_DRIVER_ID_MESA_RADV:
+    case VK_DRIVER_ID_INTEL_OPEN_SOURCE_MESA:
+      break;
+    default:
+      return false;
+  }
+
+  const auto vk_format = ToVkFormat(format);
+  std::unique_ptr<gpu::VulkanImage> vulkan_image;
+  if (modifier_vectors.empty()) {
+    // If DRM modifier is not supported, lagecy wsi_image_create_info will be
+    // used for scanout.
+    wsi_image_create_info create_info = {
+        .sType = VK_STRUCTURE_TYPE_WSI_IMAGE_CREATE_INFO_MESA,
+        .scanout = true,
+    };
+    vulkan_image = gpu::VulkanImage::CreateWithExternalMemory(
+        device_queue_, size, vk_format, shared_image_usage, /*flags=*/0,
+        VK_IMAGE_TILING_OPTIMAL, &create_info);
+  } else {
+    for (auto& modifiers : modifier_vectors) {
+      vulkan_image = gpu::VulkanImage::CreateWithExternalMemoryAndModifiers(
+          device_queue_, size, vk_format, modifiers, shared_image_usage,
+          /*flags=*/0);
+      if (vulkan_image)
+        break;
+    }
+  }
+
+  if (!vulkan_image)
+    return false;
+
+  // Destroy the |vulkan_image| when this function returns. The |vulkan_image|
+  // will be imported as a SharedImage, and the original |vulkan_image| will
+  // not be used after returning of this function.
+  // TODO(penghuang): maybe creating the shared image directly.
+  base::ScopedClosureRunner vulkan_image_destructor(base::BindOnce(
+      &gpu::VulkanImage::Destroy, base::Unretained(vulkan_image.get())));
+
+  const auto& layouts = vulkan_image->layouts();
+
+  gfx::GpuMemoryBufferHandle gmb_handle;
+  gmb_handle.type = gfx::GpuMemoryBufferType::NATIVE_PIXMAP;
+  gmb_handle.native_pixmap_handle.modifier = vulkan_image->modifier();
+  for (size_t i = 0; i < vulkan_image->plane_count(); ++i) {
+    gmb_handle.native_pixmap_handle.planes.emplace_back(
+        layouts[i].rowPitch, layouts[i].offset, layouts[i].size,
+        vulkan_image->GetMemoryFd());
+  }
+
+  auto mailbox = gpu::Mailbox::GenerateForSharedImage();
+  if (!factory->CreateSharedImage(
+          mailbox, 0, std::move(gmb_handle), BufferFormat(format),
+          deps->GetSurfaceHandle(), size, color_space, kTopLeft_GrSurfaceOrigin,
+          kPremul_SkAlphaType, shared_image_usage)) {
+    DLOG(ERROR) << "CreateSharedImage failed.";
+    return false;
+  }
+
+  if (!Image::Initialize(factory, representation_factory, mailbox, deps))
+    return false;
+
+  VkFenceCreateInfo create_info = {
+      .sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO,
+      .flags = VK_FENCE_CREATE_SIGNALED_BIT,
+  };
+  VkFence vk_fence = VK_NULL_HANDLE;
+  if (vkCreateFence(device_queue_->GetVulkanDevice(), &create_info, nullptr,
+                    &vk_fence) != VK_SUCCESS)
+    return false;
+
+  // The ownership of |vk_fence| is passed to OnX11 which will destroy it.
+  on_x11_ = base::MakeRefCounted<OnX11>(device_queue_, vk_fence);
+
+  std::vector<base::ScopedFD> fds(vulkan_image->plane_count());
+  for (size_t i = 0; i < vulkan_image->plane_count(); ++i)
+    fds[i] = vulkan_image->GetMemoryFd();
+  x11::Dri3::PixmapFromBuffersRequest request = {
+      .window = window,
+      .width = size.width(),
+      .height = size.height(),
+      .stride0 = layouts[0].rowPitch,
+      .offset0 = layouts[0].offset,
+      .stride1 = layouts[1].rowPitch,
+      .offset1 = layouts[1].offset,
+      .stride2 = layouts[2].rowPitch,
+      .offset2 = layouts[2].offset,
+      .stride3 = layouts[3].rowPitch,
+      .offset3 = layouts[3].offset,
+      .depth = depth,
+      .bpp = 32,
+      .modifier = vulkan_image->modifier(),
+      .buffers = std::move(fds)};
+  x11_task_runner_->PostTask(
+      FROM_HERE,
+      base::BindOnce(&OnX11::Initialize, on_x11_, std::move(request)));
+
+  return true;
+}
+
+void PresenterImageX11::BeginPresent() {
+  if (++present_count_ != 1) {
+    DCHECK(scoped_read_access_);
+    return;
+  }
+
+  DCHECK(!sk_surface());
+  DCHECK(!scoped_read_access_);
+
+  std::vector<GrBackendSemaphore> begin_read_semaphores;
+  scoped_read_access_ = skia_representation()->BeginScopedReadAccess(
+      &begin_read_semaphores, &end_read_semaphores_);
+  DCHECK(scoped_read_access_);
+  VkFence vk_fence = on_x11_->vk_fence();
+  vkResetFences(device_queue_->GetVulkanDevice(), 1, &vk_fence);
+  auto vk_semaphores = ToVkSemaphores(begin_read_semaphores);
+  if (!gpu::SubmitWaitVkSemaphores(device_queue_->GetVulkanQueue(),
+                                   vk_semaphores, vk_fence)) {
+    NOTREACHED();
+  }
+}
+
+void PresenterImageX11::EndPresent() {
+  DCHECK(present_count_);
+  if (--present_count_)
+    return;
+  auto vk_semaphores = ToVkSemaphores(end_read_semaphores_);
+  end_read_semaphores_.clear();
+  // Wait on the idle_fence on GPU main, after it is released, we can reuse the
+  // image safely.
+  on_x11_->idle_fence()->Wait();
+  gpu::SubmitSignalVkSemaphores(device_queue_->GetVulkanQueue(), vk_semaphores);
+  scoped_read_access_.reset();
+}
+
+int PresenterImageX11::GetPresentCount() const {
+  return present_count_;
+}
+
+void PresenterImageX11::OnContextLost() {}
+
+constexpr size_t kNumberOfBuffers = 3;
+constexpr size_t kMaxPendingFrames = 2;
+
 }  // namespace
 
+class OutputPresenterX11::OnX11 : public ui::XEventDispatcher {
+ public:
+  explicit OnX11(x11::Window window);
+  ~OnX11() override;
+
+  void Initialize();
+  void PostSubBuffer(scoped_refptr<PresenterImageX11::OnX11> image,
+                     const gfx::Rect& rect,
+                     SwapCompletionCallback completion_callback,
+                     BufferPresentedCallback presentation_callback);
+
+ private:
+  // ui::XEventDispatcher implementations:
+  bool DispatchXEvent(x11::Event* event) final;
+
+  bool OnCompleteNotifyEvent(const x11::Present::CompleteNotifyEvent* event);
+  bool OnIdleNotifyEvent(const x11::Present::IdleNotifyEvent* event);
+
+  const x11::Window window_ GUARDED_BY_CONTEXT(thread_checker_);
+  // For executing task on GPU main thread.
+  scoped_refptr<base::SingleThreadTaskRunner> task_runner_
+      GUARDED_BY_CONTEXT(thread_checker_);
+  std::unique_ptr<ui::X11EventSource> event_source_
+      GUARDED_BY_CONTEXT(thread_checker_);
+  uint32_t event_id_ GUARDED_BY_CONTEXT(thread_checker_) = 0;
+  uint64_t last_target_msc_ GUARDED_BY_CONTEXT(thread_checker_) = 0;
+  uint64_t last_present_msc_ GUARDED_BY_CONTEXT(thread_checker_) = 0;
+  // Image in present queue.
+  base::circular_deque<scoped_refptr<PresenterImageX11::OnX11>> present_images_
+      GUARDED_BY_CONTEXT(thread_checker_);
+  // Callbacks wait for X11 CompleteNotifyEvent
+  base::circular_deque<SwapCompletionCallback> swap_completion_callbacks_
+      GUARDED_BY_CONTEXT(thread_checker_);
+  base::circular_deque<BufferPresentedCallback> presentation_callbacks_
+      GUARDED_BY_CONTEXT(thread_checker_);
+
+  THREAD_CHECKER(thread_checker_);
+};
+
+OutputPresenterX11::OnX11::OnX11(x11::Window window)
+    : window_(window), task_runner_(base::ThreadTaskRunnerHandle::Get()) {
+  DETACH_FROM_THREAD(thread_checker_);
+}
+
+OutputPresenterX11::OnX11::~OnX11() {
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
+  auto* connection = x11::Connection::Get();
+  auto* present = &connection->present();
+  present->SelectInput({static_cast<x11::Present::Event>(event_id_), window_,
+                        x11::Present::EventMask::NoEvent});
+
+  event_source_->RemoveXEventDispatcher(this);
+}
+
+void OutputPresenterX11::OnX11::Initialize() {
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
+  auto* connection = x11::Connection::Get();
+  event_source_ = std::make_unique<ui::X11EventSource>(connection);
+  event_source_->AddXEventDispatcher(this);
+
+  auto* present = &connection->present();
+  event_id_ = connection->GenerateId<uint32_t>();
+  constexpr auto kEventMasks = x11::Present::EventMask::CompleteNotify |
+                               x11::Present::EventMask::IdleNotify;
+  present->SelectInput(
+      {static_cast<x11::Present::Event>(event_id_), window_, kEventMasks});
+}
+
+void OutputPresenterX11::OnX11::PostSubBuffer(
+    scoped_refptr<PresenterImageX11::OnX11> image,
+    const gfx::Rect& rect,
+    SwapCompletionCallback completion_callback,
+    BufferPresentedCallback presentation_callback) {
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
+  DCHECK(!image->busy());
+  image->set_busy(true);
+
+  // Wait for VKFence passed before sending pixmap to Xserver to present.
+  image->WaitForVkFence();
+
+  last_target_msc_ = std::max(last_present_msc_, last_target_msc_) + 1;
+  x11::Connection::Get()->present().Pixmap({
+      .window = window_,
+      .pixmap = image->pixmap(),
+      .idle_fence = image->idle_fence()->fence(),
+      .target_msc = last_target_msc_,
+  });
+
+  DCHECK_LT(present_images_.size(), kNumberOfBuffers);
+  present_images_.push_back(image);
+
+  swap_completion_callbacks_.push_back(std::move(completion_callback));
+  presentation_callbacks_.push_back(std::move(presentation_callback));
+}
+
+bool OutputPresenterX11::OnX11::DispatchXEvent(x11::Event* event) {
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
+  if (event->window() != window_)
+    return false;
+  if (auto* e = event->As<x11::Present::CompleteNotifyEvent>()) {
+    return OnCompleteNotifyEvent(e);
+  } else if (auto* e = event->As<x11::Present::IdleNotifyEvent>()) {
+    return OnIdleNotifyEvent(e);
+  }
+  return false;
+}
+
+bool OutputPresenterX11::OnX11::OnCompleteNotifyEvent(
+    const x11::Present::CompleteNotifyEvent* event) {
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
+  DCHECK_LE(last_present_msc_, event->msc);
+  last_present_msc_ = event->msc;
+
+  auto timestamp =
+      base::TimeTicks() + base::TimeDelta::FromMicroseconds(event->ust);
+  // Assume the refresh rate is 60 Hz for now.
+  // TODO(penghuang): query refresh rate from Xserver.
+  constexpr auto kInterval = base::TimeDelta::FromMicroseconds(
+      base::Time::kMicrosecondsPerSecond / 60);
+  uint32_t flags = gfx::PresentationFeedback::kVSync;
+  if (event->mode == x11::Present::CompleteMode::Flip)
+    flags |= gfx::PresentationFeedback::kZeroCopy;
+
+  task_runner_->PostTask(
+      FROM_HERE,
+      base::BindOnce(std::move(swap_completion_callbacks_.front()),
+                     gfx::SwapCompletionResult(gfx::SwapResult::SWAP_ACK)));
+  task_runner_->PostTask(
+      FROM_HERE,
+      base::BindOnce(std::move(presentation_callbacks_.front()),
+                     gfx::PresentationFeedback(timestamp, kInterval, flags)));
+  swap_completion_callbacks_.pop_front();
+  presentation_callbacks_.pop_front();
+
+  return true;
+}
+
+bool OutputPresenterX11::OnX11::OnIdleNotifyEvent(
+    const x11::Present::IdleNotifyEvent* event) {
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
+  for (auto& image : present_images_) {
+    if (image->pixmap() == event->pixmap) {
+      DCHECK(image->busy());
+      image->set_busy(false);
+      break;
+    }
+  }
+
+  // Remove idle images at the beginning of the |present_images_|.
+  while (!present_images_.empty()) {
+    auto& image = present_images_.front();
+    if (image->busy())
+      break;
+    present_images_.pop_front();
+  }
+  return true;
+}
+
 // static
 const uint32_t OutputPresenterX11::kDefaultSharedImageUsage =
     gpu::SHARED_IMAGE_USAGE_SCANOUT | gpu::SHARED_IMAGE_USAGE_DISPLAY |
@@ -308,19 +548,14 @@
     : dependency_(deps),
       shared_image_factory_(factory),
       shared_image_representation_factory_(representation_factory),
-      shared_image_usage_(shared_image_usage),
-      task_runner_(base::ThreadTaskRunnerHandle::Get()) {}
+      shared_image_usage_(shared_image_usage) {}
 
 OutputPresenterX11::~OutputPresenterX11() {
-  if (!event_id_)
-    return;
-
-  auto* present = &connection_->present();
-  present->SelectInput({static_cast<x11::Present::Event>(event_id_), window_,
-                        x11::Present::EventMask::NoEvent});
-
-  auto* event_source = ui::X11EventSource::GetInstance();
-  event_source->RemoveXEventDispatcher(this);
+  if (on_x11_)
+    x11_thread_->task_runner()->DeleteSoon(FROM_HERE, std::move(on_x11_));
+  // The dtor of |x11_thread_| will be blocked until all post tasks are
+  // finished.
+  x11_thread_.reset();
 }
 
 bool OutputPresenterX11::Initialize() {
@@ -339,29 +574,29 @@
       return false;
   }
 
-  connection_ = x11::Connection::Get();
-  auto* present = &connection_->present();
+  auto* connection = x11::Connection::Get();
+  auto* present = &connection->present();
   if (!present->present())
     return false;
 
-  auto* dri3 = &connection_->dri3();
+  auto* dri3 = &connection->dri3();
   if (!dri3->present())
     return false;
 
-  auto* sync = &connection_->sync();
+  auto* sync = &connection->sync();
   if (!sync->present())
     return false;
 
-  window_ = static_cast<x11::Window>(dependency_->GetSurfaceHandle());
+  auto window = static_cast<x11::Window>(dependency_->GetSurfaceHandle());
 
-  auto geometry = connection_->GetGeometry({window_}).Sync();
+  auto geometry = connection->GetGeometry({window}).Sync();
   depth_ = geometry->depth;
 
   const bool support_modifier =
       gfx::HasExtension(device_queue->enabled_extensions(),
                         VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_EXTENSION_NAME);
   if (auto modifiers = dri3->GetSupportedModifiers(
-                               {static_cast<uint32_t>(window_), depth_, 32})
+                               {static_cast<uint32_t>(window), depth_, 32})
                            .Sync()) {
     if (!modifiers->window_modifiers.empty())
       modifier_vectors_.push_back(std::move(modifiers->window_modifiers));
@@ -377,21 +612,23 @@
   // Without modifier, Xserver can only handle BGRA format.
   supports_rgba_ = !modifier_vectors_.empty();
 
-  event_id_ = connection_->GenerateId<uint32_t>();
-  constexpr auto kEventMasks = x11::Present::EventMask::ConfigureNotify |
-                               x11::Present::EventMask::CompleteNotify |
-                               x11::Present::EventMask::IdleNotify;
-  present->SelectInput(
-      {static_cast<x11::Present::Event>(event_id_), window_, kEventMasks});
+  x11_thread_ = std::make_unique<base::Thread>("OutputPresenterX11");
+  bool result = x11_thread_->StartWithOptions(
+      base::Thread::Options(base::MessagePumpType::UI, 0));
+  CHECK(result);
 
-  auto* event_source = ui::X11EventSource::GetInstance();
-  event_source->AddXEventDispatcher(this);
+  on_x11_ = std::make_unique<OnX11>(window);
+  x11_thread_->task_runner()->PostTask(
+      FROM_HERE, base::BindOnce(&OutputPresenterX11::OnX11::Initialize,
+                                base::Unretained(on_x11_.get())));
 
   return true;
 }
 
 void OutputPresenterX11::InitializeCapabilities(
     OutputSurface::Capabilities* capabilities) {
+  capabilities->number_of_buffers = kNumberOfBuffers;
+  capabilities->max_frames_pending = kMaxPendingFrames;
   capabilities->supports_post_sub_buffer = true;
   capabilities->supports_commit_overlay_planes = false;
   // Set supports_surfaceless to enable overlays.
@@ -430,37 +667,24 @@
 OutputPresenterX11::AllocateImages(gfx::ColorSpace color_space,
                                    gfx::Size image_size,
                                    size_t num_images) {
-  std::vector<std::unique_ptr<Image>> images;
+  DCHECK_EQ(num_images, kNumberOfBuffers);
+  auto window = static_cast<x11::Window>(dependency_->GetSurfaceHandle());
+  std::vector<std::unique_ptr<Image>> images(num_images);
   for (size_t i = 0; i < num_images; ++i) {
     auto image = std::make_unique<PresenterImageX11>();
-    if (!image->Initialize(connection_, window_, shared_image_factory_,
+    if (!image->Initialize(window, shared_image_factory_,
                            shared_image_representation_factory_, dependency_,
                            image_size, color_space, image_format_, depth_,
-                           shared_image_usage_, modifier_vectors_)) {
+                           shared_image_usage_, modifier_vectors_,
+                           x11_thread_->task_runner())) {
       DLOG(ERROR) << "Failed to initialize image.";
       return {};
     }
-    images.push_back(std::move(image));
+    images[i] = std::move(image);
   }
-
-  allocated_image_count_ = images.size();
   return images;
 }
 
-std::unique_ptr<OutputPresenter::Image>
-OutputPresenterX11::AllocateBackgroundImage(gfx::ColorSpace color_space,
-                                            gfx::Size image_size) {
-  auto image = std::make_unique<PresenterImageX11>();
-  if (!image->Initialize(connection_, window_, shared_image_factory_,
-                         shared_image_representation_factory_, dependency_,
-                         image_size, color_space, image_format_, depth_,
-                         shared_image_usage_, modifier_vectors_)) {
-    DLOG(ERROR) << "Failed to initialize image.";
-    return nullptr;
-  }
-  return image;
-}
-
 void OutputPresenterX11::SwapBuffers(
     SwapCompletionCallback completion_callback,
     BufferPresentedCallback presentation_callback) {
@@ -471,48 +695,26 @@
     const gfx::Rect& rect,
     SwapCompletionCallback completion_callback,
     BufferPresentedCallback presentation_callback) {
-  auto* image = static_cast<PresenterImageX11*>(present_images_.back());
-  DCHECK(!image->busy());
-  image->set_busy(true);
-
-  last_target_msc_ = std::max(last_present_msc_, last_target_msc_) + 1;
-  // Trigger the |wait_fence|, so the Xserver will not be blocked.
-  // TODO(penghuang): trigger the fence when the image is ready to present, and
-  // wait for the |idle_fence| before reusing the image.
-  x11::Connection::Get()->present().Pixmap({
-      .window = window_,
-      .pixmap = image->pixmap(),
-      .target_msc = last_target_msc_,
-  });
-
-  swap_completion_callbacks_.push_back(std::move(completion_callback));
-  presentation_callbacks_.push_back(std::move(presentation_callback));
+  DCHECK(scheduled_image_);
+  auto image = static_cast<PresenterImageX11*>(scheduled_image_)->on_x11();
+  // Reset the |idle_fence()| which will be released when X11 is done with the
+  // pixmap.
+  image->idle_fence()->Reset();
+  x11_thread_->task_runner()->PostTask(
+      FROM_HERE,
+      base::BindOnce(&OutputPresenterX11::OnX11::PostSubBuffer,
+                     base::Unretained(on_x11_.get()), std::move(image), rect,
+                     std::move(completion_callback),
+                     std::move(presentation_callback)));
+  scheduled_image_ = nullptr;
 }
 
 void OutputPresenterX11::SchedulePrimaryPlane(
     const OverlayProcessorInterface::OutputSurfaceOverlayPlane& plane,
     Image* image,
     bool is_submitted) {
-  present_images_.push_back(image);
-}
-
-void OutputPresenterX11::ScheduleBackground(Image* image) {
-  NOTIMPLEMENTED();
-}
-
-bool OutputPresenterX11::DispatchXEvent(x11::Event* event) {
-  if (event->window() != window_)
-    return false;
-  if (auto* e = event->As<x11::Present::ConfigureNotifyEvent>()) {
-    return OnConfigureNotifyEvent(e);
-  } else if (auto* e = event->As<x11::Present::CompleteNotifyEvent>()) {
-    return OnCompleteNotifyEvent(e);
-  } else if (auto* e = event->As<x11::Present::IdleNotifyEvent>()) {
-    return OnIdleNotifyEvent(e);
-  } else if (auto* e = event->As<x11::Present::RedirectNotifyEvent>()) {
-    return OnRedirectNotifyEvent(e);
-  }
-  return false;
+  DCHECK(!scheduled_image_);
+  scheduled_image_ = image;
 }
 
 void OutputPresenterX11::CommitOverlayPlanes(
@@ -527,64 +729,4 @@
   NOTIMPLEMENTED();
 }
 
-bool OutputPresenterX11::OnConfigureNotifyEvent(
-    const x11::Present::ConfigureNotifyEvent* event) {
-  return true;
-}
-
-bool OutputPresenterX11::OnCompleteNotifyEvent(
-    const x11::Present::CompleteNotifyEvent* event) {
-  DCHECK_LE(last_present_msc_, event->msc);
-  last_present_msc_ = event->msc;
-  // Calling |swap_completion_callbacks_| will kick off a new frame, in most
-  // cases, there should be one or more images are idle. However in some corner
-  // cases, all images could be busy.
-  // TODO(penghuang): defer calling |swap_completion_callbacks_|, if all images
-  // are busy.
-  std::move(swap_completion_callbacks_.front())
-      .Run(gfx::SwapCompletionResult(gfx::SwapResult::SWAP_ACK));
-  swap_completion_callbacks_.pop_front();
-
-  auto timestamp =
-      base::TimeTicks() + base::TimeDelta::FromMicroseconds(event->ust);
-  // Assume the refresh rate is 60 Hz for now.
-  // TODO(penghuang): query refresh rate from Xserver.
-  constexpr auto kInterval = base::TimeDelta::FromMicroseconds(
-      base::Time::kMicrosecondsPerSecond / 60);
-  uint32_t flags = gfx::PresentationFeedback::kVSync;
-  if (event->mode == x11::Present::CompleteMode::Flip)
-    flags |= gfx::PresentationFeedback::kZeroCopy;
-  std::move(presentation_callbacks_.front())
-      .Run(gfx::PresentationFeedback(timestamp, kInterval, flags));
-  presentation_callbacks_.pop_front();
-  return true;
-}
-
-bool OutputPresenterX11::OnIdleNotifyEvent(
-    const x11::Present::IdleNotifyEvent* event) {
-  for (auto* image : present_images_) {
-    auto* image_x11 = static_cast<PresenterImageX11*>(image);
-    if (image_x11->pixmap() == event->pixmap) {
-      DCHECK(image_x11->busy());
-      image_x11->set_busy(false);
-      break;
-    }
-  }
-
-  // Remove idle images at the beginning of the |present_images_|.
-  while (!present_images_.empty()) {
-    auto* image_x11 = static_cast<PresenterImageX11*>(present_images_.front());
-    if (image_x11->busy())
-      break;
-    present_images_.pop_front();
-  }
-
-  return true;
-}
-
-bool OutputPresenterX11::OnRedirectNotifyEvent(
-    const x11::Present::RedirectNotifyEvent* event) {
-  return true;
-}
-
 }  // namespace viz
diff --git a/components/viz/service/display_embedder/output_presenter_x11.h b/components/viz/service/display_embedder/output_presenter_x11.h
index 0266337..a4fd9f3 100644
--- a/components/viz/service/display_embedder/output_presenter_x11.h
+++ b/components/viz/service/display_embedder/output_presenter_x11.h
@@ -13,15 +13,13 @@
 #include "components/viz/service/viz_service_export.h"
 #include "gpu/command_buffer/common/shared_image_usage.h"
 #include "gpu/command_buffer/service/shared_image_factory.h"
-#include "ui/events/platform/x11/x11_event_source.h"
-#include "ui/gfx/x/connection.h"
-#include "ui/gfx/x/dri3.h"
-#include "ui/gfx/x/present.h"
 
+namespace base {
+class Thread;
+}
 namespace viz {
 
-class VIZ_SERVICE_EXPORT OutputPresenterX11 : public OutputPresenter,
-                                              public ui::XEventDispatcher {
+class VIZ_SERVICE_EXPORT OutputPresenterX11 : public OutputPresenter {
  public:
   static const uint32_t kDefaultSharedImageUsage;
 
@@ -48,8 +46,6 @@
       gfx::ColorSpace color_space,
       gfx::Size image_size,
       size_t num_images) final;
-  std::unique_ptr<Image> AllocateBackgroundImage(gfx::ColorSpace color_space,
-                                                 gfx::Size image_size) final;
   void SwapBuffers(SwapCompletionCallback completion_callback,
                    BufferPresentedCallback presentation_callback) final;
   void PostSubBuffer(const gfx::Rect& rect,
@@ -63,19 +59,10 @@
       bool is_submitted) final;
   void ScheduleOverlays(SkiaOutputSurface::OverlayList overlays,
                         std::vector<ScopedOverlayAccess*> accesses) final;
-  void ScheduleBackground(Image* image) final;
-
-  // ui::XEventDispatcher implementations:
-  bool DispatchXEvent(x11::Event* event) final;
 
  private:
   bool Initialize();
 
-  bool OnConfigureNotifyEvent(const x11::Present::ConfigureNotifyEvent* event);
-  bool OnCompleteNotifyEvent(const x11::Present::CompleteNotifyEvent* event);
-  bool OnIdleNotifyEvent(const x11::Present::IdleNotifyEvent* event);
-  bool OnRedirectNotifyEvent(const x11::Present::RedirectNotifyEvent* event);
-
   SkiaOutputSurfaceDependency* dependency_;
 
   // Shared Image factories
@@ -84,30 +71,20 @@
       shared_image_representation_factory_;
   const uint32_t shared_image_usage_;
 
-  // For executing task on GPU main thread.
-  scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
-
-  x11::Connection* connection_ = nullptr;
-  x11::Window window_ = x11::Window::None;
   int depth_ = 0;
-  uint32_t event_id_ = 0;
 
   ResourceFormat image_format_ = BGRA_8888;
 
-  size_t allocated_image_count_ = 0;
-
   std::vector<std::vector<uint64_t>> modifier_vectors_;
   bool supports_rgba_ = false;
 
-  // Image in present queue.
-  base::circular_deque<Image*> present_images_;
+  Image* scheduled_image_ = nullptr;
 
-  uint64_t last_target_msc_ = 0;
-  uint64_t last_present_msc_ = 0;
+  // Thread for using present extension to present pixmap.
+  std::unique_ptr<base::Thread> x11_thread_;
 
-  // Callbacks wait for X11 CompleteNotifyEvent
-  base::circular_deque<SwapCompletionCallback> swap_completion_callbacks_;
-  base::circular_deque<BufferPresentedCallback> presentation_callbacks_;
+  class OnX11;
+  std::unique_ptr<OnX11> on_x11_;
 };
 
 }  // namespace viz
diff --git a/components/viz/service/gl/gpu_service_impl.cc b/components/viz/service/gl/gpu_service_impl.cc
index 1d42308..0a19757 100644
--- a/components/viz/service/gl/gpu_service_impl.cc
+++ b/components/viz/service/gl/gpu_service_impl.cc
@@ -486,6 +486,12 @@
   gpu_info_.initialization_time = base::Time::Now() - start_time_;
 }
 
+void GpuServiceImpl::UpdateGPUInfoGL() {
+  DCHECK(main_runner_->BelongsToCurrentThread());
+  gpu::CollectGraphicsInfoGL(&gpu_info_);
+  gpu_host_->DidUpdateGPUInfo(gpu_info_);
+}
+
 void GpuServiceImpl::InitializeWithHost(
     mojo::PendingRemote<mojom::GpuHost> pending_gpu_host,
     gpu::GpuProcessActivityFlags activity_flags,
@@ -968,9 +974,16 @@
 
 void GpuServiceImpl::GpuSwitched(gl::GpuPreference active_gpu_heuristic) {
   DVLOG(1) << "GPU: GPU has switched";
-  if (!in_host_process())
+  if (!in_host_process()) {
     ui::GpuSwitchingManager::GetInstance()->NotifyGpuSwitched(
         active_gpu_heuristic);
+  }
+  if (io_runner_->BelongsToCurrentThread()) {
+    main_runner_->PostTask(
+        FROM_HERE, base::BindOnce(&GpuServiceImpl::UpdateGPUInfoGL, weak_ptr_));
+    return;
+  }
+  GpuServiceImpl::UpdateGPUInfoGL();
 }
 
 void GpuServiceImpl::DisplayAdded() {
diff --git a/components/viz/service/gl/gpu_service_impl.h b/components/viz/service/gl/gpu_service_impl.h
index dfe13124..7bb2b2e 100644
--- a/components/viz/service/gl/gpu_service_impl.h
+++ b/components/viz/service/gl/gpu_service_impl.h
@@ -103,6 +103,7 @@
   ~GpuServiceImpl() override;
 
   void UpdateGPUInfo();
+  void UpdateGPUInfoGL();
 
   void InitializeWithHost(
       mojo::PendingRemote<mojom::GpuHost> gpu_host,
diff --git a/components/webapps/BUILD.gn b/components/webapps/BUILD.gn
index 5bfff231..3e8f43f 100644
--- a/components/webapps/BUILD.gn
+++ b/components/webapps/BUILD.gn
@@ -2,10 +2,67 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+assert(!is_ios)
+
 source_set("webapps") {
   sources = [
+    "installable/installable_data.cc",
+    "installable/installable_data.h",
+    "installable/installable_logging.cc",
+    "installable/installable_logging.h",
+    "installable/installable_manager.cc",
+    "installable/installable_manager.h",
+    "installable/installable_metrics.cc",
+    "installable/installable_metrics.h",
+    "installable/installable_params.h",
+    "installable/installable_task_queue.cc",
+    "installable/installable_task_queue.h",
     "webapps_client.cc",
     "webapps_client.h",
   ]
-  deps = [ "//components/security_state/core" ]
+  deps = [
+    "//base",
+    "//components/security_state/core",
+    "//content/public/browser",
+    "//content/public/common",
+    "//net",
+    "//services/network/public/cpp",
+    "//skia",
+    "//third_party/blink/public/common",
+    "//third_party/blink/public/mojom:mojom_platform_headers",
+    "//url",
+  ]
+  if (is_android) {
+    deps += [ "//components/webapps/android" ]
+  }
+}
+
+source_set("test_support") {
+  testonly = true
+  sources = [
+    "installable/fake_installable_manager.cc",
+    "installable/fake_installable_manager.h",
+  ]
+  deps = [
+    ":webapps",
+    "//base",
+    "//skia",
+    "//url",
+  ]
+}
+
+source_set("unit_tests") {
+  testonly = true
+  sources = [
+    "installable/installable_manager_unittest.cc",
+    "installable/installable_task_queue_unittest.cc",
+  ]
+  deps = [
+    ":webapps",
+    "//base",
+    "//base/test:test_support",
+    "//content/public/common",
+    "//testing/gtest",
+    "//third_party/blink/public/mojom:mojom_platform_headers",
+  ]
 }
diff --git a/components/webapps/DEPS b/components/webapps/DEPS
index 17177c42..0fc4377 100644
--- a/components/webapps/DEPS
+++ b/components/webapps/DEPS
@@ -1,3 +1,10 @@
 include_rules = [
   "+components/security_state/core",
+  "+content/public/browser",
+  "+content/public/common",
+  "+net/base",
+  "+services/network/public/cpp",
+  "+third_party/blink/public/common",
+  "+third_party/blink/public/mojom",
+  "+third_party/skia/include",
 ]
diff --git a/components/webapps/android/DEPS b/components/webapps/android/DEPS
index e99bcf2..14f59070 100644
--- a/components/webapps/android/DEPS
+++ b/components/webapps/android/DEPS
@@ -2,9 +2,6 @@
   "+components/browser_ui/widget/android",
   "+components/webapk/android/libs/client",
   "+services/device/public/mojom",
-  "+third_party/blink/public/common",
-  "+third_party/blink/public/mojom",
-  "+third_party/skia/include",
   "+ui/android",
   "+ui/gfx",
 ]
diff --git a/chrome/browser/installable/fake_installable_manager.cc b/components/webapps/installable/fake_installable_manager.cc
similarity index 92%
rename from chrome/browser/installable/fake_installable_manager.cc
rename to components/webapps/installable/fake_installable_manager.cc
index 5e28ed6..80abdc27 100644
--- a/chrome/browser/installable/fake_installable_manager.cc
+++ b/components/webapps/installable/fake_installable_manager.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/installable/fake_installable_manager.h"
+#include "components/webapps/installable/fake_installable_manager.h"
 
 #include <utility>
 #include <vector>
@@ -10,7 +10,9 @@
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/threading/thread_task_runner_handle.h"
-#include "chrome/browser/installable/installable_data.h"
+#include "components/webapps/installable/installable_data.h"
+
+namespace webapps {
 
 FakeInstallableManager::FakeInstallableManager(
     content::WebContents* web_contents)
@@ -71,3 +73,5 @@
 
   return installable_manager;
 }
+
+}  // namespace webapps
diff --git a/chrome/browser/installable/fake_installable_manager.h b/components/webapps/installable/fake_installable_manager.h
similarity index 78%
rename from chrome/browser/installable/fake_installable_manager.h
rename to components/webapps/installable/fake_installable_manager.h
index 3168ccc..f642d9b 100644
--- a/chrome/browser/installable/fake_installable_manager.h
+++ b/components/webapps/installable/fake_installable_manager.h
@@ -2,18 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_INSTALLABLE_FAKE_INSTALLABLE_MANAGER_H_
-#define CHROME_BROWSER_INSTALLABLE_FAKE_INSTALLABLE_MANAGER_H_
+#ifndef COMPONENTS_WEBAPPS_INSTALLABLE_FAKE_INSTALLABLE_MANAGER_H_
+#define COMPONENTS_WEBAPPS_INSTALLABLE_FAKE_INSTALLABLE_MANAGER_H_
 
 #include <memory>
 
 #include "base/memory/weak_ptr.h"
-#include "chrome/browser/installable/installable_logging.h"
-#include "chrome/browser/installable/installable_manager.h"
+#include "components/webapps/installable/installable_logging.h"
+#include "components/webapps/installable/installable_manager.h"
 #include "url/gurl.h"
 
-struct InstallableData;
-
 namespace blink {
 struct Manifest;
 }
@@ -22,6 +20,9 @@
 class WebContents;
 }
 
+namespace webapps {
+struct InstallableData;
+
 class FakeInstallableManager : public InstallableManager {
  public:
   explicit FakeInstallableManager(content::WebContents* web_contents);
@@ -53,4 +54,6 @@
   base::WeakPtrFactory<FakeInstallableManager> weak_factory_{this};
 };
 
-#endif  // CHROME_BROWSER_INSTALLABLE_FAKE_INSTALLABLE_MANAGER_H_
+}  // namespace webapps
+
+#endif  // COMPONENTS_WEBAPPS_INSTALLABLE_FAKE_INSTALLABLE_MANAGER_H_
diff --git a/chrome/browser/installable/installable_data.cc b/components/webapps/installable/installable_data.cc
similarity index 91%
rename from chrome/browser/installable/installable_data.cc
rename to components/webapps/installable/installable_data.cc
index f9b30f6..28d5b4e9 100644
--- a/chrome/browser/installable/installable_data.cc
+++ b/components/webapps/installable/installable_data.cc
@@ -2,10 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/installable/installable_data.h"
+#include "components/webapps/installable/installable_data.h"
 
 #include <utility>
 
+namespace webapps {
+
 InstallableData::InstallableData(std::vector<InstallableStatusCode> errors,
                                  const GURL& manifest_url,
                                  const blink::Manifest* manifest,
@@ -28,3 +30,5 @@
       has_worker(has_worker) {}
 
 InstallableData::~InstallableData() = default;
+
+}  // namespace webapps
diff --git a/chrome/browser/installable/installable_data.h b/components/webapps/installable/installable_data.h
similarity index 91%
rename from chrome/browser/installable/installable_data.h
rename to components/webapps/installable/installable_data.h
index 7c1f7e46..f39d413 100644
--- a/chrome/browser/installable/installable_data.h
+++ b/components/webapps/installable/installable_data.h
@@ -2,18 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_INSTALLABLE_INSTALLABLE_DATA_H_
-#define CHROME_BROWSER_INSTALLABLE_INSTALLABLE_DATA_H_
+#ifndef COMPONENTS_WEBAPPS_INSTALLABLE_INSTALLABLE_DATA_H_
+#define COMPONENTS_WEBAPPS_INSTALLABLE_INSTALLABLE_DATA_H_
 
 #include <vector>
 
 #include "base/callback_forward.h"
 #include "base/macros.h"
-#include "chrome/browser/installable/installable_logging.h"
+#include "components/webapps/installable/installable_logging.h"
 #include "third_party/blink/public/common/manifest/manifest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "url/gurl.h"
 
+namespace webapps {
+
 // This struct contains the results of an InstallableManager::GetData call and
 // is passed to an InstallableCallback. Each pointer and reference is owned by
 // InstallableManager, and callers should copy any objects which they wish to
@@ -80,4 +82,6 @@
 
 using InstallableCallback = base::OnceCallback<void(const InstallableData&)>;
 
-#endif  // CHROME_BROWSER_INSTALLABLE_INSTALLABLE_DATA_H_
+}  // namespace webapps
+
+#endif  // COMPONENTS_WEBAPPS_INSTALLABLE_INSTALLABLE_DATA_H_
diff --git a/chrome/browser/installable/installable_logging.cc b/components/webapps/installable/installable_logging.cc
similarity index 98%
rename from chrome/browser/installable/installable_logging.cc
rename to components/webapps/installable/installable_logging.cc
index 8cf42596e..bb3f3ccf 100644
--- a/chrome/browser/installable/installable_logging.cc
+++ b/components/webapps/installable/installable_logging.cc
@@ -2,16 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/installable/installable_logging.h"
+#include "components/webapps/installable/installable_logging.h"
 
 #include <vector>
 
 #include "base/no_destructor.h"
 #include "base/strings/stringprintf.h"
-#include "chrome/browser/installable/installable_manager.h"
+#include "components/webapps/installable/installable_manager.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 
+namespace webapps {
+
 namespace {
 
 // Error message strings corresponding to the InstallableStatusCode enum.
@@ -337,3 +339,5 @@
   web_contents->GetMainFrame()->AddMessageToConsole(
       level, GetMessagePrefix() + message);
 }
+
+}  // namespace webapps
diff --git a/chrome/browser/installable/installable_logging.h b/components/webapps/installable/installable_logging.h
similarity index 90%
rename from chrome/browser/installable/installable_logging.h
rename to components/webapps/installable/installable_logging.h
index 96f2384..2b397fa 100644
--- a/chrome/browser/installable/installable_logging.h
+++ b/components/webapps/installable/installable_logging.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_INSTALLABLE_INSTALLABLE_LOGGING_H_
-#define CHROME_BROWSER_INSTALLABLE_INSTALLABLE_LOGGING_H_
+#ifndef COMPONENTS_WEBAPPS_INSTALLABLE_INSTALLABLE_LOGGING_H_
+#define COMPONENTS_WEBAPPS_INSTALLABLE_INSTALLABLE_LOGGING_H_
 
 #include <string>
 
@@ -12,7 +12,9 @@
 namespace content {
 struct InstallabilityError;
 class WebContents;
-}
+}  // namespace content
+
+namespace webapps {
 
 // These values are a central reference for installability errors. The
 // InstallableManager will specify an InstallableStatusCode (or
@@ -75,4 +77,6 @@
                   InstallableStatusCode code,
                   blink::mojom::ConsoleMessageLevel level);
 
-#endif  // CHROME_BROWSER_INSTALLABLE_INSTALLABLE_LOGGING_H_
+}  // namespace webapps
+
+#endif  // COMPONENTS_WEBAPPS_INSTALLABLE_INSTALLABLE_LOGGING_H_
diff --git a/chrome/browser/installable/installable_manager.cc b/components/webapps/installable/installable_manager.cc
similarity index 97%
rename from chrome/browser/installable/installable_manager.cc
rename to components/webapps/installable/installable_manager.cc
index ca2173d..5940fa93 100644
--- a/chrome/browser/installable/installable_manager.cc
+++ b/components/webapps/installable/installable_manager.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/installable/installable_manager.h"
+#include "components/webapps/installable/installable_manager.h"
 
 #include <utility>
 
@@ -13,8 +13,8 @@
 #include "base/strings/string_util.h"
 #include "base/threading/sequenced_task_runner_handle.h"
 #include "build/build_config.h"
-#include "chrome/browser/installable/installable_metrics.h"
 #include "components/security_state/core/security_state.h"
+#include "components/webapps/installable/installable_metrics.h"
 #include "components/webapps/webapps_client.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
@@ -36,6 +36,8 @@
 #include "components/webapps/android/webapps_icon_utils.h"
 #endif
 
+namespace webapps {
+
 namespace {
 
 // This constant is the icon size on Android (48dp) multiplied by the scale
@@ -60,7 +62,7 @@
 
 int GetIdealPrimaryIconSizeInPx() {
 #if defined(OS_ANDROID)
-  return webapps::WebappsIconUtils::GetIdealHomescreenIconSizeInPx();
+  return WebappsIconUtils::GetIdealHomescreenIconSizeInPx();
 #else
   return kMinimumPrimaryIconSizeInPx;
 #endif
@@ -68,7 +70,7 @@
 
 int GetMinimumPrimaryIconSizeInPx() {
 #if defined(OS_ANDROID)
-  return webapps::WebappsIconUtils::GetMinimumHomescreenIconSizeInPx();
+  return WebappsIconUtils::GetMinimumHomescreenIconSizeInPx();
 #else
   return kMinimumPrimaryIconSizeInPx;
 #endif
@@ -76,7 +78,7 @@
 
 int GetIdealPrimaryAdaptiveLauncherIconSizeInPx() {
 #if defined(OS_ANDROID)
-  return webapps::WebappsIconUtils::GetIdealAdaptiveLauncherIconSizeInPx();
+  return WebappsIconUtils::GetIdealAdaptiveLauncherIconSizeInPx();
 #else
   return kMinimumPrimaryAdaptiveLauncherIconSizeInPx;
 #endif
@@ -84,7 +86,7 @@
 
 int GetIdealSplashIconSizeInPx() {
 #if defined(OS_ANDROID)
-  return webapps::WebappsIconUtils::GetIdealSplashImageSizeInPx();
+  return WebappsIconUtils::GetIdealSplashImageSizeInPx();
 #else
   return kMinimumPrimaryIconSizeInPx;
 #endif
@@ -92,7 +94,7 @@
 
 int GetMinimumSplashIconSizeInPx() {
 #if defined(OS_ANDROID)
-  return webapps::WebappsIconUtils::GetMinimumSplashImageSizeInPx();
+  return WebappsIconUtils::GetMinimumSplashImageSizeInPx();
 #else
   return kMinimumPrimaryIconSizeInPx;
 #endif
@@ -285,8 +287,7 @@
     return false;
 
   return security_state::IsSslCertificateValid(
-      webapps::WebappsClient::Get()->GetSecurityLevelForWebContents(
-          web_contents));
+      WebappsClient::Get()->GetSecurityLevelForWebContents(web_contents));
 }
 
 // static
@@ -695,8 +696,7 @@
   service_worker_context_->CheckHasServiceWorker(
       manifest().scope,
       base::BindOnce(&InstallableManager::OnDidCheckHasServiceWorker,
-                     weak_factory_.GetWeakPtr(),
-                     base::TimeTicks::Now()));
+                     weak_factory_.GetWeakPtr(), base::TimeTicks::Now()));
 }
 
 void InstallableManager::OnDidCheckHasServiceWorker(
@@ -904,3 +904,5 @@
 }
 
 WEB_CONTENTS_USER_DATA_KEY_IMPL(InstallableManager)
+
+}  // namespace webapps
diff --git a/chrome/browser/installable/installable_manager.h b/components/webapps/installable/installable_manager.h
similarity index 95%
rename from chrome/browser/installable/installable_manager.h
rename to components/webapps/installable/installable_manager.h
index e4fa71db..884dc1e 100644
--- a/chrome/browser/installable/installable_manager.h
+++ b/components/webapps/installable/installable_manager.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_INSTALLABLE_INSTALLABLE_MANAGER_H_
-#define CHROME_BROWSER_INSTALLABLE_INSTALLABLE_MANAGER_H_
+#ifndef COMPONENTS_WEBAPPS_INSTALLABLE_INSTALLABLE_MANAGER_H_
+#define COMPONENTS_WEBAPPS_INSTALLABLE_INSTALLABLE_MANAGER_H_
 
 #include <map>
 #include <memory>
@@ -16,10 +16,10 @@
 #include "base/memory/weak_ptr.h"
 #include "base/optional.h"
 #include "base/time/time.h"
-#include "chrome/browser/installable/installable_data.h"
-#include "chrome/browser/installable/installable_logging.h"
-#include "chrome/browser/installable/installable_params.h"
-#include "chrome/browser/installable/installable_task_queue.h"
+#include "components/webapps/installable/installable_data.h"
+#include "components/webapps/installable/installable_logging.h"
+#include "components/webapps/installable/installable_params.h"
+#include "components/webapps/installable/installable_task_queue.h"
 #include "content/public/browser/installability_error.h"
 #include "content/public/browser/service_worker_context.h"
 #include "content/public/browser/service_worker_context_observer.h"
@@ -29,6 +29,8 @@
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "url/gurl.h"
 
+namespace webapps {
+
 // This class is responsible for fetching the resources required to check and
 // install a site.
 class InstallableManager
@@ -266,4 +268,6 @@
   DISALLOW_COPY_AND_ASSIGN(InstallableManager);
 };
 
-#endif  // CHROME_BROWSER_INSTALLABLE_INSTALLABLE_MANAGER_H_
+}  // namespace webapps
+
+#endif  // COMPONENTS_WEBAPPS_INSTALLABLE_INSTALLABLE_MANAGER_H_
diff --git a/chrome/browser/installable/installable_manager_unittest.cc b/components/webapps/installable/installable_manager_unittest.cc
similarity index 98%
rename from chrome/browser/installable/installable_manager_unittest.cc
rename to components/webapps/installable/installable_manager_unittest.cc
index f50c2a48..65a409c 100644
--- a/chrome/browser/installable/installable_manager_unittest.cc
+++ b/components/webapps/installable/installable_manager_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/installable/installable_manager.h"
+#include "components/webapps/installable/installable_manager.h"
 
 #include "base/feature_list.h"
 #include "base/optional.h"
@@ -14,6 +14,8 @@
 #include "third_party/blink/public/mojom/manifest/display_mode.mojom.h"
 #include "third_party/blink/public/mojom/manifest/manifest.mojom.h"
 
+namespace webapps {
+
 using IconPurpose = blink::mojom::ManifestImageResource_Purpose;
 
 class InstallableManagerUnitTest : public testing::Test {
@@ -416,3 +418,5 @@
   EXPECT_TRUE(IsManifestValid(manifest));
   EXPECT_EQ(NO_ERROR_DETECTED, GetErrorCode());
 }
+
+}  // namespace webapps
diff --git a/chrome/browser/installable/installable_metrics.cc b/components/webapps/installable/installable_metrics.cc
similarity index 66%
rename from chrome/browser/installable/installable_metrics.cc
rename to components/webapps/installable/installable_metrics.cc
index 8001d10..3801678 100644
--- a/chrome/browser/installable/installable_metrics.cc
+++ b/components/webapps/installable/installable_metrics.cc
@@ -2,16 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/installable/installable_metrics.h"
+#include "components/webapps/installable/installable_metrics.h"
 
 #include "base/metrics/histogram_macros.h"
 #include "build/build_config.h"
+#include "components/webapps/webapps_client.h"
 #include "content/public/browser/web_contents.h"
 
-#if defined(OS_ANDROID)
-#include "chrome/browser/android/tab_android.h"
-#include "chrome/browser/android/tab_web_contents_delegate_android.h"
-#endif
+namespace webapps {
 
 // static
 void InstallableMetrics::TrackInstallEvent(WebappInstallSource source) {
@@ -44,34 +42,7 @@
 WebappInstallSource InstallableMetrics::GetInstallSource(
     content::WebContents* web_contents,
     InstallTrigger trigger) {
-  bool is_custom_tab = false;
-#if defined(OS_ANDROID)
-  auto* delegate = static_cast<android::TabWebContentsDelegateAndroid*>(
-      web_contents->GetDelegate());
-  is_custom_tab = delegate->IsCustomTab();
-#endif
-
-  switch (trigger) {
-    case InstallTrigger::AMBIENT_BADGE:
-      return is_custom_tab ? WebappInstallSource::AMBIENT_BADGE_CUSTOM_TAB
-                           : WebappInstallSource::AMBIENT_BADGE_BROWSER_TAB;
-    case InstallTrigger::API:
-      return is_custom_tab ? WebappInstallSource::API_CUSTOM_TAB
-                           : WebappInstallSource::API_BROWSER_TAB;
-    case InstallTrigger::AUTOMATIC_PROMPT:
-      return is_custom_tab ? WebappInstallSource::AUTOMATIC_PROMPT_CUSTOM_TAB
-                           : WebappInstallSource::AUTOMATIC_PROMPT_BROWSER_TAB;
-    case InstallTrigger::MENU:
-      return is_custom_tab ? WebappInstallSource::MENU_CUSTOM_TAB
-                           : WebappInstallSource::MENU_BROWSER_TAB;
-    // Create shortcut does not exist on Android, so it doesn't apply to custom
-    // tab.
-    case InstallTrigger::CREATE_SHORTCUT:
-      DCHECK(!is_custom_tab);
-      return WebappInstallSource::MENU_CREATE_SHORTCUT;
-  }
-  NOTREACHED();
-  return WebappInstallSource::COUNT;
+  return WebappsClient::Get()->GetInstallSource(web_contents, trigger);
 }
 
 // static
@@ -87,8 +58,8 @@
 
 // static
 ServiceWorkerOfflineCapability
-    InstallableMetrics::ConvertFromServiceWorkerCapability(
-        content::ServiceWorkerCapability capability) {
+InstallableMetrics::ConvertFromServiceWorkerCapability(
+    content::ServiceWorkerCapability capability) {
   switch (capability) {
     case content::ServiceWorkerCapability::SERVICE_WORKER_WITH_FETCH_HANDLER:
       return ServiceWorkerOfflineCapability::kServiceWorkerWithOfflineSupport;
@@ -111,3 +82,5 @@
   }
   NOTREACHED();
 }
+
+}  // namespace webapps
diff --git a/chrome/browser/installable/installable_metrics.h b/components/webapps/installable/installable_metrics.h
similarity index 94%
rename from chrome/browser/installable/installable_metrics.h
rename to components/webapps/installable/installable_metrics.h
index 6952097..a575f5f 100644
--- a/chrome/browser/installable/installable_metrics.h
+++ b/components/webapps/installable/installable_metrics.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_INSTALLABLE_INSTALLABLE_METRICS_H_
-#define CHROME_BROWSER_INSTALLABLE_INSTALLABLE_METRICS_H_
+#ifndef COMPONENTS_WEBAPPS_INSTALLABLE_INSTALLABLE_METRICS_H_
+#define COMPONENTS_WEBAPPS_INSTALLABLE_INSTALLABLE_METRICS_H_
 
 #include "base/macros.h"
 #include "base/time/time.h"
@@ -13,6 +13,8 @@
 class WebContents;
 }
 
+namespace webapps {
+
 enum class InstallTrigger {
   AMBIENT_BADGE,
   API,
@@ -135,4 +137,6 @@
   DISALLOW_IMPLICIT_CONSTRUCTORS(InstallableMetrics);
 };
 
-#endif  // CHROME_BROWSER_INSTALLABLE_INSTALLABLE_METRICS_H_
+}  // namespace webapps
+
+#endif  // COMPONENTS_WEBAPPS_INSTALLABLE_INSTALLABLE_METRICS_H_
diff --git a/chrome/browser/installable/installable_params.h b/components/webapps/installable/installable_params.h
similarity index 89%
rename from chrome/browser/installable/installable_params.h
rename to components/webapps/installable/installable_params.h
index e8766a4..a669443 100644
--- a/chrome/browser/installable/installable_params.h
+++ b/components/webapps/installable/installable_params.h
@@ -2,8 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_INSTALLABLE_INSTALLABLE_PARAMS_H_
-#define CHROME_BROWSER_INSTALLABLE_INSTALLABLE_PARAMS_H_
+#ifndef COMPONENTS_WEBAPPS_INSTALLABLE_INSTALLABLE_PARAMS_H_
+#define COMPONENTS_WEBAPPS_INSTALLABLE_INSTALLABLE_PARAMS_H_
+
+namespace webapps {
 
 // This struct specifies the work to be done by the InstallableManager.
 // Data is cached and fetched in the order specified in this struct.
@@ -51,4 +53,6 @@
   bool is_debug_mode = false;
 };
 
-#endif  // CHROME_BROWSER_INSTALLABLE_INSTALLABLE_PARAMS_H_
+}  // namespace webapps
+
+#endif  // COMPONENTS_WEBAPPS_INSTALLABLE_INSTALLABLE_PARAMS_H_
diff --git a/chrome/browser/installable/installable_task_queue.cc b/components/webapps/installable/installable_task_queue.cc
similarity index 95%
rename from chrome/browser/installable/installable_task_queue.cc
rename to components/webapps/installable/installable_task_queue.cc
index 318c01e..82ff934 100644
--- a/chrome/browser/installable/installable_task_queue.cc
+++ b/components/webapps/installable/installable_task_queue.cc
@@ -2,9 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "components/webapps/installable/installable_task_queue.h"
+
 #include <utility>
 
-#include "chrome/browser/installable/installable_task_queue.h"
+namespace webapps {
 
 InstallableTask::InstallableTask() = default;
 
@@ -84,3 +86,5 @@
     }
   }
 }
+
+}  // namespace webapps
diff --git a/chrome/browser/installable/installable_task_queue.h b/components/webapps/installable/installable_task_queue.h
similarity index 86%
rename from chrome/browser/installable/installable_task_queue.h
rename to components/webapps/installable/installable_task_queue.h
index f220ced2..7578f42 100644
--- a/chrome/browser/installable/installable_task_queue.h
+++ b/components/webapps/installable/installable_task_queue.h
@@ -2,16 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_INSTALLABLE_INSTALLABLE_TASK_QUEUE_H_
-#define CHROME_BROWSER_INSTALLABLE_INSTALLABLE_TASK_QUEUE_H_
+#ifndef COMPONENTS_WEBAPPS_INSTALLABLE_INSTALLABLE_TASK_QUEUE_H_
+#define COMPONENTS_WEBAPPS_INSTALLABLE_INSTALLABLE_TASK_QUEUE_H_
 
 #include <deque>
 
 #include "base/callback.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
-#include "chrome/browser/installable/installable_data.h"
-#include "chrome/browser/installable/installable_params.h"
+#include "components/webapps/installable/installable_data.h"
+#include "components/webapps/installable/installable_params.h"
+
+namespace webapps {
 
 struct InstallableTask {
   InstallableTask();
@@ -80,4 +82,6 @@
   std::deque<InstallableTask> paused_tasks_;
 };
 
-#endif  // CHROME_BROWSER_INSTALLABLE_INSTALLABLE_TASK_QUEUE_H_
+}  // namespace webapps
+
+#endif  // COMPONENTS_WEBAPPS_INSTALLABLE_INSTALLABLE_TASK_QUEUE_H_
diff --git a/chrome/browser/installable/installable_task_queue_unittest.cc b/components/webapps/installable/installable_task_queue_unittest.cc
similarity index 95%
rename from chrome/browser/installable/installable_task_queue_unittest.cc
rename to components/webapps/installable/installable_task_queue_unittest.cc
index f6f96c6..e4fa0287 100644
--- a/chrome/browser/installable/installable_task_queue_unittest.cc
+++ b/components/webapps/installable/installable_task_queue_unittest.cc
@@ -2,11 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/installable/installable_task_queue.h"
+#include "components/webapps/installable/installable_task_queue.h"
 
-#include "chrome/browser/installable/installable_manager.h"
+#include "components/webapps/installable/installable_manager.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+namespace webapps {
+
 // A POD struct which holds booleans for creating and comparing against
 // a (move-only) InstallableTask.
 struct TaskParams {
@@ -109,3 +111,5 @@
   task_queue.Next();
   EXPECT_FALSE(task_queue.HasCurrent());
 }
+
+}  // namespace webapps
diff --git a/components/webapps/webapps_client.h b/components/webapps/webapps_client.h
index 4661b22d..b8c95e5 100644
--- a/components/webapps/webapps_client.h
+++ b/components/webapps/webapps_client.h
@@ -13,6 +13,9 @@
 
 namespace webapps {
 
+enum class InstallTrigger;
+enum class WebappInstallSource;
+
 // Interface to be implemented by the embedder (such as Chrome or WebLayer) to
 // expose embedder specific logic.
 class WebappsClient {
@@ -27,6 +30,10 @@
 
   virtual security_state::SecurityLevel GetSecurityLevelForWebContents(
       content::WebContents* web_contents) = 0;
+
+  virtual WebappInstallSource GetInstallSource(
+      content::WebContents* web_contents,
+      InstallTrigger trigger) = 0;
 };
 
 }  // namespace webapps
diff --git a/content/app/content_main_runner_impl.cc b/content/app/content_main_runner_impl.cc
index c0823fa..86e0588 100644
--- a/content/app/content_main_runner_impl.cc
+++ b/content/app/content_main_runner_impl.cc
@@ -17,6 +17,7 @@
 #include "base/allocator/allocator_extension.h"
 #include "base/allocator/allocator_shim.h"
 #include "base/allocator/buildflags.h"
+#include "base/allocator/partition_allocator/partition_alloc_features.h"
 #include "base/at_exit.h"
 #include "base/base_switches.h"
 #include "base/bind.h"
@@ -246,12 +247,9 @@
 }
 
 void EnablePCScanForMallocPartitionsInBrowserProcessIfNeeded() {
-  static const base::Feature kPartitionAllocPCScanBrowserOnly{
-      "PartitionAllocPCScanBrowserOnly", base::FEATURE_DISABLED_BY_DEFAULT};
-  (void)kPartitionAllocPCScanBrowserOnly;
 #if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC)
   CHECK(base::FeatureList::GetInstance());
-  if (base::FeatureList::IsEnabled(kPartitionAllocPCScanBrowserOnly)) {
+  if (base::features::IsPartitionAllocPCScanBrowserOnlyEnabled()) {
     base::allocator::EnablePCScan();
   }
 #endif
diff --git a/content/browser/accessibility/accessibility_scripts_mac_browsertest.mm b/content/browser/accessibility/accessibility_scripts_mac_browsertest.mm
index 01b7b67..658aed4c 100644
--- a/content/browser/accessibility/accessibility_scripts_mac_browsertest.mm
+++ b/content/browser/accessibility/accessibility_scripts_mac_browsertest.mm
@@ -37,8 +37,8 @@
         helper_("mac") {
     // Set property filters.
     std::vector<ui::AXPropertyFilter> property_filters;
-    formatter_->AddDefaultFilters(&property_filters);
-    formatter_->SetPropertyFilters(property_filters);
+    formatter_->SetPropertyFilters(property_filters,
+                                   ui::AXTreeFormatter::kFiltersDefaultSet);
   }
 
   void LoadFile(const std::string& file);
diff --git a/content/browser/accessibility/accessibility_tree_formatter_android.cc b/content/browser/accessibility/accessibility_tree_formatter_android.cc
index ac442804..f986318 100644
--- a/content/browser/accessibility/accessibility_tree_formatter_android.cc
+++ b/content/browser/accessibility/accessibility_tree_formatter_android.cc
@@ -89,6 +89,7 @@
   base::Value BuildTreeForSelector(
       const AXTreeSelector& selector) const override;
 
+ protected:
   void AddDefaultFilters(
       std::vector<AXPropertyFilter>* property_filters) override;
 
diff --git a/content/browser/accessibility/accessibility_tree_formatter_base.cc b/content/browser/accessibility/accessibility_tree_formatter_base.cc
index 71aedc01..67f96fe 100644
--- a/content/browser/accessibility/accessibility_tree_formatter_base.cc
+++ b/content/browser/accessibility/accessibility_tree_formatter_base.cc
@@ -87,8 +87,14 @@
 }
 
 void AccessibilityTreeFormatterBase::SetPropertyFilters(
-    const std::vector<AXPropertyFilter>& property_filters) {
-  property_filters_ = property_filters;
+    const std::vector<AXPropertyFilter>& property_filters,
+    PropertyFilterSet default_filter_set) {
+  property_filters_.clear();
+  if (default_filter_set == kFiltersDefaultSet) {
+    AddDefaultFilters(&property_filters_);
+  }
+  property_filters_.insert(property_filters_.end(), property_filters.begin(),
+                           property_filters.end());
 }
 
 void AccessibilityTreeFormatterBase::SetNodeFilters(
diff --git a/content/browser/accessibility/accessibility_tree_formatter_base.h b/content/browser/accessibility/accessibility_tree_formatter_base.h
index d1516ae7..3b6b4f5 100644
--- a/content/browser/accessibility/accessibility_tree_formatter_base.h
+++ b/content/browser/accessibility/accessibility_tree_formatter_base.h
@@ -67,11 +67,9 @@
   virtual base::Value BuildTree(BrowserAccessibility* root) const = 0;
 
   // AXTreeFormatter overrides.
-  void AddDefaultFilters(
-      std::vector<AXPropertyFilter>* property_filters) override;
   std::string FormatTree(const base::Value& tree_node) const override;
-  void SetPropertyFilters(
-      const std::vector<AXPropertyFilter>& property_filters) override;
+  void SetPropertyFilters(const std::vector<AXPropertyFilter>& property_filters,
+                          PropertyFilterSet default_filters_set) override;
   void SetNodeFilters(const std::vector<AXNodeFilter>& node_filters) override;
   void set_show_ids(bool show_ids) override;
 
@@ -80,6 +78,10 @@
   // Overridden by platform subclasses.
   //
 
+  // Appends default filters of the formatter.
+  virtual void AddDefaultFilters(
+      std::vector<AXPropertyFilter>* property_filters);
+
   // Returns property nodes complying to the line index filter for all
   // allow/allow_empty property filters.
   std::vector<ui::AXPropertyNode> PropertyFilterNodesFor(
diff --git a/content/browser/accessibility/accessibility_tree_formatter_blink.h b/content/browser/accessibility/accessibility_tree_formatter_blink.h
index a8ac6cc..a71eb4bb 100644
--- a/content/browser/accessibility/accessibility_tree_formatter_blink.h
+++ b/content/browser/accessibility/accessibility_tree_formatter_blink.h
@@ -24,8 +24,10 @@
   base::Value BuildTreeForSelector(
       const AXTreeSelector& selector) const override;
 
+ protected:
   void AddDefaultFilters(
       std::vector<AXPropertyFilter>* property_filters) override;
+
  private:
   void RecursiveBuildTree(const BrowserAccessibility& node,
                           base::Value* dict) const;
diff --git a/content/browser/accessibility/accessibility_tree_formatter_mac.mm b/content/browser/accessibility/accessibility_tree_formatter_mac.mm
index bd73a07..5fa52f5 100644
--- a/content/browser/accessibility/accessibility_tree_formatter_mac.mm
+++ b/content/browser/accessibility/accessibility_tree_formatter_mac.mm
@@ -61,14 +61,15 @@
   explicit AccessibilityTreeFormatterMac();
   ~AccessibilityTreeFormatterMac() override;
 
-  void AddDefaultFilters(
-      std::vector<AXPropertyFilter>* property_filters) override;
-
   base::Value BuildTree(BrowserAccessibility* root) const override;
   base::Value BuildTreeForWindow(gfx::AcceleratedWidget widget) const override;
   base::Value BuildTreeForSelector(
       const AXTreeSelector& selector) const override;
 
+ protected:
+  void AddDefaultFilters(
+      std::vector<AXPropertyFilter>* property_filters) override;
+
  private:
   base::Value BuildTreeForAXUIElement(AXUIElementRef node) const;
 
diff --git a/content/browser/accessibility/accessibility_tree_formatter_mac_browsertest.mm b/content/browser/accessibility/accessibility_tree_formatter_mac_browsertest.mm
index 7e9f38f..8287ef3 100644
--- a/content/browser/accessibility/accessibility_tree_formatter_mac_browsertest.mm
+++ b/content/browser/accessibility/accessibility_tree_formatter_mac_browsertest.mm
@@ -68,8 +68,8 @@
         ui::AXPropertyFilter(filter, ui::AXPropertyFilter::ALLOW_EMPTY));
   }
 
-  formatter->AddDefaultFilters(&property_filters);
-  formatter->SetPropertyFilters(property_filters);
+  formatter->SetPropertyFilters(property_filters,
+                                ui::AXTreeFormatter::kFiltersDefaultSet);
 
   BrowserAccessibility* root = GetManager()->GetRoot();
   ASSERT_NE(nullptr, root);
diff --git a/content/browser/accessibility/accessibility_tree_formatter_uia_win.h b/content/browser/accessibility/accessibility_tree_formatter_uia_win.h
index 3b4073bd..4ac0a79e 100644
--- a/content/browser/accessibility/accessibility_tree_formatter_uia_win.h
+++ b/content/browser/accessibility/accessibility_tree_formatter_uia_win.h
@@ -25,13 +25,15 @@
   ~AccessibilityTreeFormatterUia() override;
 
   // AccessibilityTreeFormatterBase:
-  void AddDefaultFilters(
-      std::vector<AXPropertyFilter>* property_filters) override;
   base::Value BuildTree(BrowserAccessibility* start) const override;
   base::Value BuildTreeForWindow(gfx::AcceleratedWidget hwnd) const override;
   base::Value BuildTreeForSelector(
       const AXTreeSelector& selector) const override;
 
+ protected:
+  void AddDefaultFilters(
+      std::vector<AXPropertyFilter>* property_filters) override;
+
  private:
   static const long properties_[];
   static const long patterns_[];
diff --git a/content/browser/accessibility/accessibility_tree_formatter_win.cc b/content/browser/accessibility/accessibility_tree_formatter_win.cc
index 96b84c0..649f3cf 100644
--- a/content/browser/accessibility/accessibility_tree_formatter_win.cc
+++ b/content/browser/accessibility/accessibility_tree_formatter_win.cc
@@ -45,6 +45,7 @@
   base::Value BuildTreeForSelector(
       const AXTreeSelector& selector) const override;
 
+ protected:
   void AddDefaultFilters(
       std::vector<AXPropertyFilter>* property_filters) override;
 
diff --git a/content/browser/accessibility/dump_accessibility_browsertest_base.cc b/content/browser/accessibility/dump_accessibility_browsertest_base.cc
index 5b040f2..475cdd86 100644
--- a/content/browser/accessibility/dump_accessibility_browsertest_base.cc
+++ b/content/browser/accessibility/dump_accessibility_browsertest_base.cc
@@ -144,9 +144,7 @@
 std::string
 DumpAccessibilityTestBase::DumpUnfilteredAccessibilityTreeAsString() {
   std::unique_ptr<AXTreeFormatter> formatter(CreateFormatter());
-  std::vector<AXPropertyFilter> property_filters;
-  property_filters.emplace_back("*", AXPropertyFilter::ALLOW);
-  formatter->SetPropertyFilters(property_filters);
+  formatter->SetPropertyFilters({{"*", AXPropertyFilter::ALLOW}});
   formatter->set_show_ids(true);
   return formatter->Format(GetRootAccessibilityNode(shell()->web_contents()));
 }
@@ -210,8 +208,6 @@
 void DumpAccessibilityTestBase::RunTestForPlatform(
     const base::FilePath file_path,
     const char* file_dir) {
-  formatter_ = CreateFormatter();
-
   // Disable the "hot tracked" state (set when the mouse is hovering over
   // an object) because it makes test output change based on the mouse position.
   BrowserAccessibilityStateImpl::GetInstance()
@@ -270,7 +266,6 @@
   std::vector<std::string> default_action_on;
   property_filters_.clear();
   node_filters_.clear();
-  formatter_->AddDefaultFilters(&property_filters_);
   AddDefaultFilters(&property_filters_);
   ParseHtmlForExtraDirectives(html_contents, &no_load_expected, &wait_for,
                               &execute, &run_until, &default_action_on);
diff --git a/content/browser/accessibility/dump_accessibility_browsertest_base.h b/content/browser/accessibility/dump_accessibility_browsertest_base.h
index f9d8054c..b9df889 100644
--- a/content/browser/accessibility/dump_accessibility_browsertest_base.h
+++ b/content/browser/accessibility/dump_accessibility_browsertest_base.h
@@ -129,9 +129,6 @@
   // The current tree-formatter and event-recorder factories.
   AccessibilityEventRecorder::EventRecorderFactory event_recorder_factory_;
 
-  // The current AXTreeFormatter.
-  std::unique_ptr<ui::AXTreeFormatter> formatter_;
-
   // Whether we should enable accessibility after navigating to the page,
   // otherwise we enable it first.
   bool enable_accessibility_after_navigating_;
diff --git a/content/browser/accessibility/dump_accessibility_tree_browsertest.cc b/content/browser/accessibility/dump_accessibility_tree_browsertest.cc
index ac6663b..e3d33f3 100644
--- a/content/browser/accessibility/dump_accessibility_tree_browsertest.cc
+++ b/content/browser/accessibility/dump_accessibility_tree_browsertest.cc
@@ -151,7 +151,8 @@
 
   std::vector<std::string> Dump(std::vector<std::string>& unused) override {
     std::unique_ptr<AXTreeFormatter> formatter(CreateFormatter());
-    formatter->SetPropertyFilters(property_filters_);
+    formatter->SetPropertyFilters(property_filters_,
+                                  AXTreeFormatter::kFiltersDefaultSet);
     formatter->SetNodeFilters(node_filters_);
     std::string actual_contents =
         formatter->Format(GetRootAccessibilityNode(shell()->web_contents()));
@@ -2122,6 +2123,11 @@
   RunHtmlTest(FILE_PATH_LITERAL("navigation.html"));
 }
 
+IN_PROC_BROWSER_TEST_P(DumpAccessibilityTreeTest,
+                       AccessibilityNextOnLineCheckFailure) {
+  RunCSSTest(FILE_PATH_LITERAL("next-on-line-check-failure.html"));
+}
+
 IN_PROC_BROWSER_TEST_P(DumpAccessibilityTreeTest, AccessibilityNoscript) {
   RunHtmlTest(FILE_PATH_LITERAL("noscript.html"));
 }
diff --git a/content/browser/file_system_access/native_file_system_directory_handle_impl.cc b/content/browser/file_system_access/native_file_system_directory_handle_impl.cc
index 2472c89..80f184b 100644
--- a/content/browser/file_system_access/native_file_system_directory_handle_impl.cc
+++ b/content/browser/file_system_access/native_file_system_directory_handle_impl.cc
@@ -158,6 +158,14 @@
           base::OnTaskRunnerDeleter(base::SequencedTaskRunnerHandle::Get()));
   listener->reset_on_disconnect();
 
+  if (GetReadPermissionStatus() != PermissionStatus::GRANTED) {
+    (*listener)->DidReadDirectory(
+        native_file_system_error::FromStatus(
+            NativeFileSystemStatus::kPermissionDenied),
+        {}, false);
+    return;
+  }
+
   DoFileSystemOperation(
       FROM_HERE, &FileSystemOperationRunner::ReadDirectory,
       base::BindRepeating(
diff --git a/content/browser/file_system_access/native_file_system_directory_handle_impl_unittest.cc b/content/browser/file_system_access/native_file_system_directory_handle_impl_unittest.cc
index 2601bc9..a3ba240 100644
--- a/content/browser/file_system_access/native_file_system_directory_handle_impl_unittest.cc
+++ b/content/browser/file_system_access/native_file_system_directory_handle_impl_unittest.cc
@@ -48,14 +48,20 @@
     auto url_and_fs = manager_->CreateFileSystemURLFromPath(
         test_src_origin_, NativeFileSystemEntryFactory::PathType::kLocal,
         dir_.GetPath());
-
     handle_ = std::make_unique<NativeFileSystemDirectoryHandleImpl>(
         manager_.get(),
         NativeFileSystemManagerImpl::BindingContext(
             test_src_origin_, test_src_url_, /*worker_process_id=*/1),
         url_and_fs.url,
         NativeFileSystemManagerImpl::SharedHandleState(
-            allow_grant_, allow_grant_, std::move(url_and_fs.file_system)));
+            allow_grant_, allow_grant_, url_and_fs.file_system));
+    denied_handle_ = std::make_unique<NativeFileSystemDirectoryHandleImpl>(
+        manager_.get(),
+        NativeFileSystemManagerImpl::BindingContext(
+            test_src_origin_, test_src_url_, /*worker_process_id=*/1),
+        url_and_fs.url,
+        NativeFileSystemManagerImpl::SharedHandleState(
+            deny_grant_, deny_grant_, std::move(url_and_fs.file_system)));
   }
 
   void TearDown() override { task_environment_.RunUntilIdle(); }
@@ -75,7 +81,12 @@
       base::MakeRefCounted<FixedNativeFileSystemPermissionGrant>(
           FixedNativeFileSystemPermissionGrant::PermissionStatus::GRANTED,
           base::FilePath());
+  scoped_refptr<FixedNativeFileSystemPermissionGrant> deny_grant_ =
+      base::MakeRefCounted<FixedNativeFileSystemPermissionGrant>(
+          FixedNativeFileSystemPermissionGrant::PermissionStatus::DENIED,
+          base::FilePath());
   std::unique_ptr<NativeFileSystemDirectoryHandleImpl> handle_;
+  std::unique_ptr<NativeFileSystemDirectoryHandleImpl> denied_handle_;
 };
 
 TEST_F(NativeFileSystemDirectoryHandleImplTest, IsSafePathComponent) {
@@ -130,23 +141,29 @@
  public:
   TestNativeFileSystemDirectoryEntriesListener(
       std::vector<blink::mojom::NativeFileSystemEntryPtr>* entries,
+      blink::mojom::NativeFileSystemErrorPtr* final_result,
       base::OnceClosure done)
-      : entries_(entries), done_(std::move(done)) {}
+      : entries_(entries),
+        final_result_(final_result),
+        done_(std::move(done)) {}
 
   void DidReadDirectory(
       blink::mojom::NativeFileSystemErrorPtr result,
       std::vector<blink::mojom::NativeFileSystemEntryPtr> entries,
       bool has_more_entries) override {
-    EXPECT_EQ(result->status, blink::mojom::NativeFileSystemStatus::kOk);
     entries_->insert(entries_->end(), std::make_move_iterator(entries.begin()),
                      std::make_move_iterator(entries.end()));
-    if (!has_more_entries) {
+    if (has_more_entries) {
+      EXPECT_EQ(result->status, blink::mojom::NativeFileSystemStatus::kOk);
+    } else {
+      *final_result_ = std::move(result);
       std::move(done_).Run();
     }
   }
 
  private:
   std::vector<blink::mojom::NativeFileSystemEntryPtr>* entries_;
+  blink::mojom::NativeFileSystemErrorPtr* final_result_;
   base::OnceClosure done_;
 };
 }  // namespace
@@ -176,16 +193,18 @@
   }
 
   std::vector<blink::mojom::NativeFileSystemEntryPtr> entries;
+  blink::mojom::NativeFileSystemErrorPtr result;
   base::RunLoop loop;
   mojo::PendingRemote<blink::mojom::NativeFileSystemDirectoryEntriesListener>
       listener;
   mojo::MakeSelfOwnedReceiver(
       std::make_unique<TestNativeFileSystemDirectoryEntriesListener>(
-          &entries, loop.QuitClosure()),
+          &entries, &result, loop.QuitClosure()),
       listener.InitWithNewPipeAndPassReceiver());
   handle_->GetEntries(std::move(listener));
   loop.Run();
 
+  EXPECT_EQ(result->status, blink::mojom::NativeFileSystemStatus::kOk);
   std::vector<std::string> names;
   for (const auto& entry : entries) {
     names.push_back(entry->name);
@@ -193,4 +212,60 @@
   EXPECT_THAT(names, testing::UnorderedElementsAreArray(kSafeNames));
 }
 
+TEST_F(NativeFileSystemDirectoryHandleImplTest, GetFile_NoReadAccess) {
+  ASSERT_TRUE(base::WriteFile(dir_.GetPath().AppendASCII("filename"), "data"));
+
+  base::RunLoop loop;
+  denied_handle_->GetFile(
+      "filename", /*create=*/false,
+      base::BindLambdaForTesting(
+          [](blink::mojom::NativeFileSystemErrorPtr result,
+             mojo::PendingRemote<blink::mojom::NativeFileSystemFileHandle>
+                 file_handle) {
+            EXPECT_EQ(result->status,
+                      blink::mojom::NativeFileSystemStatus::kPermissionDenied);
+            EXPECT_FALSE(file_handle.is_valid());
+          })
+          .Then(loop.QuitClosure()));
+  loop.Run();
+}
+
+TEST_F(NativeFileSystemDirectoryHandleImplTest, GetDirectory_NoReadAccess) {
+  ASSERT_TRUE(base::CreateDirectory(dir_.GetPath().AppendASCII("dirname")));
+
+  base::RunLoop loop;
+  denied_handle_->GetDirectory(
+      "GetDirectory_NoReadAccess", /*create=*/false,
+      base::BindLambdaForTesting(
+          [](blink::mojom::NativeFileSystemErrorPtr result,
+             mojo::PendingRemote<blink::mojom::NativeFileSystemDirectoryHandle>
+                 dir_handle) {
+            EXPECT_EQ(result->status,
+                      blink::mojom::NativeFileSystemStatus::kPermissionDenied);
+            EXPECT_FALSE(dir_handle.is_valid());
+          })
+          .Then(loop.QuitClosure()));
+  loop.Run();
+}
+
+TEST_F(NativeFileSystemDirectoryHandleImplTest, GetEntries_NoReadAccess) {
+  ASSERT_TRUE(base::WriteFile(dir_.GetPath().AppendASCII("filename"), "data"));
+
+  std::vector<blink::mojom::NativeFileSystemEntryPtr> entries;
+  blink::mojom::NativeFileSystemErrorPtr result;
+  base::RunLoop loop;
+  mojo::PendingRemote<blink::mojom::NativeFileSystemDirectoryEntriesListener>
+      listener;
+  mojo::MakeSelfOwnedReceiver(
+      std::make_unique<TestNativeFileSystemDirectoryEntriesListener>(
+          &entries, &result, loop.QuitClosure()),
+      listener.InitWithNewPipeAndPassReceiver());
+  denied_handle_->GetEntries(std::move(listener));
+  loop.Run();
+
+  EXPECT_EQ(result->status,
+            blink::mojom::NativeFileSystemStatus::kPermissionDenied);
+  EXPECT_TRUE(entries.empty());
+}
+
 }  // namespace content
diff --git a/content/browser/gpu/gpu_data_manager_impl.cc b/content/browser/gpu/gpu_data_manager_impl.cc
index 443bdfd..3b9289d 100644
--- a/content/browser/gpu/gpu_data_manager_impl.cc
+++ b/content/browser/gpu/gpu_data_manager_impl.cc
@@ -328,12 +328,6 @@
   private_->DisableDomainBlockingFor3DAPIsForTesting();
 }
 
-bool GpuDataManagerImpl::UpdateActiveGpu(uint32_t vendor_id,
-                                         uint32_t device_id) {
-  base::AutoLock auto_lock(lock_);
-  return private_->UpdateActiveGpu(vendor_id, device_id);
-}
-
 gpu::GpuMode GpuDataManagerImpl::GetGpuMode() const {
   base::AutoLock auto_lock(lock_);
   return private_->GetGpuMode();
diff --git a/content/browser/gpu/gpu_data_manager_impl.h b/content/browser/gpu/gpu_data_manager_impl.h
index f8df36a..e57176b 100644
--- a/content/browser/gpu/gpu_data_manager_impl.h
+++ b/content/browser/gpu/gpu_data_manager_impl.h
@@ -151,10 +151,6 @@
   // Disables domain blocking for 3D APIs. For use only in tests.
   void DisableDomainBlockingFor3DAPIsForTesting();
 
-  // Set the active gpu.
-  // Return true if it's a different GPU from the previous active one.
-  bool UpdateActiveGpu(uint32_t vendor_id, uint32_t device_id);
-
   // Return mode describing what the GPU process will be launched to run.
   gpu::GpuMode GetGpuMode() const;
 
diff --git a/content/browser/gpu/gpu_data_manager_impl_private.cc b/content/browser/gpu/gpu_data_manager_impl_private.cc
index 147de9d7..e47fa58 100644
--- a/content/browser/gpu/gpu_data_manager_impl_private.cc
+++ b/content/browser/gpu/gpu_data_manager_impl_private.cc
@@ -330,17 +330,7 @@
       reinterpret_cast<GpuDataManagerImpl*>(gpu_data_manager);
   DCHECK(manager);
 
-  bool gpu_changed = false;
-  if (flags & kCGDisplayAddFlag) {
-    gpu::GPUInfo gpu_info;
-    if (gpu::CollectBasicGraphicsInfo(&gpu_info)) {
-      gpu_changed = manager->UpdateActiveGpu(gpu_info.active_gpu().vendor_id,
-                                             gpu_info.active_gpu().device_id);
-    }
-  }
-
-  if (gpu_changed)
-    manager->HandleGpuSwitch();
+  manager->HandleGpuSwitch();
 }
 #endif  // OS_MAC
 
@@ -1374,70 +1364,6 @@
                            }));
 }
 
-bool GpuDataManagerImplPrivate::UpdateActiveGpu(uint32_t vendor_id,
-                                                uint32_t device_id) {
-  // Heuristics for dual-GPU detection.
-#if defined(OS_WIN)
-  // On Windows, "Microsoft Basic Render Driver" now shows up as a
-  // secondary GPU.
-  bool is_dual_gpu = gpu_info_.secondary_gpus.size() == 2;
-#else
-  bool is_dual_gpu = gpu_info_.secondary_gpus.size() == 1;
-#endif
-  // TODO(kbr/zmo): on Windows, at least, it's now possible to have a
-  // system with both low-power and high-performance GPUs from AMD.
-  const uint32_t kIntelID = 0x8086;
-  bool saw_intel_gpu = false;
-  bool saw_non_intel_gpu = false;
-
-  if (gpu_info_.gpu.vendor_id == vendor_id &&
-      gpu_info_.gpu.device_id == device_id) {
-    // The primary GPU is active.
-    if (gpu_info_.gpu.active)
-      return false;
-    gpu_info_.gpu.active = true;
-    for (size_t ii = 0; ii < gpu_info_.secondary_gpus.size(); ++ii) {
-      gpu_info_.secondary_gpus[ii].active = false;
-    }
-  } else {
-    // A secondary GPU is active.
-    for (size_t ii = 0; ii < gpu_info_.secondary_gpus.size(); ++ii) {
-      if (gpu_info_.secondary_gpus[ii].vendor_id == vendor_id &&
-          gpu_info_.secondary_gpus[ii].device_id == device_id) {
-        if (gpu_info_.secondary_gpus[ii].active)
-          return false;
-        gpu_info_.secondary_gpus[ii].active = true;
-      } else {
-        gpu_info_.secondary_gpus[ii].active = false;
-      }
-    }
-    gpu_info_.gpu.active = false;
-  }
-  active_gpu_heuristic_ = gl::GpuPreference::kDefault;
-  if (is_dual_gpu) {
-    if (gpu_info_.gpu.vendor_id == kIntelID) {
-      saw_intel_gpu = true;
-    } else {
-      saw_non_intel_gpu = true;
-    }
-    if (gpu_info_.secondary_gpus[0].vendor_id == kIntelID) {
-      saw_intel_gpu = true;
-    } else {
-      saw_non_intel_gpu = true;
-    }
-    if (saw_intel_gpu && saw_non_intel_gpu) {
-      if (vendor_id == kIntelID) {
-        active_gpu_heuristic_ = gl::GpuPreference::kLowPower;
-      } else {
-        active_gpu_heuristic_ = gl::GpuPreference::kHighPerformance;
-      }
-    }
-  }
-  GetContentClient()->SetGpuInfo(gpu_info_);
-  NotifyGpuInfoUpdate();
-  return true;
-}
-
 void GpuDataManagerImplPrivate::BlockDomainFrom3DAPIs(const GURL& url,
                                                       gpu::DomainGuilt guilt) {
   BlockDomainFrom3DAPIsAtTime(url, guilt, base::Time::Now());
diff --git a/content/browser/gpu/gpu_data_manager_impl_private.h b/content/browser/gpu/gpu_data_manager_impl_private.h
index 25ff864..a91832f 100644
--- a/content/browser/gpu/gpu_data_manager_impl_private.h
+++ b/content/browser/gpu/gpu_data_manager_impl_private.h
@@ -116,8 +116,6 @@
                           int render_frame_id,
                           ThreeDAPIType requester);
 
-  bool UpdateActiveGpu(uint32_t vendor_id, uint32_t device_id);
-
   gpu::GpuMode GetGpuMode() const;
   void FallBackToNextGpuMode();
 
diff --git a/content/browser/gpu/gpu_data_manager_testing.json b/content/browser/gpu/gpu_data_manager_testing.json
index aff45e0..5f892829 100644
--- a/content/browser/gpu/gpu_data_manager_testing.json
+++ b/content/browser/gpu/gpu_data_manager_testing.json
@@ -51,15 +51,6 @@
       "features": [
         "all"
       ]
-    },
-    {
-      "id": 7,
-      "description": "GpuDataManagerImplPrivateTest.UpdateActiveGpu",
-      "vendor_id": "0x8086",
-      "multi_gpu_category": "active",
-      "features": [
-        "accelerated_webgl"
-      ]
     }
   ]
 }
diff --git a/content/browser/gpu/gpu_data_manager_testing_arrays_and_structs_autogen.h b/content/browser/gpu/gpu_data_manager_testing_arrays_and_structs_autogen.h
index bdb580d7..44343bd 100644
--- a/content/browser/gpu/gpu_data_manager_testing_arrays_and_structs_autogen.h
+++ b/content/browser/gpu/gpu_data_manager_testing_arrays_and_structs_autogen.h
@@ -204,29 +204,6 @@
     GpuControlList::kDontCare,  // subpixel_font_rendering
 };
 
-const int kFeatureListForGpuManagerTestingEntry7[1] = {
-    GPU_FEATURE_TYPE_ACCELERATED_WEBGL,
-};
-
-const GpuControlList::More kMoreForEntry7_572251052 = {
-    GpuControlList::kGLTypeNone,  // gl_type
-    {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical,
-     GpuControlList::kVersionSchemaCommon, nullptr, nullptr},  // gl_version
-    {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical,
-     GpuControlList::kVersionSchemaCommon, nullptr,
-     nullptr},  // pixel_shader_version
-    false,      // in_process_gpu
-    0,          // gl_reset_notification_strategy
-    {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical,
-     GpuControlList::kVersionSchemaCommon, nullptr,
-     nullptr},  // direct_rendering_version
-    {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical,
-     GpuControlList::kVersionSchemaCommon, nullptr, nullptr},  // gpu_count
-    GpuControlList::kDontCare,  // hardware_overlay
-    0,                          // test_group
-    GpuControlList::kDontCare,  // subpixel_font_rendering
-};
-
 }  // namespace gpu
 
 #endif  // CONTENT_BROWSER_GPU_GPU_DATA_MANAGER_TESTING_ARRAYS_AND_STRUCTS_AUTOGEN_H_
diff --git a/content/browser/gpu/gpu_data_manager_testing_autogen.cc b/content/browser/gpu/gpu_data_manager_testing_autogen.cc
index d7f06792..92c31a6 100644
--- a/content/browser/gpu/gpu_data_manager_testing_autogen.cc
+++ b/content/browser/gpu/gpu_data_manager_testing_autogen.cc
@@ -220,40 +220,6 @@
         0,        // exceptions count
         nullptr,  // exceptions
     },
-    {
-        7,  // id
-        "GpuDataManagerImplPrivateTest.UpdateActiveGpu",
-        base::size(kFeatureListForGpuManagerTestingEntry7),  // features size
-        kFeatureListForGpuManagerTestingEntry7,              // features
-        0,        // DisabledExtensions size
-        nullptr,  // DisabledExtensions
-        0,        // DisabledWebGLExtensions size
-        nullptr,  // DisabledWebGLExtensions
-        0,        // CrBugs size
-        nullptr,  // CrBugs
-        {
-            GpuControlList::kOsAny,  // os_type
-            {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical,
-             GpuControlList::kVersionSchemaCommon, nullptr,
-             nullptr},                                // os_version
-            0x8086,                                   // vendor_id
-            0,                                        // Devices size
-            nullptr,                                  // Devices
-            GpuControlList::kMultiGpuCategoryActive,  // multi_gpu_category
-            GpuControlList::kMultiGpuStyleNone,       // multi_gpu_style
-            nullptr,                                  // driver info
-            nullptr,                                  // GL strings
-            nullptr,                                  // machine model info
-            0,                                        // intel_gpu_series size
-            nullptr,                                  // intel_gpu_series
-            {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical,
-             GpuControlList::kVersionSchemaCommon, nullptr,
-             nullptr},                  // intel_gpu_generation
-            &kMoreForEntry7_572251052,  // more data
-        },
-        0,        // exceptions count
-        nullptr,  // exceptions
-    },
 };
-const size_t kGpuDataManagerTestingEntryCount = 7;
+const size_t kGpuDataManagerTestingEntryCount = 6;
 }  // namespace gpu
diff --git a/content/browser/gpu/gpu_data_manager_testing_entry_enums_autogen.h b/content/browser/gpu/gpu_data_manager_testing_entry_enums_autogen.h
index 866b026..9f15c54 100644
--- a/content/browser/gpu/gpu_data_manager_testing_entry_enums_autogen.h
+++ b/content/browser/gpu/gpu_data_manager_testing_entry_enums_autogen.h
@@ -19,7 +19,6 @@
   kGpuDataManagerImplPrivateTest_GpuSideBlocklistingWebGL_1 = 3,
   kGpuDataManagerImplPrivateTest_GpuSideException = 4,
   kGpuDataManagerImplPrivateTest_BlocklistAllFeatures = 5,
-  kGpuDataManagerImplPrivateTest_UpdateActiveGpu = 6,
 };
 }  // namespace gpu
 
diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc
index 2879999..d807d8f 100644
--- a/content/browser/gpu/gpu_process_host.cc
+++ b/content/browser/gpu/gpu_process_host.cc
@@ -1044,6 +1044,10 @@
   }
 }
 
+void GpuProcessHost::DidUpdateGPUInfo(const gpu::GPUInfo& gpu_info) {
+  GpuDataManagerImpl::GetInstance()->UpdateGpuInfo(gpu_info, base::nullopt);
+}
+
 #if defined(OS_WIN)
 void GpuProcessHost::DidUpdateOverlayInfo(
     const gpu::OverlayInfo& overlay_info) {
diff --git a/content/browser/gpu/gpu_process_host.h b/content/browser/gpu/gpu_process_host.h
index 9479ce9..43a754b 100644
--- a/content/browser/gpu/gpu_process_host.h
+++ b/content/browser/gpu/gpu_process_host.h
@@ -163,6 +163,7 @@
   void DidFailInitialize() override;
   void DidCreateContextSuccessfully() override;
   void MaybeShutdownGpuProcess() override;
+  void DidUpdateGPUInfo(const gpu::GPUInfo& gpu_info) override;
 #if defined(OS_WIN)
   void DidUpdateOverlayInfo(const gpu::OverlayInfo& overlay_info) override;
   void DidUpdateHDRStatus(bool hdr_enabled) override;
diff --git a/content/browser/renderer_host/clipboard_host_impl.cc b/content/browser/renderer_host/clipboard_host_impl.cc
index 255be2d..bd353f3 100644
--- a/content/browser/renderer_host/clipboard_host_impl.cc
+++ b/content/browser/renderer_host/clipboard_host_impl.cc
@@ -354,15 +354,7 @@
   clipboard_writer_->WriteBookmark(title, url);
 }
 
-void ClipboardHostImpl::WriteImage(const SkBitmap& unsafe_bitmap) {
-  SkBitmap bitmap;
-  // On receipt of an arbitrary bitmap from the renderer, we convert to an N32
-  // 32bpp bitmap. Other pixel sizes can lead to out-of-bounds mistakes when
-  // transferring the pixels out of the bitmap into other buffers.
-  if (!skia::SkBitmapToN32OpaqueOrPremul(unsafe_bitmap, &bitmap)) {
-    NOTREACHED() << "Unable to convert bitmap for clipboard";
-    return;
-  }
+void ClipboardHostImpl::WriteImage(const SkBitmap& bitmap) {
   clipboard_writer_->WriteImage(bitmap);
 }
 
diff --git a/content/browser/renderer_host/clipboard_host_impl_unittest.cc b/content/browser/renderer_host/clipboard_host_impl_unittest.cc
index 227a9ec..617cc2b 100644
--- a/content/browser/renderer_host/clipboard_host_impl_unittest.cc
+++ b/content/browser/renderer_host/clipboard_host_impl_unittest.cc
@@ -95,38 +95,6 @@
   EXPECT_TRUE(gfx::BitmapsAreEqual(bitmap, actual));
 }
 
-// The clipboard implementations work with N32 ARGB bitmaps, but the renderer
-// may send arbitrary formats. They are converted appropriately.
-TEST_F(ClipboardHostImplTest, IncompatibleImage) {
-  SkBitmap bitmap;
-  bitmap.allocPixels(
-      SkImageInfo::Make(3, 2, kARGB_4444_SkColorType, kPremul_SkAlphaType));
-  bitmap.eraseARGB(255, 0, 255, 0);
-  mojo_clipboard()->WriteImage(bitmap);
-  uint64_t sequence_number =
-      system_clipboard()->GetSequenceNumber(ui::ClipboardBuffer::kCopyPaste);
-  mojo_clipboard()->CommitWrite();
-  base::RunLoop().RunUntilIdle();
-
-  EXPECT_NE(sequence_number, system_clipboard()->GetSequenceNumber(
-                                 ui::ClipboardBuffer::kCopyPaste));
-  EXPECT_FALSE(system_clipboard()->IsFormatAvailable(
-      ui::ClipboardFormatType::GetPlainTextType(),
-      ui::ClipboardBuffer::kCopyPaste, /*data_dst=*/nullptr));
-  EXPECT_TRUE(system_clipboard()->IsFormatAvailable(
-      ui::ClipboardFormatType::GetBitmapType(), ui::ClipboardBuffer::kCopyPaste,
-      /*data_dst=*/nullptr));
-
-  // The input was not N32, but we want to compare the output against something,
-  // so we convert the input to N32.
-  SkBitmap converted_input;
-  EXPECT_TRUE(skia::SkBitmapToN32OpaqueOrPremul(bitmap, &converted_input));
-
-  SkBitmap actual = ui::clipboard_test_util::ReadImage(system_clipboard());
-  EXPECT_EQ(actual.colorType(), kN32_SkColorType);
-  EXPECT_TRUE(gfx::BitmapsAreEqual(converted_input, actual));
-}
-
 TEST_F(ClipboardHostImplTest, ReentrancyInSyncCall) {
   // Due to the nature of this test, it's somewhat racy. On some platforms
   // (currently Linux), reading the clipboard requires running a nested message
diff --git a/content/browser/service_worker/service_worker_offline_capability_check_browsertest.cc b/content/browser/service_worker/service_worker_offline_capability_check_browsertest.cc
index 1e28117..0c67759 100644
--- a/content/browser/service_worker/service_worker_offline_capability_check_browsertest.cc
+++ b/content/browser/service_worker/service_worker_offline_capability_check_browsertest.cc
@@ -647,8 +647,9 @@
 
 // Sites with a service worker are identified as supporting offline capability
 // only when it returns a valid response in the offline mode.
-#if defined(OS_WIN)
+#if defined(OS_WIN) || defined(OS_MAC)
 // Flaky on Win7: https://crbug.com/1156081
+// Flaky on Mac: https://crbug.com/1156626
 #define MAYBE_CheckOfflineCapability DISABLED_CheckOfflineCapability
 #else
 #define MAYBE_CheckOfflineCapability CheckOfflineCapability
diff --git a/content/browser/site_per_process_browsertest.cc b/content/browser/site_per_process_browsertest.cc
index 99676bf..9002125a 100644
--- a/content/browser/site_per_process_browsertest.cc
+++ b/content/browser/site_per_process_browsertest.cc
@@ -2560,8 +2560,16 @@
       final_visual_viewport_oopif.Intersects(input_bounds_after_scroll_oopif));
 }
 
+// Flaky on Mac, see crbug.com/1156657
+#if defined(OS_MAC)
+#define MAYBE_ScrollClippedFocusedEditableElementIntoView \
+  DISABLED_ScrollClippedFocusedEditableElementIntoView
+#else
+#define MAYBE_ScrollClippedFocusedEditableElementIntoView \
+  ScrollClippedFocusedEditableElementIntoView
+#endif
 IN_PROC_BROWSER_TEST_P(SitePerProcessProgrammaticScrollTest,
-                       ScrollClippedFocusedEditableElementIntoView) {
+                       MAYBE_ScrollClippedFocusedEditableElementIntoView) {
   GURL url_a(embedded_test_server()->GetURL("a.com", kIframeClippedHTML));
   GURL child_url_b(embedded_test_server()->GetURL("b.com", kInputBoxHTML));
 
diff --git a/content/browser/webid/federated_auth_request_impl.cc b/content/browser/webid/federated_auth_request_impl.cc
index e9c14e3d..f98f861 100644
--- a/content/browser/webid/federated_auth_request_impl.cc
+++ b/content/browser/webid/federated_auth_request_impl.cc
@@ -126,10 +126,14 @@
     CompleteRequest(RequestIdTokenStatus::kError, "");
     return;
   }
+  // Use the web contents of the page that initiated the WebID request (i.e.
+  // the Relying Party) for showing the initial permission dialog.
+  WebContents* web_contents =
+      content::WebContents::FromRenderFrameHost(render_frame_host());
 
   request_dialog_controller_->ShowInitialPermissionDialog(
-      base::BindOnce(&FederatedAuthRequestImpl::OnSigninApproved,
-                     weak_ptr_factory_.GetWeakPtr()));
+      web_contents, base::BindOnce(&FederatedAuthRequestImpl::OnSigninApproved,
+                                   weak_ptr_factory_.GetWeakPtr()));
 }
 
 void FederatedAuthRequestImpl::OnSigninApproved(
@@ -157,8 +161,11 @@
         CompleteRequest(RequestIdTokenStatus::kError, "");
         return;
       }
+      WebContents* web_contents =
+          content::WebContents::FromRenderFrameHost(render_frame_host());
+
       request_dialog_controller_->ShowIdProviderWindow(
-          idp_signin_page_url,
+          web_contents, idp_signin_page_url,
           base::BindOnce(&FederatedAuthRequestImpl::OnIdpPageClosed,
                          weak_ptr_factory_.GetWeakPtr()));
       return;
diff --git a/content/common/frame_messages.h b/content/common/frame_messages.h
index 9daff47..b7562c8f 100644
--- a/content/common/frame_messages.h
+++ b/content/common/frame_messages.h
@@ -176,7 +176,6 @@
   IPC_STRUCT_TRAITS_MEMBER(sandbox_flags)
   IPC_STRUCT_TRAITS_MEMBER(container_policy)
   IPC_STRUCT_TRAITS_MEMBER(required_document_policy)
-  IPC_STRUCT_TRAITS_MEMBER(allowed_to_download)
   IPC_STRUCT_TRAITS_MEMBER(disallow_document_access)
 IPC_STRUCT_TRAITS_END()
 
diff --git a/content/public/android/java/src/org/chromium/content/app/ContentChildProcessServiceDelegate.java b/content/public/android/java/src/org/chromium/content/app/ContentChildProcessServiceDelegate.java
index 94f8fbd..eef404d 100644
--- a/content/public/android/java/src/org/chromium/content/app/ContentChildProcessServiceDelegate.java
+++ b/content/public/android/java/src/org/chromium/content/app/ContentChildProcessServiceDelegate.java
@@ -21,7 +21,6 @@
 import org.chromium.base.annotations.NativeMethods;
 import org.chromium.base.library_loader.LibraryLoader;
 import org.chromium.base.library_loader.Linker;
-import org.chromium.base.library_loader.ProcessInitException;
 import org.chromium.base.memory.MemoryPressureUma;
 import org.chromium.base.process_launcher.ChildProcessServiceDelegate;
 import org.chromium.base.task.PostTask;
@@ -103,27 +102,11 @@
 
         JNIUtils.enableSelectiveJniRegistration();
 
-        Linker linker = null;
-        boolean requestedSharedRelro = false;
         if (LibraryLoader.getInstance().useChromiumLinker()) {
             assert mLinkerParams != null;
-            linker = getLinker();
-            requestedSharedRelro = true;
-            linker.initServiceProcess(mLinkerParams.mBaseLoadAddress);
+            getLinker().initServiceProcess(mLinkerParams.mBaseLoadAddress);
         }
-        try {
-            LibraryLoader.getInstance().loadNowOverrideApplicationContext(hostContext);
-        } catch (ProcessInitException e) {
-            if (requestedSharedRelro) {
-                Log.w(TAG,
-                        "Failed to load native library with shared RELRO, "
-                                + "retrying without");
-                linker.disableSharedRelros();
-                LibraryLoader.getInstance().loadNowOverrideApplicationContext(hostContext);
-            } else {
-                throw e;
-            }
-        }
+        LibraryLoader.getInstance().loadNowOverrideApplicationContext(hostContext);
         LibraryLoader.getInstance().registerRendererProcessHistogram();
         initializeLibrary();
     }
diff --git a/content/public/browser/identity_request_dialog_controller.h b/content/public/browser/identity_request_dialog_controller.h
index d51fd08..95e3f585 100644
--- a/content/public/browser/identity_request_dialog_controller.h
+++ b/content/public/browser/identity_request_dialog_controller.h
@@ -11,6 +11,7 @@
 class GURL;
 
 namespace content {
+class WebContents;
 
 // IdentityRequestDialogController is in interface for control of the UI
 // surfaces that are displayed to intermediate the exchange of ID tokens.
@@ -35,8 +36,10 @@
   virtual ~IdentityRequestDialogController() = default;
 
   // Permission-oriented flow methods.
-  virtual void ShowInitialPermissionDialog(InitialApprovalCallback) = 0;
-  virtual void ShowIdProviderWindow(const GURL& idp_signin_url,
+  virtual void ShowInitialPermissionDialog(WebContents*,
+                                           InitialApprovalCallback) = 0;
+  virtual void ShowIdProviderWindow(WebContents*,
+                                    const GURL& idp_signin_url,
                                     IdProviderWindowClosedCallback) = 0;
   virtual void ShowTokenExchangePermissionDialog(
       TokenExchangeApprovalCallback) = 0;
diff --git a/content/public/renderer/render_view.h b/content/public/renderer/render_view.h
index 81f191f4..8af35e27 100644
--- a/content/public/renderer/render_view.h
+++ b/content/public/renderer/render_view.h
@@ -13,9 +13,6 @@
 #include "ui/gfx/native_widget_types.h"
 
 namespace blink {
-namespace web_pref {
-struct WebPreferences;
-}  // namespace web_pref
 class WebView;
 }  // namespace blink
 
@@ -59,17 +56,6 @@
   // Get the routing ID of the view.
   virtual int GetRoutingID() = 0;
 
-  // Returns the page's zoom level for the render view.
-  virtual float GetZoomLevel() = 0;
-
-  // Gets WebKit related preferences associated with this view.
-  virtual const blink::web_pref::WebPreferences& GetBlinkPreferences() = 0;
-
-  // Overrides the WebKit related preferences associated with this view. Note
-  // that the browser process may update the preferences at any time.
-  virtual void SetBlinkPreferences(
-      const blink::web_pref::WebPreferences& preferences) = 0;
-
   // Returns the associated WebView. May return NULL when the view is closing.
   virtual blink::WebView* GetWebView() = 0;
 
diff --git a/content/renderer/pepper/pepper_in_process_resource_creation.cc b/content/renderer/pepper/pepper_in_process_resource_creation.cc
index 5703c7e0..2a149c2 100644
--- a/content/renderer/pepper/pepper_in_process_resource_creation.cc
+++ b/content/renderer/pepper/pepper_in_process_resource_creation.cc
@@ -32,6 +32,7 @@
 #include "ppapi/shared_impl/ppapi_permissions.h"
 #include "ppapi/shared_impl/resource_tracker.h"
 #include "ppapi/shared_impl/var.h"
+#include "third_party/blink/public/web/web_view.h"
 
 // Note that the code in the creation functions in this file should generally
 // be the same as that in ppapi/proxy/resource_creation_proxy.cc. See
@@ -58,7 +59,9 @@
   // GPU process whether these features are blacklisted or not.
   gpu::GpuFeatureInfo gpu_feature_info;
   ppapi::Preferences prefs(PpapiPreferencesBuilder::Build(
-      host_impl_->GetRenderViewForInstance(instance)->GetBlinkPreferences(),
+      host_impl_->GetRenderViewForInstance(instance)
+          ->GetWebView()
+          ->GetWebPreferences(),
       gpu_feature_info));
   return (new BrowserFontResource_Trusted(
               host_impl_->in_process_router()->GetPluginConnection(instance),
diff --git a/content/renderer/pepper/pepper_plugin_instance_impl.cc b/content/renderer/pepper/pepper_plugin_instance_impl.cc
index 0f19ef1..c2841c5 100644
--- a/content/renderer/pepper/pepper_plugin_instance_impl.cc
+++ b/content/renderer/pepper/pepper_plugin_instance_impl.cc
@@ -2380,8 +2380,10 @@
 PP_Var PepperPluginInstanceImpl::GetDefaultCharSet(PP_Instance instance) {
   if (!render_frame_)
     return PP_MakeUndefined();
-  return StringVar::StringToPPVar(
-      render_frame_->render_view()->GetBlinkPreferences().default_encoding);
+  return StringVar::StringToPPVar(render_frame_->GetWebFrame()
+                                      ->View()
+                                      ->GetWebPreferences()
+                                      .default_encoding);
 }
 
 void PepperPluginInstanceImpl::SetPluginToHandleFindRequests(
diff --git a/content/renderer/pepper/plugin_module.cc b/content/renderer/pepper/plugin_module.cc
index 4a56e73..d6f2b777 100644
--- a/content/renderer/pepper/plugin_module.cc
+++ b/content/renderer/pepper/plugin_module.cc
@@ -134,6 +134,7 @@
 #include "ppapi/thunk/thunk.h"
 #include "third_party/blink/public/platform/web_security_origin.h"
 #include "third_party/blink/public/web/web_local_frame.h"
+#include "third_party/blink/public/web/web_view.h"
 
 using ppapi::InputEventData;
 using ppapi::PpapiGlobals;
@@ -617,11 +618,12 @@
   const gpu::GpuFeatureInfo& gpu_feature_info =
       channel ? channel->gpu_feature_info() : default_gpu_feature_info;
 
-  if (!dispatcher->Init(channel_handle, &GetInterface,
-                        ppapi::Preferences(PpapiPreferencesBuilder::Build(
-                            render_frame->render_view()->GetBlinkPreferences(),
-                            gpu_feature_info)),
-                        hung_filter.get(), task_runner)) {
+  if (!dispatcher->Init(
+          channel_handle, &GetInterface,
+          ppapi::Preferences(PpapiPreferencesBuilder::Build(
+              render_frame->GetWebFrame()->View()->GetWebPreferences(),
+              gpu_feature_info)),
+          hung_filter.get(), task_runner)) {
     return nullptr;
   }
 
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index ca84ee3..e64b0d8 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -2711,7 +2711,7 @@
 }
 
 const blink::web_pref::WebPreferences& RenderFrameImpl::GetBlinkPreferences() {
-  return render_view_->GetBlinkPreferences();
+  return GetWebFrame()->View()->GetWebPreferences();
 }
 
 const blink::RendererPreferences& RenderFrameImpl::GetRendererPreferences()
@@ -3403,6 +3403,12 @@
   WebNavigationParams::FillStaticResponse(navigation_params.get(), "text/html",
                                           "UTF-8", error_html);
   navigation_params->unreachable_url = error.url();
+  if (commit_params->redirects.size()) {
+    navigation_params->pre_redirect_url_for_failed_navigations =
+        commit_params->redirects[0];
+  } else {
+    navigation_params->pre_redirect_url_for_failed_navigations = error.url();
+  }
 
   // The error page load (not to confuse with a failed load of original page)
   // was not initiated through BeginNavigation, therefore
@@ -5030,11 +5036,10 @@
   // This check is very similar to RenderFrameHostImpl::CanCommitOrigin, but
   // adapted to the renderer process side.
   if (!params->origin.opaque() && params->url.IsStandard() &&
-      render_view_->GetBlinkPreferences().web_security_enabled) {
+      GetBlinkPreferences().web_security_enabled) {
     // Exclude file: URLs when settings allow them access any origin.
     if (params->origin.scheme() != url::kFileScheme ||
-        !render_view_->GetBlinkPreferences()
-             .allow_universal_access_from_file_urls) {
+        !GetBlinkPreferences().allow_universal_access_from_file_urls) {
       if (!params->origin.IsSameOriginWith(url::Origin::Create(params->url))) {
         base::debug::CrashKeyString* url = base::debug::AllocateCrashKeyString(
             "mismatched_url", base::debug::CrashKeySize::Size256);
diff --git a/content/renderer/render_frame_proxy.cc b/content/renderer/render_frame_proxy.cc
index 4a90d75a..a27d892 100644
--- a/content/renderer/render_frame_proxy.cc
+++ b/content/renderer/render_frame_proxy.cc
@@ -263,7 +263,8 @@
   // propagate VisualProperty changes down the frame/process hierarchy. Remote
   // main frame proxies do not participate in this flow.
   if (ancestor_web_frame_widget_) {
-    pending_visual_properties_.zoom_level = render_view->GetZoomLevel();
+    pending_visual_properties_.zoom_level =
+        render_view->GetWebView()->ZoomLevel();
     pending_visual_properties_.page_scale_factor =
         ancestor_web_frame_widget_->PageScaleInMainFrame();
     pending_visual_properties_.is_pinch_gesture_active =
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index a52c3c7..07614def 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -1037,6 +1037,7 @@
   WebString error_scheme(WebString::FromASCII(kChromeErrorScheme));
   WebSecurityPolicy::RegisterURLSchemeAsDisplayIsolated(error_scheme);
   WebSecurityPolicy::RegisterURLSchemeAsNotAllowingJavascriptURLs(error_scheme);
+  WebSecurityPolicy::RegisterURLSchemeAsError(error_scheme);
 
   // googlechrome:
   WebString google_chrome_scheme(WebString::FromASCII(kGoogleChromeScheme));
diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc
index 4485505..40daefc 100644
--- a/content/renderer/render_view_browsertest.cc
+++ b/content/renderer/render_view_browsertest.cc
@@ -2546,7 +2546,7 @@
 // This test ensures that a RenderFrame object is created for the top level
 // frame in the RenderView.
 TEST_F(RenderViewImplTest, BasicRenderFrame) {
-  EXPECT_TRUE(view()->main_render_frame_);
+  EXPECT_TRUE(view()->GetMainRenderFrame());
 }
 
 namespace {
@@ -3062,7 +3062,7 @@
   prefs.shrinks_viewport_contents_to_fit = true;
   prefs.default_minimum_page_scale_factor = 0.1f;
   prefs.default_maximum_page_scale_factor = 5.5f;
-  view()->SetBlinkPreferences(prefs);
+  view()->GetWebView()->SetWebPreferences(prefs);
 
   EXPECT_EQ(1.f, view()->GetWebView()->PageScaleFactor());
   EXPECT_EQ(1.f, view()->GetWebView()->MinimumPageScaleFactor());
@@ -3237,13 +3237,13 @@
 TEST_F(RenderViewImplTest, ZoomLevelUpdate) {
   // 0 will use the minimum zoom level, which is the default, nothing will
   // change.
-  EXPECT_FLOAT_EQ(0u, view()->GetZoomLevel());
+  EXPECT_FLOAT_EQ(0u, view()->GetWebView()->ZoomLevel());
 
   double zoom_level = blink::PageZoomFactorToZoomLevel(0.25);
   // Change the zoom level to 25% and check if the view gets the change.
   main_frame_widget()->SetZoomLevelForTesting(zoom_level);
   // Use EXPECT_FLOAT_EQ here because view()->GetZoomLevel returns a float.
-  EXPECT_FLOAT_EQ(zoom_level, view()->GetZoomLevel());
+  EXPECT_FLOAT_EQ(zoom_level, view()->GetWebView()->ZoomLevel());
 }
 
 #endif
diff --git a/content/renderer/render_view_browsertest_mac.mm b/content/renderer/render_view_browsertest_mac.mm
index dead5e40..474c51a 100644
--- a/content/renderer/render_view_browsertest_mac.mm
+++ b/content/renderer/render_view_browsertest_mac.mm
@@ -86,7 +86,7 @@
   blink::WebFrameWidget* blink_widget =
       view->GetMainRenderFrame()->GetLocalRootWebFrameWidget();
 
-  view->SetBlinkPreferences(prefs);
+  view->GetWebView()->SetWebPreferences(prefs);
 
   const int kMaxOutputCharacters = 1024;
   std::string output;
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index a4653c6..e25ed891 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -541,29 +541,6 @@
     GetWebView()->SetZoomLevel(GetWebView()->ZoomLevel());
 }
 
-void RenderViewImpl::SetValidationMessageDirection(
-    base::string16* wrapped_main_text,
-    base::i18n::TextDirection main_text_hint,
-    base::string16* wrapped_sub_text,
-    base::i18n::TextDirection sub_text_hint) {
-  if (main_text_hint == base::i18n::LEFT_TO_RIGHT) {
-    *wrapped_main_text =
-        base::i18n::GetDisplayStringInLTRDirectionality(*wrapped_main_text);
-  } else if (main_text_hint == base::i18n::RIGHT_TO_LEFT &&
-             !base::i18n::IsRTL()) {
-    base::i18n::WrapStringWithRTLFormatting(wrapped_main_text);
-  }
-
-  if (!wrapped_sub_text->empty()) {
-    if (sub_text_hint == base::i18n::RIGHT_TO_LEFT) {
-      *wrapped_sub_text =
-          base::i18n::GetDisplayStringInLTRDirectionality(*wrapped_sub_text);
-    } else if (sub_text_hint == base::i18n::LEFT_TO_RIGHT) {
-      base::i18n::WrapStringWithRTLFormatting(wrapped_sub_text);
-    }
-  }
-}
-
 void RenderViewImpl::StartNavStateSyncTimerIfNecessary(RenderFrameImpl* frame) {
   // Keep track of which frames have pending updates.
   frames_with_pending_state_.insert(frame->GetRoutingID());
@@ -663,19 +640,6 @@
   return routing_id_;
 }
 
-float RenderViewImpl::GetZoomLevel() {
-  return webview_->ZoomLevel();
-}
-
-const blink::web_pref::WebPreferences& RenderViewImpl::GetBlinkPreferences() {
-  return webview_->GetWebPreferences();
-}
-
-void RenderViewImpl::SetBlinkPreferences(
-    const blink::web_pref::WebPreferences& preferences) {
-  webview_->SetWebPreferences(preferences);
-}
-
 blink::WebView* RenderViewImpl::GetWebView() {
   return webview_;
 }
diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
index 991582a..cb5fab4 100644
--- a/content/renderer/render_view_impl.h
+++ b/content/renderer/render_view_impl.h
@@ -176,10 +176,6 @@
   blink::WebPagePopup* CreatePopup(blink::WebLocalFrame* creator) override;
   base::StringPiece GetSessionStorageNamespaceId() override;
   void PrintPage(blink::WebLocalFrame* frame) override;
-  void SetValidationMessageDirection(base::string16* main_text,
-                                     base::i18n::TextDirection main_text_hint,
-                                     base::string16* sub_text,
-                                     base::i18n::TextDirection sub_text_hint);
   bool AcceptsLoadDrops() override;
   bool CanUpdateLayout() override;
   void DidUpdateMainFrameLayout() override;
@@ -200,10 +196,6 @@
   bool Send(IPC::Message* message) override;
   RenderFrameImpl* GetMainRenderFrame() override;
   int GetRoutingID() override;
-  float GetZoomLevel() override;
-  const blink::web_pref::WebPreferences& GetBlinkPreferences() override;
-  void SetBlinkPreferences(
-      const blink::web_pref::WebPreferences& preferences) override;
   blink::WebView* GetWebView() override;
 
   // Please do not add your stuff randomly to the end here. If there is an
@@ -222,67 +214,15 @@
 
  private:
   // For unit tests.
-  friend class DevToolsAgentTest;
-  friend class RenderViewImplScaleFactorTest;
   friend class RenderViewImplTest;
   friend class RenderViewTest;
-  friend class RendererAccessibilityTest;
 
   // TODO(nasko): Temporarily friend RenderFrameImpl, so we don't duplicate
   // utility functions needed in both classes, while we move frame specific
   // code away from this class.
   friend class RenderFrameImpl;
 
-  FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, EmulatingPopupRect);
-  FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, RenderFrameMessageAfterDetach);
-  FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, BeginNavigationForWebUI);
-  FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest,
-                           DidFailProvisionalLoadWithErrorForError);
-  FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest,
-                           DidFailProvisionalLoadWithErrorForCancellation);
-  FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, ImeComposition);
-  FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, InsertCharacters);
-  FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, JSBlockSentAfterPageLoad);
-  FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, LastCommittedUpdateState);
-  FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, OnHandleKeyboardEvent);
-  FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, OnImeTypeChanged);
-  FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, OnNavStateChanged);
-  FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, SetBlinkPreferences);
-  FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest,
-                           SetEditableSelectionAndComposition);
-  FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, StaleNavigationsIgnored);
-  FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest,
-                           DontIgnoreBackAfterNavEntryLimit);
-  FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest,
-                           GetCompositionCharacterBoundsTest);
-  FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, OnNavigationHttpPost);
-  FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, UpdateDSFAfterSwapIn);
-  FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest,
-                           BeginNavigationHandlesAllTopLevel);
-#if defined(OS_MAC)
-  FRIEND_TEST_ALL_PREFIXES(RenderViewTest, MacTestCmdUp);
-#endif
   FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, SetHistoryLengthAndOffset);
-  FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, NavigateFrame);
-  FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, BasicRenderFrame);
-  FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, TextInputTypeWithPepper);
-  FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest,
-                           MessageOrderInDidChangeSelection);
-  FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, SendCandidateWindowEvents);
-  FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, RenderFrameClearedAfterClose);
-  FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, PaintAfterSwapOut);
-  FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest,
-                           SetZoomLevelAfterCrossProcessNavigation);
-  FRIEND_TEST_ALL_PREFIXES(RenderViewImplScaleFactorTest,
-                           ConverViewportToScreenWithZoomForDSF);
-  FRIEND_TEST_ALL_PREFIXES(RenderViewImplEnableZoomForDSFTest,
-                           GetCompositionCharacterBoundsTest);
-
-  enum ErrorPageType {
-    DNS_ERROR,
-    HTTP_404,
-    CONNECTION_ERROR,
-  };
 
   // Initialize() is separated out from the constructor because it is possible
   // to accidentally call virtual functions. All RenderViewImpl creation is
@@ -293,15 +233,6 @@
                   bool was_created_by_renderer,
                   scoped_refptr<base::SingleThreadTaskRunner> task_runner);
 
-  // Old WebLocalFrameClient implementations
-  // ----------------------------------------
-
-  // RenderViewImpl used to be a WebLocalFrameClient, but now RenderFrameImpl is
-  // the WebLocalFrameClient. However, many implementations of
-  // WebLocalFrameClient methods still live here and are called from
-  // RenderFrameImpl. These implementations are to be moved to RenderFrameImpl
-  // <http://crbug.com/361761>.
-
   static WindowOpenDisposition NavigationPolicyToDisposition(
       blink::WebNavigationPolicy policy);
 
@@ -418,8 +349,6 @@
   // notifications.
   // ---------------------------------------------------------------------------
 
-  base::WeakPtrFactory<RenderViewImpl> weak_ptr_factory_{this};
-
   DISALLOW_COPY_AND_ASSIGN(RenderViewImpl);
 };
 
diff --git a/content/test/data/accessibility/css/next-on-line-check-failure-expected-blink.txt b/content/test/data/accessibility/css/next-on-line-check-failure-expected-blink.txt
new file mode 100644
index 0000000..525fa5b
--- /dev/null
+++ b/content/test/data/accessibility/css/next-on-line-check-failure-expected-blink.txt
@@ -0,0 +1,6 @@
+rootWebArea
+++genericContainer ignored
+++++genericContainer ignored
+++++list
+++++++staticText name='0'
+++++++++inlineTextBox name='0'
diff --git a/content/test/data/accessibility/css/next-on-line-check-failure.html b/content/test/data/accessibility/css/next-on-line-check-failure.html
new file mode 100644
index 0000000..2510e0a
--- /dev/null
+++ b/content/test/data/accessibility/css/next-on-line-check-failure.html
@@ -0,0 +1,10 @@
+<style>
+ul::before { content: counter(section); -webkit-column-count: 65536;}
+</style>
+<script>
+function boom() {
+  let ul = document.createElement('ul');
+  document.documentElement.appendChild(ul);
+}
+window.onload = boom;
+</script>
diff --git a/content/test/test_render_frame_host.cc b/content/test/test_render_frame_host.cc
index a8dd845..cbdb4029 100644
--- a/content/test/test_render_frame_host.cc
+++ b/content/test/test_render_frame_host.cc
@@ -153,7 +153,7 @@
       blink::mojom::TreeScopeType::kDocument, frame_name, frame_unique_name,
       false, base::UnguessableToken::Create(), base::UnguessableToken::Create(),
       blink::FramePolicy(
-          {network::mojom::WebSandboxFlags::kNone, allow, {}, true, false}),
+          {network::mojom::WebSandboxFlags::kNone, allow, {}, false}),
       blink::mojom::FrameOwnerProperties(),
       blink::mojom::FrameOwnerElementType::kIframe);
   return static_cast<TestRenderFrameHost*>(
diff --git a/content/web_test/renderer/test_runner.cc b/content/web_test/renderer/test_runner.cc
index 753cb69..95830c2 100644
--- a/content/web_test/renderer/test_runner.cc
+++ b/content/web_test/renderer/test_runner.cc
@@ -2781,14 +2781,13 @@
 
 void TestRunner::OnTestPreferencesChanged(const TestPreferences& test_prefs,
                                           RenderFrame* frame) {
-  RenderView* render_view = frame->GetRenderView();
-  blink::web_pref::WebPreferences web_prefs =
-      render_view->GetBlinkPreferences();
+  blink::WebView* web_view = frame->GetWebFrame()->View();
+  blink::web_pref::WebPreferences web_prefs = web_view->GetWebPreferences();
 
   // Turns the TestPreferences into WebPreferences.
   ExportWebTestSpecificPreferences(test_prefs, &web_prefs);
 
-  render_view->SetBlinkPreferences(web_prefs);
+  web_view->SetWebPreferences(web_prefs);
 
   GetWebTestControlHostRemote()->OverridePreferences(web_prefs);
 }
diff --git a/content/web_test/renderer/web_frame_test_proxy.cc b/content/web_test/renderer/web_frame_test_proxy.cc
index 8e2173f..92d0b04 100644
--- a/content/web_test/renderer/web_frame_test_proxy.cc
+++ b/content/web_test/renderer/web_frame_test_proxy.cc
@@ -266,7 +266,8 @@
     blink::WebTestingSupport::ResetInternalsObject(GetWebFrame());
     // Resetting the internals object also overrides the WebPreferences, so we
     // have to sync them to WebKit again.
-    render_view()->SetBlinkPreferences(render_view()->GetBlinkPreferences());
+    blink::WebView* web_view = GetWebFrame()->View();
+    web_view->SetWebPreferences(web_view->GetWebPreferences());
 
     web_view_test_proxy_->Reset();
   }
diff --git a/docs/mac_build_instructions.md b/docs/mac_build_instructions.md
index b6609bb..0396294 100644
--- a/docs/mac_build_instructions.md
+++ b/docs/mac_build_instructions.md
@@ -12,16 +12,20 @@
 
 ## System requirements
 
-*   A 64-bit Mac running 10.14+.
-*   [Xcode](https://developer.apple.com/xcode) 11.2+
-*   The OS X 10.15.1 SDK. Run
+*   A 64-bit Intel Mac running 10.15.4+. (Building on Arm Macs is
+    [not yet supported](https://chromium.googlesource.com/chromium/src.git/+/master/docs/mac_arm64.md).)
+*   [Xcode](https://developer.apple.com/xcode/) 12.2+. This version of Xcode
+    comes with ...
+*   The macOS 11.0 SDK. Run
 
     ```shell
     $ ls `xcode-select -p`/Platforms/MacOSX.platform/Developer/SDKs
     ```
 
-    to check whether you have it.  Building with a newer SDK works too, but
-    the releases [currently use Xcode 11.2.1](https://source.chromium.org/search?q=MAC_BINARIES_LABEL&ss=chromium).
+    to check whether you have it. Building with a newer SDK usually works too
+    (please fix it if it doesn't), but the releases
+    [currently use Xcode 12.2](https://source.chromium.org/search?q=MAC_BINARIES_LABEL&ss=chromium)
+    and the macOS 11.0 SDK.
 
 ## Install `depot_tools`
 
diff --git a/fuchsia/engine/web_engine_integration_logging_test.cc b/fuchsia/engine/web_engine_integration_logging_test.cc
index a4acf58..2c95774 100644
--- a/fuchsia/engine/web_engine_integration_logging_test.cc
+++ b/fuchsia/engine/web_engine_integration_logging_test.cc
@@ -17,8 +17,13 @@
 
 namespace {
 
+// Name of the console logging test page. This is also used as the expected
+// message text, since console log messages include the name of the originating
+// file.
 constexpr char kLogTestPageFileName[] = "console_logging.html";
+
 constexpr char kWebEngineLogTag[] = "web_engine_exe";
+
 constexpr char kNormalizedLineNumber[] = "12345";
 constexpr char kNormalizedPortNumber[] = "678";
 
@@ -47,8 +52,7 @@
   WebEngineIntegrationLoggingTest()
       : WebEngineIntegrationTestBase(),
         isolated_archivist_service_dir_(
-            StartIsolatedArchivist(archivist_controller_.NewRequest())),
-        binding_(&test_log_listener_) {}
+            StartIsolatedArchivist(archivist_controller_.NewRequest())) {}
 
   void SetUp() override {
     WebEngineIntegrationTestBase::SetUp();
@@ -56,11 +60,6 @@
         base::CommandLine(base::CommandLine::NO_PROGRAM));
 
     logger_ = isolated_archivist_service_dir_.Connect<fuchsia::logger::Log>();
-    logger_.set_error_handler([&](zx_status_t status) {
-      ZX_LOG(ERROR, status) << "fuchsia.logger.Log disconnected";
-      ADD_FAILURE();
-      wait_for_message_loop_.Quit();
-    });
   }
 
   // Starts WebEngine without redirecting its logs.
@@ -120,29 +119,6 @@
     return create_params;
   }
 
-  // Checks whether the expected log line has been received yet,
-  // and invokes DumpLogsSafe() if not. It passes itself as the completion
-  // callback, so that when the call completes it can check again for the
-  // expected message and re-invoke DumpLogsSafe(), or quit the loop, as
-  // appropriate.
-  void DumpLogs() {
-    // Look for kLogTestPageFileName because that string is unique to the
-    // console logs generated by these tests.
-    if (test_log_listener_.DidReceiveString(kLogTestPageFileName,
-                                            &logged_message_)) {
-      wait_for_message_loop_.Quit();
-      return;
-    }
-
-    std::unique_ptr<fuchsia::logger::LogFilterOptions> options =
-        std::make_unique<fuchsia::logger::LogFilterOptions>();
-    options->tags = {kWebEngineLogTag};
-
-    test_log_listener_.set_on_dump_logs_done(base::BindOnce(
-        &WebEngineIntegrationLoggingTest::DumpLogs, base::Unretained(this)));
-    logger_->DumpLogsSafe(binding_.NewBinding(), std::move(options));
-  }
-
   void LoadLogTestPage() {
     EXPECT_TRUE(cr_fuchsia::LoadUrlAndExpectResponse(
         navigation_controller_.get(), fuchsia::web::LoadUrlParams(),
@@ -154,36 +130,33 @@
   sys::ServiceDirectory isolated_archivist_service_dir_;
 
   fuchsia::logger::LogPtr logger_;
-  base::TestLogListenerSafe test_log_listener_;
-  fidl::Binding<fuchsia::logger::LogListenerSafe> binding_;
-
-  fuchsia::logger::LogMessage logged_message_;
-
-  base::RunLoop wait_for_message_loop_;
 };
 
 // Verifies that calling messages from console.debug() calls go to the Fuchsia
 // system log when the script log level is set to DEBUG.
 TEST_F(WebEngineIntegrationLoggingTest, SetJavaScriptLogLevel_DEBUG) {
-  CreateContextAndFrame(ContextParamsWithIsolatedLogSink());
+  auto options = std::make_unique<fuchsia::logger::LogFilterOptions>();
+  options->tags = {kWebEngineLogTag};
+  base::SimpleTestLogListener log_listener;
+  log_listener.ListenToLog(logger_.get(), std::move(options));
 
-  // Enable all logging.
+  // Create the Context & Frame with all log severities enabled.
+  CreateContextAndFrame(ContextParamsWithIsolatedLogSink());
   frame_->SetJavaScriptLogLevel(fuchsia::web::ConsoleLogLevel::DEBUG);
 
   LoadLogTestPage();
   navigation_listener_->RunUntilTitleEquals("ended");
 
-  // Start the first DumpLogs() call.
-  DumpLogs();
+  // Run until a message containing kLogTestPageFileName is received.
+  base::Optional<fuchsia::logger::LogMessage> logged_message =
+      log_listener.RunUntilMessageReceived(kLogTestPageFileName);
 
-  // Run until kLogMessage is received.
-  wait_for_message_loop_.Run();
-
-  EXPECT_EQ(logged_message_.severity,
+  ASSERT_TRUE(logged_message.has_value());
+  EXPECT_EQ(logged_message->severity,
             static_cast<int32_t>(fuchsia::logger::LogLevelFilter::INFO));
-  ASSERT_EQ(logged_message_.tags.size(), 1u);
-  EXPECT_EQ(logged_message_.tags[0], kWebEngineLogTag);
-  EXPECT_EQ(NormalizeConsoleLogMessage(logged_message_.msg),
+  ASSERT_EQ(logged_message->tags.size(), 1u);
+  EXPECT_EQ(logged_message->tags[0], kWebEngineLogTag);
+  EXPECT_EQ(NormalizeConsoleLogMessage(logged_message->msg),
             "[frame_impl.cc(" + std::string(kNormalizedLineNumber) +
                 ")] debug:http://127.0.0.1:" + kNormalizedPortNumber +
                 "/console_logging.html:8 "
diff --git a/gpu/command_buffer/service/external_vk_image_skia_representation.cc b/gpu/command_buffer/service/external_vk_image_skia_representation.cc
index 3f5cf05..f4b47e6 100644
--- a/gpu/command_buffer/service/external_vk_image_skia_representation.cc
+++ b/gpu/command_buffer/service/external_vk_image_skia_representation.cc
@@ -80,18 +80,7 @@
 
   access_mode_ = kWrite;
 
-  if (backing_impl()->usage() & SHARED_IMAGE_USAGE_SCANOUT) {
-    // If the backing is used for scanout, we need to to set
-    // |end_state| VK_IMAGE_LAYOUT_PRESENT_SRC_KHR, and then the caller will
-    // set the VkImage to VK_IMAGE_LAYOUT_PRESENT_SRC_KHR before calling
-    // EndAccess().
-    auto queue_index = backing_impl()
-                           ->context_provider()
-                           ->GetDeviceQueue()
-                           ->GetVulkanQueueIndex();
-    *end_state = std::make_unique<GrBackendSurfaceMutableState>(
-        VK_IMAGE_LAYOUT_PRESENT_SRC_KHR, queue_index);
-  } else if (backing_impl()->need_synchronization()) {
+  if (backing_impl()->need_synchronization()) {
     // If Vulkan/GL/Dawn share the same memory backing, we need to set
     // |end_state| VK_QUEUE_FAMILY_EXTERNAL, and then the caller will set the
     // VkImage to VK_QUEUE_FAMILY_EXTERNAL before calling EndAccess().
diff --git a/infra/config/lib/builders.star b/infra/config/lib/builders.star
index 01937e2..97e7f8c 100644
--- a/infra/config/lib/builders.star
+++ b/infra/config/lib/builders.star
@@ -284,9 +284,6 @@
     bucket = args.COMPUTE,
     executable = args.COMPUTE,
     triggered_by = args.COMPUTE,
-
-    # Forward on luci.builder.defaults so users have a consistent interface
-    **{a: getattr(luci.builder.defaults, a) for a in dir(luci.builder.defaults)}
 )
 
 def builder(
diff --git a/ios/chrome/browser/passwords/ios_chrome_password_check_manager_unittest.mm b/ios/chrome/browser/passwords/ios_chrome_password_check_manager_unittest.mm
index 54d4597..1da82e7 100644
--- a/ios/chrome/browser/passwords/ios_chrome_password_check_manager_unittest.mm
+++ b/ios/chrome/browser/passwords/ios_chrome_password_check_manager_unittest.mm
@@ -108,12 +108,9 @@
     base::StringPiece username,
     base::TimeDelta time_since_creation = base::TimeDelta(),
     CompromiseType compromise_type = CompromiseType::kLeaked) {
-  return {
-      std::string(signon_realm),
-      base::ASCIIToUTF16(username),
-      base::Time::Now() - time_since_creation,
-      compromise_type,
-  };
+  return CompromisedCredentials(
+      std::string(signon_realm), base::ASCIIToUTF16(username),
+      base::Time::Now() - time_since_creation, compromise_type, false);
 }
 
 PasswordForm MakeSavedPassword(
diff --git a/ios/chrome/browser/safe_browsing/safe_browsing_egtest.mm b/ios/chrome/browser/safe_browsing/safe_browsing_egtest.mm
index 4b13f7c..3518d97 100644
--- a/ios/chrome/browser/safe_browsing/safe_browsing_egtest.mm
+++ b/ios/chrome/browser/safe_browsing/safe_browsing_egtest.mm
@@ -280,6 +280,14 @@
 // Tests expanding the details on a malware warning, proceeding past the
 // warning, and navigating back/forward to the unsafe page.
 - (void)testProceedingPastMalwareWarning {
+  if (@available(iOS 14, *)) {
+  } else {
+    if (@available(iOS 13, *)) {
+      // TODO(crbug.com/1156574): This test is failing on iOS 13, not sure why.
+      EARL_GREY_TEST_DISABLED(@"Disabled on iOS 13 as it is failing.");
+    }
+  }
+
   [ChromeEarlGrey loadURL:_safeURL1];
   [ChromeEarlGrey waitForWebStateContainingText:_safeContent1];
 
@@ -315,6 +323,14 @@
 // Tests expanding the details on a malware warning, proceeding past the
 // warning, and navigating back/forward to the unsafe page, in incognito mode.
 - (void)testProceedingPastMalwareWarningInIncognito {
+  if (@available(iOS 14, *)) {
+  } else {
+    if (@available(iOS 13, *)) {
+      // TODO(crbug.com/1156574): This test is failing on iOS 13, not sure why.
+      EARL_GREY_TEST_DISABLED(@"Disabled on iOS 13 as it is failing.");
+    }
+  }
+
   [ChromeEarlGrey openNewIncognitoTab];
   [ChromeEarlGrey loadURL:_safeURL1];
   [ChromeEarlGrey waitForWebStateContainingText:_safeContent1];
diff --git a/ios/chrome/browser/ui/content_suggestions/content_suggestions_layout.mm b/ios/chrome/browser/ui/content_suggestions/content_suggestions_layout.mm
index c7e6303..fff906f9 100644
--- a/ios/chrome/browser/ui/content_suggestions/content_suggestions_layout.mm
+++ b/ios/chrome/browser/ui/content_suggestions/content_suggestions_layout.mm
@@ -5,9 +5,10 @@
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestions_layout.h"
 
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestions_collection_utils.h"
+#import "ios/chrome/browser/ui/ntp/new_tab_page_feature.h"
 #import "ios/chrome/browser/ui/ntp/new_tab_page_header_constants.h"
 #import "ios/chrome/browser/ui/toolbar/public/toolbar_utils.h"
-#include "ios/chrome/browser/ui/util/ui_util.h"
+#import "ios/chrome/browser/ui/util/ui_util.h"
 #import "ios/chrome/browser/ui/util/uikit_ui_util.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
@@ -24,6 +25,11 @@
 }
 
 - (CGSize)collectionViewContentSize {
+  if (IsRefactoredNTP()) {
+    // In the refactored NTP, we don't want to extend the view height beyond its
+    // content.
+    return [super collectionViewContentSize];
+  }
   CGFloat collectionViewHeight = self.collectionView.bounds.size.height;
   CGFloat headerHeight = [self firstHeaderHeight];
 
diff --git a/ios/chrome/browser/ui/content_suggestions/content_suggestions_mediator.mm b/ios/chrome/browser/ui/content_suggestions/content_suggestions_mediator.mm
index 78c503a..9297a79 100644
--- a/ios/chrome/browser/ui/content_suggestions/content_suggestions_mediator.mm
+++ b/ios/chrome/browser/ui/content_suggestions/content_suggestions_mediator.mm
@@ -40,6 +40,7 @@
 #import "ios/chrome/browser/ui/content_suggestions/identifier/content_suggestion_identifier.h"
 #import "ios/chrome/browser/ui/content_suggestions/identifier/content_suggestions_section_information.h"
 #import "ios/chrome/browser/ui/content_suggestions/mediator_util.h"
+#import "ios/chrome/browser/ui/ntp/new_tab_page_feature.h"
 #import "ios/chrome/browser/ui/ntp/notification_promo_whats_new.h"
 #include "ios/chrome/browser/ui/ntp/ntp_tile_saver.h"
 #include "ios/chrome/browser/ui/util/ui_util.h"
@@ -319,7 +320,7 @@
   } else if (sectionInfo == self.learnMoreSectionInfo) {
     [convertedSuggestions addObject:self.learnMoreItem];
   } else if (sectionInfo == self.discoverSectionInfo) {
-    if ([self.contentArticlesExpanded value]) {
+    if ([self.contentArticlesExpanded value] && !IsRefactoredNTP()) {
       [convertedSuggestions addObject:self.discoverItem];
     }
   } else if (!IsDiscoverFeedEnabled()) {
diff --git a/ios/chrome/browser/ui/ntp/BUILD.gn b/ios/chrome/browser/ui/ntp/BUILD.gn
index 6ed9e65..f824d4c 100644
--- a/ios/chrome/browser/ui/ntp/BUILD.gn
+++ b/ios/chrome/browser/ui/ntp/BUILD.gn
@@ -9,6 +9,7 @@
     "new_tab_page_header_constants.mm",
   ]
   configs += [ "//build/config/compiler:enable_arc" ]
+  public_deps = [ ":feature_flags" ]
   deps = [ "//ios/chrome/browser/ui/util" ]
 }
 
@@ -30,6 +31,8 @@
     "//ios/chrome/browser/ui/main:scene_state_observer",
     "//ios/chrome/browser/url_loading",
     "//ios/chrome/browser/web_state_list",
+    "//ios/public/provider/chrome/browser",
+    "//ios/public/provider/chrome/browser/discover_feed",
     "//ios/public/provider/chrome/browser/voice",
     "//ios/web/public",
   ]
diff --git a/ios/chrome/browser/ui/ntp/discover_feed_view_controller.h b/ios/chrome/browser/ui/ntp/discover_feed_view_controller.h
index ac010f0..6eb80ab 100644
--- a/ios/chrome/browser/ui/ntp/discover_feed_view_controller.h
+++ b/ios/chrome/browser/ui/ntp/discover_feed_view_controller.h
@@ -7,14 +7,20 @@
 
 #import <UIKit/UIKit.h>
 
-// View controller wrapping a Discover feed view controller originating
-// elsewhere.
+// View controller wrapping a Discover feed view controller
+// (|self.discoverFeed|) originating from the provider.
 @interface DiscoverFeedViewController : UIViewController
 
-// Collection view subview that contains the feed articles.
+// Feed view controller being contained by this view controller. This is the
+// view controller that is wrapped by this view controller.
+@property(nonatomic, strong, readonly) UIViewController* discoverFeed;
+
+// Collection view that contains the feed articles. Is a subview of
+// |self.discoverFeed|.
 @property(nonatomic, weak, readonly) UICollectionView* feedCollectionView;
 
-// Initializes view controller with the browser object.
+// Initializes view controller with the Discover feed view controller
+// originating from the Discover feed provider.
 - (instancetype)initWithDiscoverFeedViewController:
     (UIViewController*)discoverFeed NS_DESIGNATED_INITIALIZER;
 
diff --git a/ios/chrome/browser/ui/ntp/discover_feed_view_controller.mm b/ios/chrome/browser/ui/ntp/discover_feed_view_controller.mm
index a3c3a9e..1221fd7 100644
--- a/ios/chrome/browser/ui/ntp/discover_feed_view_controller.mm
+++ b/ios/chrome/browser/ui/ntp/discover_feed_view_controller.mm
@@ -11,13 +11,6 @@
 #error "This file requires ARC support."
 #endif
 
-@interface DiscoverFeedViewController ()
-
-// Feed view controller being contained by this view controller.
-@property(nonatomic, strong) UIViewController* discoverFeed;
-
-@end
-
 @implementation DiscoverFeedViewController
 
 - (instancetype)initWithDiscoverFeedViewController:
diff --git a/ios/chrome/browser/ui/ntp/new_tab_page_coordinator.mm b/ios/chrome/browser/ui/ntp/new_tab_page_coordinator.mm
index 8ff3efdd..101946a2 100644
--- a/ios/chrome/browser/ui/ntp/new_tab_page_coordinator.mm
+++ b/ios/chrome/browser/ui/ntp/new_tab_page_coordinator.mm
@@ -14,10 +14,13 @@
 #import "ios/chrome/browser/ui/main/scene_state.h"
 #import "ios/chrome/browser/ui/main/scene_state_browser_agent.h"
 #import "ios/chrome/browser/ui/main/scene_state_observer.h"
+#import "ios/chrome/browser/ui/ntp/discover_feed_view_controller.h"
 #import "ios/chrome/browser/ui/ntp/incognito_view_controller.h"
 #import "ios/chrome/browser/ui/ntp/new_tab_page_feature.h"
 #import "ios/chrome/browser/ui/ntp/new_tab_page_view_controller.h"
 #import "ios/chrome/browser/url_loading/url_loading_browser_agent.h"
+#import "ios/public/provider/chrome/browser/chrome_browser_provider.h"
+#import "ios/public/provider/chrome/browser/discover_feed/discover_feed_provider.h"
 #import "ios/web/public/navigation/navigation_context.h"
 #import "ios/web/public/navigation/navigation_item.h"
 #import "ios/web/public/navigation/navigation_manager.h"
@@ -36,6 +39,10 @@
 // View controller for the regular NTP.
 @property(nonatomic, strong) NewTabPageViewController* ntpViewController;
 
+// View controller wrapping the Discover feed.
+@property(nonatomic, strong)
+    DiscoverFeedViewController* discoverFeedViewController;
+
 // View controller for the incognito NTP.
 @property(nonatomic, strong) IncognitoViewController* incognitoViewController;
 
@@ -89,9 +96,20 @@
 
     [self.contentSuggestionsCoordinator start];
 
-    self.ntpViewController = [[NewTabPageViewController alloc]
-        initWithContentSuggestionsViewController:
-            self.contentSuggestionsCoordinator.viewController];
+    if (IsRefactoredNTP()) {
+      UIViewController* discoverFeed =
+          ios::GetChromeBrowserProvider()
+              ->GetDiscoverFeedProvider()
+              ->NewFeedViewController(self.browser);
+
+      self.discoverFeedViewController = [[DiscoverFeedViewController alloc]
+          initWithDiscoverFeedViewController:discoverFeed];
+
+      self.ntpViewController = [[NewTabPageViewController alloc]
+          initWithDiscoverFeedViewController:self.discoverFeedViewController
+            contentSuggestionsViewController:self.contentSuggestionsCoordinator
+                                                 .viewController];
+    }
 
     base::RecordAction(base::UserMetricsAction("MobileNTPShowMostVisited"));
     SceneState* sceneState =
diff --git a/ios/chrome/browser/ui/ntp/new_tab_page_view_controller.h b/ios/chrome/browser/ui/ntp/new_tab_page_view_controller.h
index 6630327..19994e5 100644
--- a/ios/chrome/browser/ui/ntp/new_tab_page_view_controller.h
+++ b/ios/chrome/browser/ui/ntp/new_tab_page_view_controller.h
@@ -7,13 +7,22 @@
 
 #import <UIKit/UIKit.h>
 
+@class ContentSuggestionsViewController;
+@class DiscoverFeedViewController;
+
 // View controller containing all the content presented on a standard,
 // non-incognito new tab page.
 @interface NewTabPageViewController : UIViewController
 
-// Initializes view controller with content suggestions.
-- (instancetype)initWithContentSuggestionsViewController:
-    (UIViewController*)contentSuggestionsViewController
+// Initializes view controller with NTP content view controllers.
+// |discoverFeedViewController| represents the Discover feed for suggesting
+// articles. |contentSuggestionsViewController| represents other content
+// suggestions, such as the most visited site tiles.
+- (instancetype)initWithDiscoverFeedViewController:
+                    (DiscoverFeedViewController*)discoverFeedViewController
+                  contentSuggestionsViewController:
+                      (UICollectionViewController*)
+                          contentSuggestionsViewController
     NS_DESIGNATED_INITIALIZER;
 
 - (instancetype)initWithNibName:(NSString*)name
diff --git a/ios/chrome/browser/ui/ntp/new_tab_page_view_controller.mm b/ios/chrome/browser/ui/ntp/new_tab_page_view_controller.mm
index 82286ab..b601079b 100644
--- a/ios/chrome/browser/ui/ntp/new_tab_page_view_controller.mm
+++ b/ios/chrome/browser/ui/ntp/new_tab_page_view_controller.mm
@@ -6,6 +6,7 @@
 
 #import "ios/chrome/browser/ui/ntp/new_tab_page_view_controller.h"
 
+#import "ios/chrome/browser/ui/ntp/discover_feed_view_controller.h"
 #import "ios/chrome/common/ui/util/constraints_ui_util.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
@@ -14,17 +15,28 @@
 
 @interface NewTabPageViewController ()
 
-// View controller representing the NTP content suggestions.
-@property(nonatomic, strong) UIViewController* contentSuggestionsViewController;
+// View controller representing the Discover feed.
+@property(nonatomic, strong)
+    DiscoverFeedViewController* discoverFeedViewController;
+
+// View controller representing the NTP content suggestions. These suggestions
+// include the most visited site tiles, the shortcut tiles, the fake omnibox and
+// the Google doodle.
+@property(nonatomic, strong)
+    UICollectionViewController* contentSuggestionsViewController;
 
 @end
 
 @implementation NewTabPageViewController
 
-- (instancetype)initWithContentSuggestionsViewController:
-    (UIViewController*)contentSuggestionsViewController {
+- (instancetype)initWithDiscoverFeedViewController:
+                    (DiscoverFeedViewController*)discoverFeedViewController
+                  contentSuggestionsViewController:
+                      (UICollectionViewController*)
+                          contentSuggestionsViewController {
   self = [super initWithNibName:nil bundle:nil];
   if (self) {
+    _discoverFeedViewController = discoverFeedViewController;
     _contentSuggestionsViewController = contentSuggestionsViewController;
   }
 
@@ -33,14 +45,41 @@
 
 - (void)viewDidLoad {
   [super viewDidLoad];
-  [self.contentSuggestionsViewController willMoveToParentViewController:self];
-  [self addChildViewController:self.contentSuggestionsViewController];
-  [self.view addSubview:self.contentSuggestionsViewController.view];
-  [self.contentSuggestionsViewController didMoveToParentViewController:self];
 
-  self.contentSuggestionsViewController.view
-      .translatesAutoresizingMaskIntoConstraints = NO;
-  AddSameConstraints(self.contentSuggestionsViewController.view, self.view);
+  UIView* discoverFeedView = self.discoverFeedViewController.view;
+
+  [self.discoverFeedViewController willMoveToParentViewController:self];
+  [self addChildViewController:self.discoverFeedViewController];
+  [self.view addSubview:discoverFeedView];
+  [self.discoverFeedViewController didMoveToParentViewController:self];
+
+  discoverFeedView.translatesAutoresizingMaskIntoConstraints = NO;
+  AddSameConstraints(discoverFeedView, self.view);
+
+  [self.contentSuggestionsViewController
+      willMoveToParentViewController:self.discoverFeedViewController
+                                         .discoverFeed];
+  [self.discoverFeedViewController.discoverFeed
+      addChildViewController:self.contentSuggestionsViewController];
+  [self.discoverFeedViewController.feedCollectionView
+      addSubview:self.contentSuggestionsViewController.view];
+  [self.contentSuggestionsViewController
+      didMoveToParentViewController:self.discoverFeedViewController
+                                        .discoverFeed];
+}
+
+- (void)viewDidLayoutSubviews {
+  [super viewDidLayoutSubviews];
+  // Sets an inset to the Discover feed equal to the content suggestions height,
+  // so that the content suggestions could act as the feed header.
+  // TODO(crbug.com/1114792): Handle landscape/iPad layout.
+  UICollectionView* collectionView =
+      self.contentSuggestionsViewController.collectionView;
+  self.contentSuggestionsViewController.view.frame =
+      CGRectMake(0, -collectionView.contentSize.height,
+                 self.view.frame.size.width, collectionView.contentSize.height);
+  self.discoverFeedViewController.feedCollectionView.contentInset =
+      UIEdgeInsetsMake(collectionView.contentSize.height, 0, 0, 0);
 }
 
 @end
diff --git a/ios/chrome/browser/ui/settings/password/password_issues_mediator_unittest.mm b/ios/chrome/browser/ui/settings/password/password_issues_mediator_unittest.mm
index da0ab5e..f80d841 100644
--- a/ios/chrome/browser/ui/settings/password/password_issues_mediator_unittest.mm
+++ b/ios/chrome/browser/ui/settings/password/password_issues_mediator_unittest.mm
@@ -56,12 +56,9 @@
 // Returns compromised credential structure.
 CompromisedCredentials MakeCompromised(base::StringPiece signon_realm,
                                        base::StringPiece username) {
-  return {
-      std::string(signon_realm),
-      base::ASCIIToUTF16(username),
-      base::Time::Now(),
-      CompromiseType::kLeaked,
-  };
+  return CompromisedCredentials(std::string(signon_realm),
+                                base::ASCIIToUTF16(username), base::Time::Now(),
+                                CompromiseType::kLeaked, false);
 }
 }  // namespace
 
diff --git a/ios/chrome/browser/ui/settings/password/passwords_table_view_controller_unittest.mm b/ios/chrome/browser/ui/settings/password/passwords_table_view_controller_unittest.mm
index f46f0a271..33ee823 100644
--- a/ios/chrome/browser/ui/settings/password/passwords_table_view_controller_unittest.mm
+++ b/ios/chrome/browser/ui/settings/password/passwords_table_view_controller_unittest.mm
@@ -233,12 +233,9 @@
   password_manager::CompromisedCredentials MakeCompromised(
       base::StringPiece signon_realm,
       base::StringPiece username) {
-    return {
-        std::string(signon_realm),
-        base::ASCIIToUTF16(username),
-        base::Time::Now(),
-        CompromiseType::kLeaked,
-    };
+    return password_manager::CompromisedCredentials(
+        std::string(signon_realm), base::ASCIIToUTF16(username),
+        base::Time::Now(), CompromiseType::kLeaked, false);
   }
 
   void AddCompromisedCredential1() {
diff --git a/ios/chrome/browser/ui/settings/safety_check/safety_check_mediator_unittest.mm b/ios/chrome/browser/ui/settings/safety_check/safety_check_mediator_unittest.mm
index f83cec3..a57dd6eb 100644
--- a/ios/chrome/browser/ui/settings/safety_check/safety_check_mediator_unittest.mm
+++ b/ios/chrome/browser/ui/settings/safety_check/safety_check_mediator_unittest.mm
@@ -211,12 +211,9 @@
   password_manager::CompromisedCredentials MakeCompromised(
       base::StringPiece signon_realm,
       base::StringPiece username) {
-    return {
-        std::string(signon_realm),
-        base::ASCIIToUTF16(username),
-        base::Time::Now(),
-        CompromiseType::kLeaked,
-    };
+    return password_manager::CompromisedCredentials(
+        std::string(signon_realm), base::ASCIIToUTF16(username),
+        base::Time::Now(), CompromiseType::kLeaked, false);
   }
 
   TestPasswordStore& GetTestStore() {
diff --git a/media/gpu/vaapi/vaapi_unittest.cc b/media/gpu/vaapi/vaapi_unittest.cc
index 9e867d4..2ad5835 100644
--- a/media/gpu/vaapi/vaapi_unittest.cc
+++ b/media/gpu/vaapi/vaapi_unittest.cc
@@ -306,7 +306,7 @@
       // number (it could ignore it), so instead just make sure there's a
       // |pending_va_buffers_| that, when mapped, looks correct. That buffer
       // should be created by CreateContext().
-      ASSERT_TRUE(wrapper->CreateContext(gfx::Size(128, 128)));
+      ASSERT_TRUE(wrapper->CreateContext(gfx::Size(640, 368)));
       ASSERT_EQ(wrapper->pending_va_buffers_.size(), 1u);
       {
         base::AutoLock auto_lock(*wrapper->va_lock_);
diff --git a/media/gpu/vaapi/vaapi_video_decoder_delegate.cc b/media/gpu/vaapi/vaapi_video_decoder_delegate.cc
index 9efe928..378ef51 100644
--- a/media/gpu/vaapi/vaapi_video_decoder_delegate.cc
+++ b/media/gpu/vaapi/vaapi_video_decoder_delegate.cc
@@ -159,25 +159,21 @@
       protected_session_state_ = ProtectedSessionState::kFailed;
       return protected_session_state_;
     }
-    // TODO(jkardatzke): Fix pattern based encryption after Intel updates their
-    // API.
-    VAEncryptionSegmentInfo segment_info;
-    segment_info.segment_start_offset = subsamples[0].clear_bytes;
-    segment_info.segment_length =
-        DecryptConfig::kDecryptionKeySize *
-        (decrypt_config_->encryption_pattern()->skip_byte_block() +
-         decrypt_config_->encryption_pattern()->crypt_byte_block());
-    segment_info.partial_aes_block_size = 0;
-    segment_info.init_byte_length =
-        DecryptConfig::kDecryptionKeySize *
+    crypto_params->blocks_stripe_encrypted =
+        decrypt_config_->encryption_pattern()->crypt_byte_block();
+    crypto_params->blocks_stripe_clear =
         decrypt_config_->encryption_pattern()->skip_byte_block();
+    VAEncryptionSegmentInfo segment_info = {};
+    segment_info.init_byte_length = subsamples[0].clear_bytes;
+    segment_info.segment_length =
+        subsamples[0].clear_bytes + subsamples[0].cypher_bytes;
     memcpy(segment_info.aes_cbc_iv_or_ctr, decrypt_config_->iv().data(),
            DecryptConfig::kDecryptionKeySize);
     segments->emplace_back(std::move(segment_info));
   } else {
     size_t offset = 0;
     for (const auto& entry : subsamples) {
-      VAEncryptionSegmentInfo segment_info;
+      VAEncryptionSegmentInfo segment_info = {};
       segment_info.segment_start_offset = offset;
       segment_info.segment_length = entry.clear_bytes + entry.cypher_bytes;
       segment_info.partial_aes_block_size = 0;
diff --git a/sandbox/mac/BUILD.gn b/sandbox/mac/BUILD.gn
index 383014c..93216b72 100644
--- a/sandbox/mac/BUILD.gn
+++ b/sandbox/mac/BUILD.gn
@@ -11,6 +11,10 @@
   sources = [ "seatbelt.proto" ]
 }
 
+source_set("seatbelt_export") {
+  sources = [ "seatbelt_export.h" ]
+}
+
 component("seatbelt") {
   sources = [
     "sandbox_compiler.cc",
@@ -21,10 +25,12 @@
     "seatbelt.h",
     "seatbelt_exec.cc",
     "seatbelt_exec.h",
-    "seatbelt_export.h",
   ]
   libs = [ "sandbox" ]
-  deps = [ ":seatbelt_proto" ]
+  deps = [
+    ":seatbelt_export",
+    ":seatbelt_proto",
+  ]
   public_deps = [ "//third_party/protobuf:protobuf_lite" ]
   defines = [ "SEATBELT_IMPLEMENTATION" ]
 }
@@ -36,6 +42,7 @@
     "seatbelt_extension_token.cc",
     "seatbelt_extension_token.h",
   ]
+  deps = [ ":seatbelt_export" ]
   libs = [ "sandbox" ]
   public_deps = [ "//base" ]
   defines = [ "SEATBELT_IMPLEMENTATION" ]
@@ -43,7 +50,6 @@
 
 component("system_services") {
   sources = [
-    "seatbelt_export.h",
     "system_services.cc",
     "system_services.h",
   ]
@@ -51,6 +57,7 @@
     "Carbon.framework",
     "CoreFoundation.framework",
   ]
+  deps = [ ":seatbelt_export" ]
   public_deps = [ "//base" ]
   defines = [ "SEATBELT_IMPLEMENTATION" ]
 }
@@ -74,6 +81,8 @@
     ":seatbelt_proto",
     "mojom:test_interfaces",
     "//base",
+    "//base/test:test_config",
+    "//base/test:test_support",
     "//mojo/core/test:run_all_unittests",
     "//sandbox/policy:tests",
     "//testing/gtest",
diff --git a/sandbox/mac/sandbox_compiler.h b/sandbox/mac/sandbox_compiler.h
index 826dc8e..693d56e 100644
--- a/sandbox/mac/sandbox_compiler.h
+++ b/sandbox/mac/sandbox_compiler.h
@@ -8,7 +8,6 @@
 #include <map>
 #include <string>
 
-#include "base/macros.h"
 #include "sandbox/mac/seatbelt_export.h"
 
 namespace sandbox {
@@ -20,6 +19,8 @@
   explicit SandboxCompiler(const std::string& profile_str);
 
   ~SandboxCompiler();
+  SandboxCompiler(const SandboxCompiler& other) = delete;
+  SandboxCompiler& operator=(const SandboxCompiler& other) = delete;
 
   // Inserts a boolean into the parameters key/value map. A duplicate key is not
   // allowed, and will cause the function to return false. The value is not
@@ -41,8 +42,6 @@
 
   // The sandbox profile source code.
   const std::string profile_str_;
-
-  DISALLOW_COPY_AND_ASSIGN(SandboxCompiler);
 };
 
 }  // namespace sandbox
diff --git a/sandbox/mac/seatbelt.h b/sandbox/mac/seatbelt.h
index f1971590..5cf26f20 100644
--- a/sandbox/mac/seatbelt.h
+++ b/sandbox/mac/seatbelt.h
@@ -7,7 +7,6 @@
 
 #include <cstdint>
 
-#include "base/macros.h"
 #include "sandbox/mac/seatbelt_export.h"
 
 namespace sandbox {
@@ -49,9 +48,11 @@
 
   static const char* kProfilePureComputation;
 
+  Seatbelt(const Seatbelt& other) = delete;
+  Seatbelt& operator=(const Seatbelt& other) = delete;
+
  private:
   Seatbelt();
-  DISALLOW_COPY_AND_ASSIGN(Seatbelt);
 };
 
 }  // sandbox
diff --git a/sandbox/mac/seatbelt_exec.cc b/sandbox/mac/seatbelt_exec.cc
index 85e3538..b9f9cd8 100644
--- a/sandbox/mac/seatbelt_exec.cc
+++ b/sandbox/mac/seatbelt_exec.cc
@@ -14,8 +14,7 @@
 
 #include <vector>
 
-#include "base/macros.h"
-#include "base/posix/eintr_wrapper.h"
+#include "base/posix/eintr_wrapper.h"  //nogncheck
 #include "sandbox/mac/sandbox_logging.h"
 #include "sandbox/mac/seatbelt.h"
 
diff --git a/sandbox/mac/seatbelt_exec.h b/sandbox/mac/seatbelt_exec.h
index 190c793..ca9249f3 100644
--- a/sandbox/mac/seatbelt_exec.h
+++ b/sandbox/mac/seatbelt_exec.h
@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include "base/compiler_specific.h"
+#include "base/compiler_specific.h"  //nogncheck
 #include "sandbox/mac/seatbelt.pb.h"
 #include "sandbox/mac/seatbelt_export.h"
 
diff --git a/services/viz/privileged/mojom/gl/gpu_host.mojom b/services/viz/privileged/mojom/gl/gpu_host.mojom
index 2a495c0..93ffa70 100644
--- a/services/viz/privileged/mojom/gl/gpu_host.mojom
+++ b/services/viz/privileged/mojom/gl/gpu_host.mojom
@@ -36,6 +36,10 @@
                  ContextLostReason reason,
                  url.mojom.Url active_url);
 
+  // Tells the GPU host that the GPUInfo has been updated in the GPU
+  // process.
+  DidUpdateGPUInfo(gpu.mojom.GpuInfo gpu_info);
+
   // Tells the GPU host that the overlay info has been updated in the GPU
   // process.
   [EnableIf=is_win]
diff --git a/skia/config/SkUserConfig.h b/skia/config/SkUserConfig.h
index cf765ae..42abc3e 100644
--- a/skia/config/SkUserConfig.h
+++ b/skia/config/SkUserConfig.h
@@ -225,6 +225,10 @@
 #define GR_OP_ALLOCATE_USE_NEW
 #endif
 
+#ifndef SK_SUPPORT_LEGACY_IMPLICIT_FILTERQUALITY
+#define SK_SUPPORT_LEGACY_IMPLICIT_FILTERQUALITY
+#endif
+
 // Staging for lowp::bilerp_clamp_8888, and for planned misc. others.
 #define SK_DISABLE_LOWP_BILERP_CLAMP_CLAMP_STAGE
 
diff --git a/styleguide/styleguide.md b/styleguide/styleguide.md
index 5120b7c..318107c 100644
--- a/styleguide/styleguide.md
+++ b/styleguide/styleguide.md
@@ -5,6 +5,7 @@
   * [Chromium C++ style guide](c++/c++.md)
     * See also: [C++ Dos and Don'ts](c++/c++-dos-and-donts.md) for Chromium best-practices.
   * [Chromium Objective-C style guide](objective-c/objective-c.md)
+  * [Chromium Swift style guide](swift/swift.md)
   * [Java style guide for Android](java/java.md)
   * [Chromium Python style guide](python/python.md)
   * [GN style guide](https://gn.googlesource.com/gn/+/master/docs/style_guide.md) for build files.
diff --git a/styleguide/swift/OWNERS b/styleguide/swift/OWNERS
new file mode 100644
index 0000000..50b9bfb
--- /dev/null
+++ b/styleguide/swift/OWNERS
@@ -0,0 +1,2 @@
+javierrobles@chromium.org
+pinkerton@chromium.org
diff --git a/styleguide/swift/swift.md b/styleguide/swift/swift.md
new file mode 100644
index 0000000..4f800386
--- /dev/null
+++ b/styleguide/swift/swift.md
@@ -0,0 +1,10 @@
+# Chromium Swift style guide
+
+_For other languages, please see the [Chromium style guides](https://chromium.googlesource.com/chromium/src/+/master/styleguide/styleguide.md)._
+
+Chromium follows the
+[Google Swift style guide](https://google.github.io/swift/)
+no exceptions at this point.
+
+[swift-format](https://github.com/apple/swift-format)
+can be used to automatically format Swift code.
diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variations/fieldtrial_testing_config.json
index 04870ef3..2fff7b9 100644
--- a/testing/variations/fieldtrial_testing_config.json
+++ b/testing/variations/fieldtrial_testing_config.json
@@ -758,6 +758,27 @@
             ]
         }
     ],
+    "AutofillEnableCardLinkedOffer": [
+        {
+            "platforms": [
+                "android",
+                "android_webview",
+                "chromeos",
+                "linux",
+                "mac",
+                "windows"
+            ],
+            "experiments": [
+                {
+                    "name": "Enabled",
+                    "enable_features": [
+                        "SyncAutofillWalletOfferData",
+                        "kAutofillEnableOffersInDownstream"
+                    ]
+                }
+            ]
+        }
+    ],
     "AutofillEnableStickyBubbleAndUpdatedLogging": [
         {
             "platforms": [
@@ -4662,6 +4683,30 @@
             ]
         }
     ],
+    "NtpRepeatableQueriesDesktop": [
+        {
+            "platforms": [
+                "chromeos",
+                "linux",
+                "mac",
+                "windows"
+            ],
+            "experiments": [
+                {
+                    "name": "Enabled",
+                    "params": {
+                        "NtpRepeatableQueriesAgeThresholdDays": "180",
+                        "NtpRepeatableQueriesFrequencyExponent": "2",
+                        "NtpRepeatableQueriesInsertPosition": "start",
+                        "NtpRepeatableQueriesRecencyHalfLifeSeconds": "604800"
+                    },
+                    "enable_features": [
+                        "NtpRepeatableQueries"
+                    ]
+                }
+            ]
+        }
+    ],
     "NtpWebUIDesktop": [
         {
             "platforms": [
@@ -5782,6 +5827,90 @@
             ],
             "experiments": [
                 {
+                    "name": "EnabledNTPWithExploreAndTrending_20201207",
+                    "params": {
+                        "base_url": "https://chromeupboarding-pa.googleapis.com",
+                        "experiment_tag": "{maxLevels : 1, enableTrending : true}",
+                        "image_prefetch_mode": "top",
+                        "is_unmetered_network_required": "false",
+                        "most_visited_max_rows_normal_screen": "1",
+                        "most_visited_max_rows_small_screen": "1",
+                        "small_screen_height_threshold_dp": "700"
+                    },
+                    "enable_features": [
+                        "QueryTiles",
+                        "QueryTilesInNTP",
+                        "QueryTilesLocalOrdering"
+                    ],
+                    "disable_features": [
+                        "QueryTilesEnableQueryEditing",
+                        "QueryTilesInOmnibox"
+                    ]
+                },
+                {
+                    "name": "EnabledNTPWithExplore_20201207",
+                    "params": {
+                        "base_url": "https://chromeupboarding-pa.googleapis.com",
+                        "experiment_tag": "{maxLevels : 1}",
+                        "image_prefetch_mode": "top",
+                        "is_unmetered_network_required": "false",
+                        "most_visited_max_rows_normal_screen": "1",
+                        "most_visited_max_rows_small_screen": "1",
+                        "small_screen_height_threshold_dp": "700"
+                    },
+                    "enable_features": [
+                        "QueryTiles",
+                        "QueryTilesInNTP",
+                        "QueryTilesLocalOrdering"
+                    ],
+                    "disable_features": [
+                        "QueryTilesEnableQueryEditing",
+                        "QueryTilesInOmnibox"
+                    ]
+                },
+                {
+                    "name": "EnabledNTPWithStitchAndTrending_20201207",
+                    "params": {
+                        "base_url": "https://chromeupboarding-pa.googleapis.com",
+                        "experiment_tag": "{enableTrending : true}",
+                        "image_prefetch_mode": "top",
+                        "is_unmetered_network_required": "false",
+                        "most_visited_max_rows_normal_screen": "1",
+                        "most_visited_max_rows_small_screen": "1",
+                        "small_screen_height_threshold_dp": "700"
+                    },
+                    "enable_features": [
+                        "QueryTiles",
+                        "QueryTilesInNTP",
+                        "QueryTilesLocalOrdering"
+                    ],
+                    "disable_features": [
+                        "QueryTilesEnableQueryEditing",
+                        "QueryTilesInOmnibox"
+                    ]
+                },
+                {
+                    "name": "EnabledNTPWithStitch_20201207",
+                    "params": {
+                        "base_url": "https://chromeupboarding-pa.googleapis.com",
+                        "experiment_tag": "",
+                        "image_prefetch_mode": "top",
+                        "is_unmetered_network_required": "false",
+                        "most_visited_max_rows_normal_screen": "1",
+                        "most_visited_max_rows_small_screen": "1",
+                        "small_screen_height_threshold_dp": "700"
+                    },
+                    "enable_features": [
+                        "QueryTiles",
+                        "QueryTilesInNTP",
+                        "QueryTilesLocalOrdering"
+                    ],
+                    "disable_features": [
+                        "QueryTilesEnableQueryEditing",
+                        "QueryTilesInOmnibox"
+                    ]
+                },
+                {
                     "name": "EnabledStitch",
                     "params": {
                         "base_url": "https://chromeupboarding-pa.googleapis.com",
diff --git a/third_party/blink/common/frame/frame_policy.cc b/third_party/blink/common/frame/frame_policy.cc
index 143cba8..bebf6b5 100644
--- a/third_party/blink/common/frame/frame_policy.cc
+++ b/third_party/blink/common/frame/frame_policy.cc
@@ -11,19 +11,16 @@
     : sandbox_flags(network::mojom::WebSandboxFlags::kNone),
       container_policy({}),
       required_document_policy({}),
-      allowed_to_download(true),
       disallow_document_access(false) {}
 
 FramePolicy::FramePolicy(
     network::mojom::WebSandboxFlags sandbox_flags,
     const ParsedFeaturePolicy& container_policy,
     const DocumentPolicyFeatureState& required_document_policy,
-    bool allowed_to_download,
     bool disallow_document_access)
     : sandbox_flags(sandbox_flags),
       container_policy(container_policy),
       required_document_policy(required_document_policy),
-      allowed_to_download(allowed_to_download),
       disallow_document_access(disallow_document_access) {}
 
 FramePolicy::FramePolicy(const FramePolicy& lhs) = default;
diff --git a/third_party/blink/common/frame/frame_policy_mojom_traits.cc b/third_party/blink/common/frame/frame_policy_mojom_traits.cc
index 097dddb..5c4fd3e 100644
--- a/third_party/blink/common/frame/frame_policy_mojom_traits.cc
+++ b/third_party/blink/common/frame/frame_policy_mojom_traits.cc
@@ -9,7 +9,6 @@
 bool StructTraits<blink::mojom::FramePolicyDataView, blink::FramePolicy>::Read(
     blink::mojom::FramePolicyDataView in,
     blink::FramePolicy* out) {
-  out->allowed_to_download = in.allowed_to_download();
   out->disallow_document_access = in.disallow_document_access();
 
   // TODO(chenleihu): Add sanity check on enum values in
diff --git a/third_party/blink/common/frame/frame_policy_mojom_traits.h b/third_party/blink/common/frame/frame_policy_mojom_traits.h
index 4783512..b68844b4 100644
--- a/third_party/blink/common/frame/frame_policy_mojom_traits.h
+++ b/third_party/blink/common/frame/frame_policy_mojom_traits.h
@@ -16,10 +16,6 @@
 class BLINK_COMMON_EXPORT
     StructTraits<blink::mojom::FramePolicyDataView, blink::FramePolicy> {
  public:
-  static bool allowed_to_download(const blink::FramePolicy& frame_policy) {
-    return frame_policy.allowed_to_download;
-  }
-
   static bool disallow_document_access(const blink::FramePolicy& frame_policy) {
     return frame_policy.disallow_document_access;
   }
diff --git a/third_party/blink/public/common/frame/frame_policy.h b/third_party/blink/public/common/frame/frame_policy.h
index e49c34c..724af48 100644
--- a/third_party/blink/public/common/frame/frame_policy.h
+++ b/third_party/blink/public/common/frame/frame_policy.h
@@ -28,7 +28,6 @@
   FramePolicy(network::mojom::WebSandboxFlags sandbox_flags,
               const ParsedFeaturePolicy& container_policy,
               const DocumentPolicyFeatureState& required_document_policy,
-              bool allowed_to_download = true,
               bool disallow_document_access = false);
   FramePolicy(const FramePolicy& lhs);
   ~FramePolicy();
@@ -40,14 +39,6 @@
   // - 'Require-Document-Policy' http header
   // - |required_document_policy| of parent frame
   DocumentPolicyFeatureState required_document_policy;
-  // With FeaturePolicyForSandbox, as a policy affecting the document,
-  // "downloads" is included in |container_policy|.
-  // However, in certain cases where the initiator of the navigation is not the
-  // document itself (e.g., a parent document), the FrameOwner element should be
-  // checked for "downloads" flag. If this boolean is false then navigations
-  // leading to downloads should be blocked. Note: this flag is currently only
-  // set if the frame is sandboxed for downloads.
-  bool allowed_to_download;
 
   // Whether or not a frame allows direct script access across frame
   // boundaries.
diff --git a/third_party/blink/public/mojom/clipboard/clipboard.mojom b/third_party/blink/public/mojom/clipboard/clipboard.mojom
index c67bac6..e6795e7 100644
--- a/third_party/blink/public/mojom/clipboard/clipboard.mojom
+++ b/third_party/blink/public/mojom/clipboard/clipboard.mojom
@@ -59,7 +59,7 @@
   ReadRtf(ClipboardBuffer buffer) => (mojo_base.mojom.BigString result);
 
   [Sync]
-  ReadImage(ClipboardBuffer buffer) => (skia.mojom.BitmapWithArbitraryBpp? image);
+  ReadImage(ClipboardBuffer buffer) => (skia.mojom.BitmapN32? image);
 
   [Sync]
   ReadCustomData(ClipboardBuffer buffer, mojo_base.mojom.String16 type) =>
@@ -89,7 +89,7 @@
   WriteBookmark(string url,
                 mojo_base.mojom.String16 title);
 
-  WriteImage(skia.mojom.BitmapWithArbitraryBpp image);
+  WriteImage(skia.mojom.BitmapN32 image);
 
   CommitWrite();
 
diff --git a/third_party/blink/public/mojom/feature_policy/document_policy_feature.mojom b/third_party/blink/public/mojom/feature_policy/document_policy_feature.mojom
index c4ff1fb..957e59fd 100644
--- a/third_party/blink/public/mojom/feature_policy/document_policy_feature.mojom
+++ b/third_party/blink/public/mojom/feature_policy/document_policy_feature.mojom
@@ -32,6 +32,8 @@
   kDocumentWrite = 9,
   // Controls whether synchronous script elements will run.
   kSyncScript = 10,
+  // Controls whether or not the JS Self-Profiling API is enabled.
+  kJSProfiling = 11,
   // Don't change assigned numbers of any item, and don't reuse removed slots.
   // Add new features at the end of the enum.
   // Also, run update_document_policy_enum.py in
diff --git a/third_party/blink/public/mojom/frame/frame_policy.mojom b/third_party/blink/public/mojom/frame/frame_policy.mojom
index 9894c56..d6c5e41 100644
--- a/third_party/blink/public/mojom/frame/frame_policy.mojom
+++ b/third_party/blink/public/mojom/frame/frame_policy.mojom
@@ -18,6 +18,5 @@
   network.mojom.WebSandboxFlags sandbox_flags;
   array<blink.mojom.ParsedFeaturePolicyDeclaration> container_policy;
   map<blink.mojom.DocumentPolicyFeature, blink.mojom.PolicyValue> required_document_policy;
-  bool allowed_to_download = true;
   bool disallow_document_access = false;
 };
diff --git a/third_party/blink/public/web/web_navigation_params.h b/third_party/blink/public/web/web_navigation_params.h
index 13a9508d..94fc8af2 100644
--- a/third_party/blink/public/web/web_navigation_params.h
+++ b/third_party/blink/public/web/web_navigation_params.h
@@ -238,6 +238,9 @@
   // history item will contain this URL instead of request's URL.
   // This URL can be retrieved through WebDocumentLoader::UnreachableURL.
   WebURL unreachable_url;
+  // If non-null, this gives the pre-redirect URL in case that we're committing
+  // a failed navigation.
+  WebURL pre_redirect_url_for_failed_navigations;
 
   // The IP address space from which this document was loaded.
   // https://wicg.github.io/cors-rfc1918/#address-space
diff --git a/third_party/blink/public/web/web_security_policy.h b/third_party/blink/public/web/web_security_policy.h
index 48beca0..baa54a87 100644
--- a/third_party/blink/public/web/web_security_policy.h
+++ b/third_party/blink/public/web/web_security_policy.h
@@ -127,6 +127,9 @@
   BLINK_EXPORT static void RegisterURLSchemeAsAllowedForReferrer(
       const WebString&);
 
+  // Registers an URL scheme as an error page.
+  BLINK_EXPORT static void RegisterURLSchemeAsError(const WebString&);
+
  private:
   WebSecurityPolicy() = delete;
 };
diff --git a/third_party/blink/public/web/web_view_client.h b/third_party/blink/public/web/web_view_client.h
index 004c40f..12409ccf 100644
--- a/third_party/blink/public/web/web_view_client.h
+++ b/third_party/blink/public/web/web_view_client.h
@@ -119,14 +119,6 @@
   // notification unless the view did not need a layout.
   virtual void DidUpdateMainFrameLayout() {}
 
-  // Return true to swallow the input event if the embedder will start a
-  // disambiguation popup
-  virtual bool DidTapMultipleTargets(const gfx::Size& visual_viewport_offset,
-                                     const WebRect& touch_rect,
-                                     const WebVector<WebRect>& target_rects) {
-    return false;
-  }
-
   // Returns comma separated list of accept languages.
   virtual WebString AcceptLanguages() { return WebString(); }
 
@@ -152,15 +144,6 @@
   virtual int HistoryBackListCount() { return 0; }
   virtual int HistoryForwardListCount() { return 0; }
 
-  // Developer tools -----------------------------------------------------
-
-  // Called to notify the client that the inspector's settings were
-  // changed and should be saved.  See WebView::inspectorSettings.
-  virtual void DidUpdateInspectorSettings() {}
-
-  virtual void DidUpdateInspectorSetting(const WebString& key,
-                                         const WebString& value) {}
-
   // History -------------------------------------------------------------
   virtual void OnSetHistoryOffsetAndLength(int history_offset,
                                            int history_length) {}
diff --git a/third_party/blink/renderer/bindings/core/v8/serialization/serialized_color_params.cc b/third_party/blink/renderer/bindings/core/v8/serialization/serialized_color_params.cc
index 796b8003c..7aeb82b 100644
--- a/third_party/blink/renderer/bindings/core/v8/serialization/serialized_color_params.cc
+++ b/third_party/blink/renderer/bindings/core/v8/serialization/serialized_color_params.cc
@@ -14,14 +14,17 @@
     : SerializedColorParams(color_params.ColorSpace(),
                             kUint8ClampedArrayStorageFormat) {
   switch (color_params.PixelFormat()) {
+    case CanvasPixelFormat::kF16:
+      pixel_format_ = SerializedPixelFormat::kF16;
+      break;
     case CanvasPixelFormat::kRGBA8:
       pixel_format_ = SerializedPixelFormat::kRGBA8;
       break;
     case CanvasPixelFormat::kBGRA8:
       pixel_format_ = SerializedPixelFormat::kBGRA8;
       break;
-    case CanvasPixelFormat::kF16:
-      pixel_format_ = SerializedPixelFormat::kF16;
+    case CanvasPixelFormat::kRGBX8:
+      pixel_format_ = SerializedPixelFormat::kRGBX8;
       break;
   }
 
@@ -91,14 +94,17 @@
       pixel_format = CanvasPixelFormat::kBGRA8;
 #endif
       break;
+    case SerializedPixelFormat::kF16:
+      pixel_format = CanvasPixelFormat::kF16;
+      break;
     case SerializedPixelFormat::kRGBA8:
       pixel_format = CanvasPixelFormat::kRGBA8;
       break;
     case SerializedPixelFormat::kBGRA8:
       pixel_format = CanvasPixelFormat::kBGRA8;
       break;
-    case SerializedPixelFormat::kF16:
-      pixel_format = CanvasPixelFormat::kF16;
+    case SerializedPixelFormat::kRGBX8:
+      pixel_format = CanvasPixelFormat::kRGBX8;
       break;
   }
 
diff --git a/third_party/blink/renderer/bindings/core/v8/serialization/serialized_color_params.h b/third_party/blink/renderer/bindings/core/v8/serialization/serialized_color_params.h
index a654202..5478f32 100644
--- a/third_party/blink/renderer/bindings/core/v8/serialization/serialized_color_params.h
+++ b/third_party/blink/renderer/bindings/core/v8/serialization/serialized_color_params.h
@@ -53,7 +53,8 @@
   kF16 = 1,
   kRGBA8 = 2,
   kBGRA8 = 3,
-  kLast = kBGRA8,
+  kRGBX8 = 4,
+  kLast = kRGBX8,
 };
 
 // This enumeration specifies the values used to serialize
diff --git a/third_party/blink/renderer/core/DEPS b/third_party/blink/renderer/core/DEPS
index c1d86ea8..67c6a0a 100644
--- a/third_party/blink/renderer/core/DEPS
+++ b/third_party/blink/renderer/core/DEPS
@@ -85,6 +85,7 @@
     "+skia/public/mojom",
     "+skia/ext/image_operations.h",
     "+skia/ext/legacy_display_globals.h",
+    "+skia/ext/skia_utils_base.h",
     "+skia/ext/skia_utils_mac.h",
     "+third_party/blink/public/common",
     "+third_party/blink/public/mojom",
diff --git a/third_party/blink/renderer/core/clipboard/system_clipboard.cc b/third_party/blink/renderer/core/clipboard/system_clipboard.cc
index 3a11329..758f609 100644
--- a/third_party/blink/renderer/core/clipboard/system_clipboard.cc
+++ b/third_party/blink/renderer/core/clipboard/system_clipboard.cc
@@ -8,6 +8,7 @@
 #include "build/build_config.h"
 #include "build/chromeos_buildflags.h"
 #include "mojo/public/cpp/system/platform_handle.h"
+#include "skia/ext/skia_utils_base.h"
 #include "third_party/blink/public/common/browser_interface_broker_proxy.h"
 #include "third_party/blink/public/common/thread_safe_browser_interface_broker_proxy.h"
 #include "third_party/blink/public/platform/platform.h"
@@ -183,7 +184,15 @@
   SkBitmap bitmap;
   if (sk_sp<SkImage> sk_image = paint_image.GetSwSkImage())
     sk_image->asLegacyBitmap(&bitmap);
-  clipboard_->WriteImage(bitmap);
+  // The bitmap backing a canvas can be in non-native skia pixel order (aka
+  // RGBA when kN32_SkColorType is BGRA-ordered, or higher bit-depth color-types
+  // like F16. The IPC to the browser requires the bitmap to be in N32 format
+  // so we convert it here if needed.
+  SkBitmap n32_bitmap;
+  if (skia::SkBitmapToN32OpaqueOrPremul(bitmap, &n32_bitmap))
+    clipboard_->WriteImage(n32_bitmap);
+  else
+    clipboard_->WriteImage(SkBitmap());
 
   if (url.IsValid() && !url.IsEmpty()) {
 #if !defined(OS_MAC)
diff --git a/third_party/blink/renderer/core/display_lock/display_lock_context.cc b/third_party/blink/renderer/core/display_lock/display_lock_context.cc
index af78c7e..930b27c 100644
--- a/third_party/blink/renderer/core/display_lock/display_lock_context.cc
+++ b/third_party/blink/renderer/core/display_lock/display_lock_context.cc
@@ -145,10 +145,6 @@
 
   // Since our state changed, check if we need to create a scoped force update
   // object.
-  // Note that creating this forced object may cause us to dirty style, which is
-  // fine since we are in a style update for this subtree anyway.
-  StyleEngine::AllowMarkStyleDirtyFromRecalcScope scope(
-      element_->GetDocument().GetStyleEngine());
   element_->GetDocument().GetDisplayLockDocumentState().ForceLockIfNeeded(
       element_.Get());
 }
@@ -491,8 +487,12 @@
     // Now that the update is forced, we should ensure that style layout, and
     // prepaint code can reach it via dirty bits. Note that paint isn't a part
     // of this, since |update_forced_| doesn't force paint to happen. See
-    // ShouldPaint().
-    MarkForStyleRecalcIfNeeded();
+    // ShouldPaint(). Also, we could have forced a lock from SetRequestedState
+    // during a style update. If that's the case, don't mark style as dirty
+    // from within style recalc. We rely on `AdjustStyleRecalcChangeForChildren`
+    // instead.
+    if (!document_->InStyleRecalc())
+      MarkForStyleRecalcIfNeeded();
     MarkForLayoutIfNeeded();
     MarkAncestorsForPrePaintIfNeeded();
   }
diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/renderer/core/dom/element.cc
index 5ffe395..9e97929 100644
--- a/third_party/blink/renderer/core/dom/element.cc
+++ b/third_party/blink/renderer/core/dom/element.cc
@@ -221,7 +221,7 @@
   StyleRecalcChange AdjustStyleRecalcChangeForChildren(
       StyleRecalcChange change) {
     DCHECK(element_->GetDisplayLockContext());
-    DCHECK(!element_->GetDisplayLockContext()->IsLocked());
+    DCHECK(element_->GetDisplayLockContext()->ShouldStyleChildren());
     return element_->GetDisplayLockContext()
         ->AdjustStyleRecalcChangeForChildren(change);
   }
@@ -3107,7 +3107,7 @@
     // context and as a result need to process more of the subtree than we would
     // normally. Note that if this is not the first time, then
     // AdjustStyleRecalcChangeForChildren() won't do any adjustments.
-    if (!context->IsLocked())
+    if (context->ShouldStyleChildren())
       child_change = context->AdjustStyleRecalcChangeForChildren(child_change);
   }
 
diff --git a/third_party/blink/renderer/core/exported/web_security_policy.cc b/third_party/blink/renderer/core/exported/web_security_policy.cc
index 8345594c..8fd9251d 100644
--- a/third_party/blink/renderer/core/exported/web_security_policy.cc
+++ b/third_party/blink/renderer/core/exported/web_security_policy.cc
@@ -140,4 +140,8 @@
   SchemeRegistry::RegisterURLSchemeAsAllowedForReferrer(scheme);
 }
 
+void WebSecurityPolicy::RegisterURLSchemeAsError(const WebString& scheme) {
+  SchemeRegistry::RegisterURLSchemeAsError(scheme);
+}
+
 }  // namespace blink
diff --git a/third_party/blink/renderer/core/feature_policy/document_policy.dict b/third_party/blink/renderer/core/feature_policy/document_policy.dict
index 52c42ef..4cdf412 100644
--- a/third_party/blink/renderer/core/feature_policy/document_policy.dict
+++ b/third_party/blink/renderer/core/feature_policy/document_policy.dict
@@ -8,6 +8,7 @@
 "lossy-images-max-bpp"
 "oversized-images"
 "report-to"
+"js-profiling"
 "*"
 "="
 "bpp"
@@ -17,4 +18,4 @@
 "1"
 ".0"
 "("
-")"
\ No newline at end of file
+")"
diff --git a/third_party/blink/renderer/core/feature_policy/document_policy_features.json5 b/third_party/blink/renderer/core/feature_policy/document_policy_features.json5
index 6a66add..2a80d6c 100644
--- a/third_party/blink/renderer/core/feature_policy/document_policy_features.json5
+++ b/third_party/blink/renderer/core/feature_policy/document_policy_features.json5
@@ -109,5 +109,12 @@
       default_value: "true",
       depends_on: ["ExperimentalProductivityFeatures"],
     },
+    {
+      name: "JSProfiling",
+      document_policy_name: "js-profiling",
+      value_type: "Bool",
+      default_value: "false",
+      depends_on: ["ExperimentalJSProfiler"],
+    },
   ],
 }
diff --git a/third_party/blink/renderer/core/frame/local_frame_view.cc b/third_party/blink/renderer/core/frame/local_frame_view.cc
index 0249ba14..0d87545 100644
--- a/third_party/blink/renderer/core/frame/local_frame_view.cc
+++ b/third_party/blink/renderer/core/frame/local_frame_view.cc
@@ -2802,8 +2802,14 @@
             if (!RuntimeEnabledFeatures::CompositeAfterPaintEnabled())
               frame_view.SetPaintArtifactCompositorNeedsUpdate();
           }
-          if (layout_view->ShouldCheckForPaintInvalidation())
+          if (layout_view->ShouldCheckForPaintInvalidation()) {
             owner->SetShouldCheckForPaintInvalidation();
+          } else {
+            // TODO(szager): Remove these after diagnosing crash
+            CHECK(!layout_view->ShouldCheckGeometryForPaintInvalidation());
+            CHECK(!layout_view
+                       ->DescendantShouldCheckGeometryForPaintInvalidation());
+          }
         }
       }
       frame_view.pre_paint_skipped_while_throttled_ = false;
diff --git a/third_party/blink/renderer/core/frame/remote_frame_owner.cc b/third_party/blink/renderer/core/frame/remote_frame_owner.cc
index 33ffce5..b31db5f 100644
--- a/third_party/blink/renderer/core/frame/remote_frame_owner.cc
+++ b/third_party/blink/renderer/core/frame/remote_frame_owner.cc
@@ -14,6 +14,7 @@
 #include "third_party/blink/renderer/core/frame/web_remote_frame_impl.h"
 #include "third_party/blink/renderer/core/layout/intrinsic_sizing_info.h"
 #include "third_party/blink/renderer/core/timing/performance.h"
+#include "third_party/blink/renderer/platform/loader/fetch/resource_timing_info.h"
 
 namespace blink {
 
diff --git a/third_party/blink/renderer/core/html/canvas/canvas_rendering_context.cc b/third_party/blink/renderer/core/html/canvas/canvas_rendering_context.cc
index 63fd77c..38f800e 100644
--- a/third_party/blink/renderer/core/html/canvas/canvas_rendering_context.cc
+++ b/third_party/blink/renderer/core/html/canvas/canvas_rendering_context.cc
@@ -76,11 +76,11 @@
 
 WTF::String CanvasRenderingContext::PixelFormatAsString() const {
   switch (color_params_.PixelFormat()) {
-    case CanvasPixelFormat::kRGBA8:
-      return kUint8CanvasPixelFormatName;
     case CanvasPixelFormat::kF16:
       return kF16CanvasPixelFormatName;
+    case CanvasPixelFormat::kRGBA8:
     case CanvasPixelFormat::kBGRA8:
+    case CanvasPixelFormat::kRGBX8:
       return kUint8CanvasPixelFormatName;
   };
   CHECK(false);
diff --git a/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc b/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc
index 354c4f65..5935f8c9 100644
--- a/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc
+++ b/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc
@@ -39,6 +39,7 @@
 #include "base/numerics/checked_math.h"
 #include "build/build_config.h"
 #include "services/metrics/public/cpp/ukm_recorder.h"
+#include "services/metrics/public/cpp/ukm_source_id.h"
 #include "third_party/blink/public/common/features.h"
 #include "third_party/blink/public/common/privacy_budget/identifiability_metric_builder.h"
 #include "third_party/blink/public/common/privacy_budget/identifiability_metrics.h"
@@ -290,13 +291,13 @@
 
   if (IdentifiabilityStudySettings::Get()->ShouldSample(
           IdentifiableSurface::Type::kCanvasRenderingContext)) {
-    auto* context = GetExecutionContext();
-    IdentifiabilityMetricBuilder(context->UkmSourceID())
+    Document& doc = GetDocument();
+    IdentifiabilityMetricBuilder(doc.UkmSourceID())
         .Set(IdentifiableSurface::FromTypeAndToken(
                  IdentifiableSurface::Type::kCanvasRenderingContext,
                  CanvasRenderingContext::ContextTypeFromId(type)),
              !!result)
-        .Record(context->UkmRecorder());
+        .Record(doc.UkmRecorder());
   }
 
   if (ContentsCcLayer() != old_contents_cc_layer)
@@ -872,8 +873,7 @@
 }
 
 UkmParameters HTMLCanvasElement::GetUkmParameters() {
-  auto* context = GetExecutionContext();
-  return {context->UkmRecorder(), context->UkmSourceID()};
+  return {GetDocument().UkmRecorder(), GetDocument().UkmSourceID()};
 }
 
 void HTMLCanvasElement::SetSurfaceSize(const IntSize& size) {
diff --git a/third_party/blink/renderer/core/html/html_frame_owner_element.h b/third_party/blink/renderer/core/html/html_frame_owner_element.h
index 158a4bc..320bda1b 100644
--- a/third_party/blink/renderer/core/html/html_frame_owner_element.h
+++ b/third_party/blink/renderer/core/html/html_frame_owner_element.h
@@ -138,9 +138,6 @@
   HTMLFrameOwnerElement(const QualifiedName& tag_name, Document&);
 
   void SetSandboxFlags(network::mojom::blink::WebSandboxFlags);
-  void SetAllowedToDownload(bool allowed) {
-    frame_policy_.allowed_to_download = allowed;
-  }
   void SetDisallowDocumentAccesss(bool disallowed);
 
   bool LoadOrRedirectSubframe(const KURL&,
diff --git a/third_party/blink/renderer/core/html/html_iframe_element.cc b/third_party/blink/renderer/core/html/html_iframe_element.cc
index 86f11ca..06cda47 100644
--- a/third_party/blink/renderer/core/html/html_iframe_element.cc
+++ b/third_party/blink/renderer/core/html/html_iframe_element.cc
@@ -175,9 +175,6 @@
                 parsed.error_message)));
       }
     }
-    SetAllowedToDownload(
-        (current_flags & network::mojom::blink::WebSandboxFlags::kDownloads) ==
-        network::mojom::blink::WebSandboxFlags::kNone);
     SetSandboxFlags(current_flags);
     UseCounter::Count(GetDocument(), WebFeature::kSandboxViaIFrame);
   } else if (name == html_names::kReferrerpolicyAttr) {
diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_party/blink/renderer/core/loader/document_loader.cc
index 6ff7e612..814130a 100644
--- a/third_party/blink/renderer/core/loader/document_loader.cc
+++ b/third_party/blink/renderer/core/loader/document_loader.cc
@@ -170,6 +170,8 @@
       origin_policy_(params_->origin_policy),
       requestor_origin_(params_->requestor_origin),
       unreachable_url_(params_->unreachable_url),
+      pre_redirect_url_for_failed_navigations_(
+          params_->pre_redirect_url_for_failed_navigations),
       ip_address_space_(params_->ip_address_space),
       grant_load_local_resources_(params_->grant_load_local_resources),
       force_fetch_cache_mode_(params_->force_fetch_cache_mode),
@@ -197,6 +199,9 @@
           load_type_ == WebFrameLoadType::kReplaceCurrentItem &&
           (!frame_->Loader().Opener() || !url_.IsEmpty())),
       data_received_(false),
+      is_error_page_for_failed_navigation_(
+          SchemeRegistry::ShouldTreatURLSchemeAsError(
+              response_.ResponseUrl().Protocol())),
       // The input CSP is null when the CSP check done in the FrameLoader failed
       content_security_policy_(
           content_security_policy
@@ -646,7 +651,7 @@
         probe::ToCoreProbeSink(GetFrame()), main_resource_identifier_, this,
         completion_time, total_encoded_data_length, total_decoded_body_length,
         should_report_corb_blocking);
-    if (response_.IsHTTP()) {
+    if (response_.IsHTTP() || is_error_page_for_failed_navigation_) {
       // The response is being copied here to pass the Encoded and Decoded
       // sizes.
       // TODO(yoav): copy the sizes info directly.
@@ -1827,10 +1832,16 @@
     document->SetDeferredCompositorCommitIsAllowed(false);
   }
 
-  if (response_.IsHTTP() && navigation_timing_info_) {
+  if ((response_.IsHTTP() || is_error_page_for_failed_navigation_) &&
+      navigation_timing_info_) {
     // The response is being copied here to pass the ServerTiming info.
     // TODO(yoav): copy the ServerTiming info directly.
     navigation_timing_info_->SetFinalResponse(response_);
+    // Make sure we're properly reporting error documents.
+    if (is_error_page_for_failed_navigation_) {
+      navigation_timing_info_->SetInitialURL(
+          pre_redirect_url_for_failed_navigations_);
+    }
   }
 
   {
diff --git a/third_party/blink/renderer/core/loader/document_loader.h b/third_party/blink/renderer/core/loader/document_loader.h
index 64b0c81..c72712e 100644
--- a/third_party/blink/renderer/core/loader/document_loader.h
+++ b/third_party/blink/renderer/core/loader/document_loader.h
@@ -449,6 +449,7 @@
   base::Optional<WebOriginPolicy> origin_policy_;
   const scoped_refptr<const SecurityOrigin> requestor_origin_;
   const KURL unreachable_url_;
+  const KURL pre_redirect_url_for_failed_navigations_;
   std::unique_ptr<WebNavigationBodyLoader> body_loader_;
   const network::mojom::IPAddressSpace ip_address_space_ =
       network::mojom::IPAddressSpace::kUnknown;
@@ -482,6 +483,7 @@
   bool is_client_redirect_;
   bool replaces_current_history_item_;
   bool data_received_;
+  const bool is_error_page_for_failed_navigation_;
 
   const Member<ContentSecurityPolicy> content_security_policy_;
   mojo::Remote<mojom::blink::ContentSecurityNotifier>
diff --git a/third_party/blink/renderer/core/paint/ng/ng_fieldset_painter.cc b/third_party/blink/renderer/core/paint/ng/ng_fieldset_painter.cc
index 3567e8e..855b7284 100644
--- a/third_party/blink/renderer/core/paint/ng/ng_fieldset_painter.cc
+++ b/third_party/blink/renderer/core/paint/ng/ng_fieldset_painter.cc
@@ -105,7 +105,7 @@
           box_decoration_data.GetBackgroundBleedAvoidance())) {
     state_saver.Save();
     FloatRoundedRect border = RoundedBorderGeometry::PixelSnappedRoundedBorder(
-        style, paint_rect, fieldset_.SidesToInclude());
+        style, contracted_rect, fieldset_.SidesToInclude());
     graphics_context.ClipRoundedRect(border);
 
     if (box_decoration_data.GetBackgroundBleedAvoidance() ==
diff --git a/third_party/blink/renderer/core/timing/performance.cc b/third_party/blink/renderer/core/timing/performance.cc
index cb82e5ad..ec2368c 100644
--- a/third_party/blink/renderer/core/timing/performance.cc
+++ b/third_party/blink/renderer/core/timing/performance.cc
@@ -36,6 +36,7 @@
 #include "base/metrics/histogram_macros.h"
 #include "base/time/default_clock.h"
 #include "base/time/default_tick_clock.h"
+#include "third_party/blink/public/mojom/feature_policy/document_policy_feature.mojom-blink.h"
 #include "third_party/blink/public/mojom/timing/worker_timing_container.mojom-blink-forward.h"
 #include "third_party/blink/public/platform/platform.h"
 #include "third_party/blink/renderer/bindings/core/v8/script_promise.h"
@@ -866,6 +867,15 @@
   DCHECK(
       RuntimeEnabledFeatures::ExperimentalJSProfilerEnabled(execution_context));
 
+  if (!GetExecutionContext()->IsFeatureEnabled(
+          mojom::blink::DocumentPolicyFeature::kJSProfiling,
+          ReportOptions::kReportOnFailure)) {
+    exception_state.ThrowDOMException(
+        DOMExceptionCode::kNotAllowedError,
+        "JS profiling is disabled by Document Policy.");
+    return ScriptPromise();
+  }
+
   if (!execution_context->CrossOriginIsolatedCapability()) {
     exception_state.ThrowSecurityError(
         "performance.profile() requires COOP+COEP (web.dev/coop-coep)");
diff --git a/third_party/blink/renderer/modules/accessibility/ax_layout_object.cc b/third_party/blink/renderer/modules/accessibility/ax_layout_object.cc
index 456fb4a..bed0a49 100644
--- a/third_party/blink/renderer/modules/accessibility/ax_layout_object.cc
+++ b/third_party/blink/renderer/modules/accessibility/ax_layout_object.cc
@@ -1086,7 +1086,7 @@
             ax_object.AXObjectCache().GetOrCreate(runner_layout_object))
       return result;
   }
-  if (!ax_object.ParentObject())
+  if (!ax_object.ParentObjectIncludedInTree())
     return nullptr;
   // Returns next object of parent, since next of |ax_object| isn't appeared on
   // line.
@@ -1142,7 +1142,7 @@
     }
 
     if (!result) {
-      AXObject* parent = ParentObject();
+      AXObject* parent = ParentObjectIncludedInTree();
       // Our parent object could have been created based on an ignored inline or
       // inline block spanning multiple lines. We need to ensure that we are
       // really at the end of our parent before attempting to connect to the
@@ -1210,7 +1210,7 @@
     return nullptr;
   // Returns previous object of parent, since next of |ax_object| isn't appeared
   // on line.
-  return ax_object.ParentObject()->PreviousOnLine();
+  return ax_object.ParentObjectIncludedInTree()->PreviousOnLine();
 }
 
 AXObject* AXLayoutObject::PreviousOnLine() const {
@@ -1259,7 +1259,7 @@
     }
 
     if (!result) {
-      AXObject* parent = ParentObject();
+      AXObject* parent = ParentObjectIncludedInTree();
       // Our parent object could have been created based on an ignored inline or
       // inline block spanning multiple lines. We need to ensure that we are
       // really at the start of our parent before attempting to connect to the
diff --git a/third_party/blink/renderer/modules/manifest/manifest_type_converters.cc b/third_party/blink/renderer/modules/manifest/manifest_type_converters.cc
index 73d7d9f4..2ab799c 100644
--- a/third_party/blink/renderer/modules/manifest/manifest_type_converters.cc
+++ b/third_party/blink/renderer/modules/manifest/manifest_type_converters.cc
@@ -96,15 +96,8 @@
   for (auto& size : input->sizes)
     output.sizes.push_back(gfx::Size(size));
 
-  for (auto purpose : input->purpose) {
-    blink::mojom::ManifestImageResource_Purpose out_purpose;
-    if (!EnumTraits<blink::mojom::ManifestImageResource_Purpose,
-                    ::blink::mojom::ManifestImageResource_Purpose>::
-            FromMojom(purpose, &out_purpose)) {
-      NOTREACHED();
-    }
-    output.purpose.push_back(out_purpose);
-  }
+  for (auto purpose : input->purpose)
+    output.purpose.push_back(purpose);
 
   return output;
 }
diff --git a/third_party/blink/renderer/platform/graphics/DEPS b/third_party/blink/renderer/platform/graphics/DEPS
index 05a7d76..978c513b 100644
--- a/third_party/blink/renderer/platform/graphics/DEPS
+++ b/third_party/blink/renderer/platform/graphics/DEPS
@@ -72,6 +72,7 @@
 specific_include_rules = {
   ".*_test.cc": [
     "+components/viz/test",
+    "+ui/gl/buffer_format_utils.h",
   ],
   "(graphics_context|skia_utils)\.cc" : [ "+ui/base/ui_base_features.h" ],
   "graphics_context.h": [
diff --git a/third_party/blink/renderer/platform/graphics/canvas_color_params.cc b/third_party/blink/renderer/platform/graphics/canvas_color_params.cc
index 8d6308a..77f0f88 100644
--- a/third_party/blink/renderer/platform/graphics/canvas_color_params.cc
+++ b/third_party/blink/renderer/platform/graphics/canvas_color_params.cc
@@ -71,6 +71,8 @@
       return kRGBA_8888_SkColorType;
     case CanvasPixelFormat::kBGRA8:
       return kBGRA_8888_SkColorType;
+    case CanvasPixelFormat::kRGBX8:
+      return kRGB_888x_SkColorType;
   }
   NOTREACHED();
   return kN32_SkColorType;
@@ -111,12 +113,14 @@
 
 gfx::BufferFormat CanvasColorParams::GetBufferFormat() const {
   switch (GetSkColorType()) {
+    case kRGBA_F16_SkColorType:
+      return gfx::BufferFormat::RGBA_F16;
     case kRGBA_8888_SkColorType:
       return gfx::BufferFormat::RGBA_8888;
     case kBGRA_8888_SkColorType:
       return gfx::BufferFormat::BGRA_8888;
-    case kRGBA_F16_SkColorType:
-      return gfx::BufferFormat::RGBA_F16;
+    case kRGB_888x_SkColorType:
+      return gfx::BufferFormat::RGBX_8888;
     default:
       NOTREACHED();
   }
@@ -127,12 +131,14 @@
 GLenum CanvasColorParams::GLUnsizedInternalFormat() const {
   // TODO(junov): try GL_RGB when opacity_mode_ == kOpaque
   switch (GetSkColorType()) {
+    case kRGBA_F16_SkColorType:
+      return GL_RGBA;
     case kRGBA_8888_SkColorType:
       return GL_RGBA;
     case kBGRA_8888_SkColorType:
       return GL_BGRA_EXT;
-    case kRGBA_F16_SkColorType:
-      return GL_RGBA;
+    case kRGB_888x_SkColorType:
+      return GL_RGB;
     default:
       NOTREACHED();
   }
@@ -142,12 +148,14 @@
 
 GLenum CanvasColorParams::GLSizedInternalFormat() const {
   switch (GetSkColorType()) {
+    case kRGBA_F16_SkColorType:
+      return GL_RGBA16F;
     case kRGBA_8888_SkColorType:
       return GL_RGBA8;
     case kBGRA_8888_SkColorType:
       return GL_BGRA8_EXT;
-    case kRGBA_F16_SkColorType:
-      return GL_RGBA16F;
+    case kRGB_888x_SkColorType:
+      return GL_RGB8;
     default:
       NOTREACHED();
   }
@@ -157,11 +165,12 @@
 
 GLenum CanvasColorParams::GLType() const {
   switch (GetSkColorType()) {
-    case kRGBA_8888_SkColorType:
-    case kBGRA_8888_SkColorType:
-      return GL_UNSIGNED_BYTE;
     case kRGBA_F16_SkColorType:
       return GL_HALF_FLOAT_OES;
+    case kRGBA_8888_SkColorType:
+    case kBGRA_8888_SkColorType:
+    case kRGB_888x_SkColorType:
+      return GL_UNSIGNED_BYTE;
     default:
       NOTREACHED();
   }
@@ -197,6 +206,8 @@
     pixel_format_ = CanvasPixelFormat::kF16;
   else if (sk_color_type == kRGBA_8888_SkColorType)
     pixel_format_ = CanvasPixelFormat::kRGBA8;
+  else if (sk_color_type == kRGB_888x_SkColorType)
+    pixel_format_ = CanvasPixelFormat::kRGBX8;
 }
 
 }  // namespace blink
diff --git a/third_party/blink/renderer/platform/graphics/canvas_color_params.h b/third_party/blink/renderer/platform/graphics/canvas_color_params.h
index 3dcffda..206a168 100644
--- a/third_party/blink/renderer/platform/graphics/canvas_color_params.h
+++ b/third_party/blink/renderer/platform/graphics/canvas_color_params.h
@@ -28,9 +28,10 @@
 };
 
 enum class CanvasPixelFormat {
+  kF16,
   kRGBA8,
   kBGRA8,
-  kF16,
+  kRGBX8,
 };
 
 constexpr const char* kSRGBCanvasColorSpaceName = "srgb";
diff --git a/third_party/blink/renderer/platform/graphics/canvas_color_params_test.cc b/third_party/blink/renderer/platform/graphics/canvas_color_params_test.cc
index a6503d5..cd323ba 100644
--- a/third_party/blink/renderer/platform/graphics/canvas_color_params_test.cc
+++ b/third_party/blink/renderer/platform/graphics/canvas_color_params_test.cc
@@ -8,6 +8,7 @@
 #include "third_party/blink/renderer/platform/graphics/color_correction_test_utils.h"
 #include "third_party/blink/renderer/platform/testing/runtime_enabled_features_test_helpers.h"
 #include "ui/gfx/color_space.h"
+#include "ui/gl/buffer_format_utils.h"
 
 namespace blink {
 
@@ -34,4 +35,24 @@
   }
 }
 
+// Testing internal consistency of pixel format
+TEST(CanvasColorParamsTest, MatchPixelFormat) {
+  CanvasPixelFormat canvas_pixel_format[] = {
+      CanvasPixelFormat::kRGBA8,
+      CanvasPixelFormat::kBGRA8,
+      CanvasPixelFormat::kF16,
+      CanvasPixelFormat::kRGBX8,
+  };
+  for (auto pixelformat : canvas_pixel_format) {
+    CanvasColorParams color_params(CanvasColorSpace::kSRGB, pixelformat,
+                                   kNonOpaque);
+    gfx::BufferFormat buffer_format = color_params.GetBufferFormat();
+    unsigned gl_internal_format =
+        gl::BufferFormatToGLInternalFormat(buffer_format);
+    ASSERT_EQ(gl_internal_format, color_params.GLUnsizedInternalFormat());
+    auto gl_type = gl::BufferFormatToGLDataType(buffer_format);
+    ASSERT_EQ(gl_type, color_params.GLType());
+  }
+}
+
 }  // namespace blink
diff --git a/third_party/blink/renderer/platform/loader/fetch/resource.cc b/third_party/blink/renderer/platform/loader/fetch/resource.cc
index a019b61..fff2f85 100644
--- a/third_party/blink/renderer/platform/loader/fetch/resource.cc
+++ b/third_party/blink/renderer/platform/loader/fetch/resource.cc
@@ -757,13 +757,16 @@
     return MatchStatus::kUnknownFailure;
   }
 
+  // Use GetResourceRequest to get the const resource_request_.
+  const ResourceRequestHead& current_request = GetResourceRequest();
+
   // If credentials were sent with the previous request and won't be with this
   // one, or vice versa, re-fetch the resource.
   //
   // This helps with the case where the server sends back
   // "Access-Control-Allow-Origin: *" all the time, but some of the client's
   // requests are made without CORS and some with.
-  if (GetResourceRequest().AllowStoredCredentials() !=
+  if (current_request.AllowStoredCredentials() !=
       new_request.AllowStoredCredentials()) {
     return MatchStatus::kRequestCredentialsModeDoesNotMatch;
   }
@@ -810,10 +813,10 @@
     return MatchStatus::kSynchronousFlagDoesNotMatch;
   }
 
-  if (resource_request_.GetKeepalive() || new_request.GetKeepalive())
+  if (current_request.GetKeepalive() || new_request.GetKeepalive())
     return MatchStatus::kKeepaliveSet;
 
-  if (GetResourceRequest().HttpMethod() != http_names::kGET ||
+  if (current_request.HttpMethod() != http_names::kGET ||
       new_request.HttpMethod() != http_names::kGET) {
     return MatchStatus::kRequestMethodDoesNotMatch;
   }
@@ -825,16 +828,13 @@
   if (!existing_origin->IsSameOriginWith(new_origin.get()))
     return MatchStatus::kUnknownFailure;
 
-  // securityOrigin has more complicated checks which callers are responsible
-  // for.
-
   if (new_request.GetCredentialsMode() !=
-      resource_request_.GetCredentialsMode()) {
+      current_request.GetCredentialsMode()) {
     return MatchStatus::kRequestCredentialsModeDoesNotMatch;
   }
 
   const auto new_mode = new_request.GetMode();
-  const auto existing_mode = resource_request_.GetMode();
+  const auto existing_mode = current_request.GetMode();
 
   if (new_mode != existing_mode)
     return MatchStatus::kRequestModeDoesNotMatch;
diff --git a/third_party/blink/renderer/platform/weborigin/scheme_registry.cc b/third_party/blink/renderer/platform/weborigin/scheme_registry.cc
index a2cdb07..8a09026 100644
--- a/third_party/blink/renderer/platform/weborigin/scheme_registry.cc
+++ b/third_party/blink/renderer/platform/weborigin/scheme_registry.cc
@@ -102,6 +102,7 @@
       content_security_policy_bypassing_schemes;
   URLSchemesSet secure_context_bypassing_schemes;
   URLSchemesSet allowed_in_referrer_schemes;
+  URLSchemesSet error_schemes;
   URLSchemesSet wasm_eval_csp_schemes;
 
  private:
@@ -392,6 +393,18 @@
   return GetURLSchemesRegistry().allowed_in_referrer_schemes.Contains(scheme);
 }
 
+void SchemeRegistry::RegisterURLSchemeAsError(const String& scheme) {
+  DCHECK_EQ(scheme, scheme.LowerASCII());
+  GetMutableURLSchemesRegistry().error_schemes.insert(scheme);
+}
+
+bool SchemeRegistry::ShouldTreatURLSchemeAsError(const String& scheme) {
+  DCHECK_EQ(scheme, scheme.LowerASCII());
+  if (scheme.IsEmpty())
+    return false;
+  return GetURLSchemesRegistry().error_schemes.Contains(scheme);
+}
+
 void SchemeRegistry::RegisterURLSchemeAsBypassingContentSecurityPolicy(
     const String& scheme,
     PolicyAreas policy_areas) {
diff --git a/third_party/blink/renderer/platform/weborigin/scheme_registry.h b/third_party/blink/renderer/platform/weborigin/scheme_registry.h
index 47dd1cc..a03d181 100644
--- a/third_party/blink/renderer/platform/weborigin/scheme_registry.h
+++ b/third_party/blink/renderer/platform/weborigin/scheme_registry.h
@@ -132,6 +132,10 @@
   static void RemoveURLSchemeAsAllowedForReferrer(const String& scheme);
   static bool ShouldTreatURLSchemeAsAllowedForReferrer(const String& scheme);
 
+  // Schemes used for internal error pages, for failed navigations.
+  static void RegisterURLSchemeAsError(const String&);
+  static bool ShouldTreatURLSchemeAsError(const String& scheme);
+
   // Allow resources from some schemes to load on a page, regardless of its
   // Content Security Policy.
   enum PolicyAreas : uint32_t {
diff --git a/third_party/blink/web_tests/FlagExpectations/force-renderer-accessibility b/third_party/blink/web_tests/FlagExpectations/force-renderer-accessibility
index 66cc0f3..99138b1e 100644
--- a/third_party/blink/web_tests/FlagExpectations/force-renderer-accessibility
+++ b/third_party/blink/web_tests/FlagExpectations/force-renderer-accessibility
@@ -9,6 +9,8 @@
 compositing/iframes/content-visibility-hidden-div-with-frame.html [ Crash ]
 wpt_internal/display-lock/css-content-visibility/accessibility/content-visibility-accessibility-004.html [ Crash ]
 inspector-protocol/css/css-get-platform-fonts-display-locked.js [ Crash ]
+fast/css-generated-content/first-letter-in-nested-before-table.html [ Crash ]
+fast/css/first-letter-removed-added.html [ Crash ]
 fast/forms/fieldset/overflow-scroll-interaction.html [ Crash ]
 fast/forms/color/color-picker-appearance-color-well-right-keyboard-navigation-from-bottom-left-corner.html [ Crash ]
 fast/forms/color/color-picker-appearance-color-well-left-keyboard-navigation-from-top-right-corner.html [ Crash ]
@@ -41,8 +43,6 @@
 fast/css-generated-content/after-with-first-letter-float-crash.html [ Crash ]
 fast/css-generated-content/table-row-after-no-crash.html [ Crash ]
 fast/css-generated-content/positioned-div-with-floating-after-content-crash.html [ Crash ]
-fast/ruby/ruby-text-before-after-content.html [ Crash ]
-fast/ruby/ruby-beforeafter.html [ Crash ]
 fast/css/text-overflow-ellipsis-text-align-right.html [ Crash ]
 fast/css/text-overflow-ellipsis-strict.html [ Crash ]
 fast/css/text-overflow-ellipsis-block-with-border-and-padding.html [ Crash ]
@@ -140,6 +140,18 @@
 virtual/layout_ng_block_frag/fast/multicol/span/anonymous-before-child-parent-crash.html [ Crash ]
 virtual/layout_ng_block_frag/fast/multicol/huge-column-gap-crash.html [ Crash ]
 virtual/layout_ng_block_frag/fast/multicol/huge-column-count.html [ Crash ]
+virtual/focusless-spat-nav/fast/spatial-navigation/focusless/snav-focusless-display-none-editable.html [ Crash ]
+virtual/layout_ng_block_frag/external/wpt/css/css-multicol/moz-multicol3-column-balancing-break-inside-avoid-1.html [ Crash ]
+virtual/layout_ng_block_frag/fast/multicol/client-rects-rtl.html [ Crash ]
+virtual/layout_ng_block_frag/fast/multicol/client-rects.html [ Crash ]
+virtual/layout_ng_block_frag/fast/multicol/hit-test-end-of-column-with-line-height.html [ Crash ]
+virtual/layout_ng_block_frag/fast/multicol/multicol-with-child-renderLayer-for-input.html [ Crash ]
+virtual/layout_ng_block_frag/fast/multicol/outline/outline-inline-across-columns.html [ Crash ]
+virtual/layout_ng_block_frag/fast/multicol/outline/outline-inline-continuation-across-columns.html [ Crash ]
+virtual/layout_ng_block_frag/fast/multicol/vertical-lr/caret-range-anonymous-block-rtl.html [ Crash ]
+virtual/layout_ng_block_frag/fast/multicol/vertical-rl/caret-range-outside-columns-rtl.html [ Crash ]
+virtual/layout_ng_block_frag/fast/multicol/vertical-rl/caret-range-outside-columns.html [ Crash ]
+virtual/synchronous_html_parser/fast/css/first-letter-removed-added.html [ Crash ]
 virtual/text-antialias/ellipsis-in-relative-inline-2.html [ Crash ]
 virtual/text-antialias/hide-atomic-inlines-after-ellipsis.html [ Crash ]
 virtual/text-antialias/hyphen-min-preferred-width.html [ Crash ]
@@ -149,6 +161,7 @@
 virtual/text-antialias/atomic-inline-before-ellipsis.html [ Crash ]
 virtual/text-antialias/text-transform-lower-turkic.html [ Crash ]
 virtual/text-antialias/ellipsis-in-relative-inline-3.html [ Crash ]
+virtual/text-antialias/line-break-between-text-nodes-latin1.html [ Crash ]
 virtual/layout_ng_fragment_traversal/external/wpt/css/css-contain/content-visibility/content-visibility-033.sub.https.html [ Crash ]
 virtual/layout_ng_fragment_traversal/external/wpt/css/css-contain/content-visibility/content-visibility-032.html [ Crash ]
 http/tests/devtools/sources/source-frame-toolbar-items.js [ Crash ]
@@ -231,6 +244,10 @@
 external/wpt/css/css-text/hyphens/hyphens-span-001.html [ Crash ]
 external/wpt/css/css-ui/text-overflow-ruby.html [ Crash ]
 external/wpt/css/css-overflow/webkit-line-clamp-035.html [ Crash ]
+external/wpt/css/css-text/hyphens/hyphens-auto-inline-010.html [ Crash ]
+external/wpt/css/css-text/hyphens/hyphens-shaping-001.html [ Crash ]
+external/wpt/css/css-text/hyphens/hyphens-shaping-002.html [ Crash ]
+external/wpt/css/css-text/hyphens/shy-styling-001.html [ Crash ]
 virtual/layout_ng_block_frag/external/wpt/css/css-multicol/multicol-nested-margin-003.xht [ Crash ]
 virtual/layout_ng_block_frag/external/wpt/css/css-multicol/multicol-nested-005.xht [ Crash ]
 virtual/layout_ng_block_frag/external/wpt/css/css-multicol/multicol-nested-margin-004.xht [ Crash ]
@@ -265,6 +282,7 @@
 inspector-protocol/accessibility/accessibility-nameSources-input.js [ Slow ]
 inspector-protocol/accessibility/accessibility-nameSources-labelledby.js [ Slow ]
 inspector-protocol/runtime/runtime-console-basic-functions-paused.js [ Slow ]
+inspector-protocol/runtime/runtime-console-basic-functions.js [ Timeout ]
 external/wpt/selection/addRange-* [ Slow Timeout Pass ]
 external/wpt/selection/collapse-* [ Slow Timeout Pass ]
 external/wpt/selection/extend-* [ Slow Timeout Pass ]
@@ -284,6 +302,7 @@
 external/wpt/css/css-backgrounds/animations/border-image-slice-interpolation.html [ Slow ]
 external/wpt/css/css-backgrounds/animations/background-image-interpolation.html [ Slow ]
 external/wpt/css/css-backgrounds/animations/border-image-width-interpolation.html [ Slow ]
+external/wpt/css/css-conditional/js/CSS-supports-CSSStyleDeclaration.html [ Timeout ]
 external/wpt/css/motion/animation/offset-rotate-interpolation.html [ Slow ]
 external/wpt/css/css-grid/animation/grid-template-rows-interpolation.html [ Slow ]
 external/wpt/css/css-grid/animation/grid-template-columns-interpolation.html [ Slow ]
@@ -298,7 +317,7 @@
 external/wpt/dom/ranges/Range-comparePoint.html [ Slow Timeout Pass ]
 external/wpt/dom/ranges/Range-intersectsNode.html [ Slow Timeout Pass ]
 external/wpt/dom/ranges/Range-isPointInRange.html [ Slow Timeout Pass ]
-external/wpt/dom/ranges/Range-set.html [ Slow ]
+external/wpt/dom/ranges/Range-set.html [ Slow Timeout ]
 external/wpt/dom/nodes/Element-matches.html [ Slow ]
 external/wpt/dom/nodes/ParentNode-querySelector-All.html [ Timeout ]
 external/wpt/dom/nodes/Element-webkitMatchesSelector.html [ Slow ]
@@ -341,6 +360,9 @@
 virtual/webrtc-wpt-plan-b/external/wpt/webrtc/simulcast/h264.https.html [ FAILURE ]
 virtual/focusless-spat-nav/fast/spatial-navigation/focusless/snav-focusless-enter-from-interest.html [ FAILURE ]
 webcodecs/basic_video_encoding.html [ FAILURE ]
+webcodecs/reconfiguring_encooder.html [ Failure ]
 external/wpt/webrtc/RTCRtpTransceiver-setCodecPreferences.html [ FAILURE ]
 external/wpt/webrtc/protocol/video-codecs.https.html [ FAILURE ]
 external/wpt/webrtc/simulcast/h264.https.html [ FAILURE ]
+external/wpt/webrtc/protocol/rtp-demuxing.html [ FAILURE ]
+
diff --git a/third_party/blink/web_tests/TestExpectations b/third_party/blink/web_tests/TestExpectations
index 8e9e803f..6f41a84 100644
--- a/third_party/blink/web_tests/TestExpectations
+++ b/third_party/blink/web_tests/TestExpectations
@@ -215,12 +215,6 @@
 crbug.com/1093466 virtual/portals/http/tests/portals/* [ Pass ]
 crbug.com/1093466 virtual/portals/wpt_internal/portals/* [ Pass ]
 
-# Subpixel differences
-crbug.com/997202 external/wpt/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-5.html [ Failure ]
-crbug.com/997202 external/wpt/css/css-backgrounds/background-attachment-local/attachment-local-clipping-image-5.html [ Failure ]
-crbug.com/997202 external/wpt/css/css-backgrounds/border-radius-clip-001.html [ Failure ]
-crbug.com/997202 external/wpt/css/css-backgrounds/border-radius-clip-002.htm [ Failure ]
-
 crbug.com/807395 fast/multicol/mixed-opacity-test.html [ Failure ]
 
 ########## Ref tests can't be rebaselined ##########
@@ -1911,7 +1905,6 @@
 crbug.com/694525 external/wpt/content-security-policy/connect-src/worker-connect-src-blocked.sub.html [ Skip ]
 crbug.com/694525 external/wpt/content-security-policy/navigation/to-javascript-parent-initiated-child-csp.html [ Skip ]
 crbug.com/694525 external/wpt/content-security-policy/form-action/form-action-src-redirect-blocked.sub.html [ Skip ]
-crbug.com/694525 external/wpt/content-security-policy/script-src/script-src-1_10.html [ Skip ]
 crbug.com/694525 external/wpt/content-security-policy/script-src/script-src-strict_dynamic_in_img-src.html [ Skip ]
 crbug.com/694525 external/wpt/content-security-policy/script-src/worker-importscripts-blocked.sub.html [ Skip ]
 crbug.com/694525 external/wpt/content-security-policy/script-src/worker-set-timeout-blocked.sub.html [ Skip ]
@@ -3282,6 +3275,8 @@
 # [composite-bgcolor-animation]
 crbug.com/1148369 virtual/composite-bgcolor-animation/external/wpt/css/css-backgrounds/border-bottom-left-radius-010.xht [ Failure ]
 crbug.com/1148369 virtual/composite-bgcolor-animation/external/wpt/css/css-backgrounds/border-bottom-right-radius-010.xht [ Failure ]
+crbug.com/1148369 virtual/composite-bgcolor-animation/external/wpt/css/css-backgrounds/border-radius-clip-001.html [ Failure ]
+crbug.com/1148369 virtual/composite-bgcolor-animation/external/wpt/css/css-backgrounds/border-radius-clip-002.htm [ Failure ]
 crbug.com/1148369 virtual/composite-bgcolor-animation/external/wpt/css/css-backgrounds/border-top-left-radius-010.xht [ Failure ]
 crbug.com/1148369 virtual/composite-bgcolor-animation/external/wpt/css/css-backgrounds/border-top-right-radius-010.xht [ Failure ]
 
@@ -5881,3 +5876,6 @@
 
 # Sheriff 2020-12-07
 crbug.com/1156175 external/wpt/requestidlecallback/callback-iframe.html [ Pass Timeout ]
+
+# Sheriff 2020-12-08
+crbug.com/1154178 external/wpt/webmessaging/broadcastchannel/basics.html [ Pass Failure ]
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 744c105..ec7b1de4 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
@@ -87237,6 +87237,32 @@
        {}
       ]
      ],
+     "no-scrollable-overflow-vertical-rl-2.html": [
+      "895f9bafc621329b95d1bb2fe086602945991cde",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square-only.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "no-scrollable-overflow-vertical-rl.html": [
+      "13385a2685cb8b6c33c94a9b09186336fda9c61a",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square-only.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "overflow-body-propagation-001.html": [
       "0998fe68e007d5a46ff11d5ff87fdbad12d1dfe2",
       [
@@ -223100,7 +223126,7 @@
         []
        ],
        "reporting-common.js": [
-        "3b1820cebb8f1d5f8b7fb00b90740cee6de9fbb9",
+        "01f835e12ad5f24c07c50ae7376183628fff80bc",
         []
        ],
        "test-access-property.js": [
@@ -241195,6 +241221,14 @@
       "dee5b62f0005705c18dde06865ab5a9947a37357",
       []
      ],
+     "csp-default-none.html": [
+      "1f59d8c2250f7f17f143887dc4f8e68cdf7faa83",
+      []
+     ],
+     "csp-default-none.html.headers": [
+      "d66f886dd23d44bb33750cb5723f3edb6b7930ab",
+      []
+     ],
      "document-domain-no-impact.sub.html": [
       "fbd7bc3b6e21ee39478c8a63780bb673dafe96a4",
       []
@@ -253368,10 +253402,6 @@
      "604e765da46d85fe8ab85d3097fe7c2cbe00a930",
      []
     ],
-    "idlharness.tentative.window-expected.txt": [
-     "585a51ba727cef9a2f6acd0ecd4de8512969d166",
-     []
-    ],
     "no-require-trusted-types-for-report-only.tentative.html.headers": [
      "aa00fcc15a30ef1f8968be44abc1a9e934a31979",
      []
@@ -254856,7 +254886,7 @@
       ]
      },
      "generate-test-wbns.sh": [
-      "8fc28bb9db7cd9900bee9c3555e7e7d84e41b389",
+      "3c8a3ea68d60522452be94a7f8d0aaf9b11f5c55",
       []
      ],
      "location": {
@@ -254919,6 +254949,10 @@
        []
       ]
      },
+     "urn-uuid.har": [
+      "e0cea3699ae53beedde24dc55287b7d4407083dd",
+      []
+     ],
      "wbn": {
       "__dir__.headers": [
        "21e57b9caca1183ecda6f5d4fb9ebd556abf769a",
@@ -254977,6 +255011,10 @@
       "subresource.wbn": [
        "eabd994ff8bceaf4ef52b329b4faa158c292af12",
        []
+      ],
+      "urn-uuid.wbn": [
+       "a4bd3efc9cc73e1405bad5209631e0e1e1f352b5",
+       []
       ]
      }
     }
@@ -281836,7 +281874,7 @@
       ]
      ],
      "script-src-1_10.html": [
-      "a1bfdaeb15bfbadb322b393b34f6872de1c55699",
+      "fa25976c128f195828dbfdb2e7c068f72aa83f8e",
       [
        null,
        {}
@@ -406783,6 +406821,13 @@
       }
      ]
     ],
+    "iframe-failed-commit.html": [
+     "75e19f788efb2ecbccf67c4df02f030e3d9415c7",
+     [
+      null,
+      {}
+     ]
+    ],
     "nested-context-navigations-embed.html": [
      "bbba46c50edf21f50b49099c779dd5a8792faa0f",
      [
@@ -421126,7 +421171,7 @@
      ]
     ],
     "block-string-assignment-to-DOMWindowTimers-setTimeout-setInterval.tentative.html": [
-     "f36ae94ea10ce95d7087ec22ef4a25f157f7e6a8",
+     "c24715718d17561f779c6df7098f4c0b874675a9",
      [
       null,
       {}
@@ -428295,7 +428340,7 @@
       ]
      ],
      "subresource-loading-from-web-bundle.tentative.html": [
-      "c2de0eb0994f54c65a342b501aa3e9107949faf7",
+      "53a9c1b2cc707271c8d7b0e7fb7385fd59839744",
       [
        null,
        {}
diff --git a/third_party/blink/web_tests/external/wpt/content-security-policy/script-src/script-src-1_10.html b/third_party/blink/web_tests/external/wpt/content-security-policy/script-src/script-src-1_10.html
index a1bfdae..fa25976 100644
--- a/third_party/blink/web_tests/external/wpt/content-security-policy/script-src/script-src-1_10.html
+++ b/third_party/blink/web_tests/external/wpt/content-security-policy/script-src/script-src-1_10.html
@@ -15,7 +15,7 @@
         var t_spv = async_test("Test that securitypolicyviolation event is fired");
         
         window.addEventListener("securitypolicyviolation", t_spv.step_func_done(function(e) {
-            assert_equals(e.violatedDirective, "script-src");
+            assert_equals(e.violatedDirective, "script-src-elem");
         }));
     </script>
 
diff --git a/third_party/blink/web_tests/external/wpt/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-5.html b/third_party/blink/web_tests/external/wpt/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-5.html
index 7b27a040..136b704 100644
--- a/third_party/blink/web_tests/external/wpt/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-5.html
+++ b/third_party/blink/web_tests/external/wpt/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-5.html
@@ -2,6 +2,7 @@
 <title>CSS Test: background-{attachment: local; clip: padding-box; color}; border-radius</title>
 <link rel="match" href="attachment-local-clipping-color-4-ref.html" />
 <meta name="flags" content="dom" />
+<meta name=fuzzy content="0-10;0-160">
 <link rel="author" title="Simon Sapin" href="http://exyr.org/about/" />
 <link rel="help" href="http://www.w3.org/TR/css3-background/#the-background-attachment" />
 <style>
diff --git a/third_party/blink/web_tests/external/wpt/css/css-backgrounds/background-attachment-local/attachment-local-clipping-image-5.html b/third_party/blink/web_tests/external/wpt/css/css-backgrounds/background-attachment-local/attachment-local-clipping-image-5.html
index 376c9cd..1d6f1a8 100644
--- a/third_party/blink/web_tests/external/wpt/css/css-backgrounds/background-attachment-local/attachment-local-clipping-image-5.html
+++ b/third_party/blink/web_tests/external/wpt/css/css-backgrounds/background-attachment-local/attachment-local-clipping-image-5.html
@@ -2,6 +2,7 @@
 <title>CSS Test: background-{attachment: local; clip: padding-box; image}; border-radius</title>
 <link rel="match" href="attachment-local-clipping-image-4-ref.html" />
 <meta name="flags" content="dom" />
+<meta name=fuzzy content="0-10;0-300">
 <link rel="author" title="Simon Sapin" href="http://exyr.org/about/" />
 <link rel="help" href="http://www.w3.org/TR/css3-background/#the-background-attachment" />
 <style>
diff --git a/third_party/blink/web_tests/external/wpt/css/css-backgrounds/border-radius-clip-001.html b/third_party/blink/web_tests/external/wpt/css/css-backgrounds/border-radius-clip-001.html
index 585b6267..008ca736 100644
--- a/third_party/blink/web_tests/external/wpt/css/css-backgrounds/border-radius-clip-001.html
+++ b/third_party/blink/web_tests/external/wpt/css/css-backgrounds/border-radius-clip-001.html
@@ -12,6 +12,8 @@
 
   <meta name="assert" content="Test passes if a box with border-radius that clips its content to a box edge clips to the border-radius curve in the corners.">
 
+  <meta name="fuzzy" content="0-1;0-1000">
+
   <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
   <style>
   body > div { float: left; }
diff --git a/third_party/blink/web_tests/external/wpt/css/css-backgrounds/border-radius-clip-002.htm b/third_party/blink/web_tests/external/wpt/css/css-backgrounds/border-radius-clip-002.htm
index e81871e..759bd5c 100644
--- a/third_party/blink/web_tests/external/wpt/css/css-backgrounds/border-radius-clip-002.htm
+++ b/third_party/blink/web_tests/external/wpt/css/css-backgrounds/border-radius-clip-002.htm
@@ -7,6 +7,7 @@
         <link rel="match" href="reference/border-radius-clip-002-ref.htm">
         <link rel="help" href="https://www.w3.org/TR/css-backgrounds-3/#corner-clipping">
         <meta name="assert" content="Background is clipped to the curve of the content-box when 'background-clip: content-box'">
+        <meta name=fuzzy content="0-70;0-50">
         <style type="text/css">
             #test-base
             {
diff --git a/third_party/blink/web_tests/external/wpt/css/css-overflow/no-scrollable-overflow-vertical-rl-2.html b/third_party/blink/web_tests/external/wpt/css/css-overflow/no-scrollable-overflow-vertical-rl-2.html
new file mode 100644
index 0000000..895f9ba
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/css-overflow/no-scrollable-overflow-vertical-rl-2.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/ -->
+<html>
+  <meta charset="utf-8">
+  <title>CSS Overflow Test: Scrollable overflow area of a multicol container in vertical-rl writing-mode</title>
+  <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
+  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+  <link rel="help" href="https://drafts.csswg.org/css-overflow-3/#scrollable">
+  <link rel="match" href="../reference/ref-filled-green-100px-square-only.html">
+  <meta name="assert" content="This test verifies the nested float element in a multicol container in vertical-rl writing-mode shouldn't contribute to its container'sscrollable overflow area.">
+
+  <style>
+  .scroll-container {
+    writing-mode: vertical-rl;
+    inline-size: 100px;
+    block-size: 100px;
+    overflow: auto;
+  }
+  .multicol {
+    block-size: 100px;
+    inline-size: 100px;
+    column-fill: auto;
+    column-count: 2;
+    column-gap: 0;
+  }
+  .float {
+    float: left;
+    inline-size: 50px;
+    block-size: 100px;
+    background: green;
+  }
+  </style>
+
+  <!--This test passes if the scroll-container has no scrollbar. -->
+
+  <p>Test passes if there is a filled green square.</p>
+  <div class="scroll-container">
+    <div class="multicol">
+      <div>
+        <div style="block-size: 100px; background: green;"></div>
+        <div class="float"></div>
+      </div>
+    </div>
+  </div>
+</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/css-overflow/no-scrollable-overflow-vertical-rl.html b/third_party/blink/web_tests/external/wpt/css/css-overflow/no-scrollable-overflow-vertical-rl.html
new file mode 100644
index 0000000..13385a2
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/css-overflow/no-scrollable-overflow-vertical-rl.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<!-- Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/ -->
+<html>
+  <meta charset="utf-8">
+  <title>CSS Overflow Test: Scrollable overflow area of a multicol container in vertical-rl writing-mode</title>
+  <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
+  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+  <link rel="help" href="https://drafts.csswg.org/css-overflow-3/#scrollable">
+  <link rel="match" href="../reference/ref-filled-green-100px-square-only.html">
+  <meta name="assert" content="This test verifies the float element in a multicol container in vertical-rl writing-mode shouldn't contribute to its container'sscrollable overflow area.">
+
+  <style>
+  .scroll-container {
+    writing-mode: vertical-rl;
+    inline-size: 100px;
+    block-size: 100px;
+    overflow: auto;
+  }
+  .multicol {
+    block-size: 100px;
+    inline-size: 100px;
+    column-fill: auto;
+    column-count: 2;
+    column-gap: 0;
+  }
+  .float {
+    float: left;
+    inline-size: 50px;
+    block-size: 100px;
+    background: green;
+  }
+  </style>
+
+  <!--This test passes if the scroll-container has no scrollbar. -->
+
+  <p>Test passes if there is a filled green square.</p>
+  <div class="scroll-container">
+    <div class="multicol">
+      <div style="block-size: 100px; background: green;"></div>
+      <div class="float"></div>
+    </div>
+  </div>
+</html>
diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/resources/reporting-common.js b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/resources/reporting-common.js
index 3b1820ce..01f835e 100644
--- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/resources/reporting-common.js
+++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/resources/reporting-common.js
@@ -171,7 +171,8 @@
       `|header(Cross-Origin-Embedder-Policy-Report-Only,${encodeURIComponent(coepRo)})`+
       `&uuid=${executorToken}`;
       const openee = window.open(openee_url);
-      t.add_cleanup(() => send(5, "window.close()"));
+      const uuid = token();
+      t.add_cleanup(() => send(uuid, "window.close()"));
 
       // 1. Make sure the new document is loaded.
       send(executorToken, `
diff --git a/third_party/blink/web_tests/external/wpt/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-radius-with-alpha-ref.html b/third_party/blink/web_tests/external/wpt/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-radius-with-alpha-ref.html
index 577482a..5cfe13c 100644
--- a/third_party/blink/web_tests/external/wpt/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-radius-with-alpha-ref.html
+++ b/third_party/blink/web_tests/external/wpt/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-radius-with-alpha-ref.html
@@ -2,10 +2,10 @@
 <style>
 div {
     background-color: green;
-    height: 150px;
+    height: 110px;
     position: absolute;
     width: 150px;
-    top: 50px;
+    top: 70px;
 }
 </style>
 <p>There should be no red.</p>
diff --git a/third_party/blink/web_tests/external/wpt/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-radius-with-alpha.html b/third_party/blink/web_tests/external/wpt/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-radius-with-alpha.html
index 36b9fc8..7a942076 100644
--- a/third_party/blink/web_tests/external/wpt/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-radius-with-alpha.html
+++ b/third_party/blink/web_tests/external/wpt/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-radius-with-alpha.html
@@ -9,14 +9,18 @@
     height: 100px;
     width: 100px;
 }
+legend {
+    height: 50px;
+    width: 50px;
+}
 div {
     background-color: green;
-    height: 150px;
+    height: 110px;
     position: absolute;
     width: 150px;
-    top: 50px;
+    top: 70px;
 }
 </style>
 <p>There should be no red.</p>
-<fieldset></fieldset>
+<fieldset><legend></legend></fieldset>
 <div></div>
diff --git a/third_party/blink/web_tests/external/wpt/js-self-profiling/__dir__.headers b/third_party/blink/web_tests/external/wpt/js-self-profiling/__dir__.headers
index 63b60e4..35b10bd2 100644
--- a/third_party/blink/web_tests/external/wpt/js-self-profiling/__dir__.headers
+++ b/third_party/blink/web_tests/external/wpt/js-self-profiling/__dir__.headers
@@ -1,2 +1,3 @@
 Cross-Origin-Opener-Policy: same-origin
 Cross-Origin-Embedder-Policy: require-corp
+Document-Policy: js-profiling
diff --git a/third_party/blink/web_tests/external/wpt/resource-timing/iframe-failed-commit.html b/third_party/blink/web_tests/external/wpt/resource-timing/iframe-failed-commit.html
new file mode 100644
index 0000000..75e19f7
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/resource-timing/iframe-failed-commit.html
@@ -0,0 +1,69 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8" />
+<title>Resource Timing - test that unsuccessful iframes create entries</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
+<body>
+<script>
+test(() => {
+  const entries = performance.getEntriesByType("resource");
+  assert_equals(entries.length, 3, "Precondition - Entries for blocking scripts fired");
+}, "Precondition");
+
+const run_test = async (t, url, csp) => {
+  const setPerformanceObserver = new Promise(resolve => {
+    const po = new PerformanceObserver(resolve);
+    po.observe({type: "resource"});
+  });
+  const timeout = new Promise(resolve => t.step_timeout(resolve, 1000));
+  const frame = document.createElement("iframe");
+  frame.src = url;
+  if (csp) {
+    frame.csp = csp;
+  }
+  document.body.appendChild(frame);
+  const list = await Promise.race([setPerformanceObserver, timeout]);
+  assert_equals(typeof(list), "object", "No iframe entry was fired");
+  const entries = list.getEntriesByName(url);
+  assert_equals(entries.length, 1);
+}
+
+const {REMOTE_ORIGIN, ORIGINAL_HOST, HTTPS_PORT} = get_host_info();
+const nonexistent_url = "https://nonexistent." + ORIGINAL_HOST + ":" + HTTPS_PORT + "/";
+
+promise_test(t => {
+  return run_test(t, nonexistent_url);
+}, "Test iframe from non-existent host");
+
+promise_test(t => {
+  const url = new URL("resources/fake_responses.py?redirect=" + nonexistent_url, location.href);
+  return run_test(t, url.toString());
+}, "Test iframe redirecting to non-existent host");
+
+const csp_directive = "default-src 'none'";
+promise_test(t => {
+  const url = new URL("/resource-timing/resources/csp-default-none.html", location.href);
+  return run_test(t, url, csp_directive);
+}, "Same-origin iframe that complies with CSP attribute gets reported");
+
+promise_test(t => {
+  const url = new URL("/resource-timing/resources/green_frame.htm", location.href);
+  return run_test(t, url.toString(), csp_directive);
+}, "Same-origin iframe that doesn't comply with CSP attribute gets reported");
+
+promise_test(t => {
+  const url = new URL("/resource-timing/resources/csp-default-none.html", REMOTE_ORIGIN);
+  return run_test(t, url.toString(), csp_directive);
+}, "Cross-origin iframe that complies with CSP attribute gets reported");
+
+promise_test(t => {
+  const url = new URL("/resource-timing/resources/green_frame.htm", REMOTE_ORIGIN);
+  return run_test(t, url.toString(), csp_directive);
+}, "Cross-origin iframe that doesn't comply with CSP attribute gets reported");
+
+</script>
+</body>
+</html>
diff --git a/third_party/blink/web_tests/external/wpt/resource-timing/resources/csp-default-none.html b/third_party/blink/web_tests/external/wpt/resource-timing/resources/csp-default-none.html
new file mode 100644
index 0000000..1f59d8c
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/resource-timing/resources/csp-default-none.html
@@ -0,0 +1,3 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>empty page</title>
diff --git a/third_party/blink/web_tests/external/wpt/resource-timing/resources/csp-default-none.html.headers b/third_party/blink/web_tests/external/wpt/resource-timing/resources/csp-default-none.html.headers
new file mode 100644
index 0000000..d66f886
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/resource-timing/resources/csp-default-none.html.headers
@@ -0,0 +1,2 @@
+Content-Security-Policy: default-src 'none'
+
diff --git a/third_party/blink/web_tests/external/wpt/urlpattern/input.https.any.js b/third_party/blink/web_tests/external/wpt/urlpattern/input.https.any.js
deleted file mode 100644
index 71a8fb2..0000000
--- a/third_party/blink/web_tests/external/wpt/urlpattern/input.https.any.js
+++ /dev/null
@@ -1,88 +0,0 @@
-// META: global=window,worker
-// META: script=resources/utils.js
-
-// This file attempts to test the different ways you can pass input values
-// to be matched; e.g. as strings vs structured component parts.
-
-test(() => {
-  runTest({ pathname: '/foo/bar' }, [
-    { input: "https://example.com/foo/bar", expected: true },
-    { input: "https://example.com/foo/bar/baz", expected: false },
-  ]);
-}, "init single component, input string");
-
-test(() => {
-  runTest({ pathname: '/foo/bar' }, [
-    { input: { pathname: '/foo/bar' }, expected: true },
-    { input: { pathname: '/foo/bar/baz' }, expected: false },
-  ]);
-}, "init single component, input single component");
-
-test(() => {
-  runTest({ pathname: '/foo/bar' }, [
-    { input: { hostname: 'example.com', pathname: '/foo/bar' },
-      expected: true },
-    { input: { hostname: 'example.com', pathname: '/foo/bar/baz' },
-      expected: false },
-  ]);
-}, "init single component, input two components");
-
-test(() => {
-  runTest({ pathname: '/foo/bar' }, [
-    { input: { pathname: '/foo/bar', baseURL: 'https://example.com' },
-      expected: true },
-    { input: { pathname: '/foo/bar/baz', baseURL: 'https://example.com' },
-      expected: false },
-  ]);
-}, "init single component, input baseURL and single component");
-
-test(() => {
-  runTest({ pathname: '/foo/bar', baseURL: 'https://example.com?query#hash' }, [
-    { input: "https://example.com/foo/bar", expected: true },
-    { input: "https://example.com/foo/bar/baz", expected: false },
-    { input: "https://example2.com/foo/bar", expected: false },
-    { input: "http://example.com/foo/bar", expected: false },
-  ]);
-}, "init baseURL and single component, input string");
-
-test(() => {
-  runTest({ pathname: '/foo/bar', baseURL: 'https://example.com?query#hash' }, [
-    { input: { pathname: '/foo/bar' }, expected: false },
-    { input: { pathname: '/foo/bar/baz' }, expected: false },
-  ]);
-}, "init baseURL and single component, input single component");
-
-test(() => {
-  runTest({ pathname: '/foo/bar', baseURL: 'https://example.com?query#hash' }, [
-    { input: { hostname: 'example.com', pathname: '/foo/bar' },
-      expected: false },
-    { input: { hostname: 'example.com', pathname: '/foo/bar/baz' },
-      expected: false },
-    { input: { hostname: 'example2.com', pathname: '/foo/bar' },
-      expected: false },
-  ]);
-}, "init baseURL and single component, input two components");
-
-test(() => {
-  runTest({ pathname: '/foo/bar', baseURL: 'https://example.com?query#hash' }, [
-    { input: { protocol: 'https', hostname: 'example.com',
-               pathname: '/foo/bar' },
-      expected: true },
-    { input: { protocol: 'https', hostname: 'example.com',
-               pathname: '/foo/bar/baz' },
-      expected: false },
-  ]);
-}, "init single component, input three components");
-
-test(() => {
-  runTest({ pathname: '/foo/bar', baseURL: 'https://example.com?query#hash' }, [
-    { input: { pathname: '/foo/bar', baseURL: 'https://example.com' },
-      expected: true },
-    { input: { pathname: '/foo/bar/baz', baseURL: 'https://example.com' },
-      expected: false },
-    { input: { pathname: '/foo/bar', baseURL: 'https://example2.com' },
-      expected: false },
-    { input: { pathname: '/foo/bar', baseURL: 'http://example.com' },
-      expected: false },
-  ]);
-}, "init baseURL and single component, input baseURL and single component");
diff --git a/third_party/blink/web_tests/external/wpt/urlpattern/pathname.https.any.js b/third_party/blink/web_tests/external/wpt/urlpattern/pathname.https.any.js
deleted file mode 100644
index 5de41cc..0000000
--- a/third_party/blink/web_tests/external/wpt/urlpattern/pathname.https.any.js
+++ /dev/null
@@ -1,139 +0,0 @@
-// META: global=window,worker
-// META: script=resources/utils.js
-
-test(() => {
-  runTest({ pathname: '/foo/bar' }, [
-    { input: { pathname: '/foo/bar' }, expected: true },
-    { input: { pathname: '/foo/ba' }, expected: false },
-    { input: { pathname: '/foo/bar/' }, expected: false },
-    { input: { pathname: '/foo/bar/baz' }, expected: false },
-  ]);
-}, "fixed string");
-
-test(() => {
-  runTest({ pathname: '/foo/:bar' }, [
-    { input: { pathname: '/foo/bar' }, expected: true },
-    { input: { pathname: '/foo/index.html' }, expected: true },
-    { input: { pathname: '/foo/bar/' }, expected: false },
-    { input: { pathname: '/foo/' }, expected: false },
-  ]);
-}, "named group");
-
-test(() => {
-  runTest({ pathname: '/foo/(.*)' }, [
-    { input: { pathname: '/foo/bar' }, expected: true },
-    { input: { pathname: '/foo/bar/baz' }, expected: true },
-    { input: { pathname: '/foo/' }, expected: true },
-    { input: { pathname: '/foo' }, expected: false },
-  ]);
-}, "regexp group");
-
-test(() => {
-  runTest({ pathname: '/foo/:bar(.*)' }, [
-    { input: { pathname: '/foo/bar' }, expected: true },
-    { input: { pathname: '/foo/bar/baz' }, expected: true },
-    { input: { pathname: '/foo/' }, expected: true },
-    { input: { pathname: '/foo' }, expected: false },
-  ]);
-}, "named regexp group");
-
-test(() => {
-  runTest({ pathname: '/foo/:bar?' }, [
-    { input: { pathname: '/foo/bar' }, expected: true },
-    { input: { pathname: '/foo' }, expected: true },
-    { input: { pathname: '/foo/' }, expected: false },
-    { input: { pathname: '/foobar' }, expected: false },
-    { input: { pathname: '/foo/bar/baz' }, expected: false },
-  ]);
-}, "optional named group");
-
-test(() => {
-  runTest({ pathname: '/foo/:bar+' }, [
-    { input: { pathname: '/foo/bar' }, expected: true },
-    { input: { pathname: '/foo/bar/baz' }, expected: true },
-    { input: { pathname: '/foo' }, expected: false },
-    { input: { pathname: '/foo/' }, expected: false },
-    { input: { pathname: '/foobar' }, expected: false },
-  ]);
-}, "repeated named group");
-
-test(() => {
-  runTest({ pathname: '/foo/:bar*' }, [
-    { input: { pathname: '/foo/bar' }, expected: true },
-    { input: { pathname: '/foo/bar/baz' }, expected: true },
-    { input: { pathname: '/foo' }, expected: true },
-    { input: { pathname: '/foo/' }, expected: false },
-    { input: { pathname: '/foobar' }, expected: false },
-  ]);
-}, "optional repeated named group");
-
-test(() => {
-  runTest({ pathname: '/foo/(.*)?' }, [
-    { input: { pathname: '/foo/bar' }, expected: true },
-    { input: { pathname: '/foo/bar/baz' }, expected: true },
-    { input: { pathname: '/foo/' }, expected: true },
-    { input: { pathname: '/foo' }, expected: true },
-    { input: { pathname: '/fo' }, expected: false },
-    { input: { pathname: '/foobar' }, expected: false },
-  ]);
-}, "optional regexp group");
-
-test(() => {
-  runTest({ pathname: '/foo/(.*)+' }, [
-    { input: { pathname: '/foo/bar' }, expected: true },
-    { input: { pathname: '/foo/bar/baz' }, expected: true },
-    { input: { pathname: '/foo/' }, expected: true },
-    { input: { pathname: '/foo' }, expected: false },
-    { input: { pathname: '/fo' }, expected: false },
-    { input: { pathname: '/foobar' }, expected: false },
-  ]);
-}, "repeated regexp group");
-
-test(() => {
-  runTest({ pathname: '/foo/(.*)*' }, [
-    { input: { pathname: '/foo/bar' }, expected: true },
-    { input: { pathname: '/foo/bar/baz' }, expected: true },
-    { input: { pathname: '/foo/' }, expected: true },
-    { input: { pathname: '/foo' }, expected: true },
-    { input: { pathname: '/fo' }, expected: false },
-    { input: { pathname: '/foobar' }, expected: false },
-  ]);
-}, "optional repeated regexp group");
-
-test(() => {
-  runTest({ pathname: '/foo{/bar}' }, [
-    { input: { pathname: '/foo/bar' }, expected: true },
-    { input: { pathname: '/foo/bar/baz' }, expected: false },
-    { input: { pathname: '/foo/' }, expected: false },
-    { input: { pathname: '/foo' }, expected: false },
-  ]);
-}, "group");
-
-test(() => {
-  runTest({ pathname: '/foo{/bar}?' }, [
-    { input: { pathname: '/foo/bar' }, expected: true },
-    { input: { pathname: '/foo/bar/baz' }, expected: false },
-    { input: { pathname: '/foo' }, expected: true },
-    { input: { pathname: '/foo/' }, expected: false },
-  ]);
-}, "optional group");
-
-test(() => {
-  runTest({ pathname: '/foo{/bar}+' }, [
-    { input: { pathname: '/foo/bar' }, expected: true },
-    { input: { pathname: '/foo/bar/bar' }, expected: true },
-    { input: { pathname: '/foo/bar/baz' }, expected: false },
-    { input: { pathname: '/foo' }, expected: false },
-    { input: { pathname: '/foo/' }, expected: false },
-  ]);
-}, "repeated group");
-
-test(() => {
-  runTest({ pathname: '/foo{/bar}*' }, [
-    { input: { pathname: '/foo/bar' }, expected: true },
-    { input: { pathname: '/foo/bar/bar' }, expected: true },
-    { input: { pathname: '/foo/bar/baz' }, expected: false },
-    { input: { pathname: '/foo' }, expected: true },
-    { input: { pathname: '/foo/' }, expected: false },
-  ]);
-}, "repeated optional group");
diff --git a/third_party/blink/web_tests/external/wpt/urlpattern/resources/urlpatterntestdata.json b/third_party/blink/web_tests/external/wpt/urlpattern/resources/urlpatterntestdata.json
new file mode 100644
index 0000000..9bdf4d2
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/urlpattern/resources/urlpatterntestdata.json
@@ -0,0 +1,455 @@
+[
+  {
+    "pattern": { "pathname": "/foo/bar" },
+    "input": { "pathname": "/foo/bar" },
+    "expected": true
+  },
+  {
+    "pattern": { "pathname": "/foo/bar" },
+    "input": { "pathname": "/foo/ba" },
+    "expected": false
+  },
+  {
+    "pattern": { "pathname": "/foo/bar" },
+    "input": { "pathname": "/foo/bar/" },
+    "expected": false
+  },
+  {
+    "pattern": { "pathname": "/foo/bar" },
+    "input": { "pathname": "/foo/bar/baz" },
+    "expected": false
+  },
+  {
+    "pattern": { "pathname": "/foo/bar" },
+    "input": "https://example.com/foo/bar",
+    "expected": true
+  },
+  {
+    "pattern": { "pathname": "/foo/bar" },
+    "input": "https://example.com/foo/bar/baz",
+    "expected": false
+  },
+  {
+    "pattern": { "pathname": "/foo/bar" },
+    "input": { "hostname": "example.com", "pathname": "/foo/bar" },
+    "expected": true
+  },
+  {
+    "pattern": { "pathname": "/foo/bar" },
+    "input": { "hostname": "example.com", "pathname": "/foo/bar/baz" },
+    "expected": false
+  },
+  {
+    "pattern": { "pathname": "/foo/bar" },
+    "input": { "pathname": "/foo/bar", "baseURL": "https://example.com" },
+    "expected": true
+  },
+  {
+    "pattern": { "pathname": "/foo/bar" },
+    "input": { "pathname": "/foo/bar/baz", "baseURL": "https://example.com" },
+    "expected": false
+  },
+  {
+    "pattern": { "pathname": "/foo/bar",
+                 "baseURL": "https://example.com?query#hash" },
+    "input": { "pathname": "/foo/bar" },
+    "expected": false
+  },
+  {
+    "pattern": { "pathname": "/foo/bar",
+                 "baseURL": "https://example.com?query#hash" },
+    "input": { "hostname": "example.com", "pathname": "/foo/bar" },
+    "expected": false
+  },
+  {
+    "pattern": { "pathname": "/foo/bar",
+                 "baseURL": "https://example.com?query#hash" },
+    "input": { "protocol": "https", "hostname": "example.com",
+               "pathname": "/foo/bar" },
+    "expected": true
+  },
+  {
+    "pattern": { "pathname": "/foo/bar",
+                 "baseURL": "https://example.com?query#hash" },
+    "input": { "protocol": "https", "hostname": "example.com",
+               "pathname": "/foo/bar/baz" },
+    "expected": false
+  },
+  {
+    "pattern": { "pathname": "/foo/bar",
+                 "baseURL": "https://example.com?query#hash" },
+    "input": { "protocol": "https", "hostname": "example.com",
+               "pathname": "/foo/bar", "search": "otherquery",
+               "hash": "otherhash" },
+    "expected": true
+  },
+  {
+    "pattern": { "pathname": "/foo/bar",
+                 "baseURL": "https://example.com?query#hash" },
+    "input": "https://example.com/foo/bar",
+    "expected": true
+  },
+  {
+    "pattern": { "pathname": "/foo/bar",
+                 "baseURL": "https://example.com?query#hash" },
+    "input": "https://example.com/foo/bar?otherquery#otherhash",
+    "expected": true
+  },
+  {
+    "pattern": { "pathname": "/foo/bar",
+                 "baseURL": "https://example.com?query#hash" },
+    "input": "https://example.com/foo/bar/baz",
+    "expected": false
+  },
+  {
+    "pattern": { "pathname": "/foo/bar",
+                 "baseURL": "https://example.com?query#hash" },
+    "input": "https://other.com/foo/bar",
+    "expected": false
+  },
+  {
+    "pattern": { "pathname": "/foo/bar",
+                 "baseURL": "https://example.com?query#hash" },
+    "input": "http://other.com/foo/bar",
+    "expected": false
+  },
+  {
+    "pattern": { "pathname": "/foo/bar",
+                 "baseURL": "https://example.com?query#hash" },
+    "input": { "pathname": "/foo/bar", "baseURL": "https://example.com" },
+    "expected": true
+  },
+  {
+    "pattern": { "pathname": "/foo/bar",
+                 "baseURL": "https://example.com?query#hash" },
+    "input": { "pathname": "/foo/bar/baz", "baseURL": "https://example.com" },
+    "expected": false
+  },
+  {
+    "pattern": { "pathname": "/foo/bar",
+                 "baseURL": "https://example.com?query#hash" },
+    "input": { "pathname": "/foo/bar", "baseURL": "https://other.com" },
+    "expected": false
+  },
+  {
+    "pattern": { "pathname": "/foo/bar",
+                 "baseURL": "https://example.com?query#hash" },
+    "input": { "pathname": "/foo/bar", "baseURL": "http://example.com" },
+    "expected": false
+  },
+  {
+    "pattern": { "pathname": "/foo/:bar" },
+    "input": { "pathname": "/foo/bar" },
+    "expected": true
+  },
+  {
+    "pattern": { "pathname": "/foo/:bar" },
+    "input": { "pathname": "/foo/index.html" },
+    "expected": true
+  },
+  {
+    "pattern": { "pathname": "/foo/:bar" },
+    "input": { "pathname": "/foo/bar/" },
+    "expected": false
+  },
+  {
+    "pattern": { "pathname": "/foo/:bar" },
+    "input": { "pathname": "/foo/" },
+    "expected": false
+  },
+  {
+    "pattern": { "pathname": "/foo/(.*)" },
+    "input": { "pathname": "/foo/bar" },
+    "expected": true
+  },
+  {
+    "pattern": { "pathname": "/foo/(.*)" },
+    "input": { "pathname": "/foo/bar/baz" },
+    "expected": true
+  },
+  {
+    "pattern": { "pathname": "/foo/(.*)" },
+    "input": { "pathname": "/foo/" },
+    "expected": true
+  },
+  {
+    "pattern": { "pathname": "/foo/(.*)" },
+    "input": { "pathname": "/foo" },
+    "expected": false
+  },
+  {
+    "pattern": { "pathname": "/foo/:bar(.*)" },
+    "input": { "pathname": "/foo/bar" },
+    "expected": true
+  },
+  {
+    "pattern": { "pathname": "/foo/:bar(.*)" },
+    "input": { "pathname": "/foo/bar/baz" },
+    "expected": true
+  },
+  {
+    "pattern": { "pathname": "/foo/:bar(.*)" },
+    "input": { "pathname": "/foo/" },
+    "expected": true
+  },
+  {
+    "pattern": { "pathname": "/foo/:bar(.*)" },
+    "input": { "pathname": "/foo" },
+    "expected": false
+  },
+  {
+    "pattern": { "pathname": "/foo/:bar?" },
+    "input": { "pathname": "/foo/bar" },
+    "expected": true
+  },
+  {
+    "pattern": { "pathname": "/foo/:bar?" },
+    "input": { "pathname": "/foo" },
+    "expected": true
+  },
+  {
+    "pattern": { "pathname": "/foo/:bar?" },
+    "input": { "pathname": "/foo/" },
+    "expected": false
+  },
+  {
+    "pattern": { "pathname": "/foo/:bar?" },
+    "input": { "pathname": "/foobar" },
+    "expected": false
+  },
+  {
+    "pattern": { "pathname": "/foo/:bar?" },
+    "input": { "pathname": "/foo/bar/baz" },
+    "expected": false
+  },
+  {
+    "pattern": { "pathname": "/foo/:bar+" },
+    "input": { "pathname": "/foo/bar" },
+    "expected": true
+  },
+  {
+    "pattern": { "pathname": "/foo/:bar+" },
+    "input": { "pathname": "/foo/bar/baz" },
+    "expected": true
+  },
+  {
+    "pattern": { "pathname": "/foo/:bar+" },
+    "input": { "pathname": "/foo" },
+    "expected": false
+  },
+  {
+    "pattern": { "pathname": "/foo/:bar+" },
+    "input": { "pathname": "/foo/" },
+    "expected": false
+  },
+  {
+    "pattern": { "pathname": "/foo/:bar+" },
+    "input": { "pathname": "/foobar" },
+    "expected": false
+  },
+  {
+    "pattern": { "pathname": "/foo/:bar*" },
+    "input": { "pathname": "/foo/bar" },
+    "expected": true
+  },
+  {
+    "pattern": { "pathname": "/foo/:bar*" },
+    "input": { "pathname": "/foo/bar/baz" },
+    "expected": true
+  },
+  {
+    "pattern": { "pathname": "/foo/:bar*" },
+    "input": { "pathname": "/foo" },
+    "expected": true
+  },
+  {
+    "pattern": { "pathname": "/foo/:bar*" },
+    "input": { "pathname": "/foo/" },
+    "expected": false
+  },
+  {
+    "pattern": { "pathname": "/foo/:bar*" },
+    "input": { "pathname": "/foobar" },
+    "expected": false
+  },
+  {
+    "pattern": { "pathname": "/foo/(.*)?" },
+    "input": { "pathname": "/foo/bar" },
+    "expected": true
+  },
+  {
+    "pattern": { "pathname": "/foo/(.*)?" },
+    "input": { "pathname": "/foo/bar/baz" },
+    "expected": true
+  },
+  {
+    "pattern": { "pathname": "/foo/(.*)?" },
+    "input": { "pathname": "/foo" },
+    "expected": true
+  },
+  {
+    "pattern": { "pathname": "/foo/(.*)?" },
+    "input": { "pathname": "/foo/" },
+    "expected": true
+  },
+  {
+    "pattern": { "pathname": "/foo/(.*)?" },
+    "input": { "pathname": "/foobar" },
+    "expected": false
+  },
+  {
+    "pattern": { "pathname": "/foo/(.*)?" },
+    "input": { "pathname": "/fo" },
+    "expected": false
+  },
+  {
+    "pattern": { "pathname": "/foo/(.*)+" },
+    "input": { "pathname": "/foo/bar" },
+    "expected": true
+  },
+  {
+    "pattern": { "pathname": "/foo/(.*)+" },
+    "input": { "pathname": "/foo/bar/baz" },
+    "expected": true
+  },
+  {
+    "pattern": { "pathname": "/foo/(.*)+" },
+    "input": { "pathname": "/foo" },
+    "expected": false
+  },
+  {
+    "pattern": { "pathname": "/foo/(.*)+" },
+    "input": { "pathname": "/foo/" },
+    "expected": true
+  },
+  {
+    "pattern": { "pathname": "/foo/(.*)+" },
+    "input": { "pathname": "/foobar" },
+    "expected": false
+  },
+  {
+    "pattern": { "pathname": "/foo/(.*)+" },
+    "input": { "pathname": "/fo" },
+    "expected": false
+  },
+  {
+    "pattern": { "pathname": "/foo/(.*)*" },
+    "input": { "pathname": "/foo/bar" },
+    "expected": true
+  },
+  {
+    "pattern": { "pathname": "/foo/(.*)*" },
+    "input": { "pathname": "/foo/bar/baz" },
+    "expected": true
+  },
+  {
+    "pattern": { "pathname": "/foo/(.*)*" },
+    "input": { "pathname": "/foo" },
+    "expected": true
+  },
+  {
+    "pattern": { "pathname": "/foo/(.*)*" },
+    "input": { "pathname": "/foo/" },
+    "expected": true
+  },
+  {
+    "pattern": { "pathname": "/foo/(.*)*" },
+    "input": { "pathname": "/foobar" },
+    "expected": false
+  },
+  {
+    "pattern": { "pathname": "/foo/(.*)*" },
+    "input": { "pathname": "/fo" },
+    "expected": false
+  },
+  {
+    "pattern": { "pathname": "/foo{/bar}" },
+    "input": { "pathname": "/foo/bar" },
+    "expected": true
+  },
+  {
+    "pattern": { "pathname": "/foo{/bar}" },
+    "input": { "pathname": "/foo/bar/baz" },
+    "expected": false
+  },
+  {
+    "pattern": { "pathname": "/foo{/bar}" },
+    "input": { "pathname": "/foo" },
+    "expected": false
+  },
+  {
+    "pattern": { "pathname": "/foo{/bar}" },
+    "input": { "pathname": "/foo/" },
+    "expected": false
+  },
+  {
+    "pattern": { "pathname": "/foo{/bar}?" },
+    "input": { "pathname": "/foo/bar" },
+    "expected": true
+  },
+  {
+    "pattern": { "pathname": "/foo{/bar}?" },
+    "input": { "pathname": "/foo/bar/baz" },
+    "expected": false
+  },
+  {
+    "pattern": { "pathname": "/foo{/bar}?" },
+    "input": { "pathname": "/foo" },
+    "expected": true
+  },
+  {
+    "pattern": { "pathname": "/foo{/bar}?" },
+    "input": { "pathname": "/foo/" },
+    "expected": false
+  },
+  {
+    "pattern": { "pathname": "/foo{/bar}+" },
+    "input": { "pathname": "/foo/bar" },
+    "expected": true
+  },
+  {
+    "pattern": { "pathname": "/foo{/bar}+" },
+    "input": { "pathname": "/foo/bar/bar" },
+    "expected": true
+  },
+  {
+    "pattern": { "pathname": "/foo{/bar}+" },
+    "input": { "pathname": "/foo/bar/baz" },
+    "expected": false
+  },
+  {
+    "pattern": { "pathname": "/foo{/bar}+" },
+    "input": { "pathname": "/foo" },
+    "expected": false
+  },
+  {
+    "pattern": { "pathname": "/foo{/bar}+" },
+    "input": { "pathname": "/foo/" },
+    "expected": false
+  },
+  {
+    "pattern": { "pathname": "/foo{/bar}*" },
+    "input": { "pathname": "/foo/bar" },
+    "expected": true
+  },
+  {
+    "pattern": { "pathname": "/foo{/bar}*" },
+    "input": { "pathname": "/foo/bar/bar" },
+    "expected": true
+  },
+  {
+    "pattern": { "pathname": "/foo{/bar}*" },
+    "input": { "pathname": "/foo/bar/baz" },
+    "expected": false
+  },
+  {
+    "pattern": { "pathname": "/foo{/bar}*" },
+    "input": { "pathname": "/foo" },
+    "expected": true
+  },
+  {
+    "pattern": { "pathname": "/foo{/bar}*" },
+    "input": { "pathname": "/foo/" },
+    "expected": false
+  }
+]
diff --git a/third_party/blink/web_tests/external/wpt/urlpattern/resources/utils.js b/third_party/blink/web_tests/external/wpt/urlpattern/resources/utils.js
deleted file mode 100644
index 9132a52..0000000
--- a/third_party/blink/web_tests/external/wpt/urlpattern/resources/utils.js
+++ /dev/null
@@ -1,7 +0,0 @@
-function runTest(pattern, expected_list) {
-  const p = new URLPattern(pattern);
-  for (let entry of expected_list) {
-    assert_equals(p.test(entry.input), entry.expected,
-                  `input: ${JSON.stringify(entry.input)}`);
-  }
-}
diff --git a/third_party/blink/web_tests/external/wpt/urlpattern/urlpattern.https.any.js b/third_party/blink/web_tests/external/wpt/urlpattern/urlpattern.https.any.js
new file mode 100644
index 0000000..212352d
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/urlpattern/urlpattern.https.any.js
@@ -0,0 +1,16 @@
+// META: global=window,worker
+
+function runTests(data) {
+  for (let entry of data) {
+    test(function() {
+      const pattern = new URLPattern(entry.pattern);
+      assert_equals(pattern.test(entry.input), entry.expected);
+    }, `Pattern: ${JSON.stringify(entry.pattern)} Input: ${JSON.stringify(entry.input)}`);
+  }
+}
+
+promise_test(async function() {
+  const response = await fetch('resources/urlpatterntestdata.json');
+  const data = await response.json();
+  runTests(data);
+}, 'Loading data...');
diff --git a/third_party/blink/web_tests/wpt_internal/js-self-profiling/__dir__.headers b/third_party/blink/web_tests/wpt_internal/js-self-profiling/__dir__.headers
index 63b60e4..35b10bd2 100644
--- a/third_party/blink/web_tests/wpt_internal/js-self-profiling/__dir__.headers
+++ b/third_party/blink/web_tests/wpt_internal/js-self-profiling/__dir__.headers
@@ -1,2 +1,3 @@
 Cross-Origin-Opener-Policy: same-origin
 Cross-Origin-Embedder-Policy: require-corp
+Document-Policy: js-profiling
diff --git a/third_party/blink/web_tests/wpt_internal/js-self-profiling/resources/__dir__.headers b/third_party/blink/web_tests/wpt_internal/js-self-profiling/resources/__dir__.headers
index 63b60e4..35b10bd2 100644
--- a/third_party/blink/web_tests/wpt_internal/js-self-profiling/resources/__dir__.headers
+++ b/third_party/blink/web_tests/wpt_internal/js-self-profiling/resources/__dir__.headers
@@ -1,2 +1,3 @@
 Cross-Origin-Opener-Policy: same-origin
 Cross-Origin-Embedder-Policy: require-corp
+Document-Policy: js-profiling
diff --git a/third_party/blink/web_tests/wpt_internal/js-self-profiling/without-document-policy/disabled.https.html b/third_party/blink/web_tests/wpt_internal/js-self-profiling/without-document-policy/disabled.https.html
new file mode 100644
index 0000000..937e260
--- /dev/null
+++ b/third_party/blink/web_tests/wpt_internal/js-self-profiling/without-document-policy/disabled.https.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+  <script>
+    promise_test(t => {
+      const profiler = performance.profile({ sampleInterval: 10 });
+      return promise_rejects_dom(t, 'NotAllowedError', profiler);
+    }, 'profiling should throw without passing document policy');
+  </script>
+</body>
+</html>
diff --git a/third_party/crashpad/README.chromium b/third_party/crashpad/README.chromium
index cfc784fe..727a7b9 100644
--- a/third_party/crashpad/README.chromium
+++ b/third_party/crashpad/README.chromium
@@ -2,7 +2,7 @@
 Short Name: crashpad
 URL: https://crashpad.chromium.org/
 Version: unknown
-Revision: 83f194ee8544aec1c00683e1cf4e86458f33e035
+Revision: b6f2d06996335c951bfb72f98b5b9e22dc9bc03e
 License: Apache 2.0
 License File: crashpad/LICENSE
 Security Critical: yes
diff --git a/third_party/crashpad/crashpad/DEPS b/third_party/crashpad/crashpad/DEPS
index db8fd8d..fbff155 100644
--- a/third_party/crashpad/crashpad/DEPS
+++ b/third_party/crashpad/crashpad/DEPS
@@ -28,7 +28,7 @@
       '9e121212d42be62a7cce38072f925f8398d11e49',
   'crashpad/third_party/edo/edo': {
       'url': Var('chromium_git') + '/external/github.com/google/eDistantObject.git@' +
-      '6ffbf833173f53fcd06ecf08670a95cc01c01f72',
+      '97121c64019fa0e8bfbc8254e3ccb5572c500746',
       'condition': 'checkout_ios',
   },
   'crashpad/third_party/googletest/googletest':
@@ -42,7 +42,7 @@
       '7bde79cc274d06451bf65ae82c012a5d3e476b5a',
   'crashpad/third_party/mini_chromium/mini_chromium':
       Var('chromium_git') + '/chromium/mini_chromium@' +
-      'c748b289b825056985f3dd3b36dc86c766d787ad',
+      'cb82d71291f19590d3ee138ba64fcf1e9e0edd84',
   'crashpad/third_party/libfuzzer/src':
       Var('chromium_git') + '/chromium/llvm-project/compiler-rt/lib/fuzzer.git@' +
       'fda403cf93ecb8792cb1d061564d89a6553ca020',
diff --git a/third_party/crashpad/crashpad/build/ios/setup_ios_gn.py b/third_party/crashpad/crashpad/build/ios/setup_ios_gn.py
index 9522ce6..5f1829ee 100755
--- a/third_party/crashpad/crashpad/build/ios/setup_ios_gn.py
+++ b/third_party/crashpad/crashpad/build/ios/setup_ios_gn.py
@@ -199,6 +199,7 @@
         gn_command = [gn_path, '--root=%s' % os.path.realpath(src_path), '-q']
         if generate_xcode_project:
             gn_command.append('--ide=xcode')
+            gn_command.append('--root-target=gn_all')
             gn_command.append('--ninja-executable=autoninja')
             if self._settings.has_section('filters'):
                 target_filters = self._settings.values('filters')
diff --git a/third_party/crashpad/crashpad/snapshot/BUILD.gn b/third_party/crashpad/crashpad/snapshot/BUILD.gn
index 79f5eeb..6ca9bd4 100644
--- a/third_party/crashpad/crashpad/snapshot/BUILD.gn
+++ b/third_party/crashpad/crashpad/snapshot/BUILD.gn
@@ -368,8 +368,6 @@
       "linux/exception_snapshot_linux_test.cc",
       "linux/process_reader_linux_test.cc",
       "linux/system_snapshot_linux_test.cc",
-      "linux/test_modules.cc",
-      "linux/test_modules.h",
       "sanitized/process_snapshot_sanitized_test.cc",
       "sanitized/sanitization_information_test.cc",
     ]
diff --git a/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous.h b/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous.h
index 90106c9..0c30e1a 100644
--- a/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous.h
+++ b/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous.h
@@ -41,7 +41,7 @@
 
     //! \brief The difference between the preferred load address in the ELF file
     //!     and the actual loaded address in memory.
-    VMAddress load_bias;
+    LinuxVMOffset load_bias;
 
     //! \brief The address of the dynamic array for this object.
     LinuxVMAddress dynamic_array;
diff --git a/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc b/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
index 5de6e96a..3e5722d5 100644
--- a/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
+++ b/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
@@ -27,7 +27,6 @@
 #include "build/build_config.h"
 #include "gtest/gtest.h"
 #include "snapshot/elf/elf_image_reader.h"
-#include "snapshot/linux/test_modules.h"
 #include "test/linux/fake_ptrace_connection.h"
 #include "test/main_arguments.h"
 #include "test/multiprocess.h"
@@ -35,7 +34,6 @@
 #include "util/linux/auxiliary_vector.h"
 #include "util/linux/direct_ptrace_connection.h"
 #include "util/linux/memory_map.h"
-#include "util/numeric/safe_assignment.h"
 #include "util/process/process_memory_linux.h"
 #include "util/process/process_memory_range.h"
 
@@ -47,20 +45,6 @@
 namespace test {
 namespace {
 
-void ExpectLoadBias(bool is_64_bit,
-                    VMAddress unsigned_bias,
-                    VMOffset signed_bias) {
-  if (is_64_bit) {
-    EXPECT_EQ(unsigned_bias, static_cast<VMAddress>(signed_bias));
-  } else {
-    uint32_t unsigned_bias32;
-    ASSERT_TRUE(AssignIfInRange(&unsigned_bias32, unsigned_bias));
-
-    uint32_t casted_bias32 = static_cast<uint32_t>(signed_bias);
-    EXPECT_EQ(unsigned_bias32, casted_bias32);
-  }
-}
-
 void TestAgainstTarget(PtraceConnection* connection) {
   // Use ElfImageReader on the main executable which can tell us the debug
   // address. glibc declares the symbol _r_debug in link.h which we can use to
@@ -128,11 +112,9 @@
 
   // Android's loader doesn't set the load bias until Android 4.3 (API 18).
   if (android_runtime_api >= 18) {
-    ExpectLoadBias(connection->Is64Bit(),
-                   debug.Executable()->load_bias,
-                   exe_reader.GetLoadBias());
+    EXPECT_EQ(debug.Executable()->load_bias, exe_reader.GetLoadBias());
   } else {
-    EXPECT_EQ(debug.Executable()->load_bias, 0u);
+    EXPECT_EQ(debug.Executable()->load_bias, 0);
   }
 
   for (const DebugRendezvous::LinkEntry& module : debug.Modules()) {
@@ -148,7 +130,7 @@
     // (API 17).
     if (is_android_loader && android_runtime_api < 17) {
       EXPECT_EQ(module.dynamic_array, 0u);
-      EXPECT_EQ(module.load_bias, 0u);
+      EXPECT_EQ(module.load_bias, 0);
       continue;
     }
 
@@ -188,11 +170,7 @@
            const std::string& module_name) {
           const bool is_vdso_mapping =
               device == 0 && inode == 0 && mapping_name == "[vdso]";
-#if defined(ARCH_CPU_X86)
-          static constexpr char kPrefix[] = "linux-gate.so.";
-#else
           static constexpr char kPrefix[] = "linux-vdso.so.";
-#endif
           return is_vdso_mapping ==
                  (module_name.empty() ||
                   module_name.compare(0, strlen(kPrefix), kPrefix) == 0);
@@ -207,11 +185,9 @@
     // (API 20) until Android 6.0 (API 23).
     if (is_android_loader && android_runtime_api > 20 &&
         android_runtime_api < 23) {
-      EXPECT_EQ(module.load_bias, 0u);
+      EXPECT_EQ(module.load_bias, 0);
     } else {
-      ExpectLoadBias(connection->Is64Bit(),
-                     module.load_bias,
-                     static_cast<VMAddress>(module_reader->GetLoadBias()));
+      EXPECT_EQ(module.load_bias, module_reader->GetLoadBias());
     }
 
     CheckedLinuxAddressRange module_range(
@@ -220,13 +196,7 @@
   }
 }
 
-TEST(DebugRendezvous, Self) {
-  const std::string module_name = "test_module.so";
-  const std::string module_soname = "test_module_soname";
-  ScopedModuleHandle empty_test_module(
-      LoadTestModule(module_name, module_soname));
-  ASSERT_TRUE(empty_test_module.valid());
-
+TEST(DebugRendezvous, DISABLED_Self) {
   FakePtraceConnection connection;
   ASSERT_TRUE(connection.Initialize(getpid()));
 
@@ -251,7 +221,7 @@
   DISALLOW_COPY_AND_ASSIGN(ChildTest);
 };
 
-TEST(DebugRendezvous, Child) {
+TEST(DebugRendezvous, DISABLED_Child) {
   ChildTest test;
   test.Run();
 }
diff --git a/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux_test.cc b/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux_test.cc
index c3b8723..98b99e6 100644
--- a/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux_test.cc
+++ b/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux_test.cc
@@ -37,7 +37,6 @@
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
 #include "gtest/gtest.h"
-#include "snapshot/linux/test_modules.h"
 #include "test/errors.h"
 #include "test/linux/fake_ptrace_connection.h"
 #include "test/linux/get_tls.h"
@@ -542,6 +541,218 @@
 #endif  // !OS_ANDROID || !ARCH_CPU_ARMEL || __ANDROID_API__ >= 21
 }
 
+bool WriteTestModule(const base::FilePath& module_path,
+                     const std::string& soname) {
+#if defined(ARCH_CPU_64_BITS)
+  using Ehdr = Elf64_Ehdr;
+  using Phdr = Elf64_Phdr;
+  using Shdr = Elf64_Shdr;
+  using Dyn = Elf64_Dyn;
+  using Sym = Elf64_Sym;
+  unsigned char elf_class = ELFCLASS64;
+#else
+  using Ehdr = Elf32_Ehdr;
+  using Phdr = Elf32_Phdr;
+  using Shdr = Elf32_Shdr;
+  using Dyn = Elf32_Dyn;
+  using Sym = Elf32_Sym;
+  unsigned char elf_class = ELFCLASS32;
+#endif
+
+  struct {
+    Ehdr ehdr;
+    struct {
+      Phdr load1;
+      Phdr load2;
+      Phdr dynamic;
+    } phdr_table;
+    struct {
+      Dyn hash;
+      Dyn strtab;
+      Dyn symtab;
+      Dyn strsz;
+      Dyn syment;
+      Dyn soname;
+      Dyn null;
+    } dynamic_array;
+    struct {
+      Elf32_Word nbucket;
+      Elf32_Word nchain;
+      Elf32_Word bucket;
+      Elf32_Word chain;
+    } hash_table;
+    char string_table[32];
+    struct {
+    } section_header_string_table;
+    struct {
+      Sym und_symbol;
+    } symbol_table;
+    struct {
+      Shdr null;
+      Shdr dynamic;
+      Shdr string_table;
+      Shdr section_header_string_table;
+    } shdr_table;
+  } module = {};
+
+  module.ehdr.e_ident[EI_MAG0] = ELFMAG0;
+  module.ehdr.e_ident[EI_MAG1] = ELFMAG1;
+  module.ehdr.e_ident[EI_MAG2] = ELFMAG2;
+  module.ehdr.e_ident[EI_MAG3] = ELFMAG3;
+
+  module.ehdr.e_ident[EI_CLASS] = elf_class;
+
+#if defined(ARCH_CPU_LITTLE_ENDIAN)
+  module.ehdr.e_ident[EI_DATA] = ELFDATA2LSB;
+#else
+  module.ehdr.e_ident[EI_DATA] = ELFDATA2MSB;
+#endif  // ARCH_CPU_LITTLE_ENDIAN
+
+  module.ehdr.e_ident[EI_VERSION] = EV_CURRENT;
+
+  module.ehdr.e_type = ET_DYN;
+
+#if defined(ARCH_CPU_X86)
+  module.ehdr.e_machine = EM_386;
+#elif defined(ARCH_CPU_X86_64)
+  module.ehdr.e_machine = EM_X86_64;
+#elif defined(ARCH_CPU_ARMEL)
+  module.ehdr.e_machine = EM_ARM;
+#elif defined(ARCH_CPU_ARM64)
+  module.ehdr.e_machine = EM_AARCH64;
+#elif defined(ARCH_CPU_MIPSEL) || defined(ARCH_CPU_MIPS64EL)
+  module.ehdr.e_machine = EM_MIPS;
+#endif
+
+  module.ehdr.e_version = EV_CURRENT;
+  module.ehdr.e_ehsize = sizeof(module.ehdr);
+
+  module.ehdr.e_phoff = offsetof(decltype(module), phdr_table);
+  module.ehdr.e_phnum = sizeof(module.phdr_table) / sizeof(Phdr);
+  module.ehdr.e_phentsize = sizeof(Phdr);
+
+  module.ehdr.e_shoff = offsetof(decltype(module), shdr_table);
+  module.ehdr.e_shentsize = sizeof(Shdr);
+  module.ehdr.e_shnum = sizeof(module.shdr_table) / sizeof(Shdr);
+  module.ehdr.e_shstrndx =
+      offsetof(decltype(module.shdr_table), section_header_string_table) /
+      sizeof(Shdr);
+
+  constexpr size_t load2_vaddr = 0x200000;
+
+  module.phdr_table.load1.p_type = PT_LOAD;
+  module.phdr_table.load1.p_offset = 0;
+  module.phdr_table.load1.p_vaddr = 0;
+  module.phdr_table.load1.p_filesz = offsetof(decltype(module), shdr_table);
+  module.phdr_table.load1.p_memsz = offsetof(decltype(module), shdr_table);
+  module.phdr_table.load1.p_flags = PF_R;
+  module.phdr_table.load1.p_align = load2_vaddr;
+
+  module.phdr_table.load2.p_type = PT_LOAD;
+  module.phdr_table.load2.p_offset = 0;
+  module.phdr_table.load2.p_vaddr = load2_vaddr;
+  module.phdr_table.load2.p_filesz = offsetof(decltype(module), shdr_table);
+  module.phdr_table.load2.p_memsz = offsetof(decltype(module), shdr_table);
+  module.phdr_table.load2.p_flags = PF_R | PF_W;
+  module.phdr_table.load2.p_align = load2_vaddr;
+
+  module.phdr_table.dynamic.p_type = PT_DYNAMIC;
+  module.phdr_table.dynamic.p_offset =
+      offsetof(decltype(module), dynamic_array);
+  module.phdr_table.dynamic.p_vaddr =
+      load2_vaddr + module.phdr_table.dynamic.p_offset;
+  module.phdr_table.dynamic.p_filesz = sizeof(module.dynamic_array);
+  module.phdr_table.dynamic.p_memsz = sizeof(module.dynamic_array);
+  module.phdr_table.dynamic.p_flags = PF_R | PF_W;
+  module.phdr_table.dynamic.p_align = 8;
+
+  module.dynamic_array.hash.d_tag = DT_HASH;
+  module.dynamic_array.hash.d_un.d_ptr = offsetof(decltype(module), hash_table);
+  module.dynamic_array.strtab.d_tag = DT_STRTAB;
+  module.dynamic_array.strtab.d_un.d_ptr =
+      offsetof(decltype(module), string_table);
+  module.dynamic_array.symtab.d_tag = DT_SYMTAB;
+  module.dynamic_array.symtab.d_un.d_ptr =
+      offsetof(decltype(module), symbol_table);
+  module.dynamic_array.strsz.d_tag = DT_STRSZ;
+  module.dynamic_array.strsz.d_un.d_val = sizeof(module.string_table);
+  module.dynamic_array.syment.d_tag = DT_SYMENT;
+  module.dynamic_array.syment.d_un.d_val = sizeof(Sym);
+  constexpr size_t kSonameOffset = 1;
+  module.dynamic_array.soname.d_tag = DT_SONAME;
+  module.dynamic_array.soname.d_un.d_val = kSonameOffset;
+
+  module.dynamic_array.null.d_tag = DT_NULL;
+
+  module.hash_table.nbucket = 1;
+  module.hash_table.nchain = 1;
+  module.hash_table.bucket = 0;
+  module.hash_table.chain = 0;
+
+  CHECK_GE(sizeof(module.string_table), soname.size() + 2);
+  module.string_table[0] = '\0';
+  memcpy(&module.string_table[kSonameOffset], soname.c_str(), soname.size());
+
+  module.shdr_table.null.sh_type = SHT_NULL;
+
+  module.shdr_table.dynamic.sh_name = 0;
+  module.shdr_table.dynamic.sh_type = SHT_DYNAMIC;
+  module.shdr_table.dynamic.sh_flags = SHF_WRITE | SHF_ALLOC;
+  module.shdr_table.dynamic.sh_addr = module.phdr_table.dynamic.p_vaddr;
+  module.shdr_table.dynamic.sh_offset = module.phdr_table.dynamic.p_offset;
+  module.shdr_table.dynamic.sh_size = module.phdr_table.dynamic.p_filesz;
+  module.shdr_table.dynamic.sh_link =
+      offsetof(decltype(module.shdr_table), string_table) / sizeof(Shdr);
+
+  module.shdr_table.string_table.sh_name = 0;
+  module.shdr_table.string_table.sh_type = SHT_STRTAB;
+  module.shdr_table.string_table.sh_offset =
+      offsetof(decltype(module), string_table);
+  module.shdr_table.string_table.sh_size = sizeof(module.string_table);
+
+  module.shdr_table.section_header_string_table.sh_name = 0;
+  module.shdr_table.section_header_string_table.sh_type = SHT_STRTAB;
+  module.shdr_table.section_header_string_table.sh_offset =
+      offsetof(decltype(module), section_header_string_table);
+  module.shdr_table.section_header_string_table.sh_size =
+      sizeof(module.section_header_string_table);
+
+  FileWriter writer;
+  if (!writer.Open(module_path,
+                   FileWriteMode::kCreateOrFail,
+                   FilePermissions::kWorldReadable)) {
+    ADD_FAILURE();
+    return false;
+  }
+
+  if (!writer.Write(&module, sizeof(module))) {
+    ADD_FAILURE();
+    return false;
+  }
+
+  return true;
+}
+
+ScopedModuleHandle LoadTestModule(const std::string& module_name,
+                                  const std::string& module_soname) {
+  base::FilePath module_path(
+      TestPaths::Executable().DirName().Append(module_name));
+
+  if (!WriteTestModule(module_path, module_soname)) {
+    return ScopedModuleHandle(nullptr);
+  }
+  EXPECT_TRUE(IsRegularFile(module_path));
+
+  ScopedModuleHandle handle(
+      dlopen(module_path.value().c_str(), RTLD_LAZY | RTLD_LOCAL));
+  EXPECT_TRUE(handle.valid())
+      << "dlopen: " << module_path.value() << " " << dlerror();
+
+  EXPECT_TRUE(LoggingRemoveFile(module_path));
+
+  return handle;
+}
+
 void ExpectTestModule(ProcessReaderLinux* reader,
                       const std::string& module_name) {
   for (const auto& module : reader->Modules()) {
diff --git a/third_party/crashpad/crashpad/snapshot/linux/test_modules.cc b/third_party/crashpad/crashpad/snapshot/linux/test_modules.cc
deleted file mode 100644
index b2450c20..0000000
--- a/third_party/crashpad/crashpad/snapshot/linux/test_modules.cc
+++ /dev/null
@@ -1,262 +0,0 @@
-// Copyright 2020 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "snapshot/linux/test_modules.h"
-
-#include <elf.h>
-
-#include <limits>
-
-#include "base/check_op.h"
-#include "base/files/file_path.h"
-#include "build/build_config.h"
-#include "gtest/gtest.h"
-#include "test/test_paths.h"
-#include "util/file/filesystem.h"
-#include "util/file/file_writer.h"
-
-namespace crashpad {
-namespace test {
-
-bool WriteTestModule(const base::FilePath& module_path,
-                     const std::string& soname) {
-#if defined(ARCH_CPU_64_BITS)
-  using Ehdr = Elf64_Ehdr;
-  using Phdr = Elf64_Phdr;
-  using Shdr = Elf64_Shdr;
-  using Dyn = Elf64_Dyn;
-  using Sym = Elf64_Sym;
-  unsigned char elf_class = ELFCLASS64;
-#else
-  using Ehdr = Elf32_Ehdr;
-  using Phdr = Elf32_Phdr;
-  using Shdr = Elf32_Shdr;
-  using Dyn = Elf32_Dyn;
-  using Sym = Elf32_Sym;
-  unsigned char elf_class = ELFCLASS32;
-#endif
-
-  struct {
-    Ehdr ehdr;
-    struct {
-      Phdr load1;
-      Phdr load2;
-      Phdr dynamic;
-    } phdr_table;
-    struct {
-      Dyn hash;
-      Dyn strtab;
-      Dyn symtab;
-      Dyn strsz;
-      Dyn syment;
-      Dyn soname;
-      Dyn null;
-    } dynamic_array;
-    struct {
-      Elf32_Word nbucket;
-      Elf32_Word nchain;
-      Elf32_Word bucket;
-      Elf32_Word chain;
-    } hash_table;
-    char string_table[32];
-    struct {
-    } section_header_string_table;
-    struct {
-      Sym und_symbol;
-    } symbol_table;
-    struct {
-      Shdr null;
-      Shdr dynamic;
-      Shdr string_table;
-      Shdr section_header_string_table;
-    } shdr_table;
-  } module = {};
-
-  module.ehdr.e_ident[EI_MAG0] = ELFMAG0;
-  module.ehdr.e_ident[EI_MAG1] = ELFMAG1;
-  module.ehdr.e_ident[EI_MAG2] = ELFMAG2;
-  module.ehdr.e_ident[EI_MAG3] = ELFMAG3;
-
-  module.ehdr.e_ident[EI_CLASS] = elf_class;
-
-#if defined(ARCH_CPU_LITTLE_ENDIAN)
-  module.ehdr.e_ident[EI_DATA] = ELFDATA2LSB;
-#else
-  module.ehdr.e_ident[EI_DATA] = ELFDATA2MSB;
-#endif  // ARCH_CPU_LITTLE_ENDIAN
-
-  module.ehdr.e_ident[EI_VERSION] = EV_CURRENT;
-
-  module.ehdr.e_type = ET_DYN;
-
-#if defined(ARCH_CPU_X86)
-  module.ehdr.e_machine = EM_386;
-#elif defined(ARCH_CPU_X86_64)
-  module.ehdr.e_machine = EM_X86_64;
-#elif defined(ARCH_CPU_ARMEL)
-  module.ehdr.e_machine = EM_ARM;
-#elif defined(ARCH_CPU_ARM64)
-  module.ehdr.e_machine = EM_AARCH64;
-#elif defined(ARCH_CPU_MIPSEL) || defined(ARCH_CPU_MIPS64EL)
-  module.ehdr.e_machine = EM_MIPS;
-#endif
-
-  module.ehdr.e_version = EV_CURRENT;
-  module.ehdr.e_ehsize = sizeof(module.ehdr);
-
-  module.ehdr.e_phoff = offsetof(decltype(module), phdr_table);
-  module.ehdr.e_phnum = sizeof(module.phdr_table) / sizeof(Phdr);
-  module.ehdr.e_phentsize = sizeof(Phdr);
-
-  module.ehdr.e_shoff = offsetof(decltype(module), shdr_table);
-  module.ehdr.e_shentsize = sizeof(Shdr);
-  module.ehdr.e_shnum = sizeof(module.shdr_table) / sizeof(Shdr);
-  module.ehdr.e_shstrndx =
-      offsetof(decltype(module.shdr_table), section_header_string_table) /
-      sizeof(Shdr);
-
-  const size_t page_size = getpagesize();
-  auto align = [page_size](uintptr_t addr) {
-    return (addr + page_size - 1) & ~(page_size - 1);
-  };
-  constexpr size_t segment_size = offsetof(decltype(module), shdr_table);
-
-  // This test module covers cases where:
-  // 1. Multiple segments are mapped from file offset 0.
-  // 2. Load bias is negative.
-
-  const uintptr_t load2_vaddr = align(std::numeric_limits<uintptr_t>::max() -
-                                      align(segment_size) - page_size);
-  const uintptr_t load1_vaddr = load2_vaddr - align(segment_size);
-
-  module.phdr_table.load1.p_type = PT_LOAD;
-  module.phdr_table.load1.p_offset = 0;
-  module.phdr_table.load1.p_vaddr = load1_vaddr;
-  module.phdr_table.load1.p_filesz = segment_size;
-  module.phdr_table.load1.p_memsz = segment_size;
-  module.phdr_table.load1.p_flags = PF_R;
-  module.phdr_table.load1.p_align = page_size;
-
-  module.phdr_table.load2.p_type = PT_LOAD;
-  module.phdr_table.load2.p_offset = 0;
-  module.phdr_table.load2.p_vaddr = load2_vaddr;
-  module.phdr_table.load2.p_filesz = segment_size;
-  module.phdr_table.load2.p_memsz = segment_size;
-  module.phdr_table.load2.p_flags = PF_R | PF_W;
-  module.phdr_table.load2.p_align = page_size;
-
-  module.phdr_table.dynamic.p_type = PT_DYNAMIC;
-  module.phdr_table.dynamic.p_offset =
-      offsetof(decltype(module), dynamic_array);
-  module.phdr_table.dynamic.p_vaddr =
-      load2_vaddr + module.phdr_table.dynamic.p_offset;
-  module.phdr_table.dynamic.p_filesz = sizeof(module.dynamic_array);
-  module.phdr_table.dynamic.p_memsz = sizeof(module.dynamic_array);
-  module.phdr_table.dynamic.p_flags = PF_R | PF_W;
-  module.phdr_table.dynamic.p_align = 8;
-
-  module.dynamic_array.hash.d_tag = DT_HASH;
-  module.dynamic_array.hash.d_un.d_ptr =
-      load1_vaddr + offsetof(decltype(module), hash_table);
-  module.dynamic_array.strtab.d_tag = DT_STRTAB;
-  module.dynamic_array.strtab.d_un.d_ptr =
-      load1_vaddr + offsetof(decltype(module), string_table);
-  module.dynamic_array.symtab.d_tag = DT_SYMTAB;
-  module.dynamic_array.symtab.d_un.d_ptr =
-      load1_vaddr + offsetof(decltype(module), symbol_table);
-  module.dynamic_array.strsz.d_tag = DT_STRSZ;
-  module.dynamic_array.strsz.d_un.d_val = sizeof(module.string_table);
-  module.dynamic_array.syment.d_tag = DT_SYMENT;
-  module.dynamic_array.syment.d_un.d_val = sizeof(Sym);
-  constexpr size_t kSonameOffset = 1;
-  module.dynamic_array.soname.d_tag = DT_SONAME;
-  module.dynamic_array.soname.d_un.d_val = kSonameOffset;
-
-  module.dynamic_array.null.d_tag = DT_NULL;
-
-  module.hash_table.nbucket = 1;
-  module.hash_table.nchain = 1;
-  module.hash_table.bucket = 0;
-  module.hash_table.chain = 0;
-
-  if (sizeof(module.string_table) < soname.size() + 2) {
-    ADD_FAILURE() << "string table too small";
-    return false;
-  }
-  module.string_table[0] = '\0';
-  memcpy(&module.string_table[kSonameOffset], soname.c_str(), soname.size());
-
-  module.shdr_table.null.sh_type = SHT_NULL;
-
-  module.shdr_table.dynamic.sh_name = 0;
-  module.shdr_table.dynamic.sh_type = SHT_DYNAMIC;
-  module.shdr_table.dynamic.sh_flags = SHF_WRITE | SHF_ALLOC;
-  module.shdr_table.dynamic.sh_addr = module.phdr_table.dynamic.p_vaddr;
-  module.shdr_table.dynamic.sh_offset = module.phdr_table.dynamic.p_offset;
-  module.shdr_table.dynamic.sh_size = module.phdr_table.dynamic.p_filesz;
-  module.shdr_table.dynamic.sh_link =
-      offsetof(decltype(module.shdr_table), string_table) / sizeof(Shdr);
-
-  module.shdr_table.string_table.sh_name = 0;
-  module.shdr_table.string_table.sh_type = SHT_STRTAB;
-  module.shdr_table.string_table.sh_offset =
-      offsetof(decltype(module), string_table);
-  module.shdr_table.string_table.sh_size = sizeof(module.string_table);
-
-  module.shdr_table.section_header_string_table.sh_name = 0;
-  module.shdr_table.section_header_string_table.sh_type = SHT_STRTAB;
-  module.shdr_table.section_header_string_table.sh_offset =
-      offsetof(decltype(module), section_header_string_table);
-  module.shdr_table.section_header_string_table.sh_size =
-      sizeof(module.section_header_string_table);
-
-  FileWriter writer;
-  if (!writer.Open(module_path,
-                   FileWriteMode::kCreateOrFail,
-                   FilePermissions::kWorldReadable)) {
-    ADD_FAILURE();
-    return false;
-  }
-
-  if (!writer.Write(&module, sizeof(module))) {
-    ADD_FAILURE();
-    LoggingRemoveFile(module_path);
-    return false;
-  }
-
-  return true;
-}
-
-ScopedModuleHandle LoadTestModule(const std::string& module_name,
-                                  const std::string& module_soname) {
-  base::FilePath module_path(
-      TestPaths::Executable().DirName().Append(module_name));
-
-  if (!WriteTestModule(module_path, module_soname)) {
-    return ScopedModuleHandle(nullptr);
-  }
-  EXPECT_TRUE(IsRegularFile(module_path));
-
-  ScopedModuleHandle handle(
-      dlopen(module_path.value().c_str(), RTLD_LAZY | RTLD_LOCAL));
-  EXPECT_TRUE(handle.valid())
-      << "dlopen: " << module_path.value() << " " << dlerror();
-
-  EXPECT_TRUE(LoggingRemoveFile(module_path));
-
-  return handle;
-}
-
-}  // namespace test
-}  // namespace crashpad
diff --git a/third_party/crashpad/crashpad/snapshot/linux/test_modules.h b/third_party/crashpad/crashpad/snapshot/linux/test_modules.h
deleted file mode 100644
index b791480a..0000000
--- a/third_party/crashpad/crashpad/snapshot/linux/test_modules.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2020 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef CRASHPAD_SNAPSHOT_LINUX_TEST_MODULES_H_
-#define CRASHPAD_SNAPSHOT_LINUX_TEST_MODULES_H_
-
-#include <string>
-
-#include "test/scoped_module_handle.h"
-
-namespace crashpad {
-namespace test {
-
-//! \brief Constructs and loads a test module.
-//!
-//! \param module_name The filename of the mdoule.
-//! \param module_soname The SONAME for the module.
-//! \return a handle to the loaded module on success. On failure, the handle
-//!     will be invalid and a message will be logged.
-ScopedModuleHandle LoadTestModule(const std::string& module_name,
-                                  const std::string& module_soname);
-
-}  // namespace test
-}  // namespace crashpad
-
-#endif  // CRASHPAD_SNAPSHOT_LINUX_DEBUG_RENDEZVOUS_H_
diff --git a/third_party/crashpad/crashpad/snapshot/snapshot_test.gyp b/third_party/crashpad/crashpad/snapshot/snapshot_test.gyp
index a4d4d9e..43de725 100644
--- a/third_party/crashpad/crashpad/snapshot/snapshot_test.gyp
+++ b/third_party/crashpad/crashpad/snapshot/snapshot_test.gyp
@@ -80,8 +80,6 @@
         'linux/exception_snapshot_linux_test.cc',
         'linux/process_reader_linux_test.cc',
         'linux/system_snapshot_linux_test.cc',
-        'linux/test_modules.cc',
-        'linux/test_modules.h',
         'mac/cpu_context_mac_test.cc',
         'mac/mach_o_image_annotations_reader_test.cc',
         'mac/mach_o_image_reader_test.cc',
diff --git a/third_party/crashpad/crashpad/test/fuchsia_crashpad_tests.cmx b/third_party/crashpad/crashpad/test/fuchsia_crashpad_tests.cmx
index 87004b2..b25208d 100644
--- a/third_party/crashpad/crashpad/test/fuchsia_crashpad_tests.cmx
+++ b/third_party/crashpad/crashpad/test/fuchsia_crashpad_tests.cmx
@@ -7,9 +7,6 @@
             }
         }
     },
-    "include": [
-        "sdk/lib/diagnostics/syslog/client.shard.cmx"
-    ],
     "program": {
         "binary": "test/crashpad_tests"
     },
diff --git a/third_party/crashpad/crashpad/third_party/edo/BUILD.gn b/third_party/crashpad/crashpad/third_party/edo/BUILD.gn
index 73dca1a..2b8d5b9 100644
--- a/third_party/crashpad/crashpad/third_party/edo/BUILD.gn
+++ b/third_party/crashpad/crashpad/third_party/edo/BUILD.gn
@@ -124,8 +124,8 @@
       "edo/Service/Sources/NSKeyedArchiver+EDOAdditions.m",
       "edo/Service/Sources/NSKeyedUnarchiver+EDOAdditions.h",
       "edo/Service/Sources/NSKeyedUnarchiver+EDOAdditions.m",
-      "edo/Service/Sources/NSObject+EDOBlockedType.h",
-      "edo/Service/Sources/NSObject+EDOBlockedType.m",
+      "edo/Service/Sources/NSObject+EDOBlacklistedType.h",
+      "edo/Service/Sources/NSObject+EDOBlacklistedType.m",
       "edo/Service/Sources/NSObject+EDOParameter.h",
       "edo/Service/Sources/NSObject+EDOParameter.m",
       "edo/Service/Sources/NSObject+EDOValue.h",
diff --git a/third_party/crashpad/crashpad/third_party/lss/README.crashpad b/third_party/crashpad/crashpad/third_party/lss/README.crashpad
index d1ac991..c036ae0 100644
--- a/third_party/crashpad/crashpad/third_party/lss/README.crashpad
+++ b/third_party/crashpad/crashpad/third_party/lss/README.crashpad
@@ -3,7 +3,7 @@
 URL: https://chromium.googlesource.com/linux-syscall-support/
 Revision: See DEPS
 License: BSD 3-clause
-License File: lss/linux_syscall_support.h
+License File: lss/linux-syscall-support.h
 Security Critical: yes
 
 Description:
diff --git a/third_party/crashpad/crashpad/util/linux/ptrace_broker.cc b/third_party/crashpad/crashpad/util/linux/ptrace_broker.cc
index 68621f2..b6b5bb13 100644
--- a/third_party/crashpad/crashpad/util/linux/ptrace_broker.cc
+++ b/third_party/crashpad/crashpad/util/linux/ptrace_broker.cc
@@ -17,7 +17,6 @@
 #include <fcntl.h>
 #include <limits.h>
 #include <string.h>
-#include <sys/mman.h>
 #include <syscall.h>
 #include <unistd.h>
 
@@ -25,11 +24,7 @@
 
 #include "base/check_op.h"
 #include "base/posix/eintr_wrapper.h"
-#include "base/process/process_metrics.h"
-#include "third_party/lss/lss.h"
-#include "util/linux/scoped_ptrace_attach.h"
 #include "util/misc/memory_sanitizer.h"
-#include "util/posix/scoped_mmap.h"
 
 namespace crashpad {
 
@@ -57,58 +52,18 @@
 
 }  // namespace
 
-class PtraceBroker::AttachmentsArray {
- public:
-  AttachmentsArray() : allocation_(false), attach_count_(0) {}
-
-  ~AttachmentsArray() {
-    for (size_t index = 0; index < attach_count_; ++index) {
-      PtraceDetach(Attachments()[index], false);
-    }
-  }
-
-  bool Initialize() {
-    return allocation_.ResetMmap(nullptr,
-                                 base::GetPageSize(),
-                                 PROT_READ | PROT_WRITE,
-                                 MAP_PRIVATE | MAP_ANONYMOUS,
-                                 -1,
-                                 0);
-  }
-
-  bool Attach(pid_t pid) {
-    pid_t* attach = AllocateAttachment();
-    if (!attach || !PtraceAttach(pid, false)) {
-      return false;
-    }
-
-    *attach = pid;
-    return true;
-  }
-
- private:
-  pid_t* AllocateAttachment() {
-    if (attach_count_ >= (allocation_.len() / sizeof(pid_t))) {
-      return nullptr;
-    }
-    return &Attachments()[attach_count_++];
-  }
-
-  pid_t* Attachments() { return allocation_.addr_as<pid_t*>(); }
-
-  ScopedMmap allocation_;
-  size_t attach_count_;
-
-  DISALLOW_COPY_AND_ASSIGN(AttachmentsArray);
-};
-
 PtraceBroker::PtraceBroker(int sock, pid_t pid, bool is_64_bit)
     : ptracer_(is_64_bit, /* can_log= */ false),
       file_root_(file_root_buffer_),
+      attachments_(nullptr),
+      attach_count_(0),
+      attach_capacity_(0),
       memory_file_(),
       sock_(sock),
       memory_pid_(pid),
       tried_opening_mem_file_(false) {
+  AllocateAttachments();
+
   static constexpr char kProc[] = "/proc/";
   size_t root_length = strlen(kProc);
   memcpy(file_root_buffer_, kProc, root_length);
@@ -133,12 +88,35 @@
 }
 
 int PtraceBroker::Run() {
-  AttachmentsArray attachments;
-  attachments.Initialize();
-  return RunImpl(&attachments);
+  int result = RunImpl();
+  ReleaseAttachments();
+  return result;
 }
 
-int PtraceBroker::RunImpl(AttachmentsArray* attachments) {
+bool PtraceBroker::AllocateAttachments() {
+  constexpr size_t page_size = 4096;
+  constexpr size_t alloc_size =
+      (sizeof(ScopedPtraceAttach) + page_size - 1) & ~(page_size - 1);
+  void* alloc = sbrk(alloc_size);
+  if (reinterpret_cast<intptr_t>(alloc) == -1) {
+    return false;
+  }
+
+  if (attachments_ == nullptr) {
+    attachments_ = reinterpret_cast<ScopedPtraceAttach*>(alloc);
+  }
+
+  attach_capacity_ += alloc_size / sizeof(ScopedPtraceAttach);
+  return true;
+}
+
+void PtraceBroker::ReleaseAttachments() {
+  for (size_t index = 0; index < attach_count_; ++index) {
+    attachments_[index].Reset();
+  }
+}
+
+int PtraceBroker::RunImpl() {
   while (true) {
     Request request = {};
     if (!ReadFileExactly(sock_, &request, sizeof(request))) {
@@ -151,10 +129,25 @@
 
     switch (request.type) {
       case Request::kTypeAttach: {
+        ScopedPtraceAttach* attach;
+        ScopedPtraceAttach stack_attach;
+        bool attach_on_stack = false;
+
+        if (attach_capacity_ > attach_count_ || AllocateAttachments()) {
+          attach = new (&attachments_[attach_count_]) ScopedPtraceAttach;
+        } else {
+          attach = &stack_attach;
+          attach_on_stack = true;
+        }
+
         ExceptionHandlerProtocol::Bool status =
-            attachments->Attach(request.tid)
-                ? ExceptionHandlerProtocol::kBoolTrue
-                : ExceptionHandlerProtocol::kBoolFalse;
+            ExceptionHandlerProtocol::kBoolFalse;
+        if (attach->ResetAttach(request.tid)) {
+          status = ExceptionHandlerProtocol::kBoolTrue;
+          if (!attach_on_stack) {
+            ++attach_count_;
+          }
+        }
 
         if (!WriteFile(sock_, &status, sizeof(status))) {
           return errno;
@@ -167,6 +160,9 @@
           }
         }
 
+        if (attach_on_stack && status == ExceptionHandlerProtocol::kBoolTrue) {
+          return RunImpl();
+        }
         continue;
       }
 
diff --git a/third_party/crashpad/crashpad/util/linux/ptrace_broker.h b/third_party/crashpad/crashpad/util/linux/ptrace_broker.h
index 5d90cb2..6a7bfb7 100644
--- a/third_party/crashpad/crashpad/util/linux/ptrace_broker.h
+++ b/third_party/crashpad/crashpad/util/linux/ptrace_broker.h
@@ -24,6 +24,7 @@
 #include "util/linux/exception_handler_protocol.h"
 #include "util/linux/ptrace_connection.h"
 #include "util/linux/ptracer.h"
+#include "util/linux/scoped_ptrace_attach.h"
 #include "util/linux/thread_info.h"
 #include "util/misc/address_types.h"
 
@@ -185,13 +186,16 @@
   //! This method returns when a PtraceBrokerRequest with type kTypeExit is
   //! received or an error is encountered on the socket.
   //!
+  //! This method calls `sbrk`, which may break other memory management tools,
+  //! such as `malloc`.
+  //!
   //! \return 0 if Run() exited due to an exit request. Otherwise an error code.
   int Run();
 
  private:
-  class AttachmentsArray;
-
-  int RunImpl(AttachmentsArray*);
+  bool AllocateAttachments();
+  void ReleaseAttachments();
+  int RunImpl();
   int SendError(ExceptionHandlerProtocol::Errno err);
   int SendReadError(ReadError err);
   int SendOpenResult(OpenResult result);
@@ -206,6 +210,9 @@
   char file_root_buffer_[32];
   Ptracer ptracer_;
   const char* file_root_;
+  ScopedPtraceAttach* attachments_;
+  size_t attach_count_;
+  size_t attach_capacity_;
   ScopedFileHandle memory_file_;
   int sock_;
   pid_t memory_pid_;
diff --git a/third_party/crashpad/crashpad/util/linux/scoped_ptrace_attach.cc b/third_party/crashpad/crashpad/util/linux/scoped_ptrace_attach.cc
index eed83455..09e3fba 100644
--- a/third_party/crashpad/crashpad/util/linux/scoped_ptrace_attach.cc
+++ b/third_party/crashpad/crashpad/util/linux/scoped_ptrace_attach.cc
@@ -22,32 +22,6 @@
 
 namespace crashpad {
 
-bool PtraceAttach(pid_t pid, bool can_log) {
-  if (ptrace(PTRACE_ATTACH, pid, nullptr, nullptr) != 0) {
-    PLOG_IF(ERROR, can_log) << "ptrace";
-    return false;
-  }
-
-  int status;
-  if (HANDLE_EINTR(waitpid(pid, &status, __WALL)) < 0) {
-    PLOG_IF(ERROR, can_log) << "waitpid";
-    return false;
-  }
-  if (!WIFSTOPPED(status)) {
-    LOG_IF(ERROR, can_log) << "process not stopped";
-    return false;
-  }
-  return true;
-}
-
-bool PtraceDetach(pid_t pid, bool can_log) {
-  if (pid >= 0 && ptrace(PTRACE_DETACH, pid, nullptr, nullptr) != 0) {
-    PLOG_IF(ERROR, can_log) << "ptrace";
-    return false;
-  }
-  return true;
-}
-
 ScopedPtraceAttach::ScopedPtraceAttach()
     : pid_(-1) {}
 
@@ -56,7 +30,8 @@
 }
 
 bool ScopedPtraceAttach::Reset() {
-  if (!PtraceDetach(pid_, true)) {
+  if (pid_ >= 0 && ptrace(PTRACE_DETACH, pid_, nullptr, nullptr) != 0) {
+    PLOG(ERROR) << "ptrace";
     return false;
   }
   pid_ = -1;
@@ -66,11 +41,21 @@
 bool ScopedPtraceAttach::ResetAttach(pid_t pid) {
   Reset();
 
-  if (!PtraceAttach(pid, true)) {
+  if (ptrace(PTRACE_ATTACH, pid, nullptr, nullptr) != 0) {
+    PLOG(ERROR) << "ptrace";
     return false;
   }
-
   pid_ = pid;
+
+  int status;
+  if (HANDLE_EINTR(waitpid(pid_, &status, __WALL)) < 0) {
+    PLOG(ERROR) << "waitpid";
+    return false;
+  }
+  if (!WIFSTOPPED(status)) {
+    LOG(ERROR) << "process not stopped";
+    return false;
+  }
   return true;
 }
 
diff --git a/third_party/crashpad/crashpad/util/linux/scoped_ptrace_attach.h b/third_party/crashpad/crashpad/util/linux/scoped_ptrace_attach.h
index f380d25..a3d9d69 100644
--- a/third_party/crashpad/crashpad/util/linux/scoped_ptrace_attach.h
+++ b/third_party/crashpad/crashpad/util/linux/scoped_ptrace_attach.h
@@ -21,24 +21,6 @@
 
 namespace crashpad {
 
-//! \brief Attaches to the process with process ID \a pid and blocks until the
-//!     target process has stopped by calling `waitpid()`.
-//!
-//! \param pid The process ID of the process to attach to.
-//! \param can_log Whether this function may log messages on failure.
-//! \return `true` on success. `false` on failure with a message logged if \a
-//!     can_log is `true`.
-bool PtraceAttach(pid_t pid, bool can_log = true);
-
-//! \brief Detaches the process  with process ID \a pid. The process must
-//!     already be ptrace attached.
-//!
-//! \param pid The process ID of the process to detach.
-//! \param can_log Whether this function may log messages on failure.
-//! \return `true` on success. `false` on failure with a message logged if \a
-//!     ca_log is `true `true`
-bool PtraceDetach(pid_t pid, bool can_log = true);
-
 //! \brief Maintains a `ptrace()` attachment to a process.
 //!
 //! On destruction, the process will be detached.
diff --git a/third_party/crashpad/crashpad/util/posix/scoped_mmap.cc b/third_party/crashpad/crashpad/util/posix/scoped_mmap.cc
index 21533d2..0c98ba2 100644
--- a/third_party/crashpad/crashpad/util/posix/scoped_mmap.cc
+++ b/third_party/crashpad/crashpad/util/posix/scoped_mmap.cc
@@ -22,54 +22,12 @@
 #include "base/logging.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/numerics/safe_math.h"
-#include "base/process/process_metrics.h"
-#include "build/build_config.h"
-
-#if defined(OS_LINUX)
-#include "third_party/lss/lss.h"
-#endif
 
 namespace {
 
-#if defined(OS_LINUX)
-void* CallMmap(void* addr,
-               size_t len,
-               int prot,
-               int flags,
-               int fd,
-               off_t offset) {
-  return sys_mmap(addr, len, prot, flags, fd, offset);
-}
-
-int CallMunmap(void* addr, size_t len) {
-  return sys_munmap(addr, len);
-}
-
-int CallMprotect(void* addr, size_t len, int prot) {
-  return sys_mprotect(addr, len, prot);
-}
-#else
-void* CallMmap(void* addr,
-               size_t len,
-               int prot,
-               int flags,
-               int fd,
-               off_t offset) {
-  return mmap(addr, len, prot, flags, fd, offset);
-}
-
-int CallMunmap(void* addr, size_t len) {
-  return munmap(addr, len);
-}
-
-int CallMprotect(void* addr, size_t len, int prot) {
-  return mprotect(addr, len, prot);
-}
-#endif
-
-bool LoggingMunmap(uintptr_t addr, size_t len, bool can_log) {
-  if (CallMunmap(reinterpret_cast<void*>(addr), len) != 0) {
-    PLOG_IF(ERROR, can_log) << "munmap";
+bool Munmap(uintptr_t addr, size_t len) {
+  if (munmap(reinterpret_cast<void*>(addr), len) != 0) {
+    PLOG(ERROR) << "munmap";
     return false;
   }
 
@@ -77,7 +35,7 @@
 }
 
 size_t RoundPage(size_t size) {
-  const size_t kPageMask = base::checked_cast<size_t>(base::GetPageSize()) - 1;
+  const size_t kPageMask = base::checked_cast<size_t>(getpagesize()) - 1;
   return (size + kPageMask) & ~kPageMask;
 }
 
@@ -85,12 +43,11 @@
 
 namespace crashpad {
 
-ScopedMmap::ScopedMmap(bool can_log) : can_log_(can_log) {}
+ScopedMmap::ScopedMmap() {}
 
 ScopedMmap::~ScopedMmap() {
   if (is_valid()) {
-    LoggingMunmap(
-        reinterpret_cast<uintptr_t>(addr_), RoundPage(len_), can_log_);
+    Munmap(reinterpret_cast<uintptr_t>(addr_), RoundPage(len_));
   }
 }
 
@@ -106,7 +63,7 @@
     DCHECK_EQ(len, 0u);
   } else {
     DCHECK_NE(len, 0u);
-    DCHECK_EQ(new_addr % base::GetPageSize(), 0u);
+    DCHECK_EQ(new_addr % getpagesize(), 0u);
     DCHECK((base::CheckedNumeric<uintptr_t>(new_addr) + (new_len_round - 1))
                .IsValid());
   }
@@ -117,13 +74,11 @@
     const uintptr_t old_addr = reinterpret_cast<uintptr_t>(addr_);
     const size_t old_len_round = RoundPage(len_);
     if (old_addr < new_addr) {
-      result &= LoggingMunmap(
-          old_addr, std::min(old_len_round, new_addr - old_addr), can_log_);
+      result &= Munmap(old_addr, std::min(old_len_round, new_addr - old_addr));
     }
     if (old_addr + old_len_round > new_addr + new_len_round) {
       uintptr_t unmap_start = std::max(old_addr, new_addr + new_len_round);
-      result &= LoggingMunmap(
-          unmap_start, old_addr + old_len_round - unmap_start, can_log_);
+      result &= Munmap(unmap_start, old_addr + old_len_round - unmap_start);
     }
   }
 
@@ -145,9 +100,9 @@
   // consider the return value from Reset().
   Reset();
 
-  void* new_addr = CallMmap(addr, len, prot, flags, fd, offset);
+  void* new_addr = mmap(addr, len, prot, flags, fd, offset);
   if (new_addr == MAP_FAILED) {
-    PLOG_IF(ERROR, can_log_) << "mmap";
+    PLOG(ERROR) << "mmap";
     return false;
   }
 
@@ -158,8 +113,8 @@
 }
 
 bool ScopedMmap::Mprotect(int prot) {
-  if (CallMprotect(addr_, RoundPage(len_), prot) < 0) {
-    PLOG_IF(ERROR, can_log_) << "mprotect";
+  if (mprotect(addr_, RoundPage(len_), prot) < 0) {
+    PLOG(ERROR) << "mprotect";
     return false;
   }
 
diff --git a/third_party/crashpad/crashpad/util/posix/scoped_mmap.h b/third_party/crashpad/crashpad/util/posix/scoped_mmap.h
index 12f5ceed..b497d94 100644
--- a/third_party/crashpad/crashpad/util/posix/scoped_mmap.h
+++ b/third_party/crashpad/crashpad/util/posix/scoped_mmap.h
@@ -30,10 +30,7 @@
 //! will be released by calling `munmap()`.
 class ScopedMmap {
  public:
-  //! \brief Constructs this object.
-  //!
-  //! \param can_log `true` if methods of this class may log messages.
-  explicit ScopedMmap(bool can_log = true);
+  ScopedMmap();
   ~ScopedMmap();
 
   //! \brief Releases the memory-mapped region by calling `munmap()`.
@@ -108,7 +105,6 @@
  private:
   void* addr_ = MAP_FAILED;
   size_t len_ = 0;
-  bool can_log_;
 
   DISALLOW_COPY_AND_ASSIGN(ScopedMmap);
 };
diff --git a/third_party/dav1d/dav1d_generated.gni b/third_party/dav1d/dav1d_generated.gni
index 95fba31..40b1719 100644
--- a/third_party/dav1d/dav1d_generated.gni
+++ b/third_party/dav1d/dav1d_generated.gni
@@ -41,6 +41,7 @@
   "libdav1d/src/arm/32/itx.S",
   "libdav1d/src/arm/32/loopfilter.S",
   "libdav1d/src/arm/32/looprestoration.S",
+  "libdav1d/src/arm/32/looprestoration16.S",
   "libdav1d/src/arm/32/mc.S",
   "libdav1d/src/arm/32/mc16.S",
   "libdav1d/src/arm/32/msac.S",
diff --git a/third_party/libaom/cmake_update.sh b/third_party/libaom/cmake_update.sh
index 7a459ef..7490a01 100755
--- a/third_party/libaom/cmake_update.sh
+++ b/third_party/libaom/cmake_update.sh
@@ -126,10 +126,13 @@
 all_platforms="-DCONFIG_SIZE_LIMIT=1"
 all_platforms+=" -DDECODE_HEIGHT_LIMIT=16384 -DDECODE_WIDTH_LIMIT=16384"
 all_platforms+=" -DCONFIG_AV1_ENCODER=1"
-all_platforms+=" -DCONFIG_LOWBITDEPTH=1"
 all_platforms+=" -DCONFIG_MAX_DECODE_PROFILE=0"
 all_platforms+=" -DCONFIG_NORMAL_TILE_MODE=1"
 all_platforms+=" -DCONFIG_LIBYUV=0"
+# Use low bit depth.
+all_platforms+=" -DCONFIG_AV1_HIGHBITDEPTH=0"
+# Use real-time only build.
+all_platforms+=" -DCONFIG_REALTIME_ONLY=1"
 # avx2 optimizations account for ~0.3mb of the decoder.
 #all_platforms+=" -DENABLE_AVX2=0"
 toolchain="-DCMAKE_TOOLCHAIN_FILE=${SRC}/build/cmake/toolchains"
diff --git a/third_party/libaom/libaom_srcs.gni b/third_party/libaom/libaom_srcs.gni
index d215823..9c11235 100644
--- a/third_party/libaom/libaom_srcs.gni
+++ b/third_party/libaom/libaom_srcs.gni
@@ -7,15 +7,11 @@
   "//third_party/libaom/source/libaom/av1/common/x86/cfl_avx2.c",
   "//third_party/libaom/source/libaom/av1/common/x86/convolve_2d_avx2.c",
   "//third_party/libaom/source/libaom/av1/common/x86/convolve_avx2.c",
-  "//third_party/libaom/source/libaom/av1/common/x86/highbd_convolve_2d_avx2.c",
   "//third_party/libaom/source/libaom/av1/common/x86/highbd_inv_txfm_avx2.c",
   "//third_party/libaom/source/libaom/av1/common/x86/highbd_jnt_convolve_avx2.c",
   "//third_party/libaom/source/libaom/av1/common/x86/highbd_wiener_convolve_avx2.c",
-  "//third_party/libaom/source/libaom/av1/common/x86/highbd_warp_affine_avx2.c",
   "//third_party/libaom/source/libaom/av1/common/x86/jnt_convolve_avx2.c",
   "//third_party/libaom/source/libaom/av1/common/x86/reconinter_avx2.c",
-  "//third_party/libaom/source/libaom/av1/common/x86/selfguided_avx2.c",
-  "//third_party/libaom/source/libaom/av1/common/x86/warp_plane_avx2.c",
   "//third_party/libaom/source/libaom/av1/common/x86/wiener_convolve_avx2.c",
 ]
 
@@ -33,11 +29,9 @@
   "//third_party/libaom/source/libaom/av1/common/arm/reconintra_neon.c",
   "//third_party/libaom/source/libaom/av1/common/arm/resize_neon.c",
   "//third_party/libaom/source/libaom/av1/common/arm/wiener_convolve_neon.c",
-  "//third_party/libaom/source/libaom/av1/common/arm/selfguided_neon.c",
   "//third_party/libaom/source/libaom/av1/common/arm/av1_inv_txfm_neon.c",
   "//third_party/libaom/source/libaom/av1/common/arm/av1_inv_txfm_neon.h",
   "//third_party/libaom/source/libaom/av1/common/arm/highbd_inv_txfm_neon.c",
-  "//third_party/libaom/source/libaom/av1/common/arm/warp_plane_neon.c",
   "//third_party/libaom/source/libaom/av1/common/cdef_block_neon.c",
 ]
 
@@ -49,7 +43,6 @@
   "//third_party/libaom/source/libaom/av1/common/x86/jnt_convolve_sse2.c",
   "//third_party/libaom/source/libaom/av1/common/x86/wiener_convolve_sse2.c",
   "//third_party/libaom/source/libaom/av1/common/x86/av1_txfm_sse2.h",
-  "//third_party/libaom/source/libaom/av1/common/x86/warp_plane_sse2.c",
 ]
 
 aom_av1_common_intrin_sse4_1 = [
@@ -59,14 +52,10 @@
   "//third_party/libaom/source/libaom/av1/common/x86/av1_txfm_sse4.c",
   "//third_party/libaom/source/libaom/av1/common/x86/av1_txfm_sse4.h",
   "//third_party/libaom/source/libaom/av1/common/x86/filterintra_sse4.c",
-  "//third_party/libaom/source/libaom/av1/common/x86/highbd_convolve_2d_sse4.c",
   "//third_party/libaom/source/libaom/av1/common/x86/highbd_inv_txfm_sse4.c",
   "//third_party/libaom/source/libaom/av1/common/x86/highbd_jnt_convolve_sse4.c",
-  "//third_party/libaom/source/libaom/av1/common/x86/highbd_warp_plane_sse4.c",
   "//third_party/libaom/source/libaom/av1/common/x86/intra_edge_sse4.c",
   "//third_party/libaom/source/libaom/av1/common/x86/reconinter_sse4.c",
-  "//third_party/libaom/source/libaom/av1/common/x86/selfguided_sse4.c",
-  "//third_party/libaom/source/libaom/av1/common/x86/warp_plane_sse4.c",
 ]
 
 aom_av1_common_intrin_ssse3 = [
@@ -74,7 +63,6 @@
   "//third_party/libaom/source/libaom/av1/common/x86/av1_inv_txfm_ssse3.c",
   "//third_party/libaom/source/libaom/av1/common/x86/av1_inv_txfm_ssse3.h",
   "//third_party/libaom/source/libaom/av1/common/x86/cfl_ssse3.c",
-  "//third_party/libaom/source/libaom/av1/common/x86/highbd_convolve_2d_ssse3.c",
   "//third_party/libaom/source/libaom/av1/common/x86/highbd_wiener_convolve_ssse3.c",
   "//third_party/libaom/source/libaom/av1/common/x86/jnt_convolve_ssse3.c",
   "//third_party/libaom/source/libaom/av1/common/x86/reconinter_ssse3.c",
@@ -139,8 +127,6 @@
   "//third_party/libaom/source/libaom/av1/common/reconintra.h",
   "//third_party/libaom/source/libaom/av1/common/resize.c",
   "//third_party/libaom/source/libaom/av1/common/resize.h",
-  "//third_party/libaom/source/libaom/av1/common/restoration.c",
-  "//third_party/libaom/source/libaom/av1/common/restoration.h",
   "//third_party/libaom/source/libaom/av1/common/scale.c",
   "//third_party/libaom/source/libaom/av1/common/scale.h",
   "//third_party/libaom/source/libaom/av1/common/scan.c",
@@ -156,8 +142,6 @@
   "//third_party/libaom/source/libaom/av1/common/token_cdfs.h",
   "//third_party/libaom/source/libaom/av1/common/txb_common.c",
   "//third_party/libaom/source/libaom/av1/common/txb_common.h",
-  "//third_party/libaom/source/libaom/av1/common/warped_motion.c",
-  "//third_party/libaom/source/libaom/av1/common/warped_motion.h",
 ]
 
 aom_av1_decoder_sources = [
@@ -189,7 +173,6 @@
   "//third_party/libaom/source/libaom/av1/encoder/x86/av1_highbd_quantize_avx2.c",
   "//third_party/libaom/source/libaom/av1/encoder/x86/corner_match_avx2.c",
   "//third_party/libaom/source/libaom/av1/encoder/x86/error_intrin_avx2.c",
-  "//third_party/libaom/source/libaom/av1/encoder/x86/highbd_block_error_intrin_avx2.c",
   "//third_party/libaom/source/libaom/av1/encoder/x86/av1_fwd_txfm_avx2.h",
   "//third_party/libaom/source/libaom/av1/encoder/x86/av1_fwd_txfm2d_avx2.c",
   "//third_party/libaom/source/libaom/av1/encoder/x86/highbd_fwd_txfm_avx2.c",
@@ -197,8 +180,6 @@
   "//third_party/libaom/source/libaom/av1/encoder/x86/encodetxb_avx2.c",
   "//third_party/libaom/source/libaom/av1/encoder/x86/rdopt_avx2.c",
   "//third_party/libaom/source/libaom/av1/encoder/x86/temporal_filter_avx2.c",
-  "//third_party/libaom/source/libaom/av1/encoder/x86/highbd_temporal_filter_avx2.c",
-  "//third_party/libaom/source/libaom/av1/encoder/x86/pickrst_avx2.c",
 ]
 
 aom_av1_encoder_intrin_msa = [
@@ -224,9 +205,7 @@
   "//third_party/libaom/source/libaom/av1/encoder/x86/av1_fwd_txfm_sse2.h",
   "//third_party/libaom/source/libaom/av1/encoder/x86/av1_quantize_sse2.c",
   "//third_party/libaom/source/libaom/av1/encoder/x86/encodetxb_sse2.c",
-  "//third_party/libaom/source/libaom/av1/encoder/x86/highbd_block_error_intrin_sse2.c",
   "//third_party/libaom/source/libaom/av1/encoder/x86/temporal_filter_sse2.c",
-  "//third_party/libaom/source/libaom/av1/encoder/x86/highbd_temporal_filter_sse2.c",
   "//third_party/libaom/source/libaom/av1/encoder/x86/wedge_utils_sse2.c",
 ]
 
@@ -241,7 +220,6 @@
   "//third_party/libaom/source/libaom/av1/encoder/x86/encodetxb_sse4.c",
   "//third_party/libaom/source/libaom/av1/encoder/x86/highbd_fwd_txfm_sse4.c",
   "//third_party/libaom/source/libaom/av1/encoder/x86/rdopt_sse4.c",
-  "//third_party/libaom/source/libaom/av1/encoder/x86/pickrst_sse4.c",
 ]
 
 aom_av1_encoder_intrin_sse4_2 =
@@ -266,8 +244,6 @@
   "//third_party/libaom/source/libaom/av1/encoder/bitstream.c",
   "//third_party/libaom/source/libaom/av1/encoder/bitstream.h",
   "//third_party/libaom/source/libaom/av1/encoder/block.h",
-  "//third_party/libaom/source/libaom/av1/encoder/cnn.c",
-  "//third_party/libaom/source/libaom/av1/encoder/cnn.h",
   "//third_party/libaom/source/libaom/av1/encoder/compound_type.c",
   "//third_party/libaom/source/libaom/av1/encoder/compound_type.h",
   "//third_party/libaom/source/libaom/av1/encoder/context_tree.c",
@@ -302,14 +278,6 @@
   "//third_party/libaom/source/libaom/av1/encoder/ethread.h",
   "//third_party/libaom/source/libaom/av1/encoder/extend.c",
   "//third_party/libaom/source/libaom/av1/encoder/extend.h",
-  "//third_party/libaom/source/libaom/av1/encoder/firstpass.c",
-  "//third_party/libaom/source/libaom/av1/encoder/firstpass.h",
-  "//third_party/libaom/source/libaom/av1/encoder/global_motion.c",
-  "//third_party/libaom/source/libaom/av1/encoder/global_motion.h",
-  "//third_party/libaom/source/libaom/av1/encoder/global_motion_facade.c",
-  "//third_party/libaom/source/libaom/av1/encoder/global_motion_facade.h",
-  "//third_party/libaom/source/libaom/av1/encoder/gop_structure.c",
-  "//third_party/libaom/source/libaom/av1/encoder/gop_structure.h",
   "//third_party/libaom/source/libaom/av1/encoder/grain_test_vectors.h",
   "//third_party/libaom/source/libaom/av1/encoder/hash.c",
   "//third_party/libaom/source/libaom/av1/encoder/hash.h",
@@ -342,13 +310,10 @@
   "//third_party/libaom/source/libaom/av1/encoder/partition_search.h",
   "//third_party/libaom/source/libaom/av1/encoder/partition_strategy.c",
   "//third_party/libaom/source/libaom/av1/encoder/partition_strategy.h",
-  "//third_party/libaom/source/libaom/av1/encoder/pass2_strategy.c",
   "//third_party/libaom/source/libaom/av1/encoder/pass2_strategy.h",
   "//third_party/libaom/source/libaom/av1/encoder/pickcdef.c",
   "//third_party/libaom/source/libaom/av1/encoder/pickcdef.h",
   "//third_party/libaom/source/libaom/av1/encoder/picklpf.c",
-  "//third_party/libaom/source/libaom/av1/encoder/picklpf.h",
-  "//third_party/libaom/source/libaom/av1/encoder/pickrst.c",
   "//third_party/libaom/source/libaom/av1/encoder/pickrst.h",
   "//third_party/libaom/source/libaom/av1/encoder/ransac.c",
   "//third_party/libaom/source/libaom/av1/encoder/ransac.h",
@@ -371,12 +336,8 @@
   "//third_party/libaom/source/libaom/av1/encoder/superres_scale.h",
   "//third_party/libaom/source/libaom/av1/encoder/svc_layercontext.c",
   "//third_party/libaom/source/libaom/av1/encoder/svc_layercontext.h",
-  "//third_party/libaom/source/libaom/av1/encoder/temporal_filter.c",
-  "//third_party/libaom/source/libaom/av1/encoder/temporal_filter.h",
   "//third_party/libaom/source/libaom/av1/encoder/tokenize.c",
   "//third_party/libaom/source/libaom/av1/encoder/tokenize.h",
-  "//third_party/libaom/source/libaom/av1/encoder/tpl_model.c",
-  "//third_party/libaom/source/libaom/av1/encoder/tpl_model.h",
   "//third_party/libaom/source/libaom/av1/encoder/tx_search.c",
   "//third_party/libaom/source/libaom/av1/encoder/tx_search.h",
   "//third_party/libaom/source/libaom/av1/encoder/var_based_part.c",
@@ -412,8 +373,6 @@
   "//third_party/libaom/source/libaom/aom_dsp/x86/txfm_common_avx2.h",
   "//third_party/libaom/source/libaom/aom_dsp/x86/convolve_avx2.h",
   "//third_party/libaom/source/libaom/aom_dsp/x86/fft_avx2.c",
-  "//third_party/libaom/source/libaom/aom_dsp/x86/highbd_convolve_avx2.c",
-  "//third_party/libaom/source/libaom/aom_dsp/x86/highbd_loopfilter_avx2.c",
   "//third_party/libaom/source/libaom/aom_dsp/x86/intrapred_avx2.c",
   "//third_party/libaom/source/libaom/aom_dsp/x86/blend_a64_mask_avx2.c",
   "//third_party/libaom/source/libaom/aom_dsp/x86/avg_intrin_avx2.c",
@@ -461,9 +420,7 @@
   "//third_party/libaom/source/libaom/aom_dsp/x86/convolve.h",
   "//third_party/libaom/source/libaom/aom_dsp/x86/convolve_sse2.h",
   "//third_party/libaom/source/libaom/aom_dsp/x86/fft_sse2.c",
-  "//third_party/libaom/source/libaom/aom_dsp/x86/highbd_convolve_sse2.c",
   "//third_party/libaom/source/libaom/aom_dsp/x86/highbd_intrapred_sse2.c",
-  "//third_party/libaom/source/libaom/aom_dsp/x86/highbd_loopfilter_sse2.c",
   "//third_party/libaom/source/libaom/aom_dsp/x86/intrapred_sse2.c",
   "//third_party/libaom/source/libaom/aom_dsp/x86/intrapred_x86.h",
   "//third_party/libaom/source/libaom/aom_dsp/x86/loopfilter_sse2.c",
@@ -485,7 +442,6 @@
 
 aom_dsp_common_intrin_ssse3 = [
   "//third_party/libaom/source/libaom/aom_dsp/x86/aom_subpixel_8t_intrin_ssse3.c",
-  "//third_party/libaom/source/libaom/aom_dsp/x86/highbd_convolve_ssse3.c",
   "//third_party/libaom/source/libaom/aom_dsp/x86/intrapred_ssse3.c",
 ]
 
@@ -568,11 +524,8 @@
   "//third_party/libaom/source/libaom/aom_dsp/x86/sad_highbd_avx2.c",
   "//third_party/libaom/source/libaom/aom_dsp/x86/sad_impl_avx2.c",
   "//third_party/libaom/source/libaom/aom_dsp/x86/variance_avx2.c",
-  "//third_party/libaom/source/libaom/aom_dsp/x86/highbd_variance_avx2.c",
   "//third_party/libaom/source/libaom/aom_dsp/x86/sse_avx2.c",
   "//third_party/libaom/source/libaom/aom_dsp/x86/variance_impl_avx2.c",
-  "//third_party/libaom/source/libaom/aom_dsp/x86/obmc_sad_avx2.c",
-  "//third_party/libaom/source/libaom/aom_dsp/x86/obmc_variance_avx2.c",
   "//third_party/libaom/source/libaom/aom_dsp/x86/blk_sse_sum_avx2.c",
   "//third_party/libaom/source/libaom/aom_dsp/x86/sum_squares_avx2.c",
 ]
@@ -599,24 +552,16 @@
   "//third_party/libaom/source/libaom/aom_dsp/x86/fwd_txfm_impl_sse2.h",
   "//third_party/libaom/source/libaom/aom_dsp/x86/fwd_txfm_sse2.c",
   "//third_party/libaom/source/libaom/aom_dsp/x86/fwd_txfm_sse2.h",
-  "//third_party/libaom/source/libaom/aom_dsp/x86/highbd_quantize_intrin_sse2.c",
-  "//third_party/libaom/source/libaom/aom_dsp/x86/highbd_subtract_sse2.c",
-  "//third_party/libaom/source/libaom/aom_dsp/x86/highbd_variance_sse2.c",
   "//third_party/libaom/source/libaom/aom_dsp/x86/quantize_sse2.c",
   "//third_party/libaom/source/libaom/aom_dsp/x86/adaptive_quantize_sse2.c",
-  "//third_party/libaom/source/libaom/aom_dsp/x86/highbd_adaptive_quantize_sse2.c",
   "//third_party/libaom/source/libaom/aom_dsp/x86/quantize_x86.h",
   "//third_party/libaom/source/libaom/aom_dsp/x86/blk_sse_sum_sse2.c",
   "//third_party/libaom/source/libaom/aom_dsp/x86/sum_squares_sse2.c",
   "//third_party/libaom/source/libaom/aom_dsp/x86/variance_sse2.c",
 ]
 
-aom_dsp_encoder_intrin_sse4_1 = [
-  "//third_party/libaom/source/libaom/aom_dsp/x86/highbd_variance_sse4.c",
-  "//third_party/libaom/source/libaom/aom_dsp/x86/sse_sse4.c",
-  "//third_party/libaom/source/libaom/aom_dsp/x86/obmc_sad_sse4.c",
-  "//third_party/libaom/source/libaom/aom_dsp/x86/obmc_variance_sse4.c",
-]
+aom_dsp_encoder_intrin_sse4_1 =
+    [ "//third_party/libaom/source/libaom/aom_dsp/x86/sse_sse4.c" ]
 
 aom_dsp_encoder_intrin_ssse3 = [
   "//third_party/libaom/source/libaom/aom_dsp/x86/masked_sad_intrin_ssse3.h",
diff --git a/third_party/libaom/source/config/ios/arm-neon/config/aom_config.asm b/third_party/libaom/source/config/ios/arm-neon/config/aom_config.asm
index c803d9fe..8fbd732d 100644
--- a/third_party/libaom/source/config/ios/arm-neon/config/aom_config.asm
+++ b/third_party/libaom/source/config/ios/arm-neon/config/aom_config.asm
@@ -17,7 +17,7 @@
 CONFIG_ANALYZER equ 0
 CONFIG_AV1_DECODER equ 1
 CONFIG_AV1_ENCODER equ 1
-CONFIG_AV1_HIGHBITDEPTH equ 1
+CONFIG_AV1_HIGHBITDEPTH equ 0
 CONFIG_AV1_TEMPORAL_DENOISING equ 0
 CONFIG_BIG_ENDIAN equ 0
 CONFIG_BITSTREAM_DEBUG equ 0
@@ -47,7 +47,7 @@
 CONFIG_OS_SUPPORT equ 1
 CONFIG_PIC equ 0
 CONFIG_RD_DEBUG equ 0
-CONFIG_REALTIME_ONLY equ 0
+CONFIG_REALTIME_ONLY equ 1
 CONFIG_RUNTIME_CPU_DETECT equ 0
 CONFIG_SHARED equ 0
 CONFIG_SHARP_SETTINGS equ 0
diff --git a/third_party/libaom/source/config/ios/arm-neon/config/aom_config.c b/third_party/libaom/source/config/ios/arm-neon/config/aom_config.c
index 207bb578..2bcd789 100644
--- a/third_party/libaom/source/config/ios/arm-neon/config/aom_config.c
+++ b/third_party/libaom/source/config/ios/arm-neon/config/aom_config.c
@@ -9,5 +9,5 @@
  * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
  */
 #include "aom/aom_codec.h"
-static const char* const cfg = "cmake ../source/libaom -G \"Unix Makefiles\" -DCMAKE_TOOLCHAIN_FILE=\"../source/libaom/build/cmake/toolchains/armv7-ios.cmake\" -DCONFIG_AV1_ENCODER=1 -DCONFIG_LIBYUV=0 -DCONFIG_MAX_DECODE_PROFILE=0 -DCONFIG_NORMAL_TILE_MODE=1 -DCONFIG_SIZE_LIMIT=1 -DDECODE_HEIGHT_LIMIT=16384 -DDECODE_WIDTH_LIMIT=16384";
+static const char* const cfg = "cmake ../source/libaom -G \"Unix Makefiles\" -DCMAKE_TOOLCHAIN_FILE=\"../source/libaom/build/cmake/toolchains/armv7-ios.cmake\" -DCONFIG_AV1_ENCODER=1 -DCONFIG_LIBYUV=0 -DCONFIG_MAX_DECODE_PROFILE=0 -DCONFIG_NORMAL_TILE_MODE=1 -DCONFIG_SIZE_LIMIT=1 -DDECODE_HEIGHT_LIMIT=16384 -DDECODE_WIDTH_LIMIT=16384 -DCONFIG_REALTIME_ONLY=1 -DCONFIG_AV1_HIGHBITDEPTH=0";
 const char *aom_codec_build_config(void) {return cfg;}
diff --git a/third_party/libaom/source/config/ios/arm-neon/config/aom_config.h b/third_party/libaom/source/config/ios/arm-neon/config/aom_config.h
index 71185c9f..fa9522d 100644
--- a/third_party/libaom/source/config/ios/arm-neon/config/aom_config.h
+++ b/third_party/libaom/source/config/ios/arm-neon/config/aom_config.h
@@ -19,7 +19,7 @@
 #define CONFIG_ANALYZER 0
 #define CONFIG_AV1_DECODER 1
 #define CONFIG_AV1_ENCODER 1
-#define CONFIG_AV1_HIGHBITDEPTH 1
+#define CONFIG_AV1_HIGHBITDEPTH 0
 #define CONFIG_AV1_TEMPORAL_DENOISING 0
 #define CONFIG_BIG_ENDIAN 0
 #define CONFIG_BITSTREAM_DEBUG 0
@@ -49,7 +49,7 @@
 #define CONFIG_OS_SUPPORT 1
 #define CONFIG_PIC 0
 #define CONFIG_RD_DEBUG 0
-#define CONFIG_REALTIME_ONLY 0
+#define CONFIG_REALTIME_ONLY 1
 #define CONFIG_RUNTIME_CPU_DETECT 0
 #define CONFIG_SHARED 0
 #define CONFIG_SHARP_SETTINGS 0
diff --git a/third_party/libaom/source/config/ios/arm-neon/config/aom_dsp_rtcd.h b/third_party/libaom/source/config/ios/arm-neon/config/aom_dsp_rtcd.h
index 5bf7631..5bc4d69e 100644
--- a/third_party/libaom/source/config/ios/arm-neon/config/aom_dsp_rtcd.h
+++ b/third_party/libaom/source/config/ios/arm-neon/config/aom_dsp_rtcd.h
@@ -1474,8226 +1474,6 @@
                               int16_t* coeff);
 #define aom_hadamard_lp_8x8 aom_hadamard_lp_8x8_neon
 
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x128 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x64 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x16 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x16_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x32 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x32_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x4 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x4_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x64 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x64_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x8 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x8_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x16 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x16_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x32 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x32_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x64 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x64_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x8 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x8_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x16 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x4 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x4_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x8 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x128 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x16 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x16_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x32 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x32_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x64 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x64_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x16 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x16_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x32 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x32_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x4 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x4_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x8 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x8_c
-
-void aom_highbd_10_get16x16var_c(const uint8_t* src_ptr,
-                                 int source_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride,
-                                 unsigned int* sse,
-                                 int* sum);
-#define aom_highbd_10_get16x16var aom_highbd_10_get16x16var_c
-
-void aom_highbd_10_get8x8var_c(const uint8_t* src_ptr,
-                               int source_stride,
-                               const uint8_t* ref_ptr,
-                               int ref_stride,
-                               unsigned int* sse,
-                               int* sum);
-#define aom_highbd_10_get8x8var aom_highbd_10_get8x8var_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance128x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance128x128 \
-  aom_highbd_10_masked_sub_pixel_variance128x128_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance128x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance128x64 \
-  aom_highbd_10_masked_sub_pixel_variance128x64_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance16x16 \
-  aom_highbd_10_masked_sub_pixel_variance16x16_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance16x32 \
-  aom_highbd_10_masked_sub_pixel_variance16x32_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance16x4 \
-  aom_highbd_10_masked_sub_pixel_variance16x4_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance16x64 \
-  aom_highbd_10_masked_sub_pixel_variance16x64_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance16x8 \
-  aom_highbd_10_masked_sub_pixel_variance16x8_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance32x16 \
-  aom_highbd_10_masked_sub_pixel_variance32x16_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance32x32 \
-  aom_highbd_10_masked_sub_pixel_variance32x32_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance32x64 \
-  aom_highbd_10_masked_sub_pixel_variance32x64_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance32x8 \
-  aom_highbd_10_masked_sub_pixel_variance32x8_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance4x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance4x16 \
-  aom_highbd_10_masked_sub_pixel_variance4x16_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance4x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance4x4 \
-  aom_highbd_10_masked_sub_pixel_variance4x4_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance4x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance4x8 \
-  aom_highbd_10_masked_sub_pixel_variance4x8_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance64x128 \
-  aom_highbd_10_masked_sub_pixel_variance64x128_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance64x16 \
-  aom_highbd_10_masked_sub_pixel_variance64x16_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance64x32 \
-  aom_highbd_10_masked_sub_pixel_variance64x32_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance64x64 \
-  aom_highbd_10_masked_sub_pixel_variance64x64_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance8x16 \
-  aom_highbd_10_masked_sub_pixel_variance8x16_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance8x32 \
-  aom_highbd_10_masked_sub_pixel_variance8x32_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance8x4 \
-  aom_highbd_10_masked_sub_pixel_variance8x4_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance8x8 \
-  aom_highbd_10_masked_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_10_mse16x16_c(const uint8_t* src_ptr,
-                                      int source_stride,
-                                      const uint8_t* ref_ptr,
-                                      int recon_stride,
-                                      unsigned int* sse);
-#define aom_highbd_10_mse16x16 aom_highbd_10_mse16x16_c
-
-unsigned int aom_highbd_10_mse16x8_c(const uint8_t* src_ptr,
-                                     int source_stride,
-                                     const uint8_t* ref_ptr,
-                                     int recon_stride,
-                                     unsigned int* sse);
-#define aom_highbd_10_mse16x8 aom_highbd_10_mse16x8_c
-
-unsigned int aom_highbd_10_mse8x16_c(const uint8_t* src_ptr,
-                                     int source_stride,
-                                     const uint8_t* ref_ptr,
-                                     int recon_stride,
-                                     unsigned int* sse);
-#define aom_highbd_10_mse8x16 aom_highbd_10_mse8x16_c
-
-unsigned int aom_highbd_10_mse8x8_c(const uint8_t* src_ptr,
-                                    int source_stride,
-                                    const uint8_t* ref_ptr,
-                                    int recon_stride,
-                                    unsigned int* sse);
-#define aom_highbd_10_mse8x8 aom_highbd_10_mse8x8_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance128x128_c(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            int xoffset,
-                                                            int yoffset,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance128x128 \
-  aom_highbd_10_obmc_sub_pixel_variance128x128_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance128x64_c(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance128x64 \
-  aom_highbd_10_obmc_sub_pixel_variance128x64_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance16x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance16x16 \
-  aom_highbd_10_obmc_sub_pixel_variance16x16_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance16x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance16x32 \
-  aom_highbd_10_obmc_sub_pixel_variance16x32_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance16x4_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance16x4 \
-  aom_highbd_10_obmc_sub_pixel_variance16x4_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance16x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance16x64 \
-  aom_highbd_10_obmc_sub_pixel_variance16x64_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance16x8_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance16x8 \
-  aom_highbd_10_obmc_sub_pixel_variance16x8_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance32x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance32x16 \
-  aom_highbd_10_obmc_sub_pixel_variance32x16_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance32x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance32x32 \
-  aom_highbd_10_obmc_sub_pixel_variance32x32_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance32x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance32x64 \
-  aom_highbd_10_obmc_sub_pixel_variance32x64_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance32x8_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance32x8 \
-  aom_highbd_10_obmc_sub_pixel_variance32x8_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance4x16_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance4x16 \
-  aom_highbd_10_obmc_sub_pixel_variance4x16_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance4x4_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance4x4 \
-  aom_highbd_10_obmc_sub_pixel_variance4x4_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance4x8_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance4x8 \
-  aom_highbd_10_obmc_sub_pixel_variance4x8_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance64x128_c(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance64x128 \
-  aom_highbd_10_obmc_sub_pixel_variance64x128_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance64x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance64x16 \
-  aom_highbd_10_obmc_sub_pixel_variance64x16_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance64x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance64x32 \
-  aom_highbd_10_obmc_sub_pixel_variance64x32_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance64x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance64x64 \
-  aom_highbd_10_obmc_sub_pixel_variance64x64_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance8x16_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance8x16 \
-  aom_highbd_10_obmc_sub_pixel_variance8x16_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance8x32_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance8x32 \
-  aom_highbd_10_obmc_sub_pixel_variance8x32_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance8x4_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance8x4 \
-  aom_highbd_10_obmc_sub_pixel_variance8x4_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance8x8_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance8x8 \
-  aom_highbd_10_obmc_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_10_obmc_variance128x128_c(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-#define aom_highbd_10_obmc_variance128x128 aom_highbd_10_obmc_variance128x128_c
-
-unsigned int aom_highbd_10_obmc_variance128x64_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-#define aom_highbd_10_obmc_variance128x64 aom_highbd_10_obmc_variance128x64_c
-
-unsigned int aom_highbd_10_obmc_variance16x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance16x16 aom_highbd_10_obmc_variance16x16_c
-
-unsigned int aom_highbd_10_obmc_variance16x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance16x32 aom_highbd_10_obmc_variance16x32_c
-
-unsigned int aom_highbd_10_obmc_variance16x4_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_10_obmc_variance16x4 aom_highbd_10_obmc_variance16x4_c
-
-unsigned int aom_highbd_10_obmc_variance16x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance16x64 aom_highbd_10_obmc_variance16x64_c
-
-unsigned int aom_highbd_10_obmc_variance16x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_10_obmc_variance16x8 aom_highbd_10_obmc_variance16x8_c
-
-unsigned int aom_highbd_10_obmc_variance32x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance32x16 aom_highbd_10_obmc_variance32x16_c
-
-unsigned int aom_highbd_10_obmc_variance32x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance32x32 aom_highbd_10_obmc_variance32x32_c
-
-unsigned int aom_highbd_10_obmc_variance32x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance32x64 aom_highbd_10_obmc_variance32x64_c
-
-unsigned int aom_highbd_10_obmc_variance32x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_10_obmc_variance32x8 aom_highbd_10_obmc_variance32x8_c
-
-unsigned int aom_highbd_10_obmc_variance4x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_10_obmc_variance4x16 aom_highbd_10_obmc_variance4x16_c
-
-unsigned int aom_highbd_10_obmc_variance4x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_10_obmc_variance4x4 aom_highbd_10_obmc_variance4x4_c
-
-unsigned int aom_highbd_10_obmc_variance4x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_10_obmc_variance4x8 aom_highbd_10_obmc_variance4x8_c
-
-unsigned int aom_highbd_10_obmc_variance64x128_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-#define aom_highbd_10_obmc_variance64x128 aom_highbd_10_obmc_variance64x128_c
-
-unsigned int aom_highbd_10_obmc_variance64x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance64x16 aom_highbd_10_obmc_variance64x16_c
-
-unsigned int aom_highbd_10_obmc_variance64x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance64x32 aom_highbd_10_obmc_variance64x32_c
-
-unsigned int aom_highbd_10_obmc_variance64x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance64x64 aom_highbd_10_obmc_variance64x64_c
-
-unsigned int aom_highbd_10_obmc_variance8x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_10_obmc_variance8x16 aom_highbd_10_obmc_variance8x16_c
-
-unsigned int aom_highbd_10_obmc_variance8x32_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_10_obmc_variance8x32 aom_highbd_10_obmc_variance8x32_c
-
-unsigned int aom_highbd_10_obmc_variance8x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_10_obmc_variance8x4 aom_highbd_10_obmc_variance8x4_c
-
-unsigned int aom_highbd_10_obmc_variance8x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_10_obmc_variance8x8 aom_highbd_10_obmc_variance8x8_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance128x128 \
-  aom_highbd_10_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance128x64 \
-  aom_highbd_10_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance16x16 \
-  aom_highbd_10_sub_pixel_avg_variance16x16_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance16x32 \
-  aom_highbd_10_sub_pixel_avg_variance16x32_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x4_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance16x4 \
-  aom_highbd_10_sub_pixel_avg_variance16x4_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance16x64 \
-  aom_highbd_10_sub_pixel_avg_variance16x64_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance16x8 \
-  aom_highbd_10_sub_pixel_avg_variance16x8_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance32x16 \
-  aom_highbd_10_sub_pixel_avg_variance32x16_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance32x32 \
-  aom_highbd_10_sub_pixel_avg_variance32x32_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance32x64 \
-  aom_highbd_10_sub_pixel_avg_variance32x64_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x8_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance32x8 \
-  aom_highbd_10_sub_pixel_avg_variance32x8_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance4x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance4x16 \
-  aom_highbd_10_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance4x4 \
-  aom_highbd_10_sub_pixel_avg_variance4x4_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance4x8 \
-  aom_highbd_10_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance64x128 \
-  aom_highbd_10_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance64x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance64x16 \
-  aom_highbd_10_sub_pixel_avg_variance64x16_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance64x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance64x32 \
-  aom_highbd_10_sub_pixel_avg_variance64x32_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance64x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance64x64 \
-  aom_highbd_10_sub_pixel_avg_variance64x64_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance8x16 \
-  aom_highbd_10_sub_pixel_avg_variance8x16_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x32_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance8x32 \
-  aom_highbd_10_sub_pixel_avg_variance8x32_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance8x4 \
-  aom_highbd_10_sub_pixel_avg_variance8x4_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance8x8 \
-  aom_highbd_10_sub_pixel_avg_variance8x8_c
-
-uint32_t aom_highbd_10_sub_pixel_variance128x128_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance128x128 \
-  aom_highbd_10_sub_pixel_variance128x128_c
-
-uint32_t aom_highbd_10_sub_pixel_variance128x64_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance128x64 \
-  aom_highbd_10_sub_pixel_variance128x64_c
-
-uint32_t aom_highbd_10_sub_pixel_variance16x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance16x16 \
-  aom_highbd_10_sub_pixel_variance16x16_c
-
-uint32_t aom_highbd_10_sub_pixel_variance16x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance16x32 \
-  aom_highbd_10_sub_pixel_variance16x32_c
-
-uint32_t aom_highbd_10_sub_pixel_variance16x4_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance16x4 \
-  aom_highbd_10_sub_pixel_variance16x4_c
-
-uint32_t aom_highbd_10_sub_pixel_variance16x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance16x64 \
-  aom_highbd_10_sub_pixel_variance16x64_c
-
-uint32_t aom_highbd_10_sub_pixel_variance16x8_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance16x8 \
-  aom_highbd_10_sub_pixel_variance16x8_c
-
-uint32_t aom_highbd_10_sub_pixel_variance32x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance32x16 \
-  aom_highbd_10_sub_pixel_variance32x16_c
-
-uint32_t aom_highbd_10_sub_pixel_variance32x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance32x32 \
-  aom_highbd_10_sub_pixel_variance32x32_c
-
-uint32_t aom_highbd_10_sub_pixel_variance32x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance32x64 \
-  aom_highbd_10_sub_pixel_variance32x64_c
-
-uint32_t aom_highbd_10_sub_pixel_variance32x8_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance32x8 \
-  aom_highbd_10_sub_pixel_variance32x8_c
-
-uint32_t aom_highbd_10_sub_pixel_variance4x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance4x16 \
-  aom_highbd_10_sub_pixel_variance4x16_c
-
-uint32_t aom_highbd_10_sub_pixel_variance4x4_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance4x4 \
-  aom_highbd_10_sub_pixel_variance4x4_c
-
-uint32_t aom_highbd_10_sub_pixel_variance4x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance4x8 \
-  aom_highbd_10_sub_pixel_variance4x8_c
-
-uint32_t aom_highbd_10_sub_pixel_variance64x128_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance64x128 \
-  aom_highbd_10_sub_pixel_variance64x128_c
-
-uint32_t aom_highbd_10_sub_pixel_variance64x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance64x16 \
-  aom_highbd_10_sub_pixel_variance64x16_c
-
-uint32_t aom_highbd_10_sub_pixel_variance64x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance64x32 \
-  aom_highbd_10_sub_pixel_variance64x32_c
-
-uint32_t aom_highbd_10_sub_pixel_variance64x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance64x64 \
-  aom_highbd_10_sub_pixel_variance64x64_c
-
-uint32_t aom_highbd_10_sub_pixel_variance8x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance8x16 \
-  aom_highbd_10_sub_pixel_variance8x16_c
-
-uint32_t aom_highbd_10_sub_pixel_variance8x32_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance8x32 \
-  aom_highbd_10_sub_pixel_variance8x32_c
-
-uint32_t aom_highbd_10_sub_pixel_variance8x4_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance8x4 \
-  aom_highbd_10_sub_pixel_variance8x4_c
-
-uint32_t aom_highbd_10_sub_pixel_variance8x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance8x8 \
-  aom_highbd_10_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_10_variance128x128_c(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-#define aom_highbd_10_variance128x128 aom_highbd_10_variance128x128_c
-
-unsigned int aom_highbd_10_variance128x64_c(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-#define aom_highbd_10_variance128x64 aom_highbd_10_variance128x64_c
-
-unsigned int aom_highbd_10_variance16x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_10_variance16x16 aom_highbd_10_variance16x16_c
-
-unsigned int aom_highbd_10_variance16x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_10_variance16x32 aom_highbd_10_variance16x32_c
-
-unsigned int aom_highbd_10_variance16x4_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_10_variance16x4 aom_highbd_10_variance16x4_c
-
-unsigned int aom_highbd_10_variance16x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           uint32_t* sse);
-#define aom_highbd_10_variance16x64 aom_highbd_10_variance16x64_c
-
-unsigned int aom_highbd_10_variance16x8_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_10_variance16x8 aom_highbd_10_variance16x8_c
-
-unsigned int aom_highbd_10_variance2x2_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance2x2 aom_highbd_10_variance2x2_c
-
-unsigned int aom_highbd_10_variance2x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance2x4 aom_highbd_10_variance2x4_c
-
-unsigned int aom_highbd_10_variance32x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_10_variance32x16 aom_highbd_10_variance32x16_c
-
-unsigned int aom_highbd_10_variance32x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_10_variance32x32 aom_highbd_10_variance32x32_c
-
-unsigned int aom_highbd_10_variance32x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_10_variance32x64 aom_highbd_10_variance32x64_c
-
-unsigned int aom_highbd_10_variance32x8_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_10_variance32x8 aom_highbd_10_variance32x8_c
-
-unsigned int aom_highbd_10_variance4x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_10_variance4x16 aom_highbd_10_variance4x16_c
-
-unsigned int aom_highbd_10_variance4x2_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance4x2 aom_highbd_10_variance4x2_c
-
-unsigned int aom_highbd_10_variance4x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance4x4 aom_highbd_10_variance4x4_c
-
-unsigned int aom_highbd_10_variance4x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance4x8 aom_highbd_10_variance4x8_c
-
-unsigned int aom_highbd_10_variance64x128_c(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-#define aom_highbd_10_variance64x128 aom_highbd_10_variance64x128_c
-
-unsigned int aom_highbd_10_variance64x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           uint32_t* sse);
-#define aom_highbd_10_variance64x16 aom_highbd_10_variance64x16_c
-
-unsigned int aom_highbd_10_variance64x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_10_variance64x32 aom_highbd_10_variance64x32_c
-
-unsigned int aom_highbd_10_variance64x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_10_variance64x64 aom_highbd_10_variance64x64_c
-
-unsigned int aom_highbd_10_variance8x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_10_variance8x16 aom_highbd_10_variance8x16_c
-
-unsigned int aom_highbd_10_variance8x32_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_10_variance8x32 aom_highbd_10_variance8x32_c
-
-unsigned int aom_highbd_10_variance8x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance8x4 aom_highbd_10_variance8x4_c
-
-unsigned int aom_highbd_10_variance8x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance8x8 aom_highbd_10_variance8x8_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x128 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x64 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x16 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x16_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x32 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x32_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x4 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x4_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x64 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x64_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x8 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x8_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x16 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x16_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x32 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x32_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x64 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x64_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x8 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x8_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x16 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x4 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x4_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x8 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x128 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x16 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x16_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x32 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x32_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x64 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x64_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x16 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x16_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x32 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x32_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x4 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x4_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x8 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x8_c
-
-void aom_highbd_12_get16x16var_c(const uint8_t* src_ptr,
-                                 int source_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride,
-                                 unsigned int* sse,
-                                 int* sum);
-#define aom_highbd_12_get16x16var aom_highbd_12_get16x16var_c
-
-void aom_highbd_12_get8x8var_c(const uint8_t* src_ptr,
-                               int source_stride,
-                               const uint8_t* ref_ptr,
-                               int ref_stride,
-                               unsigned int* sse,
-                               int* sum);
-#define aom_highbd_12_get8x8var aom_highbd_12_get8x8var_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance128x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance128x128 \
-  aom_highbd_12_masked_sub_pixel_variance128x128_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance128x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance128x64 \
-  aom_highbd_12_masked_sub_pixel_variance128x64_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance16x16 \
-  aom_highbd_12_masked_sub_pixel_variance16x16_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance16x32 \
-  aom_highbd_12_masked_sub_pixel_variance16x32_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance16x4 \
-  aom_highbd_12_masked_sub_pixel_variance16x4_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance16x64 \
-  aom_highbd_12_masked_sub_pixel_variance16x64_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance16x8 \
-  aom_highbd_12_masked_sub_pixel_variance16x8_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance32x16 \
-  aom_highbd_12_masked_sub_pixel_variance32x16_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance32x32 \
-  aom_highbd_12_masked_sub_pixel_variance32x32_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance32x64 \
-  aom_highbd_12_masked_sub_pixel_variance32x64_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance32x8 \
-  aom_highbd_12_masked_sub_pixel_variance32x8_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance4x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance4x16 \
-  aom_highbd_12_masked_sub_pixel_variance4x16_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance4x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance4x4 \
-  aom_highbd_12_masked_sub_pixel_variance4x4_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance4x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance4x8 \
-  aom_highbd_12_masked_sub_pixel_variance4x8_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance64x128 \
-  aom_highbd_12_masked_sub_pixel_variance64x128_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance64x16 \
-  aom_highbd_12_masked_sub_pixel_variance64x16_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance64x32 \
-  aom_highbd_12_masked_sub_pixel_variance64x32_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance64x64 \
-  aom_highbd_12_masked_sub_pixel_variance64x64_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance8x16 \
-  aom_highbd_12_masked_sub_pixel_variance8x16_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance8x32 \
-  aom_highbd_12_masked_sub_pixel_variance8x32_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance8x4 \
-  aom_highbd_12_masked_sub_pixel_variance8x4_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance8x8 \
-  aom_highbd_12_masked_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_12_mse16x16_c(const uint8_t* src_ptr,
-                                      int source_stride,
-                                      const uint8_t* ref_ptr,
-                                      int recon_stride,
-                                      unsigned int* sse);
-#define aom_highbd_12_mse16x16 aom_highbd_12_mse16x16_c
-
-unsigned int aom_highbd_12_mse16x8_c(const uint8_t* src_ptr,
-                                     int source_stride,
-                                     const uint8_t* ref_ptr,
-                                     int recon_stride,
-                                     unsigned int* sse);
-#define aom_highbd_12_mse16x8 aom_highbd_12_mse16x8_c
-
-unsigned int aom_highbd_12_mse8x16_c(const uint8_t* src_ptr,
-                                     int source_stride,
-                                     const uint8_t* ref_ptr,
-                                     int recon_stride,
-                                     unsigned int* sse);
-#define aom_highbd_12_mse8x16 aom_highbd_12_mse8x16_c
-
-unsigned int aom_highbd_12_mse8x8_c(const uint8_t* src_ptr,
-                                    int source_stride,
-                                    const uint8_t* ref_ptr,
-                                    int recon_stride,
-                                    unsigned int* sse);
-#define aom_highbd_12_mse8x8 aom_highbd_12_mse8x8_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance128x128_c(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            int xoffset,
-                                                            int yoffset,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance128x128 \
-  aom_highbd_12_obmc_sub_pixel_variance128x128_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance128x64_c(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance128x64 \
-  aom_highbd_12_obmc_sub_pixel_variance128x64_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance16x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance16x16 \
-  aom_highbd_12_obmc_sub_pixel_variance16x16_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance16x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance16x32 \
-  aom_highbd_12_obmc_sub_pixel_variance16x32_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance16x4_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance16x4 \
-  aom_highbd_12_obmc_sub_pixel_variance16x4_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance16x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance16x64 \
-  aom_highbd_12_obmc_sub_pixel_variance16x64_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance16x8_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance16x8 \
-  aom_highbd_12_obmc_sub_pixel_variance16x8_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance32x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance32x16 \
-  aom_highbd_12_obmc_sub_pixel_variance32x16_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance32x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance32x32 \
-  aom_highbd_12_obmc_sub_pixel_variance32x32_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance32x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance32x64 \
-  aom_highbd_12_obmc_sub_pixel_variance32x64_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance32x8_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance32x8 \
-  aom_highbd_12_obmc_sub_pixel_variance32x8_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance4x16_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance4x16 \
-  aom_highbd_12_obmc_sub_pixel_variance4x16_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance4x4_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance4x4 \
-  aom_highbd_12_obmc_sub_pixel_variance4x4_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance4x8_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance4x8 \
-  aom_highbd_12_obmc_sub_pixel_variance4x8_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance64x128_c(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance64x128 \
-  aom_highbd_12_obmc_sub_pixel_variance64x128_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance64x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance64x16 \
-  aom_highbd_12_obmc_sub_pixel_variance64x16_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance64x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance64x32 \
-  aom_highbd_12_obmc_sub_pixel_variance64x32_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance64x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance64x64 \
-  aom_highbd_12_obmc_sub_pixel_variance64x64_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance8x16_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance8x16 \
-  aom_highbd_12_obmc_sub_pixel_variance8x16_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance8x32_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance8x32 \
-  aom_highbd_12_obmc_sub_pixel_variance8x32_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance8x4_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance8x4 \
-  aom_highbd_12_obmc_sub_pixel_variance8x4_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance8x8_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance8x8 \
-  aom_highbd_12_obmc_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_12_obmc_variance128x128_c(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-#define aom_highbd_12_obmc_variance128x128 aom_highbd_12_obmc_variance128x128_c
-
-unsigned int aom_highbd_12_obmc_variance128x64_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-#define aom_highbd_12_obmc_variance128x64 aom_highbd_12_obmc_variance128x64_c
-
-unsigned int aom_highbd_12_obmc_variance16x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance16x16 aom_highbd_12_obmc_variance16x16_c
-
-unsigned int aom_highbd_12_obmc_variance16x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance16x32 aom_highbd_12_obmc_variance16x32_c
-
-unsigned int aom_highbd_12_obmc_variance16x4_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_12_obmc_variance16x4 aom_highbd_12_obmc_variance16x4_c
-
-unsigned int aom_highbd_12_obmc_variance16x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance16x64 aom_highbd_12_obmc_variance16x64_c
-
-unsigned int aom_highbd_12_obmc_variance16x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_12_obmc_variance16x8 aom_highbd_12_obmc_variance16x8_c
-
-unsigned int aom_highbd_12_obmc_variance32x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance32x16 aom_highbd_12_obmc_variance32x16_c
-
-unsigned int aom_highbd_12_obmc_variance32x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance32x32 aom_highbd_12_obmc_variance32x32_c
-
-unsigned int aom_highbd_12_obmc_variance32x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance32x64 aom_highbd_12_obmc_variance32x64_c
-
-unsigned int aom_highbd_12_obmc_variance32x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_12_obmc_variance32x8 aom_highbd_12_obmc_variance32x8_c
-
-unsigned int aom_highbd_12_obmc_variance4x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_12_obmc_variance4x16 aom_highbd_12_obmc_variance4x16_c
-
-unsigned int aom_highbd_12_obmc_variance4x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_12_obmc_variance4x4 aom_highbd_12_obmc_variance4x4_c
-
-unsigned int aom_highbd_12_obmc_variance4x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_12_obmc_variance4x8 aom_highbd_12_obmc_variance4x8_c
-
-unsigned int aom_highbd_12_obmc_variance64x128_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-#define aom_highbd_12_obmc_variance64x128 aom_highbd_12_obmc_variance64x128_c
-
-unsigned int aom_highbd_12_obmc_variance64x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance64x16 aom_highbd_12_obmc_variance64x16_c
-
-unsigned int aom_highbd_12_obmc_variance64x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance64x32 aom_highbd_12_obmc_variance64x32_c
-
-unsigned int aom_highbd_12_obmc_variance64x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance64x64 aom_highbd_12_obmc_variance64x64_c
-
-unsigned int aom_highbd_12_obmc_variance8x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_12_obmc_variance8x16 aom_highbd_12_obmc_variance8x16_c
-
-unsigned int aom_highbd_12_obmc_variance8x32_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_12_obmc_variance8x32 aom_highbd_12_obmc_variance8x32_c
-
-unsigned int aom_highbd_12_obmc_variance8x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_12_obmc_variance8x4 aom_highbd_12_obmc_variance8x4_c
-
-unsigned int aom_highbd_12_obmc_variance8x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_12_obmc_variance8x8 aom_highbd_12_obmc_variance8x8_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance128x128 \
-  aom_highbd_12_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance128x64 \
-  aom_highbd_12_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance16x16 \
-  aom_highbd_12_sub_pixel_avg_variance16x16_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance16x32 \
-  aom_highbd_12_sub_pixel_avg_variance16x32_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x4_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance16x4 \
-  aom_highbd_12_sub_pixel_avg_variance16x4_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance16x64 \
-  aom_highbd_12_sub_pixel_avg_variance16x64_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance16x8 \
-  aom_highbd_12_sub_pixel_avg_variance16x8_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance32x16 \
-  aom_highbd_12_sub_pixel_avg_variance32x16_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance32x32 \
-  aom_highbd_12_sub_pixel_avg_variance32x32_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance32x64 \
-  aom_highbd_12_sub_pixel_avg_variance32x64_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x8_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance32x8 \
-  aom_highbd_12_sub_pixel_avg_variance32x8_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance4x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance4x16 \
-  aom_highbd_12_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance4x4 \
-  aom_highbd_12_sub_pixel_avg_variance4x4_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance4x8 \
-  aom_highbd_12_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance64x128 \
-  aom_highbd_12_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance64x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance64x16 \
-  aom_highbd_12_sub_pixel_avg_variance64x16_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance64x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance64x32 \
-  aom_highbd_12_sub_pixel_avg_variance64x32_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance64x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance64x64 \
-  aom_highbd_12_sub_pixel_avg_variance64x64_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance8x16 \
-  aom_highbd_12_sub_pixel_avg_variance8x16_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x32_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance8x32 \
-  aom_highbd_12_sub_pixel_avg_variance8x32_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance8x4 \
-  aom_highbd_12_sub_pixel_avg_variance8x4_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance8x8 \
-  aom_highbd_12_sub_pixel_avg_variance8x8_c
-
-uint32_t aom_highbd_12_sub_pixel_variance128x128_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance128x128 \
-  aom_highbd_12_sub_pixel_variance128x128_c
-
-uint32_t aom_highbd_12_sub_pixel_variance128x64_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance128x64 \
-  aom_highbd_12_sub_pixel_variance128x64_c
-
-uint32_t aom_highbd_12_sub_pixel_variance16x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance16x16 \
-  aom_highbd_12_sub_pixel_variance16x16_c
-
-uint32_t aom_highbd_12_sub_pixel_variance16x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance16x32 \
-  aom_highbd_12_sub_pixel_variance16x32_c
-
-uint32_t aom_highbd_12_sub_pixel_variance16x4_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance16x4 \
-  aom_highbd_12_sub_pixel_variance16x4_c
-
-uint32_t aom_highbd_12_sub_pixel_variance16x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance16x64 \
-  aom_highbd_12_sub_pixel_variance16x64_c
-
-uint32_t aom_highbd_12_sub_pixel_variance16x8_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance16x8 \
-  aom_highbd_12_sub_pixel_variance16x8_c
-
-uint32_t aom_highbd_12_sub_pixel_variance32x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance32x16 \
-  aom_highbd_12_sub_pixel_variance32x16_c
-
-uint32_t aom_highbd_12_sub_pixel_variance32x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance32x32 \
-  aom_highbd_12_sub_pixel_variance32x32_c
-
-uint32_t aom_highbd_12_sub_pixel_variance32x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance32x64 \
-  aom_highbd_12_sub_pixel_variance32x64_c
-
-uint32_t aom_highbd_12_sub_pixel_variance32x8_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance32x8 \
-  aom_highbd_12_sub_pixel_variance32x8_c
-
-uint32_t aom_highbd_12_sub_pixel_variance4x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance4x16 \
-  aom_highbd_12_sub_pixel_variance4x16_c
-
-uint32_t aom_highbd_12_sub_pixel_variance4x4_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance4x4 \
-  aom_highbd_12_sub_pixel_variance4x4_c
-
-uint32_t aom_highbd_12_sub_pixel_variance4x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance4x8 \
-  aom_highbd_12_sub_pixel_variance4x8_c
-
-uint32_t aom_highbd_12_sub_pixel_variance64x128_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance64x128 \
-  aom_highbd_12_sub_pixel_variance64x128_c
-
-uint32_t aom_highbd_12_sub_pixel_variance64x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance64x16 \
-  aom_highbd_12_sub_pixel_variance64x16_c
-
-uint32_t aom_highbd_12_sub_pixel_variance64x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance64x32 \
-  aom_highbd_12_sub_pixel_variance64x32_c
-
-uint32_t aom_highbd_12_sub_pixel_variance64x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance64x64 \
-  aom_highbd_12_sub_pixel_variance64x64_c
-
-uint32_t aom_highbd_12_sub_pixel_variance8x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance8x16 \
-  aom_highbd_12_sub_pixel_variance8x16_c
-
-uint32_t aom_highbd_12_sub_pixel_variance8x32_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance8x32 \
-  aom_highbd_12_sub_pixel_variance8x32_c
-
-uint32_t aom_highbd_12_sub_pixel_variance8x4_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance8x4 \
-  aom_highbd_12_sub_pixel_variance8x4_c
-
-uint32_t aom_highbd_12_sub_pixel_variance8x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance8x8 \
-  aom_highbd_12_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_12_variance128x128_c(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-#define aom_highbd_12_variance128x128 aom_highbd_12_variance128x128_c
-
-unsigned int aom_highbd_12_variance128x64_c(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-#define aom_highbd_12_variance128x64 aom_highbd_12_variance128x64_c
-
-unsigned int aom_highbd_12_variance16x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_12_variance16x16 aom_highbd_12_variance16x16_c
-
-unsigned int aom_highbd_12_variance16x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_12_variance16x32 aom_highbd_12_variance16x32_c
-
-unsigned int aom_highbd_12_variance16x4_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_12_variance16x4 aom_highbd_12_variance16x4_c
-
-unsigned int aom_highbd_12_variance16x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           uint32_t* sse);
-#define aom_highbd_12_variance16x64 aom_highbd_12_variance16x64_c
-
-unsigned int aom_highbd_12_variance16x8_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_12_variance16x8 aom_highbd_12_variance16x8_c
-
-unsigned int aom_highbd_12_variance2x2_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance2x2 aom_highbd_12_variance2x2_c
-
-unsigned int aom_highbd_12_variance2x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance2x4 aom_highbd_12_variance2x4_c
-
-unsigned int aom_highbd_12_variance32x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_12_variance32x16 aom_highbd_12_variance32x16_c
-
-unsigned int aom_highbd_12_variance32x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_12_variance32x32 aom_highbd_12_variance32x32_c
-
-unsigned int aom_highbd_12_variance32x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_12_variance32x64 aom_highbd_12_variance32x64_c
-
-unsigned int aom_highbd_12_variance32x8_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_12_variance32x8 aom_highbd_12_variance32x8_c
-
-unsigned int aom_highbd_12_variance4x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_12_variance4x16 aom_highbd_12_variance4x16_c
-
-unsigned int aom_highbd_12_variance4x2_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance4x2 aom_highbd_12_variance4x2_c
-
-unsigned int aom_highbd_12_variance4x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance4x4 aom_highbd_12_variance4x4_c
-
-unsigned int aom_highbd_12_variance4x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance4x8 aom_highbd_12_variance4x8_c
-
-unsigned int aom_highbd_12_variance64x128_c(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-#define aom_highbd_12_variance64x128 aom_highbd_12_variance64x128_c
-
-unsigned int aom_highbd_12_variance64x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           uint32_t* sse);
-#define aom_highbd_12_variance64x16 aom_highbd_12_variance64x16_c
-
-unsigned int aom_highbd_12_variance64x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_12_variance64x32 aom_highbd_12_variance64x32_c
-
-unsigned int aom_highbd_12_variance64x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_12_variance64x64 aom_highbd_12_variance64x64_c
-
-unsigned int aom_highbd_12_variance8x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_12_variance8x16 aom_highbd_12_variance8x16_c
-
-unsigned int aom_highbd_12_variance8x32_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_12_variance8x32 aom_highbd_12_variance8x32_c
-
-unsigned int aom_highbd_12_variance8x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance8x4 aom_highbd_12_variance8x4_c
-
-unsigned int aom_highbd_12_variance8x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance8x8 aom_highbd_12_variance8x8_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x128 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x64 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x16 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x16_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x32 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x32_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x4 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x4_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x64 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x64_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x8 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x8_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x16 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x16_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x32 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x32_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x64 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x64_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x8 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x8_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x16 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x4 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x4_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x8 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x128 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x16 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x16_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x32 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x32_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x64 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x64_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x16 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x16_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x32 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x32_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x4 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x4_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x8 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x8_c
-
-void aom_highbd_8_get16x16var_c(const uint8_t* src_ptr,
-                                int source_stride,
-                                const uint8_t* ref_ptr,
-                                int ref_stride,
-                                unsigned int* sse,
-                                int* sum);
-#define aom_highbd_8_get16x16var aom_highbd_8_get16x16var_c
-
-void aom_highbd_8_get8x8var_c(const uint8_t* src_ptr,
-                              int source_stride,
-                              const uint8_t* ref_ptr,
-                              int ref_stride,
-                              unsigned int* sse,
-                              int* sum);
-#define aom_highbd_8_get8x8var aom_highbd_8_get8x8var_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance128x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance128x128 \
-  aom_highbd_8_masked_sub_pixel_variance128x128_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance128x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance128x64 \
-  aom_highbd_8_masked_sub_pixel_variance128x64_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance16x16 \
-  aom_highbd_8_masked_sub_pixel_variance16x16_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance16x32 \
-  aom_highbd_8_masked_sub_pixel_variance16x32_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance16x4 \
-  aom_highbd_8_masked_sub_pixel_variance16x4_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance16x64 \
-  aom_highbd_8_masked_sub_pixel_variance16x64_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance16x8 \
-  aom_highbd_8_masked_sub_pixel_variance16x8_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance32x16 \
-  aom_highbd_8_masked_sub_pixel_variance32x16_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance32x32 \
-  aom_highbd_8_masked_sub_pixel_variance32x32_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance32x64 \
-  aom_highbd_8_masked_sub_pixel_variance32x64_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance32x8 \
-  aom_highbd_8_masked_sub_pixel_variance32x8_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance4x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance4x16 \
-  aom_highbd_8_masked_sub_pixel_variance4x16_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance4x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance4x4 \
-  aom_highbd_8_masked_sub_pixel_variance4x4_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance4x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance4x8 \
-  aom_highbd_8_masked_sub_pixel_variance4x8_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance64x128 \
-  aom_highbd_8_masked_sub_pixel_variance64x128_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance64x16 \
-  aom_highbd_8_masked_sub_pixel_variance64x16_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance64x32 \
-  aom_highbd_8_masked_sub_pixel_variance64x32_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance64x64 \
-  aom_highbd_8_masked_sub_pixel_variance64x64_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance8x16 \
-  aom_highbd_8_masked_sub_pixel_variance8x16_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance8x32 \
-  aom_highbd_8_masked_sub_pixel_variance8x32_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance8x4 \
-  aom_highbd_8_masked_sub_pixel_variance8x4_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance8x8 \
-  aom_highbd_8_masked_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_8_mse16x16_c(const uint8_t* src_ptr,
-                                     int source_stride,
-                                     const uint8_t* ref_ptr,
-                                     int recon_stride,
-                                     unsigned int* sse);
-#define aom_highbd_8_mse16x16 aom_highbd_8_mse16x16_c
-
-unsigned int aom_highbd_8_mse16x8_c(const uint8_t* src_ptr,
-                                    int source_stride,
-                                    const uint8_t* ref_ptr,
-                                    int recon_stride,
-                                    unsigned int* sse);
-#define aom_highbd_8_mse16x8 aom_highbd_8_mse16x8_c
-
-unsigned int aom_highbd_8_mse8x16_c(const uint8_t* src_ptr,
-                                    int source_stride,
-                                    const uint8_t* ref_ptr,
-                                    int recon_stride,
-                                    unsigned int* sse);
-#define aom_highbd_8_mse8x16 aom_highbd_8_mse8x16_c
-
-unsigned int aom_highbd_8_mse8x8_c(const uint8_t* src_ptr,
-                                   int source_stride,
-                                   const uint8_t* ref_ptr,
-                                   int recon_stride,
-                                   unsigned int* sse);
-#define aom_highbd_8_mse8x8 aom_highbd_8_mse8x8_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance128x128 \
-  aom_highbd_8_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance128x64 \
-  aom_highbd_8_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance16x16 \
-  aom_highbd_8_sub_pixel_avg_variance16x16_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x32_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance16x32 \
-  aom_highbd_8_sub_pixel_avg_variance16x32_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x4_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance16x4 \
-  aom_highbd_8_sub_pixel_avg_variance16x4_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x64_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance16x64 \
-  aom_highbd_8_sub_pixel_avg_variance16x64_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance16x8 \
-  aom_highbd_8_sub_pixel_avg_variance16x8_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance32x16 \
-  aom_highbd_8_sub_pixel_avg_variance32x16_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x32_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance32x32 \
-  aom_highbd_8_sub_pixel_avg_variance32x32_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x64_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance32x64 \
-  aom_highbd_8_sub_pixel_avg_variance32x64_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance32x8 \
-  aom_highbd_8_sub_pixel_avg_variance32x8_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance4x16_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance4x16 \
-  aom_highbd_8_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse,
-                                                  const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance4x4 \
-  aom_highbd_8_sub_pixel_avg_variance4x4_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse,
-                                                  const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance4x8 \
-  aom_highbd_8_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance64x128 \
-  aom_highbd_8_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance64x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance64x16 \
-  aom_highbd_8_sub_pixel_avg_variance64x16_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance64x32_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance64x32 \
-  aom_highbd_8_sub_pixel_avg_variance64x32_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance64x64_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance64x64 \
-  aom_highbd_8_sub_pixel_avg_variance64x64_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance8x16 \
-  aom_highbd_8_sub_pixel_avg_variance8x16_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x32_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance8x32 \
-  aom_highbd_8_sub_pixel_avg_variance8x32_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse,
-                                                  const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance8x4 \
-  aom_highbd_8_sub_pixel_avg_variance8x4_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse,
-                                                  const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance8x8 \
-  aom_highbd_8_sub_pixel_avg_variance8x8_c
-
-uint32_t aom_highbd_8_sub_pixel_variance128x128_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance128x128 \
-  aom_highbd_8_sub_pixel_variance128x128_c
-
-uint32_t aom_highbd_8_sub_pixel_variance128x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance128x64 \
-  aom_highbd_8_sub_pixel_variance128x64_c
-
-uint32_t aom_highbd_8_sub_pixel_variance16x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance16x16 \
-  aom_highbd_8_sub_pixel_variance16x16_c
-
-uint32_t aom_highbd_8_sub_pixel_variance16x32_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance16x32 \
-  aom_highbd_8_sub_pixel_variance16x32_c
-
-uint32_t aom_highbd_8_sub_pixel_variance16x4_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance16x4 \
-  aom_highbd_8_sub_pixel_variance16x4_c
-
-uint32_t aom_highbd_8_sub_pixel_variance16x64_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance16x64 \
-  aom_highbd_8_sub_pixel_variance16x64_c
-
-uint32_t aom_highbd_8_sub_pixel_variance16x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance16x8 \
-  aom_highbd_8_sub_pixel_variance16x8_c
-
-uint32_t aom_highbd_8_sub_pixel_variance32x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance32x16 \
-  aom_highbd_8_sub_pixel_variance32x16_c
-
-uint32_t aom_highbd_8_sub_pixel_variance32x32_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance32x32 \
-  aom_highbd_8_sub_pixel_variance32x32_c
-
-uint32_t aom_highbd_8_sub_pixel_variance32x64_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance32x64 \
-  aom_highbd_8_sub_pixel_variance32x64_c
-
-uint32_t aom_highbd_8_sub_pixel_variance32x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance32x8 \
-  aom_highbd_8_sub_pixel_variance32x8_c
-
-uint32_t aom_highbd_8_sub_pixel_variance4x16_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance4x16 \
-  aom_highbd_8_sub_pixel_variance4x16_c
-
-uint32_t aom_highbd_8_sub_pixel_variance4x4_c(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance4x4 aom_highbd_8_sub_pixel_variance4x4_c
-
-uint32_t aom_highbd_8_sub_pixel_variance4x8_c(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance4x8 aom_highbd_8_sub_pixel_variance4x8_c
-
-uint32_t aom_highbd_8_sub_pixel_variance64x128_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance64x128 \
-  aom_highbd_8_sub_pixel_variance64x128_c
-
-uint32_t aom_highbd_8_sub_pixel_variance64x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance64x16 \
-  aom_highbd_8_sub_pixel_variance64x16_c
-
-uint32_t aom_highbd_8_sub_pixel_variance64x32_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance64x32 \
-  aom_highbd_8_sub_pixel_variance64x32_c
-
-uint32_t aom_highbd_8_sub_pixel_variance64x64_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance64x64 \
-  aom_highbd_8_sub_pixel_variance64x64_c
-
-uint32_t aom_highbd_8_sub_pixel_variance8x16_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance8x16 \
-  aom_highbd_8_sub_pixel_variance8x16_c
-
-uint32_t aom_highbd_8_sub_pixel_variance8x32_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance8x32 \
-  aom_highbd_8_sub_pixel_variance8x32_c
-
-uint32_t aom_highbd_8_sub_pixel_variance8x4_c(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance8x4 aom_highbd_8_sub_pixel_variance8x4_c
-
-uint32_t aom_highbd_8_sub_pixel_variance8x8_c(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance8x8 aom_highbd_8_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_8_variance128x128_c(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-#define aom_highbd_8_variance128x128 aom_highbd_8_variance128x128_c
-
-unsigned int aom_highbd_8_variance128x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_8_variance128x64 aom_highbd_8_variance128x64_c
-
-unsigned int aom_highbd_8_variance16x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_8_variance16x16 aom_highbd_8_variance16x16_c
-
-unsigned int aom_highbd_8_variance16x32_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_8_variance16x32 aom_highbd_8_variance16x32_c
-
-unsigned int aom_highbd_8_variance16x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         uint32_t* sse);
-#define aom_highbd_8_variance16x4 aom_highbd_8_variance16x4_c
-
-unsigned int aom_highbd_8_variance16x64_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_8_variance16x64 aom_highbd_8_variance16x64_c
-
-unsigned int aom_highbd_8_variance16x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_8_variance16x8 aom_highbd_8_variance16x8_c
-
-unsigned int aom_highbd_8_variance2x2_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance2x2 aom_highbd_8_variance2x2_c
-
-unsigned int aom_highbd_8_variance2x4_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance2x4 aom_highbd_8_variance2x4_c
-
-unsigned int aom_highbd_8_variance32x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_8_variance32x16 aom_highbd_8_variance32x16_c
-
-unsigned int aom_highbd_8_variance32x32_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_8_variance32x32 aom_highbd_8_variance32x32_c
-
-unsigned int aom_highbd_8_variance32x64_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_8_variance32x64 aom_highbd_8_variance32x64_c
-
-unsigned int aom_highbd_8_variance32x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         uint32_t* sse);
-#define aom_highbd_8_variance32x8 aom_highbd_8_variance32x8_c
-
-unsigned int aom_highbd_8_variance4x16_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         uint32_t* sse);
-#define aom_highbd_8_variance4x16 aom_highbd_8_variance4x16_c
-
-unsigned int aom_highbd_8_variance4x2_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance4x2 aom_highbd_8_variance4x2_c
-
-unsigned int aom_highbd_8_variance4x4_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance4x4 aom_highbd_8_variance4x4_c
-
-unsigned int aom_highbd_8_variance4x8_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance4x8 aom_highbd_8_variance4x8_c
-
-unsigned int aom_highbd_8_variance64x128_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_8_variance64x128 aom_highbd_8_variance64x128_c
-
-unsigned int aom_highbd_8_variance64x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_8_variance64x16 aom_highbd_8_variance64x16_c
-
-unsigned int aom_highbd_8_variance64x32_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_8_variance64x32 aom_highbd_8_variance64x32_c
-
-unsigned int aom_highbd_8_variance64x64_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_8_variance64x64 aom_highbd_8_variance64x64_c
-
-unsigned int aom_highbd_8_variance8x16_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_8_variance8x16 aom_highbd_8_variance8x16_c
-
-unsigned int aom_highbd_8_variance8x32_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         uint32_t* sse);
-#define aom_highbd_8_variance8x32 aom_highbd_8_variance8x32_c
-
-unsigned int aom_highbd_8_variance8x4_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance8x4 aom_highbd_8_variance8x4_c
-
-unsigned int aom_highbd_8_variance8x8_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance8x8 aom_highbd_8_variance8x8_c
-
-unsigned int aom_highbd_avg_4x4_c(const uint8_t*, int p);
-#define aom_highbd_avg_4x4 aom_highbd_avg_4x4_c
-
-unsigned int aom_highbd_avg_8x8_c(const uint8_t*, int p);
-#define aom_highbd_avg_8x8 aom_highbd_avg_8x8_c
-
-void aom_highbd_blend_a64_d16_mask_c(uint8_t* dst,
-                                     uint32_t dst_stride,
-                                     const CONV_BUF_TYPE* src0,
-                                     uint32_t src0_stride,
-                                     const CONV_BUF_TYPE* src1,
-                                     uint32_t src1_stride,
-                                     const uint8_t* mask,
-                                     uint32_t mask_stride,
-                                     int w,
-                                     int h,
-                                     int subw,
-                                     int subh,
-                                     ConvolveParams* conv_params,
-                                     const int bd);
-#define aom_highbd_blend_a64_d16_mask aom_highbd_blend_a64_d16_mask_c
-
-void aom_highbd_blend_a64_hmask_c(uint8_t* dst,
-                                  uint32_t dst_stride,
-                                  const uint8_t* src0,
-                                  uint32_t src0_stride,
-                                  const uint8_t* src1,
-                                  uint32_t src1_stride,
-                                  const uint8_t* mask,
-                                  int w,
-                                  int h,
-                                  int bd);
-#define aom_highbd_blend_a64_hmask aom_highbd_blend_a64_hmask_c
-
-void aom_highbd_blend_a64_mask_c(uint8_t* dst,
-                                 uint32_t dst_stride,
-                                 const uint8_t* src0,
-                                 uint32_t src0_stride,
-                                 const uint8_t* src1,
-                                 uint32_t src1_stride,
-                                 const uint8_t* mask,
-                                 uint32_t mask_stride,
-                                 int w,
-                                 int h,
-                                 int subw,
-                                 int subh,
-                                 int bd);
-#define aom_highbd_blend_a64_mask aom_highbd_blend_a64_mask_c
-
-void aom_highbd_blend_a64_vmask_c(uint8_t* dst,
-                                  uint32_t dst_stride,
-                                  const uint8_t* src0,
-                                  uint32_t src0_stride,
-                                  const uint8_t* src1,
-                                  uint32_t src1_stride,
-                                  const uint8_t* mask,
-                                  int w,
-                                  int h,
-                                  int bd);
-#define aom_highbd_blend_a64_vmask aom_highbd_blend_a64_vmask_c
-
-void aom_highbd_comp_avg_pred_c(uint8_t* comp_pred8,
-                                const uint8_t* pred8,
-                                int width,
-                                int height,
-                                const uint8_t* ref8,
-                                int ref_stride);
-#define aom_highbd_comp_avg_pred aom_highbd_comp_avg_pred_c
-
-void aom_highbd_comp_avg_upsampled_pred_c(MACROBLOCKD* xd,
-                                          const struct AV1Common* const cm,
-                                          int mi_row,
-                                          int mi_col,
-                                          const MV* const mv,
-                                          uint8_t* comp_pred8,
-                                          const uint8_t* pred8,
-                                          int width,
-                                          int height,
-                                          int subpel_x_q3,
-                                          int subpel_y_q3,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          int bd,
-                                          int subpel_search);
-#define aom_highbd_comp_avg_upsampled_pred aom_highbd_comp_avg_upsampled_pred_c
-
-void aom_highbd_comp_mask_pred_c(uint8_t* comp_pred,
-                                 const uint8_t* pred8,
-                                 int width,
-                                 int height,
-                                 const uint8_t* ref8,
-                                 int ref_stride,
-                                 const uint8_t* mask,
-                                 int mask_stride,
-                                 int invert_mask);
-#define aom_highbd_comp_mask_pred aom_highbd_comp_mask_pred_c
-
-void aom_highbd_convolve8_horiz_c(const uint8_t* src,
-                                  ptrdiff_t src_stride,
-                                  uint8_t* dst,
-                                  ptrdiff_t dst_stride,
-                                  const int16_t* filter_x,
-                                  int x_step_q4,
-                                  const int16_t* filter_y,
-                                  int y_step_q4,
-                                  int w,
-                                  int h,
-                                  int bd);
-#define aom_highbd_convolve8_horiz aom_highbd_convolve8_horiz_c
-
-void aom_highbd_convolve8_vert_c(const uint8_t* src,
-                                 ptrdiff_t src_stride,
-                                 uint8_t* dst,
-                                 ptrdiff_t dst_stride,
-                                 const int16_t* filter_x,
-                                 int x_step_q4,
-                                 const int16_t* filter_y,
-                                 int y_step_q4,
-                                 int w,
-                                 int h,
-                                 int bd);
-#define aom_highbd_convolve8_vert aom_highbd_convolve8_vert_c
-
-void aom_highbd_convolve_copy_c(const uint16_t* src,
-                                ptrdiff_t src_stride,
-                                uint16_t* dst,
-                                ptrdiff_t dst_stride,
-                                int w,
-                                int h);
-#define aom_highbd_convolve_copy aom_highbd_convolve_copy_c
-
-void aom_highbd_dc_128_predictor_16x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_16x16 aom_highbd_dc_128_predictor_16x16_c
-
-void aom_highbd_dc_128_predictor_16x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_16x32 aom_highbd_dc_128_predictor_16x32_c
-
-void aom_highbd_dc_128_predictor_16x4_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_16x4 aom_highbd_dc_128_predictor_16x4_c
-
-void aom_highbd_dc_128_predictor_16x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_16x64 aom_highbd_dc_128_predictor_16x64_c
-
-void aom_highbd_dc_128_predictor_16x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_16x8 aom_highbd_dc_128_predictor_16x8_c
-
-void aom_highbd_dc_128_predictor_2x2_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_128_predictor_2x2 aom_highbd_dc_128_predictor_2x2_c
-
-void aom_highbd_dc_128_predictor_32x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_32x16 aom_highbd_dc_128_predictor_32x16_c
-
-void aom_highbd_dc_128_predictor_32x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_32x32 aom_highbd_dc_128_predictor_32x32_c
-
-void aom_highbd_dc_128_predictor_32x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_32x64 aom_highbd_dc_128_predictor_32x64_c
-
-void aom_highbd_dc_128_predictor_32x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_32x8 aom_highbd_dc_128_predictor_32x8_c
-
-void aom_highbd_dc_128_predictor_4x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_4x16 aom_highbd_dc_128_predictor_4x16_c
-
-void aom_highbd_dc_128_predictor_4x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_128_predictor_4x4 aom_highbd_dc_128_predictor_4x4_c
-
-void aom_highbd_dc_128_predictor_4x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_128_predictor_4x8 aom_highbd_dc_128_predictor_4x8_c
-
-void aom_highbd_dc_128_predictor_64x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_64x16 aom_highbd_dc_128_predictor_64x16_c
-
-void aom_highbd_dc_128_predictor_64x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_64x32 aom_highbd_dc_128_predictor_64x32_c
-
-void aom_highbd_dc_128_predictor_64x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_64x64 aom_highbd_dc_128_predictor_64x64_c
-
-void aom_highbd_dc_128_predictor_8x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_8x16 aom_highbd_dc_128_predictor_8x16_c
-
-void aom_highbd_dc_128_predictor_8x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_8x32 aom_highbd_dc_128_predictor_8x32_c
-
-void aom_highbd_dc_128_predictor_8x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_128_predictor_8x4 aom_highbd_dc_128_predictor_8x4_c
-
-void aom_highbd_dc_128_predictor_8x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_128_predictor_8x8 aom_highbd_dc_128_predictor_8x8_c
-
-void aom_highbd_dc_left_predictor_16x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_16x16 aom_highbd_dc_left_predictor_16x16_c
-
-void aom_highbd_dc_left_predictor_16x32_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_16x32 aom_highbd_dc_left_predictor_16x32_c
-
-void aom_highbd_dc_left_predictor_16x4_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_16x4 aom_highbd_dc_left_predictor_16x4_c
-
-void aom_highbd_dc_left_predictor_16x64_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_16x64 aom_highbd_dc_left_predictor_16x64_c
-
-void aom_highbd_dc_left_predictor_16x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_16x8 aom_highbd_dc_left_predictor_16x8_c
-
-void aom_highbd_dc_left_predictor_2x2_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_left_predictor_2x2 aom_highbd_dc_left_predictor_2x2_c
-
-void aom_highbd_dc_left_predictor_32x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_32x16 aom_highbd_dc_left_predictor_32x16_c
-
-void aom_highbd_dc_left_predictor_32x32_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_32x32 aom_highbd_dc_left_predictor_32x32_c
-
-void aom_highbd_dc_left_predictor_32x64_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_32x64 aom_highbd_dc_left_predictor_32x64_c
-
-void aom_highbd_dc_left_predictor_32x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_32x8 aom_highbd_dc_left_predictor_32x8_c
-
-void aom_highbd_dc_left_predictor_4x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_4x16 aom_highbd_dc_left_predictor_4x16_c
-
-void aom_highbd_dc_left_predictor_4x4_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_left_predictor_4x4 aom_highbd_dc_left_predictor_4x4_c
-
-void aom_highbd_dc_left_predictor_4x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_left_predictor_4x8 aom_highbd_dc_left_predictor_4x8_c
-
-void aom_highbd_dc_left_predictor_64x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_64x16 aom_highbd_dc_left_predictor_64x16_c
-
-void aom_highbd_dc_left_predictor_64x32_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_64x32 aom_highbd_dc_left_predictor_64x32_c
-
-void aom_highbd_dc_left_predictor_64x64_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_64x64 aom_highbd_dc_left_predictor_64x64_c
-
-void aom_highbd_dc_left_predictor_8x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_8x16 aom_highbd_dc_left_predictor_8x16_c
-
-void aom_highbd_dc_left_predictor_8x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_8x32 aom_highbd_dc_left_predictor_8x32_c
-
-void aom_highbd_dc_left_predictor_8x4_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_left_predictor_8x4 aom_highbd_dc_left_predictor_8x4_c
-
-void aom_highbd_dc_left_predictor_8x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_left_predictor_8x8 aom_highbd_dc_left_predictor_8x8_c
-
-void aom_highbd_dc_predictor_16x16_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-void aom_highbd_dc_predictor_16x16_neon(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_predictor_16x16 aom_highbd_dc_predictor_16x16_neon
-
-void aom_highbd_dc_predictor_16x32_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_16x32 aom_highbd_dc_predictor_16x32_c
-
-void aom_highbd_dc_predictor_16x4_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_16x4 aom_highbd_dc_predictor_16x4_c
-
-void aom_highbd_dc_predictor_16x64_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_16x64 aom_highbd_dc_predictor_16x64_c
-
-void aom_highbd_dc_predictor_16x8_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_16x8 aom_highbd_dc_predictor_16x8_c
-
-void aom_highbd_dc_predictor_2x2_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_dc_predictor_2x2 aom_highbd_dc_predictor_2x2_c
-
-void aom_highbd_dc_predictor_32x16_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_32x16 aom_highbd_dc_predictor_32x16_c
-
-void aom_highbd_dc_predictor_32x32_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-void aom_highbd_dc_predictor_32x32_neon(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_predictor_32x32 aom_highbd_dc_predictor_32x32_neon
-
-void aom_highbd_dc_predictor_32x64_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_32x64 aom_highbd_dc_predictor_32x64_c
-
-void aom_highbd_dc_predictor_32x8_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_32x8 aom_highbd_dc_predictor_32x8_c
-
-void aom_highbd_dc_predictor_4x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_4x16 aom_highbd_dc_predictor_4x16_c
-
-void aom_highbd_dc_predictor_4x4_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-void aom_highbd_dc_predictor_4x4_neon(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_dc_predictor_4x4 aom_highbd_dc_predictor_4x4_neon
-
-void aom_highbd_dc_predictor_4x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_dc_predictor_4x8 aom_highbd_dc_predictor_4x8_c
-
-void aom_highbd_dc_predictor_64x16_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_64x16 aom_highbd_dc_predictor_64x16_c
-
-void aom_highbd_dc_predictor_64x32_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_64x32 aom_highbd_dc_predictor_64x32_c
-
-void aom_highbd_dc_predictor_64x64_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-void aom_highbd_dc_predictor_64x64_neon(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_predictor_64x64 aom_highbd_dc_predictor_64x64_neon
-
-void aom_highbd_dc_predictor_8x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_8x16 aom_highbd_dc_predictor_8x16_c
-
-void aom_highbd_dc_predictor_8x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_8x32 aom_highbd_dc_predictor_8x32_c
-
-void aom_highbd_dc_predictor_8x4_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_dc_predictor_8x4 aom_highbd_dc_predictor_8x4_c
-
-void aom_highbd_dc_predictor_8x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-void aom_highbd_dc_predictor_8x8_neon(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_dc_predictor_8x8 aom_highbd_dc_predictor_8x8_neon
-
-void aom_highbd_dc_top_predictor_16x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_16x16 aom_highbd_dc_top_predictor_16x16_c
-
-void aom_highbd_dc_top_predictor_16x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_16x32 aom_highbd_dc_top_predictor_16x32_c
-
-void aom_highbd_dc_top_predictor_16x4_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_16x4 aom_highbd_dc_top_predictor_16x4_c
-
-void aom_highbd_dc_top_predictor_16x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_16x64 aom_highbd_dc_top_predictor_16x64_c
-
-void aom_highbd_dc_top_predictor_16x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_16x8 aom_highbd_dc_top_predictor_16x8_c
-
-void aom_highbd_dc_top_predictor_2x2_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_top_predictor_2x2 aom_highbd_dc_top_predictor_2x2_c
-
-void aom_highbd_dc_top_predictor_32x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_32x16 aom_highbd_dc_top_predictor_32x16_c
-
-void aom_highbd_dc_top_predictor_32x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_32x32 aom_highbd_dc_top_predictor_32x32_c
-
-void aom_highbd_dc_top_predictor_32x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_32x64 aom_highbd_dc_top_predictor_32x64_c
-
-void aom_highbd_dc_top_predictor_32x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_32x8 aom_highbd_dc_top_predictor_32x8_c
-
-void aom_highbd_dc_top_predictor_4x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_4x16 aom_highbd_dc_top_predictor_4x16_c
-
-void aom_highbd_dc_top_predictor_4x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_top_predictor_4x4 aom_highbd_dc_top_predictor_4x4_c
-
-void aom_highbd_dc_top_predictor_4x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_top_predictor_4x8 aom_highbd_dc_top_predictor_4x8_c
-
-void aom_highbd_dc_top_predictor_64x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_64x16 aom_highbd_dc_top_predictor_64x16_c
-
-void aom_highbd_dc_top_predictor_64x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_64x32 aom_highbd_dc_top_predictor_64x32_c
-
-void aom_highbd_dc_top_predictor_64x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_64x64 aom_highbd_dc_top_predictor_64x64_c
-
-void aom_highbd_dc_top_predictor_8x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_8x16 aom_highbd_dc_top_predictor_8x16_c
-
-void aom_highbd_dc_top_predictor_8x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_8x32 aom_highbd_dc_top_predictor_8x32_c
-
-void aom_highbd_dc_top_predictor_8x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_top_predictor_8x4 aom_highbd_dc_top_predictor_8x4_c
-
-void aom_highbd_dc_top_predictor_8x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_top_predictor_8x8 aom_highbd_dc_top_predictor_8x8_c
-
-void aom_highbd_dist_wtd_comp_avg_pred_c(uint8_t* comp_pred8,
-                                         const uint8_t* pred8,
-                                         int width,
-                                         int height,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_comp_avg_pred aom_highbd_dist_wtd_comp_avg_pred_c
-
-void aom_highbd_dist_wtd_comp_avg_upsampled_pred_c(
-    MACROBLOCKD* xd,
-    const struct AV1Common* const cm,
-    int mi_row,
-    int mi_col,
-    const MV* const mv,
-    uint8_t* comp_pred8,
-    const uint8_t* pred8,
-    int width,
-    int height,
-    int subpel_x_q3,
-    int subpel_y_q3,
-    const uint8_t* ref8,
-    int ref_stride,
-    int bd,
-    const DIST_WTD_COMP_PARAMS* jcp_param,
-    int subpel_search);
-#define aom_highbd_dist_wtd_comp_avg_upsampled_pred \
-  aom_highbd_dist_wtd_comp_avg_upsampled_pred_c
-
-unsigned int aom_highbd_dist_wtd_sad128x128_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad128x128_avg aom_highbd_dist_wtd_sad128x128_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad128x64_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad128x64_avg aom_highbd_dist_wtd_sad128x64_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad16x16_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad16x16_avg aom_highbd_dist_wtd_sad16x16_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad16x32_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad16x32_avg aom_highbd_dist_wtd_sad16x32_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad16x4_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad16x4_avg aom_highbd_dist_wtd_sad16x4_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad16x64_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad16x64_avg aom_highbd_dist_wtd_sad16x64_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad16x8_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad16x8_avg aom_highbd_dist_wtd_sad16x8_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad32x16_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad32x16_avg aom_highbd_dist_wtd_sad32x16_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad32x32_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad32x32_avg aom_highbd_dist_wtd_sad32x32_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad32x64_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad32x64_avg aom_highbd_dist_wtd_sad32x64_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad32x8_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad32x8_avg aom_highbd_dist_wtd_sad32x8_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad4x16_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad4x16_avg aom_highbd_dist_wtd_sad4x16_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad4x4_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad4x4_avg aom_highbd_dist_wtd_sad4x4_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad4x8_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad4x8_avg aom_highbd_dist_wtd_sad4x8_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad64x128_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad64x128_avg aom_highbd_dist_wtd_sad64x128_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad64x16_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad64x16_avg aom_highbd_dist_wtd_sad64x16_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad64x32_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad64x32_avg aom_highbd_dist_wtd_sad64x32_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad64x64_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad64x64_avg aom_highbd_dist_wtd_sad64x64_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad8x16_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad8x16_avg aom_highbd_dist_wtd_sad8x16_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad8x32_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad8x32_avg aom_highbd_dist_wtd_sad8x32_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad8x4_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad8x4_avg aom_highbd_dist_wtd_sad8x4_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad8x8_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad8x8_avg aom_highbd_dist_wtd_sad8x8_avg_c
-
-void aom_highbd_fdct8x8_c(const int16_t* input, tran_low_t* output, int stride);
-#define aom_highbd_fdct8x8 aom_highbd_fdct8x8_c
-
-void aom_highbd_h_predictor_16x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_16x16 aom_highbd_h_predictor_16x16_c
-
-void aom_highbd_h_predictor_16x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_16x32 aom_highbd_h_predictor_16x32_c
-
-void aom_highbd_h_predictor_16x4_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_16x4 aom_highbd_h_predictor_16x4_c
-
-void aom_highbd_h_predictor_16x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_16x64 aom_highbd_h_predictor_16x64_c
-
-void aom_highbd_h_predictor_16x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_16x8 aom_highbd_h_predictor_16x8_c
-
-void aom_highbd_h_predictor_2x2_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_h_predictor_2x2 aom_highbd_h_predictor_2x2_c
-
-void aom_highbd_h_predictor_32x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_32x16 aom_highbd_h_predictor_32x16_c
-
-void aom_highbd_h_predictor_32x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_32x32 aom_highbd_h_predictor_32x32_c
-
-void aom_highbd_h_predictor_32x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_32x64 aom_highbd_h_predictor_32x64_c
-
-void aom_highbd_h_predictor_32x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_32x8 aom_highbd_h_predictor_32x8_c
-
-void aom_highbd_h_predictor_4x16_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_4x16 aom_highbd_h_predictor_4x16_c
-
-void aom_highbd_h_predictor_4x4_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_h_predictor_4x4 aom_highbd_h_predictor_4x4_c
-
-void aom_highbd_h_predictor_4x8_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_h_predictor_4x8 aom_highbd_h_predictor_4x8_c
-
-void aom_highbd_h_predictor_64x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_64x16 aom_highbd_h_predictor_64x16_c
-
-void aom_highbd_h_predictor_64x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_64x32 aom_highbd_h_predictor_64x32_c
-
-void aom_highbd_h_predictor_64x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_64x64 aom_highbd_h_predictor_64x64_c
-
-void aom_highbd_h_predictor_8x16_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_8x16 aom_highbd_h_predictor_8x16_c
-
-void aom_highbd_h_predictor_8x32_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_8x32 aom_highbd_h_predictor_8x32_c
-
-void aom_highbd_h_predictor_8x4_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_h_predictor_8x4 aom_highbd_h_predictor_8x4_c
-
-void aom_highbd_h_predictor_8x8_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_h_predictor_8x8 aom_highbd_h_predictor_8x8_c
-
-void aom_highbd_hadamard_16x16_c(const int16_t* src_diff,
-                                 ptrdiff_t src_stride,
-                                 tran_low_t* coeff);
-#define aom_highbd_hadamard_16x16 aom_highbd_hadamard_16x16_c
-
-void aom_highbd_hadamard_32x32_c(const int16_t* src_diff,
-                                 ptrdiff_t src_stride,
-                                 tran_low_t* coeff);
-#define aom_highbd_hadamard_32x32 aom_highbd_hadamard_32x32_c
-
-void aom_highbd_hadamard_8x8_c(const int16_t* src_diff,
-                               ptrdiff_t src_stride,
-                               tran_low_t* coeff);
-#define aom_highbd_hadamard_8x8 aom_highbd_hadamard_8x8_c
-
-void aom_highbd_lpf_horizontal_14_c(uint16_t* s,
-                                    int pitch,
-                                    const uint8_t* blimit,
-                                    const uint8_t* limit,
-                                    const uint8_t* thresh,
-                                    int bd);
-#define aom_highbd_lpf_horizontal_14 aom_highbd_lpf_horizontal_14_c
-
-void aom_highbd_lpf_horizontal_14_dual_c(uint16_t* s,
-                                         int pitch,
-                                         const uint8_t* blimit0,
-                                         const uint8_t* limit0,
-                                         const uint8_t* thresh0,
-                                         const uint8_t* blimit1,
-                                         const uint8_t* limit1,
-                                         const uint8_t* thresh1,
-                                         int bd);
-#define aom_highbd_lpf_horizontal_14_dual aom_highbd_lpf_horizontal_14_dual_c
-
-void aom_highbd_lpf_horizontal_4_c(uint16_t* s,
-                                   int pitch,
-                                   const uint8_t* blimit,
-                                   const uint8_t* limit,
-                                   const uint8_t* thresh,
-                                   int bd);
-#define aom_highbd_lpf_horizontal_4 aom_highbd_lpf_horizontal_4_c
-
-void aom_highbd_lpf_horizontal_4_dual_c(uint16_t* s,
-                                        int pitch,
-                                        const uint8_t* blimit0,
-                                        const uint8_t* limit0,
-                                        const uint8_t* thresh0,
-                                        const uint8_t* blimit1,
-                                        const uint8_t* limit1,
-                                        const uint8_t* thresh1,
-                                        int bd);
-#define aom_highbd_lpf_horizontal_4_dual aom_highbd_lpf_horizontal_4_dual_c
-
-void aom_highbd_lpf_horizontal_6_c(uint16_t* s,
-                                   int pitch,
-                                   const uint8_t* blimit,
-                                   const uint8_t* limit,
-                                   const uint8_t* thresh,
-                                   int bd);
-#define aom_highbd_lpf_horizontal_6 aom_highbd_lpf_horizontal_6_c
-
-void aom_highbd_lpf_horizontal_6_dual_c(uint16_t* s,
-                                        int pitch,
-                                        const uint8_t* blimit0,
-                                        const uint8_t* limit0,
-                                        const uint8_t* thresh0,
-                                        const uint8_t* blimit1,
-                                        const uint8_t* limit1,
-                                        const uint8_t* thresh1,
-                                        int bd);
-#define aom_highbd_lpf_horizontal_6_dual aom_highbd_lpf_horizontal_6_dual_c
-
-void aom_highbd_lpf_horizontal_8_c(uint16_t* s,
-                                   int pitch,
-                                   const uint8_t* blimit,
-                                   const uint8_t* limit,
-                                   const uint8_t* thresh,
-                                   int bd);
-#define aom_highbd_lpf_horizontal_8 aom_highbd_lpf_horizontal_8_c
-
-void aom_highbd_lpf_horizontal_8_dual_c(uint16_t* s,
-                                        int pitch,
-                                        const uint8_t* blimit0,
-                                        const uint8_t* limit0,
-                                        const uint8_t* thresh0,
-                                        const uint8_t* blimit1,
-                                        const uint8_t* limit1,
-                                        const uint8_t* thresh1,
-                                        int bd);
-#define aom_highbd_lpf_horizontal_8_dual aom_highbd_lpf_horizontal_8_dual_c
-
-void aom_highbd_lpf_vertical_14_c(uint16_t* s,
-                                  int pitch,
-                                  const uint8_t* blimit,
-                                  const uint8_t* limit,
-                                  const uint8_t* thresh,
-                                  int bd);
-#define aom_highbd_lpf_vertical_14 aom_highbd_lpf_vertical_14_c
-
-void aom_highbd_lpf_vertical_14_dual_c(uint16_t* s,
-                                       int pitch,
-                                       const uint8_t* blimit0,
-                                       const uint8_t* limit0,
-                                       const uint8_t* thresh0,
-                                       const uint8_t* blimit1,
-                                       const uint8_t* limit1,
-                                       const uint8_t* thresh1,
-                                       int bd);
-#define aom_highbd_lpf_vertical_14_dual aom_highbd_lpf_vertical_14_dual_c
-
-void aom_highbd_lpf_vertical_4_c(uint16_t* s,
-                                 int pitch,
-                                 const uint8_t* blimit,
-                                 const uint8_t* limit,
-                                 const uint8_t* thresh,
-                                 int bd);
-#define aom_highbd_lpf_vertical_4 aom_highbd_lpf_vertical_4_c
-
-void aom_highbd_lpf_vertical_4_dual_c(uint16_t* s,
-                                      int pitch,
-                                      const uint8_t* blimit0,
-                                      const uint8_t* limit0,
-                                      const uint8_t* thresh0,
-                                      const uint8_t* blimit1,
-                                      const uint8_t* limit1,
-                                      const uint8_t* thresh1,
-                                      int bd);
-#define aom_highbd_lpf_vertical_4_dual aom_highbd_lpf_vertical_4_dual_c
-
-void aom_highbd_lpf_vertical_6_c(uint16_t* s,
-                                 int pitch,
-                                 const uint8_t* blimit,
-                                 const uint8_t* limit,
-                                 const uint8_t* thresh,
-                                 int bd);
-#define aom_highbd_lpf_vertical_6 aom_highbd_lpf_vertical_6_c
-
-void aom_highbd_lpf_vertical_6_dual_c(uint16_t* s,
-                                      int pitch,
-                                      const uint8_t* blimit0,
-                                      const uint8_t* limit0,
-                                      const uint8_t* thresh0,
-                                      const uint8_t* blimit1,
-                                      const uint8_t* limit1,
-                                      const uint8_t* thresh1,
-                                      int bd);
-#define aom_highbd_lpf_vertical_6_dual aom_highbd_lpf_vertical_6_dual_c
-
-void aom_highbd_lpf_vertical_8_c(uint16_t* s,
-                                 int pitch,
-                                 const uint8_t* blimit,
-                                 const uint8_t* limit,
-                                 const uint8_t* thresh,
-                                 int bd);
-#define aom_highbd_lpf_vertical_8 aom_highbd_lpf_vertical_8_c
-
-void aom_highbd_lpf_vertical_8_dual_c(uint16_t* s,
-                                      int pitch,
-                                      const uint8_t* blimit0,
-                                      const uint8_t* limit0,
-                                      const uint8_t* thresh0,
-                                      const uint8_t* blimit1,
-                                      const uint8_t* limit1,
-                                      const uint8_t* thresh1,
-                                      int bd);
-#define aom_highbd_lpf_vertical_8_dual aom_highbd_lpf_vertical_8_dual_c
-
-unsigned int aom_highbd_masked_sad128x128_c(const uint8_t* src8,
-                                            int src_stride,
-                                            const uint8_t* ref8,
-                                            int ref_stride,
-                                            const uint8_t* second_pred8,
-                                            const uint8_t* msk,
-                                            int msk_stride,
-                                            int invert_mask);
-#define aom_highbd_masked_sad128x128 aom_highbd_masked_sad128x128_c
-
-unsigned int aom_highbd_masked_sad128x64_c(const uint8_t* src8,
-                                           int src_stride,
-                                           const uint8_t* ref8,
-                                           int ref_stride,
-                                           const uint8_t* second_pred8,
-                                           const uint8_t* msk,
-                                           int msk_stride,
-                                           int invert_mask);
-#define aom_highbd_masked_sad128x64 aom_highbd_masked_sad128x64_c
-
-unsigned int aom_highbd_masked_sad16x16_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad16x16 aom_highbd_masked_sad16x16_c
-
-unsigned int aom_highbd_masked_sad16x32_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad16x32 aom_highbd_masked_sad16x32_c
-
-unsigned int aom_highbd_masked_sad16x4_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-#define aom_highbd_masked_sad16x4 aom_highbd_masked_sad16x4_c
-
-unsigned int aom_highbd_masked_sad16x64_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad16x64 aom_highbd_masked_sad16x64_c
-
-unsigned int aom_highbd_masked_sad16x8_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-#define aom_highbd_masked_sad16x8 aom_highbd_masked_sad16x8_c
-
-unsigned int aom_highbd_masked_sad32x16_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad32x16 aom_highbd_masked_sad32x16_c
-
-unsigned int aom_highbd_masked_sad32x32_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad32x32 aom_highbd_masked_sad32x32_c
-
-unsigned int aom_highbd_masked_sad32x64_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad32x64 aom_highbd_masked_sad32x64_c
-
-unsigned int aom_highbd_masked_sad32x8_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-#define aom_highbd_masked_sad32x8 aom_highbd_masked_sad32x8_c
-
-unsigned int aom_highbd_masked_sad4x16_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-#define aom_highbd_masked_sad4x16 aom_highbd_masked_sad4x16_c
-
-unsigned int aom_highbd_masked_sad4x4_c(const uint8_t* src8,
-                                        int src_stride,
-                                        const uint8_t* ref8,
-                                        int ref_stride,
-                                        const uint8_t* second_pred8,
-                                        const uint8_t* msk,
-                                        int msk_stride,
-                                        int invert_mask);
-#define aom_highbd_masked_sad4x4 aom_highbd_masked_sad4x4_c
-
-unsigned int aom_highbd_masked_sad4x8_c(const uint8_t* src8,
-                                        int src_stride,
-                                        const uint8_t* ref8,
-                                        int ref_stride,
-                                        const uint8_t* second_pred8,
-                                        const uint8_t* msk,
-                                        int msk_stride,
-                                        int invert_mask);
-#define aom_highbd_masked_sad4x8 aom_highbd_masked_sad4x8_c
-
-unsigned int aom_highbd_masked_sad64x128_c(const uint8_t* src8,
-                                           int src_stride,
-                                           const uint8_t* ref8,
-                                           int ref_stride,
-                                           const uint8_t* second_pred8,
-                                           const uint8_t* msk,
-                                           int msk_stride,
-                                           int invert_mask);
-#define aom_highbd_masked_sad64x128 aom_highbd_masked_sad64x128_c
-
-unsigned int aom_highbd_masked_sad64x16_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad64x16 aom_highbd_masked_sad64x16_c
-
-unsigned int aom_highbd_masked_sad64x32_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad64x32 aom_highbd_masked_sad64x32_c
-
-unsigned int aom_highbd_masked_sad64x64_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad64x64 aom_highbd_masked_sad64x64_c
-
-unsigned int aom_highbd_masked_sad8x16_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-#define aom_highbd_masked_sad8x16 aom_highbd_masked_sad8x16_c
-
-unsigned int aom_highbd_masked_sad8x32_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-#define aom_highbd_masked_sad8x32 aom_highbd_masked_sad8x32_c
-
-unsigned int aom_highbd_masked_sad8x4_c(const uint8_t* src8,
-                                        int src_stride,
-                                        const uint8_t* ref8,
-                                        int ref_stride,
-                                        const uint8_t* second_pred8,
-                                        const uint8_t* msk,
-                                        int msk_stride,
-                                        int invert_mask);
-#define aom_highbd_masked_sad8x4 aom_highbd_masked_sad8x4_c
-
-unsigned int aom_highbd_masked_sad8x8_c(const uint8_t* src8,
-                                        int src_stride,
-                                        const uint8_t* ref8,
-                                        int ref_stride,
-                                        const uint8_t* second_pred8,
-                                        const uint8_t* msk,
-                                        int msk_stride,
-                                        int invert_mask);
-#define aom_highbd_masked_sad8x8 aom_highbd_masked_sad8x8_c
-
-void aom_highbd_minmax_8x8_c(const uint8_t* s,
-                             int p,
-                             const uint8_t* d,
-                             int dp,
-                             int* min,
-                             int* max);
-#define aom_highbd_minmax_8x8 aom_highbd_minmax_8x8_c
-
-unsigned int aom_highbd_obmc_sad128x128_c(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask);
-#define aom_highbd_obmc_sad128x128 aom_highbd_obmc_sad128x128_c
-
-unsigned int aom_highbd_obmc_sad128x64_c(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask);
-#define aom_highbd_obmc_sad128x64 aom_highbd_obmc_sad128x64_c
-
-unsigned int aom_highbd_obmc_sad16x16_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad16x16 aom_highbd_obmc_sad16x16_c
-
-unsigned int aom_highbd_obmc_sad16x32_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad16x32 aom_highbd_obmc_sad16x32_c
-
-unsigned int aom_highbd_obmc_sad16x4_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-#define aom_highbd_obmc_sad16x4 aom_highbd_obmc_sad16x4_c
-
-unsigned int aom_highbd_obmc_sad16x64_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad16x64 aom_highbd_obmc_sad16x64_c
-
-unsigned int aom_highbd_obmc_sad16x8_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-#define aom_highbd_obmc_sad16x8 aom_highbd_obmc_sad16x8_c
-
-unsigned int aom_highbd_obmc_sad32x16_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad32x16 aom_highbd_obmc_sad32x16_c
-
-unsigned int aom_highbd_obmc_sad32x32_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad32x32 aom_highbd_obmc_sad32x32_c
-
-unsigned int aom_highbd_obmc_sad32x64_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad32x64 aom_highbd_obmc_sad32x64_c
-
-unsigned int aom_highbd_obmc_sad32x8_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-#define aom_highbd_obmc_sad32x8 aom_highbd_obmc_sad32x8_c
-
-unsigned int aom_highbd_obmc_sad4x16_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-#define aom_highbd_obmc_sad4x16 aom_highbd_obmc_sad4x16_c
-
-unsigned int aom_highbd_obmc_sad4x4_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-#define aom_highbd_obmc_sad4x4 aom_highbd_obmc_sad4x4_c
-
-unsigned int aom_highbd_obmc_sad4x8_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-#define aom_highbd_obmc_sad4x8 aom_highbd_obmc_sad4x8_c
-
-unsigned int aom_highbd_obmc_sad64x128_c(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask);
-#define aom_highbd_obmc_sad64x128 aom_highbd_obmc_sad64x128_c
-
-unsigned int aom_highbd_obmc_sad64x16_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad64x16 aom_highbd_obmc_sad64x16_c
-
-unsigned int aom_highbd_obmc_sad64x32_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad64x32 aom_highbd_obmc_sad64x32_c
-
-unsigned int aom_highbd_obmc_sad64x64_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad64x64 aom_highbd_obmc_sad64x64_c
-
-unsigned int aom_highbd_obmc_sad8x16_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-#define aom_highbd_obmc_sad8x16 aom_highbd_obmc_sad8x16_c
-
-unsigned int aom_highbd_obmc_sad8x32_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-#define aom_highbd_obmc_sad8x32 aom_highbd_obmc_sad8x32_c
-
-unsigned int aom_highbd_obmc_sad8x4_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-#define aom_highbd_obmc_sad8x4 aom_highbd_obmc_sad8x4_c
-
-unsigned int aom_highbd_obmc_sad8x8_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-#define aom_highbd_obmc_sad8x8 aom_highbd_obmc_sad8x8_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance128x128_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance128x128 \
-  aom_highbd_obmc_sub_pixel_variance128x128_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance128x64_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance128x64 \
-  aom_highbd_obmc_sub_pixel_variance128x64_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance16x16_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance16x16 \
-  aom_highbd_obmc_sub_pixel_variance16x16_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance16x32_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance16x32 \
-  aom_highbd_obmc_sub_pixel_variance16x32_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance16x4_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance16x4 \
-  aom_highbd_obmc_sub_pixel_variance16x4_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance16x64_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance16x64 \
-  aom_highbd_obmc_sub_pixel_variance16x64_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance16x8_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance16x8 \
-  aom_highbd_obmc_sub_pixel_variance16x8_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance32x16_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance32x16 \
-  aom_highbd_obmc_sub_pixel_variance32x16_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance32x32_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance32x32 \
-  aom_highbd_obmc_sub_pixel_variance32x32_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance32x64_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance32x64 \
-  aom_highbd_obmc_sub_pixel_variance32x64_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance32x8_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance32x8 \
-  aom_highbd_obmc_sub_pixel_variance32x8_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance4x16_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance4x16 \
-  aom_highbd_obmc_sub_pixel_variance4x16_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance4x4_c(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance4x4 \
-  aom_highbd_obmc_sub_pixel_variance4x4_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance4x8_c(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance4x8 \
-  aom_highbd_obmc_sub_pixel_variance4x8_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance64x128_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance64x128 \
-  aom_highbd_obmc_sub_pixel_variance64x128_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance64x16_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance64x16 \
-  aom_highbd_obmc_sub_pixel_variance64x16_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance64x32_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance64x32 \
-  aom_highbd_obmc_sub_pixel_variance64x32_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance64x64_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance64x64 \
-  aom_highbd_obmc_sub_pixel_variance64x64_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance8x16_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance8x16 \
-  aom_highbd_obmc_sub_pixel_variance8x16_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance8x32_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance8x32 \
-  aom_highbd_obmc_sub_pixel_variance8x32_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance8x4_c(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance8x4 \
-  aom_highbd_obmc_sub_pixel_variance8x4_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance8x8_c(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance8x8 \
-  aom_highbd_obmc_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_obmc_variance128x128_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_obmc_variance128x128 aom_highbd_obmc_variance128x128_c
-
-unsigned int aom_highbd_obmc_variance128x64_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_obmc_variance128x64 aom_highbd_obmc_variance128x64_c
-
-unsigned int aom_highbd_obmc_variance16x16_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance16x16 aom_highbd_obmc_variance16x16_c
-
-unsigned int aom_highbd_obmc_variance16x32_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance16x32 aom_highbd_obmc_variance16x32_c
-
-unsigned int aom_highbd_obmc_variance16x4_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-#define aom_highbd_obmc_variance16x4 aom_highbd_obmc_variance16x4_c
-
-unsigned int aom_highbd_obmc_variance16x64_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance16x64 aom_highbd_obmc_variance16x64_c
-
-unsigned int aom_highbd_obmc_variance16x8_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-#define aom_highbd_obmc_variance16x8 aom_highbd_obmc_variance16x8_c
-
-unsigned int aom_highbd_obmc_variance32x16_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance32x16 aom_highbd_obmc_variance32x16_c
-
-unsigned int aom_highbd_obmc_variance32x32_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance32x32 aom_highbd_obmc_variance32x32_c
-
-unsigned int aom_highbd_obmc_variance32x64_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance32x64 aom_highbd_obmc_variance32x64_c
-
-unsigned int aom_highbd_obmc_variance32x8_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-#define aom_highbd_obmc_variance32x8 aom_highbd_obmc_variance32x8_c
-
-unsigned int aom_highbd_obmc_variance4x16_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-#define aom_highbd_obmc_variance4x16 aom_highbd_obmc_variance4x16_c
-
-unsigned int aom_highbd_obmc_variance4x4_c(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-#define aom_highbd_obmc_variance4x4 aom_highbd_obmc_variance4x4_c
-
-unsigned int aom_highbd_obmc_variance4x8_c(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-#define aom_highbd_obmc_variance4x8 aom_highbd_obmc_variance4x8_c
-
-unsigned int aom_highbd_obmc_variance64x128_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_obmc_variance64x128 aom_highbd_obmc_variance64x128_c
-
-unsigned int aom_highbd_obmc_variance64x16_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance64x16 aom_highbd_obmc_variance64x16_c
-
-unsigned int aom_highbd_obmc_variance64x32_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance64x32 aom_highbd_obmc_variance64x32_c
-
-unsigned int aom_highbd_obmc_variance64x64_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance64x64 aom_highbd_obmc_variance64x64_c
-
-unsigned int aom_highbd_obmc_variance8x16_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-#define aom_highbd_obmc_variance8x16 aom_highbd_obmc_variance8x16_c
-
-unsigned int aom_highbd_obmc_variance8x32_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-#define aom_highbd_obmc_variance8x32 aom_highbd_obmc_variance8x32_c
-
-unsigned int aom_highbd_obmc_variance8x4_c(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-#define aom_highbd_obmc_variance8x4 aom_highbd_obmc_variance8x4_c
-
-unsigned int aom_highbd_obmc_variance8x8_c(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-#define aom_highbd_obmc_variance8x8 aom_highbd_obmc_variance8x8_c
-
-void aom_highbd_paeth_predictor_16x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_16x16 aom_highbd_paeth_predictor_16x16_c
-
-void aom_highbd_paeth_predictor_16x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_16x32 aom_highbd_paeth_predictor_16x32_c
-
-void aom_highbd_paeth_predictor_16x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_16x4 aom_highbd_paeth_predictor_16x4_c
-
-void aom_highbd_paeth_predictor_16x64_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_16x64 aom_highbd_paeth_predictor_16x64_c
-
-void aom_highbd_paeth_predictor_16x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_16x8 aom_highbd_paeth_predictor_16x8_c
-
-void aom_highbd_paeth_predictor_2x2_c(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_paeth_predictor_2x2 aom_highbd_paeth_predictor_2x2_c
-
-void aom_highbd_paeth_predictor_32x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_32x16 aom_highbd_paeth_predictor_32x16_c
-
-void aom_highbd_paeth_predictor_32x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_32x32 aom_highbd_paeth_predictor_32x32_c
-
-void aom_highbd_paeth_predictor_32x64_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_32x64 aom_highbd_paeth_predictor_32x64_c
-
-void aom_highbd_paeth_predictor_32x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_32x8 aom_highbd_paeth_predictor_32x8_c
-
-void aom_highbd_paeth_predictor_4x16_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_4x16 aom_highbd_paeth_predictor_4x16_c
-
-void aom_highbd_paeth_predictor_4x4_c(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_paeth_predictor_4x4 aom_highbd_paeth_predictor_4x4_c
-
-void aom_highbd_paeth_predictor_4x8_c(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_paeth_predictor_4x8 aom_highbd_paeth_predictor_4x8_c
-
-void aom_highbd_paeth_predictor_64x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_64x16 aom_highbd_paeth_predictor_64x16_c
-
-void aom_highbd_paeth_predictor_64x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_64x32 aom_highbd_paeth_predictor_64x32_c
-
-void aom_highbd_paeth_predictor_64x64_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_64x64 aom_highbd_paeth_predictor_64x64_c
-
-void aom_highbd_paeth_predictor_8x16_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_8x16 aom_highbd_paeth_predictor_8x16_c
-
-void aom_highbd_paeth_predictor_8x32_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_8x32 aom_highbd_paeth_predictor_8x32_c
-
-void aom_highbd_paeth_predictor_8x4_c(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_paeth_predictor_8x4 aom_highbd_paeth_predictor_8x4_c
-
-void aom_highbd_paeth_predictor_8x8_c(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_paeth_predictor_8x8 aom_highbd_paeth_predictor_8x8_c
-
-void aom_highbd_quantize_b_c(const tran_low_t* coeff_ptr,
-                             intptr_t n_coeffs,
-                             const int16_t* zbin_ptr,
-                             const int16_t* round_ptr,
-                             const int16_t* quant_ptr,
-                             const int16_t* quant_shift_ptr,
-                             tran_low_t* qcoeff_ptr,
-                             tran_low_t* dqcoeff_ptr,
-                             const int16_t* dequant_ptr,
-                             uint16_t* eob_ptr,
-                             const int16_t* scan,
-                             const int16_t* iscan);
-#define aom_highbd_quantize_b aom_highbd_quantize_b_c
-
-void aom_highbd_quantize_b_32x32_c(const tran_low_t* coeff_ptr,
-                                   intptr_t n_coeffs,
-                                   const int16_t* zbin_ptr,
-                                   const int16_t* round_ptr,
-                                   const int16_t* quant_ptr,
-                                   const int16_t* quant_shift_ptr,
-                                   tran_low_t* qcoeff_ptr,
-                                   tran_low_t* dqcoeff_ptr,
-                                   const int16_t* dequant_ptr,
-                                   uint16_t* eob_ptr,
-                                   const int16_t* scan,
-                                   const int16_t* iscan);
-#define aom_highbd_quantize_b_32x32 aom_highbd_quantize_b_32x32_c
-
-void aom_highbd_quantize_b_32x32_adaptive_c(const tran_low_t* coeff_ptr,
-                                            intptr_t n_coeffs,
-                                            const int16_t* zbin_ptr,
-                                            const int16_t* round_ptr,
-                                            const int16_t* quant_ptr,
-                                            const int16_t* quant_shift_ptr,
-                                            tran_low_t* qcoeff_ptr,
-                                            tran_low_t* dqcoeff_ptr,
-                                            const int16_t* dequant_ptr,
-                                            uint16_t* eob_ptr,
-                                            const int16_t* scan,
-                                            const int16_t* iscan);
-#define aom_highbd_quantize_b_32x32_adaptive \
-  aom_highbd_quantize_b_32x32_adaptive_c
-
-void aom_highbd_quantize_b_64x64_c(const tran_low_t* coeff_ptr,
-                                   intptr_t n_coeffs,
-                                   const int16_t* zbin_ptr,
-                                   const int16_t* round_ptr,
-                                   const int16_t* quant_ptr,
-                                   const int16_t* quant_shift_ptr,
-                                   tran_low_t* qcoeff_ptr,
-                                   tran_low_t* dqcoeff_ptr,
-                                   const int16_t* dequant_ptr,
-                                   uint16_t* eob_ptr,
-                                   const int16_t* scan,
-                                   const int16_t* iscan);
-#define aom_highbd_quantize_b_64x64 aom_highbd_quantize_b_64x64_c
-
-void aom_highbd_quantize_b_64x64_adaptive_c(const tran_low_t* coeff_ptr,
-                                            intptr_t n_coeffs,
-                                            const int16_t* zbin_ptr,
-                                            const int16_t* round_ptr,
-                                            const int16_t* quant_ptr,
-                                            const int16_t* quant_shift_ptr,
-                                            tran_low_t* qcoeff_ptr,
-                                            tran_low_t* dqcoeff_ptr,
-                                            const int16_t* dequant_ptr,
-                                            uint16_t* eob_ptr,
-                                            const int16_t* scan,
-                                            const int16_t* iscan);
-#define aom_highbd_quantize_b_64x64_adaptive \
-  aom_highbd_quantize_b_64x64_adaptive_c
-
-void aom_highbd_quantize_b_adaptive_c(const tran_low_t* coeff_ptr,
-                                      intptr_t n_coeffs,
-                                      const int16_t* zbin_ptr,
-                                      const int16_t* round_ptr,
-                                      const int16_t* quant_ptr,
-                                      const int16_t* quant_shift_ptr,
-                                      tran_low_t* qcoeff_ptr,
-                                      tran_low_t* dqcoeff_ptr,
-                                      const int16_t* dequant_ptr,
-                                      uint16_t* eob_ptr,
-                                      const int16_t* scan,
-                                      const int16_t* iscan);
-#define aom_highbd_quantize_b_adaptive aom_highbd_quantize_b_adaptive_c
-
-unsigned int aom_highbd_sad128x128_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride);
-#define aom_highbd_sad128x128 aom_highbd_sad128x128_c
-
-unsigned int aom_highbd_sad128x128_avg_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         const uint8_t* second_pred);
-#define aom_highbd_sad128x128_avg aom_highbd_sad128x128_avg_c
-
-void aom_highbd_sad128x128x4d_c(const uint8_t* src_ptr,
-                                int src_stride,
-                                const uint8_t* const ref_ptr[],
-                                int ref_stride,
-                                uint32_t* sad_array);
-#define aom_highbd_sad128x128x4d aom_highbd_sad128x128x4d_c
-
-unsigned int aom_highbd_sad128x64_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* ref_ptr,
-                                    int ref_stride);
-#define aom_highbd_sad128x64 aom_highbd_sad128x64_c
-
-unsigned int aom_highbd_sad128x64_avg_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        const uint8_t* second_pred);
-#define aom_highbd_sad128x64_avg aom_highbd_sad128x64_avg_c
-
-void aom_highbd_sad128x64x4d_c(const uint8_t* src_ptr,
-                               int src_stride,
-                               const uint8_t* const ref_ptr[],
-                               int ref_stride,
-                               uint32_t* sad_array);
-#define aom_highbd_sad128x64x4d aom_highbd_sad128x64x4d_c
-
-unsigned int aom_highbd_sad16x16_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad16x16 aom_highbd_sad16x16_c
-
-unsigned int aom_highbd_sad16x16_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad16x16_avg aom_highbd_sad16x16_avg_c
-
-void aom_highbd_sad16x16x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad16x16x4d aom_highbd_sad16x16x4d_c
-
-unsigned int aom_highbd_sad16x32_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad16x32 aom_highbd_sad16x32_c
-
-unsigned int aom_highbd_sad16x32_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad16x32_avg aom_highbd_sad16x32_avg_c
-
-void aom_highbd_sad16x32x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad16x32x4d aom_highbd_sad16x32x4d_c
-
-unsigned int aom_highbd_sad16x4_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-#define aom_highbd_sad16x4 aom_highbd_sad16x4_c
-
-unsigned int aom_highbd_sad16x4_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-#define aom_highbd_sad16x4_avg aom_highbd_sad16x4_avg_c
-
-void aom_highbd_sad16x4x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-#define aom_highbd_sad16x4x4d aom_highbd_sad16x4x4d_c
-
-unsigned int aom_highbd_sad16x64_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad16x64 aom_highbd_sad16x64_c
-
-unsigned int aom_highbd_sad16x64_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad16x64_avg aom_highbd_sad16x64_avg_c
-
-void aom_highbd_sad16x64x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad16x64x4d aom_highbd_sad16x64x4d_c
-
-unsigned int aom_highbd_sad16x8_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-#define aom_highbd_sad16x8 aom_highbd_sad16x8_c
-
-unsigned int aom_highbd_sad16x8_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-#define aom_highbd_sad16x8_avg aom_highbd_sad16x8_avg_c
-
-void aom_highbd_sad16x8x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-#define aom_highbd_sad16x8x4d aom_highbd_sad16x8x4d_c
-
-unsigned int aom_highbd_sad32x16_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad32x16 aom_highbd_sad32x16_c
-
-unsigned int aom_highbd_sad32x16_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad32x16_avg aom_highbd_sad32x16_avg_c
-
-void aom_highbd_sad32x16x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad32x16x4d aom_highbd_sad32x16x4d_c
-
-unsigned int aom_highbd_sad32x32_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad32x32 aom_highbd_sad32x32_c
-
-unsigned int aom_highbd_sad32x32_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad32x32_avg aom_highbd_sad32x32_avg_c
-
-void aom_highbd_sad32x32x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad32x32x4d aom_highbd_sad32x32x4d_c
-
-unsigned int aom_highbd_sad32x64_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad32x64 aom_highbd_sad32x64_c
-
-unsigned int aom_highbd_sad32x64_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad32x64_avg aom_highbd_sad32x64_avg_c
-
-void aom_highbd_sad32x64x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad32x64x4d aom_highbd_sad32x64x4d_c
-
-unsigned int aom_highbd_sad32x8_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-#define aom_highbd_sad32x8 aom_highbd_sad32x8_c
-
-unsigned int aom_highbd_sad32x8_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-#define aom_highbd_sad32x8_avg aom_highbd_sad32x8_avg_c
-
-void aom_highbd_sad32x8x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-#define aom_highbd_sad32x8x4d aom_highbd_sad32x8x4d_c
-
-unsigned int aom_highbd_sad4x16_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-#define aom_highbd_sad4x16 aom_highbd_sad4x16_c
-
-unsigned int aom_highbd_sad4x16_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-#define aom_highbd_sad4x16_avg aom_highbd_sad4x16_avg_c
-
-void aom_highbd_sad4x16x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-#define aom_highbd_sad4x16x4d aom_highbd_sad4x16x4d_c
-
-unsigned int aom_highbd_sad4x4_c(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride);
-#define aom_highbd_sad4x4 aom_highbd_sad4x4_c
-
-unsigned int aom_highbd_sad4x4_avg_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride,
-                                     const uint8_t* second_pred);
-#define aom_highbd_sad4x4_avg aom_highbd_sad4x4_avg_c
-
-void aom_highbd_sad4x4x4d_c(const uint8_t* src_ptr,
-                            int src_stride,
-                            const uint8_t* const ref_ptr[],
-                            int ref_stride,
-                            uint32_t* sad_array);
-#define aom_highbd_sad4x4x4d aom_highbd_sad4x4x4d_c
-
-unsigned int aom_highbd_sad4x8_c(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride);
-#define aom_highbd_sad4x8 aom_highbd_sad4x8_c
-
-unsigned int aom_highbd_sad4x8_avg_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride,
-                                     const uint8_t* second_pred);
-#define aom_highbd_sad4x8_avg aom_highbd_sad4x8_avg_c
-
-void aom_highbd_sad4x8x4d_c(const uint8_t* src_ptr,
-                            int src_stride,
-                            const uint8_t* const ref_ptr[],
-                            int ref_stride,
-                            uint32_t* sad_array);
-#define aom_highbd_sad4x8x4d aom_highbd_sad4x8x4d_c
-
-unsigned int aom_highbd_sad64x128_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* ref_ptr,
-                                    int ref_stride);
-#define aom_highbd_sad64x128 aom_highbd_sad64x128_c
-
-unsigned int aom_highbd_sad64x128_avg_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        const uint8_t* second_pred);
-#define aom_highbd_sad64x128_avg aom_highbd_sad64x128_avg_c
-
-void aom_highbd_sad64x128x4d_c(const uint8_t* src_ptr,
-                               int src_stride,
-                               const uint8_t* const ref_ptr[],
-                               int ref_stride,
-                               uint32_t* sad_array);
-#define aom_highbd_sad64x128x4d aom_highbd_sad64x128x4d_c
-
-unsigned int aom_highbd_sad64x16_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad64x16 aom_highbd_sad64x16_c
-
-unsigned int aom_highbd_sad64x16_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad64x16_avg aom_highbd_sad64x16_avg_c
-
-void aom_highbd_sad64x16x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad64x16x4d aom_highbd_sad64x16x4d_c
-
-unsigned int aom_highbd_sad64x32_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad64x32 aom_highbd_sad64x32_c
-
-unsigned int aom_highbd_sad64x32_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad64x32_avg aom_highbd_sad64x32_avg_c
-
-void aom_highbd_sad64x32x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad64x32x4d aom_highbd_sad64x32x4d_c
-
-unsigned int aom_highbd_sad64x64_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad64x64 aom_highbd_sad64x64_c
-
-unsigned int aom_highbd_sad64x64_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad64x64_avg aom_highbd_sad64x64_avg_c
-
-void aom_highbd_sad64x64x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad64x64x4d aom_highbd_sad64x64x4d_c
-
-unsigned int aom_highbd_sad8x16_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-#define aom_highbd_sad8x16 aom_highbd_sad8x16_c
-
-unsigned int aom_highbd_sad8x16_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-#define aom_highbd_sad8x16_avg aom_highbd_sad8x16_avg_c
-
-void aom_highbd_sad8x16x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-#define aom_highbd_sad8x16x4d aom_highbd_sad8x16x4d_c
-
-unsigned int aom_highbd_sad8x32_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-#define aom_highbd_sad8x32 aom_highbd_sad8x32_c
-
-unsigned int aom_highbd_sad8x32_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-#define aom_highbd_sad8x32_avg aom_highbd_sad8x32_avg_c
-
-void aom_highbd_sad8x32x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-#define aom_highbd_sad8x32x4d aom_highbd_sad8x32x4d_c
-
-unsigned int aom_highbd_sad8x4_c(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride);
-#define aom_highbd_sad8x4 aom_highbd_sad8x4_c
-
-unsigned int aom_highbd_sad8x4_avg_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride,
-                                     const uint8_t* second_pred);
-#define aom_highbd_sad8x4_avg aom_highbd_sad8x4_avg_c
-
-void aom_highbd_sad8x4x4d_c(const uint8_t* src_ptr,
-                            int src_stride,
-                            const uint8_t* const ref_ptr[],
-                            int ref_stride,
-                            uint32_t* sad_array);
-#define aom_highbd_sad8x4x4d aom_highbd_sad8x4x4d_c
-
-unsigned int aom_highbd_sad8x8_c(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride);
-#define aom_highbd_sad8x8 aom_highbd_sad8x8_c
-
-unsigned int aom_highbd_sad8x8_avg_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride,
-                                     const uint8_t* second_pred);
-#define aom_highbd_sad8x8_avg aom_highbd_sad8x8_avg_c
-
-void aom_highbd_sad8x8x4d_c(const uint8_t* src_ptr,
-                            int src_stride,
-                            const uint8_t* const ref_ptr[],
-                            int ref_stride,
-                            uint32_t* sad_array);
-#define aom_highbd_sad8x8x4d aom_highbd_sad8x8x4d_c
-
-unsigned int aom_highbd_sad_skip_128x128_c(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride);
-#define aom_highbd_sad_skip_128x128 aom_highbd_sad_skip_128x128_c
-
-void aom_highbd_sad_skip_128x128x4d_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* const ref_ptr[],
-                                      int ref_stride,
-                                      uint32_t* sad_array);
-#define aom_highbd_sad_skip_128x128x4d aom_highbd_sad_skip_128x128x4d_c
-
-unsigned int aom_highbd_sad_skip_128x64_c(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride);
-#define aom_highbd_sad_skip_128x64 aom_highbd_sad_skip_128x64_c
-
-void aom_highbd_sad_skip_128x64x4d_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* const ref_ptr[],
-                                     int ref_stride,
-                                     uint32_t* sad_array);
-#define aom_highbd_sad_skip_128x64x4d aom_highbd_sad_skip_128x64x4d_c
-
-unsigned int aom_highbd_sad_skip_16x16_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_16x16 aom_highbd_sad_skip_16x16_c
-
-void aom_highbd_sad_skip_16x16x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_16x16x4d aom_highbd_sad_skip_16x16x4d_c
-
-unsigned int aom_highbd_sad_skip_16x32_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_16x32 aom_highbd_sad_skip_16x32_c
-
-void aom_highbd_sad_skip_16x32x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_16x32x4d aom_highbd_sad_skip_16x32x4d_c
-
-unsigned int aom_highbd_sad_skip_16x4_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-#define aom_highbd_sad_skip_16x4 aom_highbd_sad_skip_16x4_c
-
-void aom_highbd_sad_skip_16x4x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-#define aom_highbd_sad_skip_16x4x4d aom_highbd_sad_skip_16x4x4d_c
-
-unsigned int aom_highbd_sad_skip_16x64_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_16x64 aom_highbd_sad_skip_16x64_c
-
-void aom_highbd_sad_skip_16x64x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_16x64x4d aom_highbd_sad_skip_16x64x4d_c
-
-unsigned int aom_highbd_sad_skip_16x8_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-#define aom_highbd_sad_skip_16x8 aom_highbd_sad_skip_16x8_c
-
-void aom_highbd_sad_skip_16x8x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-#define aom_highbd_sad_skip_16x8x4d aom_highbd_sad_skip_16x8x4d_c
-
-unsigned int aom_highbd_sad_skip_32x16_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_32x16 aom_highbd_sad_skip_32x16_c
-
-void aom_highbd_sad_skip_32x16x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_32x16x4d aom_highbd_sad_skip_32x16x4d_c
-
-unsigned int aom_highbd_sad_skip_32x32_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_32x32 aom_highbd_sad_skip_32x32_c
-
-void aom_highbd_sad_skip_32x32x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_32x32x4d aom_highbd_sad_skip_32x32x4d_c
-
-unsigned int aom_highbd_sad_skip_32x64_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_32x64 aom_highbd_sad_skip_32x64_c
-
-void aom_highbd_sad_skip_32x64x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_32x64x4d aom_highbd_sad_skip_32x64x4d_c
-
-unsigned int aom_highbd_sad_skip_32x8_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-#define aom_highbd_sad_skip_32x8 aom_highbd_sad_skip_32x8_c
-
-void aom_highbd_sad_skip_32x8x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-#define aom_highbd_sad_skip_32x8x4d aom_highbd_sad_skip_32x8x4d_c
-
-unsigned int aom_highbd_sad_skip_4x16_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-#define aom_highbd_sad_skip_4x16 aom_highbd_sad_skip_4x16_c
-
-void aom_highbd_sad_skip_4x16x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-#define aom_highbd_sad_skip_4x16x4d aom_highbd_sad_skip_4x16x4d_c
-
-unsigned int aom_highbd_sad_skip_4x4_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride);
-#define aom_highbd_sad_skip_4x4 aom_highbd_sad_skip_4x4_c
-
-void aom_highbd_sad_skip_4x4x4d_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* const ref_ptr[],
-                                  int ref_stride,
-                                  uint32_t* sad_array);
-#define aom_highbd_sad_skip_4x4x4d aom_highbd_sad_skip_4x4x4d_c
-
-unsigned int aom_highbd_sad_skip_4x8_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride);
-#define aom_highbd_sad_skip_4x8 aom_highbd_sad_skip_4x8_c
-
-void aom_highbd_sad_skip_4x8x4d_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* const ref_ptr[],
-                                  int ref_stride,
-                                  uint32_t* sad_array);
-#define aom_highbd_sad_skip_4x8x4d aom_highbd_sad_skip_4x8x4d_c
-
-unsigned int aom_highbd_sad_skip_64x128_c(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride);
-#define aom_highbd_sad_skip_64x128 aom_highbd_sad_skip_64x128_c
-
-void aom_highbd_sad_skip_64x128x4d_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* const ref_ptr[],
-                                     int ref_stride,
-                                     uint32_t* sad_array);
-#define aom_highbd_sad_skip_64x128x4d aom_highbd_sad_skip_64x128x4d_c
-
-unsigned int aom_highbd_sad_skip_64x16_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_64x16 aom_highbd_sad_skip_64x16_c
-
-void aom_highbd_sad_skip_64x16x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_64x16x4d aom_highbd_sad_skip_64x16x4d_c
-
-unsigned int aom_highbd_sad_skip_64x32_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_64x32 aom_highbd_sad_skip_64x32_c
-
-void aom_highbd_sad_skip_64x32x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_64x32x4d aom_highbd_sad_skip_64x32x4d_c
-
-unsigned int aom_highbd_sad_skip_64x64_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_64x64 aom_highbd_sad_skip_64x64_c
-
-void aom_highbd_sad_skip_64x64x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_64x64x4d aom_highbd_sad_skip_64x64x4d_c
-
-unsigned int aom_highbd_sad_skip_8x16_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-#define aom_highbd_sad_skip_8x16 aom_highbd_sad_skip_8x16_c
-
-void aom_highbd_sad_skip_8x16x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-#define aom_highbd_sad_skip_8x16x4d aom_highbd_sad_skip_8x16x4d_c
-
-unsigned int aom_highbd_sad_skip_8x32_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-#define aom_highbd_sad_skip_8x32 aom_highbd_sad_skip_8x32_c
-
-void aom_highbd_sad_skip_8x32x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-#define aom_highbd_sad_skip_8x32x4d aom_highbd_sad_skip_8x32x4d_c
-
-unsigned int aom_highbd_sad_skip_8x4_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride);
-#define aom_highbd_sad_skip_8x4 aom_highbd_sad_skip_8x4_c
-
-void aom_highbd_sad_skip_8x4x4d_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* const ref_ptr[],
-                                  int ref_stride,
-                                  uint32_t* sad_array);
-#define aom_highbd_sad_skip_8x4x4d aom_highbd_sad_skip_8x4x4d_c
-
-unsigned int aom_highbd_sad_skip_8x8_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride);
-#define aom_highbd_sad_skip_8x8 aom_highbd_sad_skip_8x8_c
-
-void aom_highbd_sad_skip_8x8x4d_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* const ref_ptr[],
-                                  int ref_stride,
-                                  uint32_t* sad_array);
-#define aom_highbd_sad_skip_8x8x4d aom_highbd_sad_skip_8x8x4d_c
-
-void aom_highbd_smooth_h_predictor_16x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_16x16 \
-  aom_highbd_smooth_h_predictor_16x16_c
-
-void aom_highbd_smooth_h_predictor_16x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_16x32 \
-  aom_highbd_smooth_h_predictor_16x32_c
-
-void aom_highbd_smooth_h_predictor_16x4_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_16x4 aom_highbd_smooth_h_predictor_16x4_c
-
-void aom_highbd_smooth_h_predictor_16x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_16x64 \
-  aom_highbd_smooth_h_predictor_16x64_c
-
-void aom_highbd_smooth_h_predictor_16x8_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_16x8 aom_highbd_smooth_h_predictor_16x8_c
-
-void aom_highbd_smooth_h_predictor_2x2_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_h_predictor_2x2 aom_highbd_smooth_h_predictor_2x2_c
-
-void aom_highbd_smooth_h_predictor_32x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_32x16 \
-  aom_highbd_smooth_h_predictor_32x16_c
-
-void aom_highbd_smooth_h_predictor_32x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_32x32 \
-  aom_highbd_smooth_h_predictor_32x32_c
-
-void aom_highbd_smooth_h_predictor_32x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_32x64 \
-  aom_highbd_smooth_h_predictor_32x64_c
-
-void aom_highbd_smooth_h_predictor_32x8_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_32x8 aom_highbd_smooth_h_predictor_32x8_c
-
-void aom_highbd_smooth_h_predictor_4x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_4x16 aom_highbd_smooth_h_predictor_4x16_c
-
-void aom_highbd_smooth_h_predictor_4x4_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_h_predictor_4x4 aom_highbd_smooth_h_predictor_4x4_c
-
-void aom_highbd_smooth_h_predictor_4x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_h_predictor_4x8 aom_highbd_smooth_h_predictor_4x8_c
-
-void aom_highbd_smooth_h_predictor_64x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_64x16 \
-  aom_highbd_smooth_h_predictor_64x16_c
-
-void aom_highbd_smooth_h_predictor_64x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_64x32 \
-  aom_highbd_smooth_h_predictor_64x32_c
-
-void aom_highbd_smooth_h_predictor_64x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_64x64 \
-  aom_highbd_smooth_h_predictor_64x64_c
-
-void aom_highbd_smooth_h_predictor_8x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_8x16 aom_highbd_smooth_h_predictor_8x16_c
-
-void aom_highbd_smooth_h_predictor_8x32_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_8x32 aom_highbd_smooth_h_predictor_8x32_c
-
-void aom_highbd_smooth_h_predictor_8x4_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_h_predictor_8x4 aom_highbd_smooth_h_predictor_8x4_c
-
-void aom_highbd_smooth_h_predictor_8x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_h_predictor_8x8 aom_highbd_smooth_h_predictor_8x8_c
-
-void aom_highbd_smooth_predictor_16x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_16x16 aom_highbd_smooth_predictor_16x16_c
-
-void aom_highbd_smooth_predictor_16x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_16x32 aom_highbd_smooth_predictor_16x32_c
-
-void aom_highbd_smooth_predictor_16x4_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_16x4 aom_highbd_smooth_predictor_16x4_c
-
-void aom_highbd_smooth_predictor_16x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_16x64 aom_highbd_smooth_predictor_16x64_c
-
-void aom_highbd_smooth_predictor_16x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_16x8 aom_highbd_smooth_predictor_16x8_c
-
-void aom_highbd_smooth_predictor_2x2_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_smooth_predictor_2x2 aom_highbd_smooth_predictor_2x2_c
-
-void aom_highbd_smooth_predictor_32x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_32x16 aom_highbd_smooth_predictor_32x16_c
-
-void aom_highbd_smooth_predictor_32x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_32x32 aom_highbd_smooth_predictor_32x32_c
-
-void aom_highbd_smooth_predictor_32x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_32x64 aom_highbd_smooth_predictor_32x64_c
-
-void aom_highbd_smooth_predictor_32x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_32x8 aom_highbd_smooth_predictor_32x8_c
-
-void aom_highbd_smooth_predictor_4x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_4x16 aom_highbd_smooth_predictor_4x16_c
-
-void aom_highbd_smooth_predictor_4x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_smooth_predictor_4x4 aom_highbd_smooth_predictor_4x4_c
-
-void aom_highbd_smooth_predictor_4x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_smooth_predictor_4x8 aom_highbd_smooth_predictor_4x8_c
-
-void aom_highbd_smooth_predictor_64x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_64x16 aom_highbd_smooth_predictor_64x16_c
-
-void aom_highbd_smooth_predictor_64x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_64x32 aom_highbd_smooth_predictor_64x32_c
-
-void aom_highbd_smooth_predictor_64x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_64x64 aom_highbd_smooth_predictor_64x64_c
-
-void aom_highbd_smooth_predictor_8x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_8x16 aom_highbd_smooth_predictor_8x16_c
-
-void aom_highbd_smooth_predictor_8x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_8x32 aom_highbd_smooth_predictor_8x32_c
-
-void aom_highbd_smooth_predictor_8x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_smooth_predictor_8x4 aom_highbd_smooth_predictor_8x4_c
-
-void aom_highbd_smooth_predictor_8x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_smooth_predictor_8x8 aom_highbd_smooth_predictor_8x8_c
-
-void aom_highbd_smooth_v_predictor_16x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_16x16 \
-  aom_highbd_smooth_v_predictor_16x16_c
-
-void aom_highbd_smooth_v_predictor_16x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_16x32 \
-  aom_highbd_smooth_v_predictor_16x32_c
-
-void aom_highbd_smooth_v_predictor_16x4_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_16x4 aom_highbd_smooth_v_predictor_16x4_c
-
-void aom_highbd_smooth_v_predictor_16x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_16x64 \
-  aom_highbd_smooth_v_predictor_16x64_c
-
-void aom_highbd_smooth_v_predictor_16x8_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_16x8 aom_highbd_smooth_v_predictor_16x8_c
-
-void aom_highbd_smooth_v_predictor_2x2_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_v_predictor_2x2 aom_highbd_smooth_v_predictor_2x2_c
-
-void aom_highbd_smooth_v_predictor_32x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_32x16 \
-  aom_highbd_smooth_v_predictor_32x16_c
-
-void aom_highbd_smooth_v_predictor_32x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_32x32 \
-  aom_highbd_smooth_v_predictor_32x32_c
-
-void aom_highbd_smooth_v_predictor_32x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_32x64 \
-  aom_highbd_smooth_v_predictor_32x64_c
-
-void aom_highbd_smooth_v_predictor_32x8_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_32x8 aom_highbd_smooth_v_predictor_32x8_c
-
-void aom_highbd_smooth_v_predictor_4x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_4x16 aom_highbd_smooth_v_predictor_4x16_c
-
-void aom_highbd_smooth_v_predictor_4x4_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_v_predictor_4x4 aom_highbd_smooth_v_predictor_4x4_c
-
-void aom_highbd_smooth_v_predictor_4x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_v_predictor_4x8 aom_highbd_smooth_v_predictor_4x8_c
-
-void aom_highbd_smooth_v_predictor_64x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_64x16 \
-  aom_highbd_smooth_v_predictor_64x16_c
-
-void aom_highbd_smooth_v_predictor_64x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_64x32 \
-  aom_highbd_smooth_v_predictor_64x32_c
-
-void aom_highbd_smooth_v_predictor_64x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_64x64 \
-  aom_highbd_smooth_v_predictor_64x64_c
-
-void aom_highbd_smooth_v_predictor_8x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_8x16 aom_highbd_smooth_v_predictor_8x16_c
-
-void aom_highbd_smooth_v_predictor_8x32_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_8x32 aom_highbd_smooth_v_predictor_8x32_c
-
-void aom_highbd_smooth_v_predictor_8x4_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_v_predictor_8x4 aom_highbd_smooth_v_predictor_8x4_c
-
-void aom_highbd_smooth_v_predictor_8x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_v_predictor_8x8 aom_highbd_smooth_v_predictor_8x8_c
-
-int64_t aom_highbd_sse_c(const uint8_t* a8,
-                         int a_stride,
-                         const uint8_t* b8,
-                         int b_stride,
-                         int width,
-                         int height);
-int64_t aom_highbd_sse_neon(const uint8_t* a8,
-                            int a_stride,
-                            const uint8_t* b8,
-                            int b_stride,
-                            int width,
-                            int height);
-#define aom_highbd_sse aom_highbd_sse_neon
-
-void aom_highbd_subtract_block_c(int rows,
-                                 int cols,
-                                 int16_t* diff_ptr,
-                                 ptrdiff_t diff_stride,
-                                 const uint8_t* src_ptr,
-                                 ptrdiff_t src_stride,
-                                 const uint8_t* pred_ptr,
-                                 ptrdiff_t pred_stride,
-                                 int bd);
-#define aom_highbd_subtract_block aom_highbd_subtract_block_c
-
-void aom_highbd_upsampled_pred_c(MACROBLOCKD* xd,
-                                 const struct AV1Common* const cm,
-                                 int mi_row,
-                                 int mi_col,
-                                 const MV* const mv,
-                                 uint8_t* comp_pred8,
-                                 int width,
-                                 int height,
-                                 int subpel_x_q3,
-                                 int subpel_y_q3,
-                                 const uint8_t* ref8,
-                                 int ref_stride,
-                                 int bd,
-                                 int subpel_search);
-#define aom_highbd_upsampled_pred aom_highbd_upsampled_pred_c
-
-void aom_highbd_v_predictor_16x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_16x16 aom_highbd_v_predictor_16x16_c
-
-void aom_highbd_v_predictor_16x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_16x32 aom_highbd_v_predictor_16x32_c
-
-void aom_highbd_v_predictor_16x4_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_16x4 aom_highbd_v_predictor_16x4_c
-
-void aom_highbd_v_predictor_16x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_16x64 aom_highbd_v_predictor_16x64_c
-
-void aom_highbd_v_predictor_16x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_16x8 aom_highbd_v_predictor_16x8_c
-
-void aom_highbd_v_predictor_2x2_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_v_predictor_2x2 aom_highbd_v_predictor_2x2_c
-
-void aom_highbd_v_predictor_32x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_32x16 aom_highbd_v_predictor_32x16_c
-
-void aom_highbd_v_predictor_32x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_32x32 aom_highbd_v_predictor_32x32_c
-
-void aom_highbd_v_predictor_32x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_32x64 aom_highbd_v_predictor_32x64_c
-
-void aom_highbd_v_predictor_32x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_32x8 aom_highbd_v_predictor_32x8_c
-
-void aom_highbd_v_predictor_4x16_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_4x16 aom_highbd_v_predictor_4x16_c
-
-void aom_highbd_v_predictor_4x4_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_v_predictor_4x4 aom_highbd_v_predictor_4x4_c
-
-void aom_highbd_v_predictor_4x8_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_v_predictor_4x8 aom_highbd_v_predictor_4x8_c
-
-void aom_highbd_v_predictor_64x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_64x16 aom_highbd_v_predictor_64x16_c
-
-void aom_highbd_v_predictor_64x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_64x32 aom_highbd_v_predictor_64x32_c
-
-void aom_highbd_v_predictor_64x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_64x64 aom_highbd_v_predictor_64x64_c
-
-void aom_highbd_v_predictor_8x16_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_8x16 aom_highbd_v_predictor_8x16_c
-
-void aom_highbd_v_predictor_8x32_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_8x32 aom_highbd_v_predictor_8x32_c
-
-void aom_highbd_v_predictor_8x4_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_v_predictor_8x4 aom_highbd_v_predictor_8x4_c
-
-void aom_highbd_v_predictor_8x8_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_v_predictor_8x8 aom_highbd_v_predictor_8x8_c
-
 void aom_ifft16x16_float_c(const float* input, float* temp, float* output);
 #define aom_ifft16x16_float aom_ifft16x16_float_c
 
@@ -10727,498 +2507,6 @@
                              int h);
 #define aom_mse_wxh_16bit aom_mse_wxh_16bit_c
 
-uint64_t aom_mse_wxh_16bit_highbd_c(uint16_t* dst,
-                                    int dstride,
-                                    uint16_t* src,
-                                    int sstride,
-                                    int w,
-                                    int h);
-#define aom_mse_wxh_16bit_highbd aom_mse_wxh_16bit_highbd_c
-
-unsigned int aom_obmc_sad128x128_c(const uint8_t* pre,
-                                   int pre_stride,
-                                   const int32_t* wsrc,
-                                   const int32_t* mask);
-#define aom_obmc_sad128x128 aom_obmc_sad128x128_c
-
-unsigned int aom_obmc_sad128x64_c(const uint8_t* pre,
-                                  int pre_stride,
-                                  const int32_t* wsrc,
-                                  const int32_t* mask);
-#define aom_obmc_sad128x64 aom_obmc_sad128x64_c
-
-unsigned int aom_obmc_sad16x16_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad16x16 aom_obmc_sad16x16_c
-
-unsigned int aom_obmc_sad16x32_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad16x32 aom_obmc_sad16x32_c
-
-unsigned int aom_obmc_sad16x4_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-#define aom_obmc_sad16x4 aom_obmc_sad16x4_c
-
-unsigned int aom_obmc_sad16x64_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad16x64 aom_obmc_sad16x64_c
-
-unsigned int aom_obmc_sad16x8_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-#define aom_obmc_sad16x8 aom_obmc_sad16x8_c
-
-unsigned int aom_obmc_sad32x16_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad32x16 aom_obmc_sad32x16_c
-
-unsigned int aom_obmc_sad32x32_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad32x32 aom_obmc_sad32x32_c
-
-unsigned int aom_obmc_sad32x64_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad32x64 aom_obmc_sad32x64_c
-
-unsigned int aom_obmc_sad32x8_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-#define aom_obmc_sad32x8 aom_obmc_sad32x8_c
-
-unsigned int aom_obmc_sad4x16_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-#define aom_obmc_sad4x16 aom_obmc_sad4x16_c
-
-unsigned int aom_obmc_sad4x4_c(const uint8_t* pre,
-                               int pre_stride,
-                               const int32_t* wsrc,
-                               const int32_t* mask);
-#define aom_obmc_sad4x4 aom_obmc_sad4x4_c
-
-unsigned int aom_obmc_sad4x8_c(const uint8_t* pre,
-                               int pre_stride,
-                               const int32_t* wsrc,
-                               const int32_t* mask);
-#define aom_obmc_sad4x8 aom_obmc_sad4x8_c
-
-unsigned int aom_obmc_sad64x128_c(const uint8_t* pre,
-                                  int pre_stride,
-                                  const int32_t* wsrc,
-                                  const int32_t* mask);
-#define aom_obmc_sad64x128 aom_obmc_sad64x128_c
-
-unsigned int aom_obmc_sad64x16_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad64x16 aom_obmc_sad64x16_c
-
-unsigned int aom_obmc_sad64x32_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad64x32 aom_obmc_sad64x32_c
-
-unsigned int aom_obmc_sad64x64_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad64x64 aom_obmc_sad64x64_c
-
-unsigned int aom_obmc_sad8x16_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-#define aom_obmc_sad8x16 aom_obmc_sad8x16_c
-
-unsigned int aom_obmc_sad8x32_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-#define aom_obmc_sad8x32 aom_obmc_sad8x32_c
-
-unsigned int aom_obmc_sad8x4_c(const uint8_t* pre,
-                               int pre_stride,
-                               const int32_t* wsrc,
-                               const int32_t* mask);
-#define aom_obmc_sad8x4 aom_obmc_sad8x4_c
-
-unsigned int aom_obmc_sad8x8_c(const uint8_t* pre,
-                               int pre_stride,
-                               const int32_t* wsrc,
-                               const int32_t* mask);
-#define aom_obmc_sad8x8 aom_obmc_sad8x8_c
-
-unsigned int aom_obmc_sub_pixel_variance128x128_c(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-#define aom_obmc_sub_pixel_variance128x128 aom_obmc_sub_pixel_variance128x128_c
-
-unsigned int aom_obmc_sub_pixel_variance128x64_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-#define aom_obmc_sub_pixel_variance128x64 aom_obmc_sub_pixel_variance128x64_c
-
-unsigned int aom_obmc_sub_pixel_variance16x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance16x16 aom_obmc_sub_pixel_variance16x16_c
-
-unsigned int aom_obmc_sub_pixel_variance16x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance16x32 aom_obmc_sub_pixel_variance16x32_c
-
-unsigned int aom_obmc_sub_pixel_variance16x4_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_obmc_sub_pixel_variance16x4 aom_obmc_sub_pixel_variance16x4_c
-
-unsigned int aom_obmc_sub_pixel_variance16x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance16x64 aom_obmc_sub_pixel_variance16x64_c
-
-unsigned int aom_obmc_sub_pixel_variance16x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_obmc_sub_pixel_variance16x8 aom_obmc_sub_pixel_variance16x8_c
-
-unsigned int aom_obmc_sub_pixel_variance32x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance32x16 aom_obmc_sub_pixel_variance32x16_c
-
-unsigned int aom_obmc_sub_pixel_variance32x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance32x32 aom_obmc_sub_pixel_variance32x32_c
-
-unsigned int aom_obmc_sub_pixel_variance32x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance32x64 aom_obmc_sub_pixel_variance32x64_c
-
-unsigned int aom_obmc_sub_pixel_variance32x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_obmc_sub_pixel_variance32x8 aom_obmc_sub_pixel_variance32x8_c
-
-unsigned int aom_obmc_sub_pixel_variance4x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_obmc_sub_pixel_variance4x16 aom_obmc_sub_pixel_variance4x16_c
-
-unsigned int aom_obmc_sub_pixel_variance4x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_obmc_sub_pixel_variance4x4 aom_obmc_sub_pixel_variance4x4_c
-
-unsigned int aom_obmc_sub_pixel_variance4x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_obmc_sub_pixel_variance4x8 aom_obmc_sub_pixel_variance4x8_c
-
-unsigned int aom_obmc_sub_pixel_variance64x128_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-#define aom_obmc_sub_pixel_variance64x128 aom_obmc_sub_pixel_variance64x128_c
-
-unsigned int aom_obmc_sub_pixel_variance64x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance64x16 aom_obmc_sub_pixel_variance64x16_c
-
-unsigned int aom_obmc_sub_pixel_variance64x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance64x32 aom_obmc_sub_pixel_variance64x32_c
-
-unsigned int aom_obmc_sub_pixel_variance64x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance64x64 aom_obmc_sub_pixel_variance64x64_c
-
-unsigned int aom_obmc_sub_pixel_variance8x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_obmc_sub_pixel_variance8x16 aom_obmc_sub_pixel_variance8x16_c
-
-unsigned int aom_obmc_sub_pixel_variance8x32_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_obmc_sub_pixel_variance8x32 aom_obmc_sub_pixel_variance8x32_c
-
-unsigned int aom_obmc_sub_pixel_variance8x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_obmc_sub_pixel_variance8x4 aom_obmc_sub_pixel_variance8x4_c
-
-unsigned int aom_obmc_sub_pixel_variance8x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_obmc_sub_pixel_variance8x8 aom_obmc_sub_pixel_variance8x8_c
-
-unsigned int aom_obmc_variance128x128_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask,
-                                        unsigned int* sse);
-#define aom_obmc_variance128x128 aom_obmc_variance128x128_c
-
-unsigned int aom_obmc_variance128x64_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask,
-                                       unsigned int* sse);
-#define aom_obmc_variance128x64 aom_obmc_variance128x64_c
-
-unsigned int aom_obmc_variance16x16_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance16x16 aom_obmc_variance16x16_c
-
-unsigned int aom_obmc_variance16x32_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance16x32 aom_obmc_variance16x32_c
-
-unsigned int aom_obmc_variance16x4_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-#define aom_obmc_variance16x4 aom_obmc_variance16x4_c
-
-unsigned int aom_obmc_variance16x64_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance16x64 aom_obmc_variance16x64_c
-
-unsigned int aom_obmc_variance16x8_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-#define aom_obmc_variance16x8 aom_obmc_variance16x8_c
-
-unsigned int aom_obmc_variance32x16_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance32x16 aom_obmc_variance32x16_c
-
-unsigned int aom_obmc_variance32x32_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance32x32 aom_obmc_variance32x32_c
-
-unsigned int aom_obmc_variance32x64_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance32x64 aom_obmc_variance32x64_c
-
-unsigned int aom_obmc_variance32x8_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-#define aom_obmc_variance32x8 aom_obmc_variance32x8_c
-
-unsigned int aom_obmc_variance4x16_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-#define aom_obmc_variance4x16 aom_obmc_variance4x16_c
-
-unsigned int aom_obmc_variance4x4_c(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask,
-                                    unsigned int* sse);
-#define aom_obmc_variance4x4 aom_obmc_variance4x4_c
-
-unsigned int aom_obmc_variance4x8_c(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask,
-                                    unsigned int* sse);
-#define aom_obmc_variance4x8 aom_obmc_variance4x8_c
-
-unsigned int aom_obmc_variance64x128_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask,
-                                       unsigned int* sse);
-#define aom_obmc_variance64x128 aom_obmc_variance64x128_c
-
-unsigned int aom_obmc_variance64x16_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance64x16 aom_obmc_variance64x16_c
-
-unsigned int aom_obmc_variance64x32_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance64x32 aom_obmc_variance64x32_c
-
-unsigned int aom_obmc_variance64x64_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance64x64 aom_obmc_variance64x64_c
-
-unsigned int aom_obmc_variance8x16_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-#define aom_obmc_variance8x16 aom_obmc_variance8x16_c
-
-unsigned int aom_obmc_variance8x32_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-#define aom_obmc_variance8x32 aom_obmc_variance8x32_c
-
-unsigned int aom_obmc_variance8x4_c(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask,
-                                    unsigned int* sse);
-#define aom_obmc_variance8x4 aom_obmc_variance8x4_c
-
-unsigned int aom_obmc_variance8x8_c(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask,
-                                    unsigned int* sse);
-#define aom_obmc_variance8x8 aom_obmc_variance8x8_c
-
 void aom_paeth_predictor_16x16_c(uint8_t* dst,
                                  ptrdiff_t y_stride,
                                  const uint8_t* above,
diff --git a/third_party/libaom/source/config/ios/arm-neon/config/av1_rtcd.h b/third_party/libaom/source/config/ios/arm-neon/config/av1_rtcd.h
index d612ede3..c8b39bd0 100644
--- a/third_party/libaom/source/config/ios/arm-neon/config/av1_rtcd.h
+++ b/third_party/libaom/source/config/ios/arm-neon/config/av1_rtcd.h
@@ -114,46 +114,6 @@
                                 const int log_scale);
 #define aom_quantize_b_helper aom_quantize_b_helper_neon
 
-void av1_apply_selfguided_restoration_c(const uint8_t* dat,
-                                        int width,
-                                        int height,
-                                        int stride,
-                                        int eps,
-                                        const int* xqd,
-                                        uint8_t* dst,
-                                        int dst_stride,
-                                        int32_t* tmpbuf,
-                                        int bit_depth,
-                                        int highbd);
-void av1_apply_selfguided_restoration_neon(const uint8_t* dat,
-                                           int width,
-                                           int height,
-                                           int stride,
-                                           int eps,
-                                           const int* xqd,
-                                           uint8_t* dst,
-                                           int dst_stride,
-                                           int32_t* tmpbuf,
-                                           int bit_depth,
-                                           int highbd);
-#define av1_apply_selfguided_restoration av1_apply_selfguided_restoration_neon
-
-void av1_apply_temporal_filter_c(const struct yv12_buffer_config* ref_frame,
-                                 const struct macroblockd* mbd,
-                                 const BLOCK_SIZE block_size,
-                                 const int mb_row,
-                                 const int mb_col,
-                                 const int num_planes,
-                                 const double* noise_levels,
-                                 const MV* subblock_mvs,
-                                 const int* subblock_mses,
-                                 const int q_factor,
-                                 const int filter_strength,
-                                 const uint8_t* pred,
-                                 uint32_t* accum,
-                                 uint16_t* count);
-#define av1_apply_temporal_filter av1_apply_temporal_filter_c
-
 int64_t av1_block_error_c(const tran_low_t* coeff,
                           const tran_low_t* dqcoeff,
                           intptr_t block_size,
@@ -217,44 +177,6 @@
 #define av1_build_compound_diffwtd_mask_highbd \
   av1_build_compound_diffwtd_mask_highbd_c
 
-int64_t av1_calc_frame_error_c(const uint8_t* const ref,
-                               int stride,
-                               const uint8_t* const dst,
-                               int p_width,
-                               int p_height,
-                               int p_stride);
-#define av1_calc_frame_error av1_calc_frame_error_c
-
-void av1_calc_proj_params_c(const uint8_t* src8,
-                            int width,
-                            int height,
-                            int src_stride,
-                            const uint8_t* dat8,
-                            int dat_stride,
-                            int32_t* flt0,
-                            int flt0_stride,
-                            int32_t* flt1,
-                            int flt1_stride,
-                            int64_t H[2][2],
-                            int64_t C[2],
-                            const sgr_params_type* params);
-#define av1_calc_proj_params av1_calc_proj_params_c
-
-void av1_calc_proj_params_high_bd_c(const uint8_t* src8,
-                                    int width,
-                                    int height,
-                                    int src_stride,
-                                    const uint8_t* dat8,
-                                    int dat_stride,
-                                    int32_t* flt0,
-                                    int flt0_stride,
-                                    int32_t* flt1,
-                                    int flt1_stride,
-                                    int64_t H[2][2],
-                                    int64_t C[2],
-                                    const sgr_params_type* params);
-#define av1_calc_proj_params_high_bd av1_calc_proj_params_high_bd_c
-
 void av1_cnn_activate_c(float** input,
                         int channels,
                         int width,
@@ -321,33 +243,6 @@
                                        int y2);
 #define av1_compute_cross_correlation av1_compute_cross_correlation_c
 
-void av1_compute_stats_c(int wiener_win,
-                         const uint8_t* dgd8,
-                         const uint8_t* src8,
-                         int h_start,
-                         int h_end,
-                         int v_start,
-                         int v_end,
-                         int dgd_stride,
-                         int src_stride,
-                         int64_t* M,
-                         int64_t* H);
-#define av1_compute_stats av1_compute_stats_c
-
-void av1_compute_stats_highbd_c(int wiener_win,
-                                const uint8_t* dgd8,
-                                const uint8_t* src8,
-                                int h_start,
-                                int h_end,
-                                int v_start,
-                                int v_end,
-                                int dgd_stride,
-                                int src_stride,
-                                int64_t* M,
-                                int64_t* H,
-                                aom_bit_depth_t bit_depth);
-#define av1_compute_stats_highbd av1_compute_stats_highbd_c
-
 void av1_convolve_2d_scale_c(const uint8_t* src,
                              int src_stride,
                              uint8_t* dst,
@@ -863,30 +758,6 @@
                                   int8_t* const coeff_contexts);
 #define av1_get_nz_map_contexts av1_get_nz_map_contexts_neon
 
-void av1_highbd_apply_temporal_filter_c(
-    const struct yv12_buffer_config* ref_frame,
-    const struct macroblockd* mbd,
-    const BLOCK_SIZE block_size,
-    const int mb_row,
-    const int mb_col,
-    const int num_planes,
-    const double* noise_levels,
-    const MV* subblock_mvs,
-    const int* subblock_mses,
-    const int q_factor,
-    const int filter_strength,
-    const uint8_t* pred,
-    uint32_t* accum,
-    uint16_t* count);
-#define av1_highbd_apply_temporal_filter av1_highbd_apply_temporal_filter_c
-
-int64_t av1_highbd_block_error_c(const tran_low_t* coeff,
-                                 const tran_low_t* dqcoeff,
-                                 intptr_t block_size,
-                                 int64_t* ssz,
-                                 int bd);
-#define av1_highbd_block_error av1_highbd_block_error_c
-
 void av1_highbd_convolve8_c(const uint8_t* src,
                             ptrdiff_t src_stride,
                             uint8_t* dst,
@@ -926,36 +797,6 @@
                                  int bps);
 #define av1_highbd_convolve8_vert av1_highbd_convolve8_vert_c
 
-void av1_highbd_convolve_2d_scale_c(const uint16_t* src,
-                                    int src_stride,
-                                    uint16_t* dst,
-                                    int dst_stride,
-                                    int w,
-                                    int h,
-                                    const InterpFilterParams* filter_params_x,
-                                    const InterpFilterParams* filter_params_y,
-                                    const int subpel_x_qn,
-                                    const int x_step_qn,
-                                    const int subpel_y_qn,
-                                    const int y_step_qn,
-                                    ConvolveParams* conv_params,
-                                    int bd);
-#define av1_highbd_convolve_2d_scale av1_highbd_convolve_2d_scale_c
-
-void av1_highbd_convolve_2d_sr_c(const uint16_t* src,
-                                 int src_stride,
-                                 uint16_t* dst,
-                                 int dst_stride,
-                                 int w,
-                                 int h,
-                                 const InterpFilterParams* filter_params_x,
-                                 const InterpFilterParams* filter_params_y,
-                                 const int subpel_x_qn,
-                                 const int subpel_y_qn,
-                                 ConvolveParams* conv_params,
-                                 int bd);
-#define av1_highbd_convolve_2d_sr av1_highbd_convolve_2d_sr_c
-
 void av1_highbd_convolve_avg_c(const uint8_t* src,
                                ptrdiff_t src_stride,
                                uint8_t* dst,
@@ -982,128 +823,6 @@
                                 int bps);
 #define av1_highbd_convolve_copy av1_highbd_convolve_copy_c
 
-void av1_highbd_convolve_horiz_rs_c(const uint16_t* src,
-                                    int src_stride,
-                                    uint16_t* dst,
-                                    int dst_stride,
-                                    int w,
-                                    int h,
-                                    const int16_t* x_filters,
-                                    int x0_qn,
-                                    int x_step_qn,
-                                    int bd);
-#define av1_highbd_convolve_horiz_rs av1_highbd_convolve_horiz_rs_c
-
-void av1_highbd_convolve_x_sr_c(const uint16_t* src,
-                                int src_stride,
-                                uint16_t* dst,
-                                int dst_stride,
-                                int w,
-                                int h,
-                                const InterpFilterParams* filter_params_x,
-                                const int subpel_x_qn,
-                                ConvolveParams* conv_params,
-                                int bd);
-#define av1_highbd_convolve_x_sr av1_highbd_convolve_x_sr_c
-
-void av1_highbd_convolve_y_sr_c(const uint16_t* src,
-                                int src_stride,
-                                uint16_t* dst,
-                                int dst_stride,
-                                int w,
-                                int h,
-                                const InterpFilterParams* filter_params_y,
-                                const int subpel_y_qn,
-                                int bd);
-#define av1_highbd_convolve_y_sr av1_highbd_convolve_y_sr_c
-
-void av1_highbd_dist_wtd_convolve_2d_c(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_x,
-    const InterpFilterParams* filter_params_y,
-    const int subpel_x_qn,
-    const int subpel_y_qn,
-    ConvolveParams* conv_params,
-    int bd);
-#define av1_highbd_dist_wtd_convolve_2d av1_highbd_dist_wtd_convolve_2d_c
-
-void av1_highbd_dist_wtd_convolve_2d_copy_c(const uint16_t* src,
-                                            int src_stride,
-                                            uint16_t* dst,
-                                            int dst_stride,
-                                            int w,
-                                            int h,
-                                            ConvolveParams* conv_params,
-                                            int bd);
-#define av1_highbd_dist_wtd_convolve_2d_copy \
-  av1_highbd_dist_wtd_convolve_2d_copy_c
-
-void av1_highbd_dist_wtd_convolve_x_c(const uint16_t* src,
-                                      int src_stride,
-                                      uint16_t* dst,
-                                      int dst_stride,
-                                      int w,
-                                      int h,
-                                      const InterpFilterParams* filter_params_x,
-                                      const int subpel_x_qn,
-                                      ConvolveParams* conv_params,
-                                      int bd);
-#define av1_highbd_dist_wtd_convolve_x av1_highbd_dist_wtd_convolve_x_c
-
-void av1_highbd_dist_wtd_convolve_y_c(const uint16_t* src,
-                                      int src_stride,
-                                      uint16_t* dst,
-                                      int dst_stride,
-                                      int w,
-                                      int h,
-                                      const InterpFilterParams* filter_params_y,
-                                      const int subpel_y_qn,
-                                      ConvolveParams* conv_params,
-                                      int bd);
-#define av1_highbd_dist_wtd_convolve_y av1_highbd_dist_wtd_convolve_y_c
-
-void av1_highbd_dr_prediction_z1_c(uint16_t* dst,
-                                   ptrdiff_t stride,
-                                   int bw,
-                                   int bh,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int upsample_above,
-                                   int dx,
-                                   int dy,
-                                   int bd);
-#define av1_highbd_dr_prediction_z1 av1_highbd_dr_prediction_z1_c
-
-void av1_highbd_dr_prediction_z2_c(uint16_t* dst,
-                                   ptrdiff_t stride,
-                                   int bw,
-                                   int bh,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int upsample_above,
-                                   int upsample_left,
-                                   int dx,
-                                   int dy,
-                                   int bd);
-#define av1_highbd_dr_prediction_z2 av1_highbd_dr_prediction_z2_c
-
-void av1_highbd_dr_prediction_z3_c(uint16_t* dst,
-                                   ptrdiff_t stride,
-                                   int bw,
-                                   int bh,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int upsample_left,
-                                   int dx,
-                                   int dy,
-                                   int bd);
-#define av1_highbd_dr_prediction_z3 av1_highbd_dr_prediction_z3_c
-
 void av1_highbd_fwht4x4_c(const int16_t* input, tran_low_t* output, int stride);
 void av1_highbd_fwht4x4_neon(const int16_t* input,
                              tran_low_t* output,
@@ -1296,70 +1015,6 @@
                                 int bd);
 #define av1_highbd_iwht4x4_1_add av1_highbd_iwht4x4_1_add_c
 
-int64_t av1_highbd_pixel_proj_error_c(const uint8_t* src8,
-                                      int width,
-                                      int height,
-                                      int src_stride,
-                                      const uint8_t* dat8,
-                                      int dat_stride,
-                                      int32_t* flt0,
-                                      int flt0_stride,
-                                      int32_t* flt1,
-                                      int flt1_stride,
-                                      int xq[2],
-                                      const sgr_params_type* params);
-#define av1_highbd_pixel_proj_error av1_highbd_pixel_proj_error_c
-
-void av1_highbd_quantize_fp_c(const tran_low_t* coeff_ptr,
-                              intptr_t n_coeffs,
-                              const int16_t* zbin_ptr,
-                              const int16_t* round_ptr,
-                              const int16_t* quant_ptr,
-                              const int16_t* quant_shift_ptr,
-                              tran_low_t* qcoeff_ptr,
-                              tran_low_t* dqcoeff_ptr,
-                              const int16_t* dequant_ptr,
-                              uint16_t* eob_ptr,
-                              const int16_t* scan,
-                              const int16_t* iscan,
-                              int log_scale);
-#define av1_highbd_quantize_fp av1_highbd_quantize_fp_c
-
-void av1_highbd_warp_affine_c(const int32_t* mat,
-                              const uint16_t* ref,
-                              int width,
-                              int height,
-                              int stride,
-                              uint16_t* pred,
-                              int p_col,
-                              int p_row,
-                              int p_width,
-                              int p_height,
-                              int p_stride,
-                              int subsampling_x,
-                              int subsampling_y,
-                              int bd,
-                              ConvolveParams* conv_params,
-                              int16_t alpha,
-                              int16_t beta,
-                              int16_t gamma,
-                              int16_t delta);
-#define av1_highbd_warp_affine av1_highbd_warp_affine_c
-
-void av1_highbd_wiener_convolve_add_src_c(const uint8_t* src,
-                                          ptrdiff_t src_stride,
-                                          uint8_t* dst,
-                                          ptrdiff_t dst_stride,
-                                          const int16_t* filter_x,
-                                          int x_step_q4,
-                                          const int16_t* filter_y,
-                                          int y_step_q4,
-                                          int w,
-                                          int h,
-                                          const ConvolveParams* conv_params,
-                                          int bd);
-#define av1_highbd_wiener_convolve_add_src av1_highbd_wiener_convolve_add_src_c
-
 void av1_inv_txfm2d_add_16x16_c(const int32_t* input,
                                 uint16_t* output,
                                 int stride,
@@ -1603,32 +1258,6 @@
                              TxfmParam* txfm_param);
 #define av1_lowbd_fwd_txfm av1_lowbd_fwd_txfm_neon
 
-int64_t av1_lowbd_pixel_proj_error_c(const uint8_t* src8,
-                                     int width,
-                                     int height,
-                                     int src_stride,
-                                     const uint8_t* dat8,
-                                     int dat_stride,
-                                     int32_t* flt0,
-                                     int flt0_stride,
-                                     int32_t* flt1,
-                                     int flt1_stride,
-                                     int xq[2],
-                                     const sgr_params_type* params);
-int64_t av1_lowbd_pixel_proj_error_neon(const uint8_t* src8,
-                                        int width,
-                                        int height,
-                                        int src_stride,
-                                        const uint8_t* dat8,
-                                        int dat_stride,
-                                        int32_t* flt0,
-                                        int flt0_stride,
-                                        int32_t* flt1,
-                                        int flt1_stride,
-                                        int xq[2],
-                                        const sgr_params_type* params);
-#define av1_lowbd_pixel_proj_error av1_lowbd_pixel_proj_error_neon
-
 void av1_nn_predict_c(const float* input_nodes,
                       const NN_CONFIG* const nn_config,
                       int reduce_prec,
@@ -1770,28 +1399,6 @@
 void av1_round_shift_array_neon(int32_t* arr, int size, int bit);
 #define av1_round_shift_array av1_round_shift_array_neon
 
-int av1_selfguided_restoration_c(const uint8_t* dgd8,
-                                 int width,
-                                 int height,
-                                 int dgd_stride,
-                                 int32_t* flt0,
-                                 int32_t* flt1,
-                                 int flt_stride,
-                                 int sgr_params_idx,
-                                 int bit_depth,
-                                 int highbd);
-int av1_selfguided_restoration_neon(const uint8_t* dgd8,
-                                    int width,
-                                    int height,
-                                    int dgd_stride,
-                                    int32_t* flt0,
-                                    int32_t* flt1,
-                                    int flt_stride,
-                                    int sgr_params_idx,
-                                    int bit_depth,
-                                    int highbd);
-#define av1_selfguided_restoration av1_selfguided_restoration_neon
-
 void av1_txb_init_levels_c(const tran_low_t* const coeff,
                            const int width,
                            const int height,
@@ -1808,44 +1415,6 @@
 void av1_upsample_intra_edge_high_c(uint16_t* p, int sz, int bd);
 #define av1_upsample_intra_edge_high av1_upsample_intra_edge_high_c
 
-void av1_warp_affine_c(const int32_t* mat,
-                       const uint8_t* ref,
-                       int width,
-                       int height,
-                       int stride,
-                       uint8_t* pred,
-                       int p_col,
-                       int p_row,
-                       int p_width,
-                       int p_height,
-                       int p_stride,
-                       int subsampling_x,
-                       int subsampling_y,
-                       ConvolveParams* conv_params,
-                       int16_t alpha,
-                       int16_t beta,
-                       int16_t gamma,
-                       int16_t delta);
-void av1_warp_affine_neon(const int32_t* mat,
-                          const uint8_t* ref,
-                          int width,
-                          int height,
-                          int stride,
-                          uint8_t* pred,
-                          int p_col,
-                          int p_row,
-                          int p_width,
-                          int p_height,
-                          int p_stride,
-                          int subsampling_x,
-                          int subsampling_y,
-                          ConvolveParams* conv_params,
-                          int16_t alpha,
-                          int16_t beta,
-                          int16_t gamma,
-                          int16_t delta);
-#define av1_warp_affine av1_warp_affine_neon
-
 void av1_wedge_compute_delta_squares_c(int16_t* d,
                                        const int16_t* a,
                                        const int16_t* b,
@@ -1950,34 +1519,18 @@
                        int coeff_shift);
 #define cdef_find_dir cdef_find_dir_neon
 
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_420_hbd_c(TX_SIZE tx_size);
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_420_hbd_neon(TX_SIZE tx_size);
-#define cfl_get_luma_subsampling_420_hbd cfl_get_luma_subsampling_420_hbd_neon
-
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_420_lbd_c(TX_SIZE tx_size);
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_420_lbd_neon(TX_SIZE tx_size);
 #define cfl_get_luma_subsampling_420_lbd cfl_get_luma_subsampling_420_lbd_neon
 
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_422_hbd_c(TX_SIZE tx_size);
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_422_hbd_neon(TX_SIZE tx_size);
-#define cfl_get_luma_subsampling_422_hbd cfl_get_luma_subsampling_422_hbd_neon
-
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_422_lbd_c(TX_SIZE tx_size);
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_422_lbd_neon(TX_SIZE tx_size);
 #define cfl_get_luma_subsampling_422_lbd cfl_get_luma_subsampling_422_lbd_neon
 
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_444_hbd_c(TX_SIZE tx_size);
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_444_hbd_neon(TX_SIZE tx_size);
-#define cfl_get_luma_subsampling_444_hbd cfl_get_luma_subsampling_444_hbd_neon
-
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_444_lbd_c(TX_SIZE tx_size);
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_444_lbd_neon(TX_SIZE tx_size);
 #define cfl_get_luma_subsampling_444_lbd cfl_get_luma_subsampling_444_lbd_neon
 
-cfl_predict_hbd_fn cfl_get_predict_hbd_fn_c(TX_SIZE tx_size);
-cfl_predict_hbd_fn cfl_get_predict_hbd_fn_neon(TX_SIZE tx_size);
-#define cfl_get_predict_hbd_fn cfl_get_predict_hbd_fn_neon
-
 cfl_predict_lbd_fn cfl_get_predict_lbd_fn_c(TX_SIZE tx_size);
 cfl_predict_lbd_fn cfl_get_predict_lbd_fn_neon(TX_SIZE tx_size);
 #define cfl_get_predict_lbd_fn cfl_get_predict_lbd_fn_neon
diff --git a/third_party/libaom/source/config/ios/arm64/config/aom_config.asm b/third_party/libaom/source/config/ios/arm64/config/aom_config.asm
index c803d9fe..8fbd732d 100644
--- a/third_party/libaom/source/config/ios/arm64/config/aom_config.asm
+++ b/third_party/libaom/source/config/ios/arm64/config/aom_config.asm
@@ -17,7 +17,7 @@
 CONFIG_ANALYZER equ 0
 CONFIG_AV1_DECODER equ 1
 CONFIG_AV1_ENCODER equ 1
-CONFIG_AV1_HIGHBITDEPTH equ 1
+CONFIG_AV1_HIGHBITDEPTH equ 0
 CONFIG_AV1_TEMPORAL_DENOISING equ 0
 CONFIG_BIG_ENDIAN equ 0
 CONFIG_BITSTREAM_DEBUG equ 0
@@ -47,7 +47,7 @@
 CONFIG_OS_SUPPORT equ 1
 CONFIG_PIC equ 0
 CONFIG_RD_DEBUG equ 0
-CONFIG_REALTIME_ONLY equ 0
+CONFIG_REALTIME_ONLY equ 1
 CONFIG_RUNTIME_CPU_DETECT equ 0
 CONFIG_SHARED equ 0
 CONFIG_SHARP_SETTINGS equ 0
diff --git a/third_party/libaom/source/config/ios/arm64/config/aom_config.c b/third_party/libaom/source/config/ios/arm64/config/aom_config.c
index 43dd7b6..4a2aa61 100644
--- a/third_party/libaom/source/config/ios/arm64/config/aom_config.c
+++ b/third_party/libaom/source/config/ios/arm64/config/aom_config.c
@@ -9,5 +9,5 @@
  * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
  */
 #include "aom/aom_codec.h"
-static const char* const cfg = "cmake ../source/libaom -G \"Unix Makefiles\" -DCMAKE_TOOLCHAIN_FILE=\"../source/libaom/build/cmake/toolchains/arm64-ios.cmake\" -DCONFIG_AV1_ENCODER=1 -DCONFIG_LIBYUV=0 -DCONFIG_MAX_DECODE_PROFILE=0 -DCONFIG_NORMAL_TILE_MODE=1 -DCONFIG_SIZE_LIMIT=1 -DDECODE_HEIGHT_LIMIT=16384 -DDECODE_WIDTH_LIMIT=16384";
+static const char* const cfg = "cmake ../source/libaom -G \"Unix Makefiles\" -DCMAKE_TOOLCHAIN_FILE=\"../source/libaom/build/cmake/toolchains/arm64-ios.cmake\" -DCONFIG_AV1_ENCODER=1 -DCONFIG_LIBYUV=0 -DCONFIG_MAX_DECODE_PROFILE=0 -DCONFIG_NORMAL_TILE_MODE=1 -DCONFIG_SIZE_LIMIT=1 -DDECODE_HEIGHT_LIMIT=16384 -DDECODE_WIDTH_LIMIT=16384 -DCONFIG_REALTIME_ONLY=1 -DCONFIG_AV1_HIGHBITDEPTH=0";
 const char *aom_codec_build_config(void) {return cfg;}
diff --git a/third_party/libaom/source/config/ios/arm64/config/aom_config.h b/third_party/libaom/source/config/ios/arm64/config/aom_config.h
index 71185c9f..fa9522d 100644
--- a/third_party/libaom/source/config/ios/arm64/config/aom_config.h
+++ b/third_party/libaom/source/config/ios/arm64/config/aom_config.h
@@ -19,7 +19,7 @@
 #define CONFIG_ANALYZER 0
 #define CONFIG_AV1_DECODER 1
 #define CONFIG_AV1_ENCODER 1
-#define CONFIG_AV1_HIGHBITDEPTH 1
+#define CONFIG_AV1_HIGHBITDEPTH 0
 #define CONFIG_AV1_TEMPORAL_DENOISING 0
 #define CONFIG_BIG_ENDIAN 0
 #define CONFIG_BITSTREAM_DEBUG 0
@@ -49,7 +49,7 @@
 #define CONFIG_OS_SUPPORT 1
 #define CONFIG_PIC 0
 #define CONFIG_RD_DEBUG 0
-#define CONFIG_REALTIME_ONLY 0
+#define CONFIG_REALTIME_ONLY 1
 #define CONFIG_RUNTIME_CPU_DETECT 0
 #define CONFIG_SHARED 0
 #define CONFIG_SHARP_SETTINGS 0
diff --git a/third_party/libaom/source/config/ios/arm64/config/aom_dsp_rtcd.h b/third_party/libaom/source/config/ios/arm64/config/aom_dsp_rtcd.h
index 5bf7631..5bc4d69e 100644
--- a/third_party/libaom/source/config/ios/arm64/config/aom_dsp_rtcd.h
+++ b/third_party/libaom/source/config/ios/arm64/config/aom_dsp_rtcd.h
@@ -1474,8226 +1474,6 @@
                               int16_t* coeff);
 #define aom_hadamard_lp_8x8 aom_hadamard_lp_8x8_neon
 
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x128 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x64 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x16 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x16_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x32 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x32_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x4 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x4_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x64 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x64_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x8 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x8_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x16 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x16_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x32 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x32_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x64 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x64_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x8 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x8_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x16 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x4 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x4_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x8 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x128 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x16 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x16_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x32 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x32_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x64 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x64_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x16 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x16_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x32 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x32_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x4 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x4_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x8 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x8_c
-
-void aom_highbd_10_get16x16var_c(const uint8_t* src_ptr,
-                                 int source_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride,
-                                 unsigned int* sse,
-                                 int* sum);
-#define aom_highbd_10_get16x16var aom_highbd_10_get16x16var_c
-
-void aom_highbd_10_get8x8var_c(const uint8_t* src_ptr,
-                               int source_stride,
-                               const uint8_t* ref_ptr,
-                               int ref_stride,
-                               unsigned int* sse,
-                               int* sum);
-#define aom_highbd_10_get8x8var aom_highbd_10_get8x8var_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance128x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance128x128 \
-  aom_highbd_10_masked_sub_pixel_variance128x128_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance128x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance128x64 \
-  aom_highbd_10_masked_sub_pixel_variance128x64_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance16x16 \
-  aom_highbd_10_masked_sub_pixel_variance16x16_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance16x32 \
-  aom_highbd_10_masked_sub_pixel_variance16x32_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance16x4 \
-  aom_highbd_10_masked_sub_pixel_variance16x4_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance16x64 \
-  aom_highbd_10_masked_sub_pixel_variance16x64_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance16x8 \
-  aom_highbd_10_masked_sub_pixel_variance16x8_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance32x16 \
-  aom_highbd_10_masked_sub_pixel_variance32x16_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance32x32 \
-  aom_highbd_10_masked_sub_pixel_variance32x32_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance32x64 \
-  aom_highbd_10_masked_sub_pixel_variance32x64_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance32x8 \
-  aom_highbd_10_masked_sub_pixel_variance32x8_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance4x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance4x16 \
-  aom_highbd_10_masked_sub_pixel_variance4x16_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance4x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance4x4 \
-  aom_highbd_10_masked_sub_pixel_variance4x4_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance4x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance4x8 \
-  aom_highbd_10_masked_sub_pixel_variance4x8_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance64x128 \
-  aom_highbd_10_masked_sub_pixel_variance64x128_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance64x16 \
-  aom_highbd_10_masked_sub_pixel_variance64x16_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance64x32 \
-  aom_highbd_10_masked_sub_pixel_variance64x32_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance64x64 \
-  aom_highbd_10_masked_sub_pixel_variance64x64_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance8x16 \
-  aom_highbd_10_masked_sub_pixel_variance8x16_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance8x32 \
-  aom_highbd_10_masked_sub_pixel_variance8x32_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance8x4 \
-  aom_highbd_10_masked_sub_pixel_variance8x4_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance8x8 \
-  aom_highbd_10_masked_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_10_mse16x16_c(const uint8_t* src_ptr,
-                                      int source_stride,
-                                      const uint8_t* ref_ptr,
-                                      int recon_stride,
-                                      unsigned int* sse);
-#define aom_highbd_10_mse16x16 aom_highbd_10_mse16x16_c
-
-unsigned int aom_highbd_10_mse16x8_c(const uint8_t* src_ptr,
-                                     int source_stride,
-                                     const uint8_t* ref_ptr,
-                                     int recon_stride,
-                                     unsigned int* sse);
-#define aom_highbd_10_mse16x8 aom_highbd_10_mse16x8_c
-
-unsigned int aom_highbd_10_mse8x16_c(const uint8_t* src_ptr,
-                                     int source_stride,
-                                     const uint8_t* ref_ptr,
-                                     int recon_stride,
-                                     unsigned int* sse);
-#define aom_highbd_10_mse8x16 aom_highbd_10_mse8x16_c
-
-unsigned int aom_highbd_10_mse8x8_c(const uint8_t* src_ptr,
-                                    int source_stride,
-                                    const uint8_t* ref_ptr,
-                                    int recon_stride,
-                                    unsigned int* sse);
-#define aom_highbd_10_mse8x8 aom_highbd_10_mse8x8_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance128x128_c(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            int xoffset,
-                                                            int yoffset,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance128x128 \
-  aom_highbd_10_obmc_sub_pixel_variance128x128_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance128x64_c(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance128x64 \
-  aom_highbd_10_obmc_sub_pixel_variance128x64_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance16x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance16x16 \
-  aom_highbd_10_obmc_sub_pixel_variance16x16_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance16x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance16x32 \
-  aom_highbd_10_obmc_sub_pixel_variance16x32_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance16x4_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance16x4 \
-  aom_highbd_10_obmc_sub_pixel_variance16x4_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance16x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance16x64 \
-  aom_highbd_10_obmc_sub_pixel_variance16x64_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance16x8_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance16x8 \
-  aom_highbd_10_obmc_sub_pixel_variance16x8_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance32x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance32x16 \
-  aom_highbd_10_obmc_sub_pixel_variance32x16_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance32x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance32x32 \
-  aom_highbd_10_obmc_sub_pixel_variance32x32_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance32x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance32x64 \
-  aom_highbd_10_obmc_sub_pixel_variance32x64_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance32x8_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance32x8 \
-  aom_highbd_10_obmc_sub_pixel_variance32x8_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance4x16_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance4x16 \
-  aom_highbd_10_obmc_sub_pixel_variance4x16_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance4x4_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance4x4 \
-  aom_highbd_10_obmc_sub_pixel_variance4x4_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance4x8_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance4x8 \
-  aom_highbd_10_obmc_sub_pixel_variance4x8_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance64x128_c(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance64x128 \
-  aom_highbd_10_obmc_sub_pixel_variance64x128_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance64x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance64x16 \
-  aom_highbd_10_obmc_sub_pixel_variance64x16_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance64x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance64x32 \
-  aom_highbd_10_obmc_sub_pixel_variance64x32_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance64x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance64x64 \
-  aom_highbd_10_obmc_sub_pixel_variance64x64_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance8x16_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance8x16 \
-  aom_highbd_10_obmc_sub_pixel_variance8x16_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance8x32_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance8x32 \
-  aom_highbd_10_obmc_sub_pixel_variance8x32_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance8x4_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance8x4 \
-  aom_highbd_10_obmc_sub_pixel_variance8x4_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance8x8_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance8x8 \
-  aom_highbd_10_obmc_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_10_obmc_variance128x128_c(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-#define aom_highbd_10_obmc_variance128x128 aom_highbd_10_obmc_variance128x128_c
-
-unsigned int aom_highbd_10_obmc_variance128x64_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-#define aom_highbd_10_obmc_variance128x64 aom_highbd_10_obmc_variance128x64_c
-
-unsigned int aom_highbd_10_obmc_variance16x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance16x16 aom_highbd_10_obmc_variance16x16_c
-
-unsigned int aom_highbd_10_obmc_variance16x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance16x32 aom_highbd_10_obmc_variance16x32_c
-
-unsigned int aom_highbd_10_obmc_variance16x4_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_10_obmc_variance16x4 aom_highbd_10_obmc_variance16x4_c
-
-unsigned int aom_highbd_10_obmc_variance16x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance16x64 aom_highbd_10_obmc_variance16x64_c
-
-unsigned int aom_highbd_10_obmc_variance16x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_10_obmc_variance16x8 aom_highbd_10_obmc_variance16x8_c
-
-unsigned int aom_highbd_10_obmc_variance32x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance32x16 aom_highbd_10_obmc_variance32x16_c
-
-unsigned int aom_highbd_10_obmc_variance32x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance32x32 aom_highbd_10_obmc_variance32x32_c
-
-unsigned int aom_highbd_10_obmc_variance32x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance32x64 aom_highbd_10_obmc_variance32x64_c
-
-unsigned int aom_highbd_10_obmc_variance32x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_10_obmc_variance32x8 aom_highbd_10_obmc_variance32x8_c
-
-unsigned int aom_highbd_10_obmc_variance4x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_10_obmc_variance4x16 aom_highbd_10_obmc_variance4x16_c
-
-unsigned int aom_highbd_10_obmc_variance4x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_10_obmc_variance4x4 aom_highbd_10_obmc_variance4x4_c
-
-unsigned int aom_highbd_10_obmc_variance4x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_10_obmc_variance4x8 aom_highbd_10_obmc_variance4x8_c
-
-unsigned int aom_highbd_10_obmc_variance64x128_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-#define aom_highbd_10_obmc_variance64x128 aom_highbd_10_obmc_variance64x128_c
-
-unsigned int aom_highbd_10_obmc_variance64x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance64x16 aom_highbd_10_obmc_variance64x16_c
-
-unsigned int aom_highbd_10_obmc_variance64x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance64x32 aom_highbd_10_obmc_variance64x32_c
-
-unsigned int aom_highbd_10_obmc_variance64x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance64x64 aom_highbd_10_obmc_variance64x64_c
-
-unsigned int aom_highbd_10_obmc_variance8x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_10_obmc_variance8x16 aom_highbd_10_obmc_variance8x16_c
-
-unsigned int aom_highbd_10_obmc_variance8x32_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_10_obmc_variance8x32 aom_highbd_10_obmc_variance8x32_c
-
-unsigned int aom_highbd_10_obmc_variance8x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_10_obmc_variance8x4 aom_highbd_10_obmc_variance8x4_c
-
-unsigned int aom_highbd_10_obmc_variance8x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_10_obmc_variance8x8 aom_highbd_10_obmc_variance8x8_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance128x128 \
-  aom_highbd_10_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance128x64 \
-  aom_highbd_10_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance16x16 \
-  aom_highbd_10_sub_pixel_avg_variance16x16_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance16x32 \
-  aom_highbd_10_sub_pixel_avg_variance16x32_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x4_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance16x4 \
-  aom_highbd_10_sub_pixel_avg_variance16x4_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance16x64 \
-  aom_highbd_10_sub_pixel_avg_variance16x64_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance16x8 \
-  aom_highbd_10_sub_pixel_avg_variance16x8_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance32x16 \
-  aom_highbd_10_sub_pixel_avg_variance32x16_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance32x32 \
-  aom_highbd_10_sub_pixel_avg_variance32x32_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance32x64 \
-  aom_highbd_10_sub_pixel_avg_variance32x64_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x8_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance32x8 \
-  aom_highbd_10_sub_pixel_avg_variance32x8_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance4x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance4x16 \
-  aom_highbd_10_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance4x4 \
-  aom_highbd_10_sub_pixel_avg_variance4x4_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance4x8 \
-  aom_highbd_10_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance64x128 \
-  aom_highbd_10_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance64x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance64x16 \
-  aom_highbd_10_sub_pixel_avg_variance64x16_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance64x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance64x32 \
-  aom_highbd_10_sub_pixel_avg_variance64x32_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance64x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance64x64 \
-  aom_highbd_10_sub_pixel_avg_variance64x64_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance8x16 \
-  aom_highbd_10_sub_pixel_avg_variance8x16_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x32_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance8x32 \
-  aom_highbd_10_sub_pixel_avg_variance8x32_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance8x4 \
-  aom_highbd_10_sub_pixel_avg_variance8x4_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance8x8 \
-  aom_highbd_10_sub_pixel_avg_variance8x8_c
-
-uint32_t aom_highbd_10_sub_pixel_variance128x128_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance128x128 \
-  aom_highbd_10_sub_pixel_variance128x128_c
-
-uint32_t aom_highbd_10_sub_pixel_variance128x64_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance128x64 \
-  aom_highbd_10_sub_pixel_variance128x64_c
-
-uint32_t aom_highbd_10_sub_pixel_variance16x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance16x16 \
-  aom_highbd_10_sub_pixel_variance16x16_c
-
-uint32_t aom_highbd_10_sub_pixel_variance16x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance16x32 \
-  aom_highbd_10_sub_pixel_variance16x32_c
-
-uint32_t aom_highbd_10_sub_pixel_variance16x4_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance16x4 \
-  aom_highbd_10_sub_pixel_variance16x4_c
-
-uint32_t aom_highbd_10_sub_pixel_variance16x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance16x64 \
-  aom_highbd_10_sub_pixel_variance16x64_c
-
-uint32_t aom_highbd_10_sub_pixel_variance16x8_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance16x8 \
-  aom_highbd_10_sub_pixel_variance16x8_c
-
-uint32_t aom_highbd_10_sub_pixel_variance32x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance32x16 \
-  aom_highbd_10_sub_pixel_variance32x16_c
-
-uint32_t aom_highbd_10_sub_pixel_variance32x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance32x32 \
-  aom_highbd_10_sub_pixel_variance32x32_c
-
-uint32_t aom_highbd_10_sub_pixel_variance32x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance32x64 \
-  aom_highbd_10_sub_pixel_variance32x64_c
-
-uint32_t aom_highbd_10_sub_pixel_variance32x8_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance32x8 \
-  aom_highbd_10_sub_pixel_variance32x8_c
-
-uint32_t aom_highbd_10_sub_pixel_variance4x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance4x16 \
-  aom_highbd_10_sub_pixel_variance4x16_c
-
-uint32_t aom_highbd_10_sub_pixel_variance4x4_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance4x4 \
-  aom_highbd_10_sub_pixel_variance4x4_c
-
-uint32_t aom_highbd_10_sub_pixel_variance4x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance4x8 \
-  aom_highbd_10_sub_pixel_variance4x8_c
-
-uint32_t aom_highbd_10_sub_pixel_variance64x128_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance64x128 \
-  aom_highbd_10_sub_pixel_variance64x128_c
-
-uint32_t aom_highbd_10_sub_pixel_variance64x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance64x16 \
-  aom_highbd_10_sub_pixel_variance64x16_c
-
-uint32_t aom_highbd_10_sub_pixel_variance64x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance64x32 \
-  aom_highbd_10_sub_pixel_variance64x32_c
-
-uint32_t aom_highbd_10_sub_pixel_variance64x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance64x64 \
-  aom_highbd_10_sub_pixel_variance64x64_c
-
-uint32_t aom_highbd_10_sub_pixel_variance8x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance8x16 \
-  aom_highbd_10_sub_pixel_variance8x16_c
-
-uint32_t aom_highbd_10_sub_pixel_variance8x32_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance8x32 \
-  aom_highbd_10_sub_pixel_variance8x32_c
-
-uint32_t aom_highbd_10_sub_pixel_variance8x4_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance8x4 \
-  aom_highbd_10_sub_pixel_variance8x4_c
-
-uint32_t aom_highbd_10_sub_pixel_variance8x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance8x8 \
-  aom_highbd_10_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_10_variance128x128_c(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-#define aom_highbd_10_variance128x128 aom_highbd_10_variance128x128_c
-
-unsigned int aom_highbd_10_variance128x64_c(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-#define aom_highbd_10_variance128x64 aom_highbd_10_variance128x64_c
-
-unsigned int aom_highbd_10_variance16x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_10_variance16x16 aom_highbd_10_variance16x16_c
-
-unsigned int aom_highbd_10_variance16x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_10_variance16x32 aom_highbd_10_variance16x32_c
-
-unsigned int aom_highbd_10_variance16x4_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_10_variance16x4 aom_highbd_10_variance16x4_c
-
-unsigned int aom_highbd_10_variance16x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           uint32_t* sse);
-#define aom_highbd_10_variance16x64 aom_highbd_10_variance16x64_c
-
-unsigned int aom_highbd_10_variance16x8_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_10_variance16x8 aom_highbd_10_variance16x8_c
-
-unsigned int aom_highbd_10_variance2x2_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance2x2 aom_highbd_10_variance2x2_c
-
-unsigned int aom_highbd_10_variance2x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance2x4 aom_highbd_10_variance2x4_c
-
-unsigned int aom_highbd_10_variance32x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_10_variance32x16 aom_highbd_10_variance32x16_c
-
-unsigned int aom_highbd_10_variance32x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_10_variance32x32 aom_highbd_10_variance32x32_c
-
-unsigned int aom_highbd_10_variance32x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_10_variance32x64 aom_highbd_10_variance32x64_c
-
-unsigned int aom_highbd_10_variance32x8_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_10_variance32x8 aom_highbd_10_variance32x8_c
-
-unsigned int aom_highbd_10_variance4x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_10_variance4x16 aom_highbd_10_variance4x16_c
-
-unsigned int aom_highbd_10_variance4x2_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance4x2 aom_highbd_10_variance4x2_c
-
-unsigned int aom_highbd_10_variance4x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance4x4 aom_highbd_10_variance4x4_c
-
-unsigned int aom_highbd_10_variance4x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance4x8 aom_highbd_10_variance4x8_c
-
-unsigned int aom_highbd_10_variance64x128_c(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-#define aom_highbd_10_variance64x128 aom_highbd_10_variance64x128_c
-
-unsigned int aom_highbd_10_variance64x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           uint32_t* sse);
-#define aom_highbd_10_variance64x16 aom_highbd_10_variance64x16_c
-
-unsigned int aom_highbd_10_variance64x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_10_variance64x32 aom_highbd_10_variance64x32_c
-
-unsigned int aom_highbd_10_variance64x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_10_variance64x64 aom_highbd_10_variance64x64_c
-
-unsigned int aom_highbd_10_variance8x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_10_variance8x16 aom_highbd_10_variance8x16_c
-
-unsigned int aom_highbd_10_variance8x32_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_10_variance8x32 aom_highbd_10_variance8x32_c
-
-unsigned int aom_highbd_10_variance8x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance8x4 aom_highbd_10_variance8x4_c
-
-unsigned int aom_highbd_10_variance8x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance8x8 aom_highbd_10_variance8x8_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x128 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x64 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x16 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x16_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x32 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x32_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x4 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x4_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x64 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x64_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x8 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x8_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x16 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x16_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x32 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x32_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x64 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x64_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x8 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x8_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x16 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x4 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x4_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x8 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x128 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x16 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x16_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x32 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x32_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x64 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x64_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x16 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x16_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x32 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x32_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x4 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x4_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x8 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x8_c
-
-void aom_highbd_12_get16x16var_c(const uint8_t* src_ptr,
-                                 int source_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride,
-                                 unsigned int* sse,
-                                 int* sum);
-#define aom_highbd_12_get16x16var aom_highbd_12_get16x16var_c
-
-void aom_highbd_12_get8x8var_c(const uint8_t* src_ptr,
-                               int source_stride,
-                               const uint8_t* ref_ptr,
-                               int ref_stride,
-                               unsigned int* sse,
-                               int* sum);
-#define aom_highbd_12_get8x8var aom_highbd_12_get8x8var_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance128x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance128x128 \
-  aom_highbd_12_masked_sub_pixel_variance128x128_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance128x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance128x64 \
-  aom_highbd_12_masked_sub_pixel_variance128x64_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance16x16 \
-  aom_highbd_12_masked_sub_pixel_variance16x16_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance16x32 \
-  aom_highbd_12_masked_sub_pixel_variance16x32_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance16x4 \
-  aom_highbd_12_masked_sub_pixel_variance16x4_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance16x64 \
-  aom_highbd_12_masked_sub_pixel_variance16x64_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance16x8 \
-  aom_highbd_12_masked_sub_pixel_variance16x8_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance32x16 \
-  aom_highbd_12_masked_sub_pixel_variance32x16_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance32x32 \
-  aom_highbd_12_masked_sub_pixel_variance32x32_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance32x64 \
-  aom_highbd_12_masked_sub_pixel_variance32x64_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance32x8 \
-  aom_highbd_12_masked_sub_pixel_variance32x8_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance4x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance4x16 \
-  aom_highbd_12_masked_sub_pixel_variance4x16_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance4x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance4x4 \
-  aom_highbd_12_masked_sub_pixel_variance4x4_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance4x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance4x8 \
-  aom_highbd_12_masked_sub_pixel_variance4x8_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance64x128 \
-  aom_highbd_12_masked_sub_pixel_variance64x128_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance64x16 \
-  aom_highbd_12_masked_sub_pixel_variance64x16_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance64x32 \
-  aom_highbd_12_masked_sub_pixel_variance64x32_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance64x64 \
-  aom_highbd_12_masked_sub_pixel_variance64x64_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance8x16 \
-  aom_highbd_12_masked_sub_pixel_variance8x16_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance8x32 \
-  aom_highbd_12_masked_sub_pixel_variance8x32_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance8x4 \
-  aom_highbd_12_masked_sub_pixel_variance8x4_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance8x8 \
-  aom_highbd_12_masked_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_12_mse16x16_c(const uint8_t* src_ptr,
-                                      int source_stride,
-                                      const uint8_t* ref_ptr,
-                                      int recon_stride,
-                                      unsigned int* sse);
-#define aom_highbd_12_mse16x16 aom_highbd_12_mse16x16_c
-
-unsigned int aom_highbd_12_mse16x8_c(const uint8_t* src_ptr,
-                                     int source_stride,
-                                     const uint8_t* ref_ptr,
-                                     int recon_stride,
-                                     unsigned int* sse);
-#define aom_highbd_12_mse16x8 aom_highbd_12_mse16x8_c
-
-unsigned int aom_highbd_12_mse8x16_c(const uint8_t* src_ptr,
-                                     int source_stride,
-                                     const uint8_t* ref_ptr,
-                                     int recon_stride,
-                                     unsigned int* sse);
-#define aom_highbd_12_mse8x16 aom_highbd_12_mse8x16_c
-
-unsigned int aom_highbd_12_mse8x8_c(const uint8_t* src_ptr,
-                                    int source_stride,
-                                    const uint8_t* ref_ptr,
-                                    int recon_stride,
-                                    unsigned int* sse);
-#define aom_highbd_12_mse8x8 aom_highbd_12_mse8x8_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance128x128_c(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            int xoffset,
-                                                            int yoffset,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance128x128 \
-  aom_highbd_12_obmc_sub_pixel_variance128x128_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance128x64_c(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance128x64 \
-  aom_highbd_12_obmc_sub_pixel_variance128x64_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance16x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance16x16 \
-  aom_highbd_12_obmc_sub_pixel_variance16x16_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance16x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance16x32 \
-  aom_highbd_12_obmc_sub_pixel_variance16x32_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance16x4_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance16x4 \
-  aom_highbd_12_obmc_sub_pixel_variance16x4_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance16x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance16x64 \
-  aom_highbd_12_obmc_sub_pixel_variance16x64_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance16x8_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance16x8 \
-  aom_highbd_12_obmc_sub_pixel_variance16x8_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance32x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance32x16 \
-  aom_highbd_12_obmc_sub_pixel_variance32x16_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance32x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance32x32 \
-  aom_highbd_12_obmc_sub_pixel_variance32x32_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance32x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance32x64 \
-  aom_highbd_12_obmc_sub_pixel_variance32x64_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance32x8_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance32x8 \
-  aom_highbd_12_obmc_sub_pixel_variance32x8_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance4x16_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance4x16 \
-  aom_highbd_12_obmc_sub_pixel_variance4x16_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance4x4_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance4x4 \
-  aom_highbd_12_obmc_sub_pixel_variance4x4_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance4x8_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance4x8 \
-  aom_highbd_12_obmc_sub_pixel_variance4x8_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance64x128_c(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance64x128 \
-  aom_highbd_12_obmc_sub_pixel_variance64x128_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance64x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance64x16 \
-  aom_highbd_12_obmc_sub_pixel_variance64x16_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance64x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance64x32 \
-  aom_highbd_12_obmc_sub_pixel_variance64x32_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance64x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance64x64 \
-  aom_highbd_12_obmc_sub_pixel_variance64x64_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance8x16_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance8x16 \
-  aom_highbd_12_obmc_sub_pixel_variance8x16_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance8x32_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance8x32 \
-  aom_highbd_12_obmc_sub_pixel_variance8x32_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance8x4_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance8x4 \
-  aom_highbd_12_obmc_sub_pixel_variance8x4_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance8x8_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance8x8 \
-  aom_highbd_12_obmc_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_12_obmc_variance128x128_c(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-#define aom_highbd_12_obmc_variance128x128 aom_highbd_12_obmc_variance128x128_c
-
-unsigned int aom_highbd_12_obmc_variance128x64_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-#define aom_highbd_12_obmc_variance128x64 aom_highbd_12_obmc_variance128x64_c
-
-unsigned int aom_highbd_12_obmc_variance16x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance16x16 aom_highbd_12_obmc_variance16x16_c
-
-unsigned int aom_highbd_12_obmc_variance16x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance16x32 aom_highbd_12_obmc_variance16x32_c
-
-unsigned int aom_highbd_12_obmc_variance16x4_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_12_obmc_variance16x4 aom_highbd_12_obmc_variance16x4_c
-
-unsigned int aom_highbd_12_obmc_variance16x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance16x64 aom_highbd_12_obmc_variance16x64_c
-
-unsigned int aom_highbd_12_obmc_variance16x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_12_obmc_variance16x8 aom_highbd_12_obmc_variance16x8_c
-
-unsigned int aom_highbd_12_obmc_variance32x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance32x16 aom_highbd_12_obmc_variance32x16_c
-
-unsigned int aom_highbd_12_obmc_variance32x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance32x32 aom_highbd_12_obmc_variance32x32_c
-
-unsigned int aom_highbd_12_obmc_variance32x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance32x64 aom_highbd_12_obmc_variance32x64_c
-
-unsigned int aom_highbd_12_obmc_variance32x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_12_obmc_variance32x8 aom_highbd_12_obmc_variance32x8_c
-
-unsigned int aom_highbd_12_obmc_variance4x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_12_obmc_variance4x16 aom_highbd_12_obmc_variance4x16_c
-
-unsigned int aom_highbd_12_obmc_variance4x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_12_obmc_variance4x4 aom_highbd_12_obmc_variance4x4_c
-
-unsigned int aom_highbd_12_obmc_variance4x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_12_obmc_variance4x8 aom_highbd_12_obmc_variance4x8_c
-
-unsigned int aom_highbd_12_obmc_variance64x128_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-#define aom_highbd_12_obmc_variance64x128 aom_highbd_12_obmc_variance64x128_c
-
-unsigned int aom_highbd_12_obmc_variance64x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance64x16 aom_highbd_12_obmc_variance64x16_c
-
-unsigned int aom_highbd_12_obmc_variance64x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance64x32 aom_highbd_12_obmc_variance64x32_c
-
-unsigned int aom_highbd_12_obmc_variance64x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance64x64 aom_highbd_12_obmc_variance64x64_c
-
-unsigned int aom_highbd_12_obmc_variance8x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_12_obmc_variance8x16 aom_highbd_12_obmc_variance8x16_c
-
-unsigned int aom_highbd_12_obmc_variance8x32_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_12_obmc_variance8x32 aom_highbd_12_obmc_variance8x32_c
-
-unsigned int aom_highbd_12_obmc_variance8x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_12_obmc_variance8x4 aom_highbd_12_obmc_variance8x4_c
-
-unsigned int aom_highbd_12_obmc_variance8x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_12_obmc_variance8x8 aom_highbd_12_obmc_variance8x8_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance128x128 \
-  aom_highbd_12_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance128x64 \
-  aom_highbd_12_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance16x16 \
-  aom_highbd_12_sub_pixel_avg_variance16x16_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance16x32 \
-  aom_highbd_12_sub_pixel_avg_variance16x32_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x4_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance16x4 \
-  aom_highbd_12_sub_pixel_avg_variance16x4_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance16x64 \
-  aom_highbd_12_sub_pixel_avg_variance16x64_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance16x8 \
-  aom_highbd_12_sub_pixel_avg_variance16x8_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance32x16 \
-  aom_highbd_12_sub_pixel_avg_variance32x16_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance32x32 \
-  aom_highbd_12_sub_pixel_avg_variance32x32_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance32x64 \
-  aom_highbd_12_sub_pixel_avg_variance32x64_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x8_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance32x8 \
-  aom_highbd_12_sub_pixel_avg_variance32x8_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance4x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance4x16 \
-  aom_highbd_12_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance4x4 \
-  aom_highbd_12_sub_pixel_avg_variance4x4_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance4x8 \
-  aom_highbd_12_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance64x128 \
-  aom_highbd_12_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance64x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance64x16 \
-  aom_highbd_12_sub_pixel_avg_variance64x16_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance64x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance64x32 \
-  aom_highbd_12_sub_pixel_avg_variance64x32_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance64x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance64x64 \
-  aom_highbd_12_sub_pixel_avg_variance64x64_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance8x16 \
-  aom_highbd_12_sub_pixel_avg_variance8x16_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x32_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance8x32 \
-  aom_highbd_12_sub_pixel_avg_variance8x32_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance8x4 \
-  aom_highbd_12_sub_pixel_avg_variance8x4_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance8x8 \
-  aom_highbd_12_sub_pixel_avg_variance8x8_c
-
-uint32_t aom_highbd_12_sub_pixel_variance128x128_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance128x128 \
-  aom_highbd_12_sub_pixel_variance128x128_c
-
-uint32_t aom_highbd_12_sub_pixel_variance128x64_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance128x64 \
-  aom_highbd_12_sub_pixel_variance128x64_c
-
-uint32_t aom_highbd_12_sub_pixel_variance16x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance16x16 \
-  aom_highbd_12_sub_pixel_variance16x16_c
-
-uint32_t aom_highbd_12_sub_pixel_variance16x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance16x32 \
-  aom_highbd_12_sub_pixel_variance16x32_c
-
-uint32_t aom_highbd_12_sub_pixel_variance16x4_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance16x4 \
-  aom_highbd_12_sub_pixel_variance16x4_c
-
-uint32_t aom_highbd_12_sub_pixel_variance16x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance16x64 \
-  aom_highbd_12_sub_pixel_variance16x64_c
-
-uint32_t aom_highbd_12_sub_pixel_variance16x8_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance16x8 \
-  aom_highbd_12_sub_pixel_variance16x8_c
-
-uint32_t aom_highbd_12_sub_pixel_variance32x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance32x16 \
-  aom_highbd_12_sub_pixel_variance32x16_c
-
-uint32_t aom_highbd_12_sub_pixel_variance32x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance32x32 \
-  aom_highbd_12_sub_pixel_variance32x32_c
-
-uint32_t aom_highbd_12_sub_pixel_variance32x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance32x64 \
-  aom_highbd_12_sub_pixel_variance32x64_c
-
-uint32_t aom_highbd_12_sub_pixel_variance32x8_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance32x8 \
-  aom_highbd_12_sub_pixel_variance32x8_c
-
-uint32_t aom_highbd_12_sub_pixel_variance4x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance4x16 \
-  aom_highbd_12_sub_pixel_variance4x16_c
-
-uint32_t aom_highbd_12_sub_pixel_variance4x4_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance4x4 \
-  aom_highbd_12_sub_pixel_variance4x4_c
-
-uint32_t aom_highbd_12_sub_pixel_variance4x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance4x8 \
-  aom_highbd_12_sub_pixel_variance4x8_c
-
-uint32_t aom_highbd_12_sub_pixel_variance64x128_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance64x128 \
-  aom_highbd_12_sub_pixel_variance64x128_c
-
-uint32_t aom_highbd_12_sub_pixel_variance64x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance64x16 \
-  aom_highbd_12_sub_pixel_variance64x16_c
-
-uint32_t aom_highbd_12_sub_pixel_variance64x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance64x32 \
-  aom_highbd_12_sub_pixel_variance64x32_c
-
-uint32_t aom_highbd_12_sub_pixel_variance64x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance64x64 \
-  aom_highbd_12_sub_pixel_variance64x64_c
-
-uint32_t aom_highbd_12_sub_pixel_variance8x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance8x16 \
-  aom_highbd_12_sub_pixel_variance8x16_c
-
-uint32_t aom_highbd_12_sub_pixel_variance8x32_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance8x32 \
-  aom_highbd_12_sub_pixel_variance8x32_c
-
-uint32_t aom_highbd_12_sub_pixel_variance8x4_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance8x4 \
-  aom_highbd_12_sub_pixel_variance8x4_c
-
-uint32_t aom_highbd_12_sub_pixel_variance8x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance8x8 \
-  aom_highbd_12_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_12_variance128x128_c(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-#define aom_highbd_12_variance128x128 aom_highbd_12_variance128x128_c
-
-unsigned int aom_highbd_12_variance128x64_c(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-#define aom_highbd_12_variance128x64 aom_highbd_12_variance128x64_c
-
-unsigned int aom_highbd_12_variance16x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_12_variance16x16 aom_highbd_12_variance16x16_c
-
-unsigned int aom_highbd_12_variance16x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_12_variance16x32 aom_highbd_12_variance16x32_c
-
-unsigned int aom_highbd_12_variance16x4_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_12_variance16x4 aom_highbd_12_variance16x4_c
-
-unsigned int aom_highbd_12_variance16x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           uint32_t* sse);
-#define aom_highbd_12_variance16x64 aom_highbd_12_variance16x64_c
-
-unsigned int aom_highbd_12_variance16x8_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_12_variance16x8 aom_highbd_12_variance16x8_c
-
-unsigned int aom_highbd_12_variance2x2_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance2x2 aom_highbd_12_variance2x2_c
-
-unsigned int aom_highbd_12_variance2x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance2x4 aom_highbd_12_variance2x4_c
-
-unsigned int aom_highbd_12_variance32x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_12_variance32x16 aom_highbd_12_variance32x16_c
-
-unsigned int aom_highbd_12_variance32x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_12_variance32x32 aom_highbd_12_variance32x32_c
-
-unsigned int aom_highbd_12_variance32x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_12_variance32x64 aom_highbd_12_variance32x64_c
-
-unsigned int aom_highbd_12_variance32x8_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_12_variance32x8 aom_highbd_12_variance32x8_c
-
-unsigned int aom_highbd_12_variance4x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_12_variance4x16 aom_highbd_12_variance4x16_c
-
-unsigned int aom_highbd_12_variance4x2_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance4x2 aom_highbd_12_variance4x2_c
-
-unsigned int aom_highbd_12_variance4x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance4x4 aom_highbd_12_variance4x4_c
-
-unsigned int aom_highbd_12_variance4x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance4x8 aom_highbd_12_variance4x8_c
-
-unsigned int aom_highbd_12_variance64x128_c(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-#define aom_highbd_12_variance64x128 aom_highbd_12_variance64x128_c
-
-unsigned int aom_highbd_12_variance64x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           uint32_t* sse);
-#define aom_highbd_12_variance64x16 aom_highbd_12_variance64x16_c
-
-unsigned int aom_highbd_12_variance64x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_12_variance64x32 aom_highbd_12_variance64x32_c
-
-unsigned int aom_highbd_12_variance64x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_12_variance64x64 aom_highbd_12_variance64x64_c
-
-unsigned int aom_highbd_12_variance8x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_12_variance8x16 aom_highbd_12_variance8x16_c
-
-unsigned int aom_highbd_12_variance8x32_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_12_variance8x32 aom_highbd_12_variance8x32_c
-
-unsigned int aom_highbd_12_variance8x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance8x4 aom_highbd_12_variance8x4_c
-
-unsigned int aom_highbd_12_variance8x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance8x8 aom_highbd_12_variance8x8_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x128 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x64 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x16 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x16_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x32 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x32_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x4 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x4_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x64 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x64_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x8 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x8_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x16 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x16_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x32 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x32_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x64 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x64_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x8 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x8_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x16 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x4 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x4_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x8 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x128 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x16 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x16_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x32 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x32_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x64 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x64_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x16 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x16_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x32 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x32_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x4 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x4_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x8 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x8_c
-
-void aom_highbd_8_get16x16var_c(const uint8_t* src_ptr,
-                                int source_stride,
-                                const uint8_t* ref_ptr,
-                                int ref_stride,
-                                unsigned int* sse,
-                                int* sum);
-#define aom_highbd_8_get16x16var aom_highbd_8_get16x16var_c
-
-void aom_highbd_8_get8x8var_c(const uint8_t* src_ptr,
-                              int source_stride,
-                              const uint8_t* ref_ptr,
-                              int ref_stride,
-                              unsigned int* sse,
-                              int* sum);
-#define aom_highbd_8_get8x8var aom_highbd_8_get8x8var_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance128x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance128x128 \
-  aom_highbd_8_masked_sub_pixel_variance128x128_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance128x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance128x64 \
-  aom_highbd_8_masked_sub_pixel_variance128x64_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance16x16 \
-  aom_highbd_8_masked_sub_pixel_variance16x16_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance16x32 \
-  aom_highbd_8_masked_sub_pixel_variance16x32_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance16x4 \
-  aom_highbd_8_masked_sub_pixel_variance16x4_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance16x64 \
-  aom_highbd_8_masked_sub_pixel_variance16x64_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance16x8 \
-  aom_highbd_8_masked_sub_pixel_variance16x8_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance32x16 \
-  aom_highbd_8_masked_sub_pixel_variance32x16_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance32x32 \
-  aom_highbd_8_masked_sub_pixel_variance32x32_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance32x64 \
-  aom_highbd_8_masked_sub_pixel_variance32x64_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance32x8 \
-  aom_highbd_8_masked_sub_pixel_variance32x8_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance4x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance4x16 \
-  aom_highbd_8_masked_sub_pixel_variance4x16_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance4x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance4x4 \
-  aom_highbd_8_masked_sub_pixel_variance4x4_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance4x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance4x8 \
-  aom_highbd_8_masked_sub_pixel_variance4x8_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance64x128 \
-  aom_highbd_8_masked_sub_pixel_variance64x128_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance64x16 \
-  aom_highbd_8_masked_sub_pixel_variance64x16_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance64x32 \
-  aom_highbd_8_masked_sub_pixel_variance64x32_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance64x64 \
-  aom_highbd_8_masked_sub_pixel_variance64x64_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance8x16 \
-  aom_highbd_8_masked_sub_pixel_variance8x16_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance8x32 \
-  aom_highbd_8_masked_sub_pixel_variance8x32_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance8x4 \
-  aom_highbd_8_masked_sub_pixel_variance8x4_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance8x8 \
-  aom_highbd_8_masked_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_8_mse16x16_c(const uint8_t* src_ptr,
-                                     int source_stride,
-                                     const uint8_t* ref_ptr,
-                                     int recon_stride,
-                                     unsigned int* sse);
-#define aom_highbd_8_mse16x16 aom_highbd_8_mse16x16_c
-
-unsigned int aom_highbd_8_mse16x8_c(const uint8_t* src_ptr,
-                                    int source_stride,
-                                    const uint8_t* ref_ptr,
-                                    int recon_stride,
-                                    unsigned int* sse);
-#define aom_highbd_8_mse16x8 aom_highbd_8_mse16x8_c
-
-unsigned int aom_highbd_8_mse8x16_c(const uint8_t* src_ptr,
-                                    int source_stride,
-                                    const uint8_t* ref_ptr,
-                                    int recon_stride,
-                                    unsigned int* sse);
-#define aom_highbd_8_mse8x16 aom_highbd_8_mse8x16_c
-
-unsigned int aom_highbd_8_mse8x8_c(const uint8_t* src_ptr,
-                                   int source_stride,
-                                   const uint8_t* ref_ptr,
-                                   int recon_stride,
-                                   unsigned int* sse);
-#define aom_highbd_8_mse8x8 aom_highbd_8_mse8x8_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance128x128 \
-  aom_highbd_8_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance128x64 \
-  aom_highbd_8_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance16x16 \
-  aom_highbd_8_sub_pixel_avg_variance16x16_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x32_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance16x32 \
-  aom_highbd_8_sub_pixel_avg_variance16x32_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x4_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance16x4 \
-  aom_highbd_8_sub_pixel_avg_variance16x4_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x64_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance16x64 \
-  aom_highbd_8_sub_pixel_avg_variance16x64_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance16x8 \
-  aom_highbd_8_sub_pixel_avg_variance16x8_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance32x16 \
-  aom_highbd_8_sub_pixel_avg_variance32x16_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x32_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance32x32 \
-  aom_highbd_8_sub_pixel_avg_variance32x32_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x64_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance32x64 \
-  aom_highbd_8_sub_pixel_avg_variance32x64_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance32x8 \
-  aom_highbd_8_sub_pixel_avg_variance32x8_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance4x16_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance4x16 \
-  aom_highbd_8_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse,
-                                                  const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance4x4 \
-  aom_highbd_8_sub_pixel_avg_variance4x4_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse,
-                                                  const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance4x8 \
-  aom_highbd_8_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance64x128 \
-  aom_highbd_8_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance64x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance64x16 \
-  aom_highbd_8_sub_pixel_avg_variance64x16_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance64x32_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance64x32 \
-  aom_highbd_8_sub_pixel_avg_variance64x32_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance64x64_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance64x64 \
-  aom_highbd_8_sub_pixel_avg_variance64x64_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance8x16 \
-  aom_highbd_8_sub_pixel_avg_variance8x16_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x32_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance8x32 \
-  aom_highbd_8_sub_pixel_avg_variance8x32_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse,
-                                                  const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance8x4 \
-  aom_highbd_8_sub_pixel_avg_variance8x4_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse,
-                                                  const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance8x8 \
-  aom_highbd_8_sub_pixel_avg_variance8x8_c
-
-uint32_t aom_highbd_8_sub_pixel_variance128x128_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance128x128 \
-  aom_highbd_8_sub_pixel_variance128x128_c
-
-uint32_t aom_highbd_8_sub_pixel_variance128x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance128x64 \
-  aom_highbd_8_sub_pixel_variance128x64_c
-
-uint32_t aom_highbd_8_sub_pixel_variance16x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance16x16 \
-  aom_highbd_8_sub_pixel_variance16x16_c
-
-uint32_t aom_highbd_8_sub_pixel_variance16x32_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance16x32 \
-  aom_highbd_8_sub_pixel_variance16x32_c
-
-uint32_t aom_highbd_8_sub_pixel_variance16x4_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance16x4 \
-  aom_highbd_8_sub_pixel_variance16x4_c
-
-uint32_t aom_highbd_8_sub_pixel_variance16x64_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance16x64 \
-  aom_highbd_8_sub_pixel_variance16x64_c
-
-uint32_t aom_highbd_8_sub_pixel_variance16x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance16x8 \
-  aom_highbd_8_sub_pixel_variance16x8_c
-
-uint32_t aom_highbd_8_sub_pixel_variance32x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance32x16 \
-  aom_highbd_8_sub_pixel_variance32x16_c
-
-uint32_t aom_highbd_8_sub_pixel_variance32x32_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance32x32 \
-  aom_highbd_8_sub_pixel_variance32x32_c
-
-uint32_t aom_highbd_8_sub_pixel_variance32x64_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance32x64 \
-  aom_highbd_8_sub_pixel_variance32x64_c
-
-uint32_t aom_highbd_8_sub_pixel_variance32x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance32x8 \
-  aom_highbd_8_sub_pixel_variance32x8_c
-
-uint32_t aom_highbd_8_sub_pixel_variance4x16_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance4x16 \
-  aom_highbd_8_sub_pixel_variance4x16_c
-
-uint32_t aom_highbd_8_sub_pixel_variance4x4_c(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance4x4 aom_highbd_8_sub_pixel_variance4x4_c
-
-uint32_t aom_highbd_8_sub_pixel_variance4x8_c(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance4x8 aom_highbd_8_sub_pixel_variance4x8_c
-
-uint32_t aom_highbd_8_sub_pixel_variance64x128_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance64x128 \
-  aom_highbd_8_sub_pixel_variance64x128_c
-
-uint32_t aom_highbd_8_sub_pixel_variance64x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance64x16 \
-  aom_highbd_8_sub_pixel_variance64x16_c
-
-uint32_t aom_highbd_8_sub_pixel_variance64x32_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance64x32 \
-  aom_highbd_8_sub_pixel_variance64x32_c
-
-uint32_t aom_highbd_8_sub_pixel_variance64x64_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance64x64 \
-  aom_highbd_8_sub_pixel_variance64x64_c
-
-uint32_t aom_highbd_8_sub_pixel_variance8x16_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance8x16 \
-  aom_highbd_8_sub_pixel_variance8x16_c
-
-uint32_t aom_highbd_8_sub_pixel_variance8x32_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance8x32 \
-  aom_highbd_8_sub_pixel_variance8x32_c
-
-uint32_t aom_highbd_8_sub_pixel_variance8x4_c(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance8x4 aom_highbd_8_sub_pixel_variance8x4_c
-
-uint32_t aom_highbd_8_sub_pixel_variance8x8_c(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance8x8 aom_highbd_8_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_8_variance128x128_c(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-#define aom_highbd_8_variance128x128 aom_highbd_8_variance128x128_c
-
-unsigned int aom_highbd_8_variance128x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_8_variance128x64 aom_highbd_8_variance128x64_c
-
-unsigned int aom_highbd_8_variance16x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_8_variance16x16 aom_highbd_8_variance16x16_c
-
-unsigned int aom_highbd_8_variance16x32_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_8_variance16x32 aom_highbd_8_variance16x32_c
-
-unsigned int aom_highbd_8_variance16x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         uint32_t* sse);
-#define aom_highbd_8_variance16x4 aom_highbd_8_variance16x4_c
-
-unsigned int aom_highbd_8_variance16x64_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_8_variance16x64 aom_highbd_8_variance16x64_c
-
-unsigned int aom_highbd_8_variance16x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_8_variance16x8 aom_highbd_8_variance16x8_c
-
-unsigned int aom_highbd_8_variance2x2_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance2x2 aom_highbd_8_variance2x2_c
-
-unsigned int aom_highbd_8_variance2x4_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance2x4 aom_highbd_8_variance2x4_c
-
-unsigned int aom_highbd_8_variance32x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_8_variance32x16 aom_highbd_8_variance32x16_c
-
-unsigned int aom_highbd_8_variance32x32_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_8_variance32x32 aom_highbd_8_variance32x32_c
-
-unsigned int aom_highbd_8_variance32x64_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_8_variance32x64 aom_highbd_8_variance32x64_c
-
-unsigned int aom_highbd_8_variance32x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         uint32_t* sse);
-#define aom_highbd_8_variance32x8 aom_highbd_8_variance32x8_c
-
-unsigned int aom_highbd_8_variance4x16_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         uint32_t* sse);
-#define aom_highbd_8_variance4x16 aom_highbd_8_variance4x16_c
-
-unsigned int aom_highbd_8_variance4x2_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance4x2 aom_highbd_8_variance4x2_c
-
-unsigned int aom_highbd_8_variance4x4_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance4x4 aom_highbd_8_variance4x4_c
-
-unsigned int aom_highbd_8_variance4x8_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance4x8 aom_highbd_8_variance4x8_c
-
-unsigned int aom_highbd_8_variance64x128_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_8_variance64x128 aom_highbd_8_variance64x128_c
-
-unsigned int aom_highbd_8_variance64x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_8_variance64x16 aom_highbd_8_variance64x16_c
-
-unsigned int aom_highbd_8_variance64x32_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_8_variance64x32 aom_highbd_8_variance64x32_c
-
-unsigned int aom_highbd_8_variance64x64_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_8_variance64x64 aom_highbd_8_variance64x64_c
-
-unsigned int aom_highbd_8_variance8x16_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_8_variance8x16 aom_highbd_8_variance8x16_c
-
-unsigned int aom_highbd_8_variance8x32_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         uint32_t* sse);
-#define aom_highbd_8_variance8x32 aom_highbd_8_variance8x32_c
-
-unsigned int aom_highbd_8_variance8x4_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance8x4 aom_highbd_8_variance8x4_c
-
-unsigned int aom_highbd_8_variance8x8_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance8x8 aom_highbd_8_variance8x8_c
-
-unsigned int aom_highbd_avg_4x4_c(const uint8_t*, int p);
-#define aom_highbd_avg_4x4 aom_highbd_avg_4x4_c
-
-unsigned int aom_highbd_avg_8x8_c(const uint8_t*, int p);
-#define aom_highbd_avg_8x8 aom_highbd_avg_8x8_c
-
-void aom_highbd_blend_a64_d16_mask_c(uint8_t* dst,
-                                     uint32_t dst_stride,
-                                     const CONV_BUF_TYPE* src0,
-                                     uint32_t src0_stride,
-                                     const CONV_BUF_TYPE* src1,
-                                     uint32_t src1_stride,
-                                     const uint8_t* mask,
-                                     uint32_t mask_stride,
-                                     int w,
-                                     int h,
-                                     int subw,
-                                     int subh,
-                                     ConvolveParams* conv_params,
-                                     const int bd);
-#define aom_highbd_blend_a64_d16_mask aom_highbd_blend_a64_d16_mask_c
-
-void aom_highbd_blend_a64_hmask_c(uint8_t* dst,
-                                  uint32_t dst_stride,
-                                  const uint8_t* src0,
-                                  uint32_t src0_stride,
-                                  const uint8_t* src1,
-                                  uint32_t src1_stride,
-                                  const uint8_t* mask,
-                                  int w,
-                                  int h,
-                                  int bd);
-#define aom_highbd_blend_a64_hmask aom_highbd_blend_a64_hmask_c
-
-void aom_highbd_blend_a64_mask_c(uint8_t* dst,
-                                 uint32_t dst_stride,
-                                 const uint8_t* src0,
-                                 uint32_t src0_stride,
-                                 const uint8_t* src1,
-                                 uint32_t src1_stride,
-                                 const uint8_t* mask,
-                                 uint32_t mask_stride,
-                                 int w,
-                                 int h,
-                                 int subw,
-                                 int subh,
-                                 int bd);
-#define aom_highbd_blend_a64_mask aom_highbd_blend_a64_mask_c
-
-void aom_highbd_blend_a64_vmask_c(uint8_t* dst,
-                                  uint32_t dst_stride,
-                                  const uint8_t* src0,
-                                  uint32_t src0_stride,
-                                  const uint8_t* src1,
-                                  uint32_t src1_stride,
-                                  const uint8_t* mask,
-                                  int w,
-                                  int h,
-                                  int bd);
-#define aom_highbd_blend_a64_vmask aom_highbd_blend_a64_vmask_c
-
-void aom_highbd_comp_avg_pred_c(uint8_t* comp_pred8,
-                                const uint8_t* pred8,
-                                int width,
-                                int height,
-                                const uint8_t* ref8,
-                                int ref_stride);
-#define aom_highbd_comp_avg_pred aom_highbd_comp_avg_pred_c
-
-void aom_highbd_comp_avg_upsampled_pred_c(MACROBLOCKD* xd,
-                                          const struct AV1Common* const cm,
-                                          int mi_row,
-                                          int mi_col,
-                                          const MV* const mv,
-                                          uint8_t* comp_pred8,
-                                          const uint8_t* pred8,
-                                          int width,
-                                          int height,
-                                          int subpel_x_q3,
-                                          int subpel_y_q3,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          int bd,
-                                          int subpel_search);
-#define aom_highbd_comp_avg_upsampled_pred aom_highbd_comp_avg_upsampled_pred_c
-
-void aom_highbd_comp_mask_pred_c(uint8_t* comp_pred,
-                                 const uint8_t* pred8,
-                                 int width,
-                                 int height,
-                                 const uint8_t* ref8,
-                                 int ref_stride,
-                                 const uint8_t* mask,
-                                 int mask_stride,
-                                 int invert_mask);
-#define aom_highbd_comp_mask_pred aom_highbd_comp_mask_pred_c
-
-void aom_highbd_convolve8_horiz_c(const uint8_t* src,
-                                  ptrdiff_t src_stride,
-                                  uint8_t* dst,
-                                  ptrdiff_t dst_stride,
-                                  const int16_t* filter_x,
-                                  int x_step_q4,
-                                  const int16_t* filter_y,
-                                  int y_step_q4,
-                                  int w,
-                                  int h,
-                                  int bd);
-#define aom_highbd_convolve8_horiz aom_highbd_convolve8_horiz_c
-
-void aom_highbd_convolve8_vert_c(const uint8_t* src,
-                                 ptrdiff_t src_stride,
-                                 uint8_t* dst,
-                                 ptrdiff_t dst_stride,
-                                 const int16_t* filter_x,
-                                 int x_step_q4,
-                                 const int16_t* filter_y,
-                                 int y_step_q4,
-                                 int w,
-                                 int h,
-                                 int bd);
-#define aom_highbd_convolve8_vert aom_highbd_convolve8_vert_c
-
-void aom_highbd_convolve_copy_c(const uint16_t* src,
-                                ptrdiff_t src_stride,
-                                uint16_t* dst,
-                                ptrdiff_t dst_stride,
-                                int w,
-                                int h);
-#define aom_highbd_convolve_copy aom_highbd_convolve_copy_c
-
-void aom_highbd_dc_128_predictor_16x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_16x16 aom_highbd_dc_128_predictor_16x16_c
-
-void aom_highbd_dc_128_predictor_16x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_16x32 aom_highbd_dc_128_predictor_16x32_c
-
-void aom_highbd_dc_128_predictor_16x4_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_16x4 aom_highbd_dc_128_predictor_16x4_c
-
-void aom_highbd_dc_128_predictor_16x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_16x64 aom_highbd_dc_128_predictor_16x64_c
-
-void aom_highbd_dc_128_predictor_16x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_16x8 aom_highbd_dc_128_predictor_16x8_c
-
-void aom_highbd_dc_128_predictor_2x2_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_128_predictor_2x2 aom_highbd_dc_128_predictor_2x2_c
-
-void aom_highbd_dc_128_predictor_32x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_32x16 aom_highbd_dc_128_predictor_32x16_c
-
-void aom_highbd_dc_128_predictor_32x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_32x32 aom_highbd_dc_128_predictor_32x32_c
-
-void aom_highbd_dc_128_predictor_32x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_32x64 aom_highbd_dc_128_predictor_32x64_c
-
-void aom_highbd_dc_128_predictor_32x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_32x8 aom_highbd_dc_128_predictor_32x8_c
-
-void aom_highbd_dc_128_predictor_4x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_4x16 aom_highbd_dc_128_predictor_4x16_c
-
-void aom_highbd_dc_128_predictor_4x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_128_predictor_4x4 aom_highbd_dc_128_predictor_4x4_c
-
-void aom_highbd_dc_128_predictor_4x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_128_predictor_4x8 aom_highbd_dc_128_predictor_4x8_c
-
-void aom_highbd_dc_128_predictor_64x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_64x16 aom_highbd_dc_128_predictor_64x16_c
-
-void aom_highbd_dc_128_predictor_64x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_64x32 aom_highbd_dc_128_predictor_64x32_c
-
-void aom_highbd_dc_128_predictor_64x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_64x64 aom_highbd_dc_128_predictor_64x64_c
-
-void aom_highbd_dc_128_predictor_8x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_8x16 aom_highbd_dc_128_predictor_8x16_c
-
-void aom_highbd_dc_128_predictor_8x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_8x32 aom_highbd_dc_128_predictor_8x32_c
-
-void aom_highbd_dc_128_predictor_8x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_128_predictor_8x4 aom_highbd_dc_128_predictor_8x4_c
-
-void aom_highbd_dc_128_predictor_8x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_128_predictor_8x8 aom_highbd_dc_128_predictor_8x8_c
-
-void aom_highbd_dc_left_predictor_16x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_16x16 aom_highbd_dc_left_predictor_16x16_c
-
-void aom_highbd_dc_left_predictor_16x32_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_16x32 aom_highbd_dc_left_predictor_16x32_c
-
-void aom_highbd_dc_left_predictor_16x4_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_16x4 aom_highbd_dc_left_predictor_16x4_c
-
-void aom_highbd_dc_left_predictor_16x64_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_16x64 aom_highbd_dc_left_predictor_16x64_c
-
-void aom_highbd_dc_left_predictor_16x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_16x8 aom_highbd_dc_left_predictor_16x8_c
-
-void aom_highbd_dc_left_predictor_2x2_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_left_predictor_2x2 aom_highbd_dc_left_predictor_2x2_c
-
-void aom_highbd_dc_left_predictor_32x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_32x16 aom_highbd_dc_left_predictor_32x16_c
-
-void aom_highbd_dc_left_predictor_32x32_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_32x32 aom_highbd_dc_left_predictor_32x32_c
-
-void aom_highbd_dc_left_predictor_32x64_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_32x64 aom_highbd_dc_left_predictor_32x64_c
-
-void aom_highbd_dc_left_predictor_32x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_32x8 aom_highbd_dc_left_predictor_32x8_c
-
-void aom_highbd_dc_left_predictor_4x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_4x16 aom_highbd_dc_left_predictor_4x16_c
-
-void aom_highbd_dc_left_predictor_4x4_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_left_predictor_4x4 aom_highbd_dc_left_predictor_4x4_c
-
-void aom_highbd_dc_left_predictor_4x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_left_predictor_4x8 aom_highbd_dc_left_predictor_4x8_c
-
-void aom_highbd_dc_left_predictor_64x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_64x16 aom_highbd_dc_left_predictor_64x16_c
-
-void aom_highbd_dc_left_predictor_64x32_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_64x32 aom_highbd_dc_left_predictor_64x32_c
-
-void aom_highbd_dc_left_predictor_64x64_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_64x64 aom_highbd_dc_left_predictor_64x64_c
-
-void aom_highbd_dc_left_predictor_8x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_8x16 aom_highbd_dc_left_predictor_8x16_c
-
-void aom_highbd_dc_left_predictor_8x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_8x32 aom_highbd_dc_left_predictor_8x32_c
-
-void aom_highbd_dc_left_predictor_8x4_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_left_predictor_8x4 aom_highbd_dc_left_predictor_8x4_c
-
-void aom_highbd_dc_left_predictor_8x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_left_predictor_8x8 aom_highbd_dc_left_predictor_8x8_c
-
-void aom_highbd_dc_predictor_16x16_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-void aom_highbd_dc_predictor_16x16_neon(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_predictor_16x16 aom_highbd_dc_predictor_16x16_neon
-
-void aom_highbd_dc_predictor_16x32_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_16x32 aom_highbd_dc_predictor_16x32_c
-
-void aom_highbd_dc_predictor_16x4_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_16x4 aom_highbd_dc_predictor_16x4_c
-
-void aom_highbd_dc_predictor_16x64_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_16x64 aom_highbd_dc_predictor_16x64_c
-
-void aom_highbd_dc_predictor_16x8_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_16x8 aom_highbd_dc_predictor_16x8_c
-
-void aom_highbd_dc_predictor_2x2_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_dc_predictor_2x2 aom_highbd_dc_predictor_2x2_c
-
-void aom_highbd_dc_predictor_32x16_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_32x16 aom_highbd_dc_predictor_32x16_c
-
-void aom_highbd_dc_predictor_32x32_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-void aom_highbd_dc_predictor_32x32_neon(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_predictor_32x32 aom_highbd_dc_predictor_32x32_neon
-
-void aom_highbd_dc_predictor_32x64_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_32x64 aom_highbd_dc_predictor_32x64_c
-
-void aom_highbd_dc_predictor_32x8_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_32x8 aom_highbd_dc_predictor_32x8_c
-
-void aom_highbd_dc_predictor_4x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_4x16 aom_highbd_dc_predictor_4x16_c
-
-void aom_highbd_dc_predictor_4x4_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-void aom_highbd_dc_predictor_4x4_neon(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_dc_predictor_4x4 aom_highbd_dc_predictor_4x4_neon
-
-void aom_highbd_dc_predictor_4x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_dc_predictor_4x8 aom_highbd_dc_predictor_4x8_c
-
-void aom_highbd_dc_predictor_64x16_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_64x16 aom_highbd_dc_predictor_64x16_c
-
-void aom_highbd_dc_predictor_64x32_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_64x32 aom_highbd_dc_predictor_64x32_c
-
-void aom_highbd_dc_predictor_64x64_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-void aom_highbd_dc_predictor_64x64_neon(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_predictor_64x64 aom_highbd_dc_predictor_64x64_neon
-
-void aom_highbd_dc_predictor_8x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_8x16 aom_highbd_dc_predictor_8x16_c
-
-void aom_highbd_dc_predictor_8x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_8x32 aom_highbd_dc_predictor_8x32_c
-
-void aom_highbd_dc_predictor_8x4_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_dc_predictor_8x4 aom_highbd_dc_predictor_8x4_c
-
-void aom_highbd_dc_predictor_8x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-void aom_highbd_dc_predictor_8x8_neon(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_dc_predictor_8x8 aom_highbd_dc_predictor_8x8_neon
-
-void aom_highbd_dc_top_predictor_16x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_16x16 aom_highbd_dc_top_predictor_16x16_c
-
-void aom_highbd_dc_top_predictor_16x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_16x32 aom_highbd_dc_top_predictor_16x32_c
-
-void aom_highbd_dc_top_predictor_16x4_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_16x4 aom_highbd_dc_top_predictor_16x4_c
-
-void aom_highbd_dc_top_predictor_16x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_16x64 aom_highbd_dc_top_predictor_16x64_c
-
-void aom_highbd_dc_top_predictor_16x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_16x8 aom_highbd_dc_top_predictor_16x8_c
-
-void aom_highbd_dc_top_predictor_2x2_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_top_predictor_2x2 aom_highbd_dc_top_predictor_2x2_c
-
-void aom_highbd_dc_top_predictor_32x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_32x16 aom_highbd_dc_top_predictor_32x16_c
-
-void aom_highbd_dc_top_predictor_32x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_32x32 aom_highbd_dc_top_predictor_32x32_c
-
-void aom_highbd_dc_top_predictor_32x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_32x64 aom_highbd_dc_top_predictor_32x64_c
-
-void aom_highbd_dc_top_predictor_32x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_32x8 aom_highbd_dc_top_predictor_32x8_c
-
-void aom_highbd_dc_top_predictor_4x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_4x16 aom_highbd_dc_top_predictor_4x16_c
-
-void aom_highbd_dc_top_predictor_4x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_top_predictor_4x4 aom_highbd_dc_top_predictor_4x4_c
-
-void aom_highbd_dc_top_predictor_4x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_top_predictor_4x8 aom_highbd_dc_top_predictor_4x8_c
-
-void aom_highbd_dc_top_predictor_64x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_64x16 aom_highbd_dc_top_predictor_64x16_c
-
-void aom_highbd_dc_top_predictor_64x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_64x32 aom_highbd_dc_top_predictor_64x32_c
-
-void aom_highbd_dc_top_predictor_64x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_64x64 aom_highbd_dc_top_predictor_64x64_c
-
-void aom_highbd_dc_top_predictor_8x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_8x16 aom_highbd_dc_top_predictor_8x16_c
-
-void aom_highbd_dc_top_predictor_8x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_8x32 aom_highbd_dc_top_predictor_8x32_c
-
-void aom_highbd_dc_top_predictor_8x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_top_predictor_8x4 aom_highbd_dc_top_predictor_8x4_c
-
-void aom_highbd_dc_top_predictor_8x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_top_predictor_8x8 aom_highbd_dc_top_predictor_8x8_c
-
-void aom_highbd_dist_wtd_comp_avg_pred_c(uint8_t* comp_pred8,
-                                         const uint8_t* pred8,
-                                         int width,
-                                         int height,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_comp_avg_pred aom_highbd_dist_wtd_comp_avg_pred_c
-
-void aom_highbd_dist_wtd_comp_avg_upsampled_pred_c(
-    MACROBLOCKD* xd,
-    const struct AV1Common* const cm,
-    int mi_row,
-    int mi_col,
-    const MV* const mv,
-    uint8_t* comp_pred8,
-    const uint8_t* pred8,
-    int width,
-    int height,
-    int subpel_x_q3,
-    int subpel_y_q3,
-    const uint8_t* ref8,
-    int ref_stride,
-    int bd,
-    const DIST_WTD_COMP_PARAMS* jcp_param,
-    int subpel_search);
-#define aom_highbd_dist_wtd_comp_avg_upsampled_pred \
-  aom_highbd_dist_wtd_comp_avg_upsampled_pred_c
-
-unsigned int aom_highbd_dist_wtd_sad128x128_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad128x128_avg aom_highbd_dist_wtd_sad128x128_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad128x64_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad128x64_avg aom_highbd_dist_wtd_sad128x64_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad16x16_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad16x16_avg aom_highbd_dist_wtd_sad16x16_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad16x32_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad16x32_avg aom_highbd_dist_wtd_sad16x32_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad16x4_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad16x4_avg aom_highbd_dist_wtd_sad16x4_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad16x64_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad16x64_avg aom_highbd_dist_wtd_sad16x64_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad16x8_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad16x8_avg aom_highbd_dist_wtd_sad16x8_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad32x16_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad32x16_avg aom_highbd_dist_wtd_sad32x16_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad32x32_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad32x32_avg aom_highbd_dist_wtd_sad32x32_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad32x64_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad32x64_avg aom_highbd_dist_wtd_sad32x64_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad32x8_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad32x8_avg aom_highbd_dist_wtd_sad32x8_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad4x16_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad4x16_avg aom_highbd_dist_wtd_sad4x16_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad4x4_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad4x4_avg aom_highbd_dist_wtd_sad4x4_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad4x8_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad4x8_avg aom_highbd_dist_wtd_sad4x8_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad64x128_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad64x128_avg aom_highbd_dist_wtd_sad64x128_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad64x16_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad64x16_avg aom_highbd_dist_wtd_sad64x16_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad64x32_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad64x32_avg aom_highbd_dist_wtd_sad64x32_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad64x64_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad64x64_avg aom_highbd_dist_wtd_sad64x64_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad8x16_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad8x16_avg aom_highbd_dist_wtd_sad8x16_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad8x32_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad8x32_avg aom_highbd_dist_wtd_sad8x32_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad8x4_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad8x4_avg aom_highbd_dist_wtd_sad8x4_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad8x8_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad8x8_avg aom_highbd_dist_wtd_sad8x8_avg_c
-
-void aom_highbd_fdct8x8_c(const int16_t* input, tran_low_t* output, int stride);
-#define aom_highbd_fdct8x8 aom_highbd_fdct8x8_c
-
-void aom_highbd_h_predictor_16x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_16x16 aom_highbd_h_predictor_16x16_c
-
-void aom_highbd_h_predictor_16x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_16x32 aom_highbd_h_predictor_16x32_c
-
-void aom_highbd_h_predictor_16x4_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_16x4 aom_highbd_h_predictor_16x4_c
-
-void aom_highbd_h_predictor_16x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_16x64 aom_highbd_h_predictor_16x64_c
-
-void aom_highbd_h_predictor_16x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_16x8 aom_highbd_h_predictor_16x8_c
-
-void aom_highbd_h_predictor_2x2_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_h_predictor_2x2 aom_highbd_h_predictor_2x2_c
-
-void aom_highbd_h_predictor_32x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_32x16 aom_highbd_h_predictor_32x16_c
-
-void aom_highbd_h_predictor_32x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_32x32 aom_highbd_h_predictor_32x32_c
-
-void aom_highbd_h_predictor_32x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_32x64 aom_highbd_h_predictor_32x64_c
-
-void aom_highbd_h_predictor_32x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_32x8 aom_highbd_h_predictor_32x8_c
-
-void aom_highbd_h_predictor_4x16_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_4x16 aom_highbd_h_predictor_4x16_c
-
-void aom_highbd_h_predictor_4x4_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_h_predictor_4x4 aom_highbd_h_predictor_4x4_c
-
-void aom_highbd_h_predictor_4x8_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_h_predictor_4x8 aom_highbd_h_predictor_4x8_c
-
-void aom_highbd_h_predictor_64x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_64x16 aom_highbd_h_predictor_64x16_c
-
-void aom_highbd_h_predictor_64x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_64x32 aom_highbd_h_predictor_64x32_c
-
-void aom_highbd_h_predictor_64x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_64x64 aom_highbd_h_predictor_64x64_c
-
-void aom_highbd_h_predictor_8x16_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_8x16 aom_highbd_h_predictor_8x16_c
-
-void aom_highbd_h_predictor_8x32_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_8x32 aom_highbd_h_predictor_8x32_c
-
-void aom_highbd_h_predictor_8x4_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_h_predictor_8x4 aom_highbd_h_predictor_8x4_c
-
-void aom_highbd_h_predictor_8x8_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_h_predictor_8x8 aom_highbd_h_predictor_8x8_c
-
-void aom_highbd_hadamard_16x16_c(const int16_t* src_diff,
-                                 ptrdiff_t src_stride,
-                                 tran_low_t* coeff);
-#define aom_highbd_hadamard_16x16 aom_highbd_hadamard_16x16_c
-
-void aom_highbd_hadamard_32x32_c(const int16_t* src_diff,
-                                 ptrdiff_t src_stride,
-                                 tran_low_t* coeff);
-#define aom_highbd_hadamard_32x32 aom_highbd_hadamard_32x32_c
-
-void aom_highbd_hadamard_8x8_c(const int16_t* src_diff,
-                               ptrdiff_t src_stride,
-                               tran_low_t* coeff);
-#define aom_highbd_hadamard_8x8 aom_highbd_hadamard_8x8_c
-
-void aom_highbd_lpf_horizontal_14_c(uint16_t* s,
-                                    int pitch,
-                                    const uint8_t* blimit,
-                                    const uint8_t* limit,
-                                    const uint8_t* thresh,
-                                    int bd);
-#define aom_highbd_lpf_horizontal_14 aom_highbd_lpf_horizontal_14_c
-
-void aom_highbd_lpf_horizontal_14_dual_c(uint16_t* s,
-                                         int pitch,
-                                         const uint8_t* blimit0,
-                                         const uint8_t* limit0,
-                                         const uint8_t* thresh0,
-                                         const uint8_t* blimit1,
-                                         const uint8_t* limit1,
-                                         const uint8_t* thresh1,
-                                         int bd);
-#define aom_highbd_lpf_horizontal_14_dual aom_highbd_lpf_horizontal_14_dual_c
-
-void aom_highbd_lpf_horizontal_4_c(uint16_t* s,
-                                   int pitch,
-                                   const uint8_t* blimit,
-                                   const uint8_t* limit,
-                                   const uint8_t* thresh,
-                                   int bd);
-#define aom_highbd_lpf_horizontal_4 aom_highbd_lpf_horizontal_4_c
-
-void aom_highbd_lpf_horizontal_4_dual_c(uint16_t* s,
-                                        int pitch,
-                                        const uint8_t* blimit0,
-                                        const uint8_t* limit0,
-                                        const uint8_t* thresh0,
-                                        const uint8_t* blimit1,
-                                        const uint8_t* limit1,
-                                        const uint8_t* thresh1,
-                                        int bd);
-#define aom_highbd_lpf_horizontal_4_dual aom_highbd_lpf_horizontal_4_dual_c
-
-void aom_highbd_lpf_horizontal_6_c(uint16_t* s,
-                                   int pitch,
-                                   const uint8_t* blimit,
-                                   const uint8_t* limit,
-                                   const uint8_t* thresh,
-                                   int bd);
-#define aom_highbd_lpf_horizontal_6 aom_highbd_lpf_horizontal_6_c
-
-void aom_highbd_lpf_horizontal_6_dual_c(uint16_t* s,
-                                        int pitch,
-                                        const uint8_t* blimit0,
-                                        const uint8_t* limit0,
-                                        const uint8_t* thresh0,
-                                        const uint8_t* blimit1,
-                                        const uint8_t* limit1,
-                                        const uint8_t* thresh1,
-                                        int bd);
-#define aom_highbd_lpf_horizontal_6_dual aom_highbd_lpf_horizontal_6_dual_c
-
-void aom_highbd_lpf_horizontal_8_c(uint16_t* s,
-                                   int pitch,
-                                   const uint8_t* blimit,
-                                   const uint8_t* limit,
-                                   const uint8_t* thresh,
-                                   int bd);
-#define aom_highbd_lpf_horizontal_8 aom_highbd_lpf_horizontal_8_c
-
-void aom_highbd_lpf_horizontal_8_dual_c(uint16_t* s,
-                                        int pitch,
-                                        const uint8_t* blimit0,
-                                        const uint8_t* limit0,
-                                        const uint8_t* thresh0,
-                                        const uint8_t* blimit1,
-                                        const uint8_t* limit1,
-                                        const uint8_t* thresh1,
-                                        int bd);
-#define aom_highbd_lpf_horizontal_8_dual aom_highbd_lpf_horizontal_8_dual_c
-
-void aom_highbd_lpf_vertical_14_c(uint16_t* s,
-                                  int pitch,
-                                  const uint8_t* blimit,
-                                  const uint8_t* limit,
-                                  const uint8_t* thresh,
-                                  int bd);
-#define aom_highbd_lpf_vertical_14 aom_highbd_lpf_vertical_14_c
-
-void aom_highbd_lpf_vertical_14_dual_c(uint16_t* s,
-                                       int pitch,
-                                       const uint8_t* blimit0,
-                                       const uint8_t* limit0,
-                                       const uint8_t* thresh0,
-                                       const uint8_t* blimit1,
-                                       const uint8_t* limit1,
-                                       const uint8_t* thresh1,
-                                       int bd);
-#define aom_highbd_lpf_vertical_14_dual aom_highbd_lpf_vertical_14_dual_c
-
-void aom_highbd_lpf_vertical_4_c(uint16_t* s,
-                                 int pitch,
-                                 const uint8_t* blimit,
-                                 const uint8_t* limit,
-                                 const uint8_t* thresh,
-                                 int bd);
-#define aom_highbd_lpf_vertical_4 aom_highbd_lpf_vertical_4_c
-
-void aom_highbd_lpf_vertical_4_dual_c(uint16_t* s,
-                                      int pitch,
-                                      const uint8_t* blimit0,
-                                      const uint8_t* limit0,
-                                      const uint8_t* thresh0,
-                                      const uint8_t* blimit1,
-                                      const uint8_t* limit1,
-                                      const uint8_t* thresh1,
-                                      int bd);
-#define aom_highbd_lpf_vertical_4_dual aom_highbd_lpf_vertical_4_dual_c
-
-void aom_highbd_lpf_vertical_6_c(uint16_t* s,
-                                 int pitch,
-                                 const uint8_t* blimit,
-                                 const uint8_t* limit,
-                                 const uint8_t* thresh,
-                                 int bd);
-#define aom_highbd_lpf_vertical_6 aom_highbd_lpf_vertical_6_c
-
-void aom_highbd_lpf_vertical_6_dual_c(uint16_t* s,
-                                      int pitch,
-                                      const uint8_t* blimit0,
-                                      const uint8_t* limit0,
-                                      const uint8_t* thresh0,
-                                      const uint8_t* blimit1,
-                                      const uint8_t* limit1,
-                                      const uint8_t* thresh1,
-                                      int bd);
-#define aom_highbd_lpf_vertical_6_dual aom_highbd_lpf_vertical_6_dual_c
-
-void aom_highbd_lpf_vertical_8_c(uint16_t* s,
-                                 int pitch,
-                                 const uint8_t* blimit,
-                                 const uint8_t* limit,
-                                 const uint8_t* thresh,
-                                 int bd);
-#define aom_highbd_lpf_vertical_8 aom_highbd_lpf_vertical_8_c
-
-void aom_highbd_lpf_vertical_8_dual_c(uint16_t* s,
-                                      int pitch,
-                                      const uint8_t* blimit0,
-                                      const uint8_t* limit0,
-                                      const uint8_t* thresh0,
-                                      const uint8_t* blimit1,
-                                      const uint8_t* limit1,
-                                      const uint8_t* thresh1,
-                                      int bd);
-#define aom_highbd_lpf_vertical_8_dual aom_highbd_lpf_vertical_8_dual_c
-
-unsigned int aom_highbd_masked_sad128x128_c(const uint8_t* src8,
-                                            int src_stride,
-                                            const uint8_t* ref8,
-                                            int ref_stride,
-                                            const uint8_t* second_pred8,
-                                            const uint8_t* msk,
-                                            int msk_stride,
-                                            int invert_mask);
-#define aom_highbd_masked_sad128x128 aom_highbd_masked_sad128x128_c
-
-unsigned int aom_highbd_masked_sad128x64_c(const uint8_t* src8,
-                                           int src_stride,
-                                           const uint8_t* ref8,
-                                           int ref_stride,
-                                           const uint8_t* second_pred8,
-                                           const uint8_t* msk,
-                                           int msk_stride,
-                                           int invert_mask);
-#define aom_highbd_masked_sad128x64 aom_highbd_masked_sad128x64_c
-
-unsigned int aom_highbd_masked_sad16x16_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad16x16 aom_highbd_masked_sad16x16_c
-
-unsigned int aom_highbd_masked_sad16x32_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad16x32 aom_highbd_masked_sad16x32_c
-
-unsigned int aom_highbd_masked_sad16x4_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-#define aom_highbd_masked_sad16x4 aom_highbd_masked_sad16x4_c
-
-unsigned int aom_highbd_masked_sad16x64_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad16x64 aom_highbd_masked_sad16x64_c
-
-unsigned int aom_highbd_masked_sad16x8_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-#define aom_highbd_masked_sad16x8 aom_highbd_masked_sad16x8_c
-
-unsigned int aom_highbd_masked_sad32x16_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad32x16 aom_highbd_masked_sad32x16_c
-
-unsigned int aom_highbd_masked_sad32x32_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad32x32 aom_highbd_masked_sad32x32_c
-
-unsigned int aom_highbd_masked_sad32x64_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad32x64 aom_highbd_masked_sad32x64_c
-
-unsigned int aom_highbd_masked_sad32x8_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-#define aom_highbd_masked_sad32x8 aom_highbd_masked_sad32x8_c
-
-unsigned int aom_highbd_masked_sad4x16_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-#define aom_highbd_masked_sad4x16 aom_highbd_masked_sad4x16_c
-
-unsigned int aom_highbd_masked_sad4x4_c(const uint8_t* src8,
-                                        int src_stride,
-                                        const uint8_t* ref8,
-                                        int ref_stride,
-                                        const uint8_t* second_pred8,
-                                        const uint8_t* msk,
-                                        int msk_stride,
-                                        int invert_mask);
-#define aom_highbd_masked_sad4x4 aom_highbd_masked_sad4x4_c
-
-unsigned int aom_highbd_masked_sad4x8_c(const uint8_t* src8,
-                                        int src_stride,
-                                        const uint8_t* ref8,
-                                        int ref_stride,
-                                        const uint8_t* second_pred8,
-                                        const uint8_t* msk,
-                                        int msk_stride,
-                                        int invert_mask);
-#define aom_highbd_masked_sad4x8 aom_highbd_masked_sad4x8_c
-
-unsigned int aom_highbd_masked_sad64x128_c(const uint8_t* src8,
-                                           int src_stride,
-                                           const uint8_t* ref8,
-                                           int ref_stride,
-                                           const uint8_t* second_pred8,
-                                           const uint8_t* msk,
-                                           int msk_stride,
-                                           int invert_mask);
-#define aom_highbd_masked_sad64x128 aom_highbd_masked_sad64x128_c
-
-unsigned int aom_highbd_masked_sad64x16_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad64x16 aom_highbd_masked_sad64x16_c
-
-unsigned int aom_highbd_masked_sad64x32_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad64x32 aom_highbd_masked_sad64x32_c
-
-unsigned int aom_highbd_masked_sad64x64_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad64x64 aom_highbd_masked_sad64x64_c
-
-unsigned int aom_highbd_masked_sad8x16_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-#define aom_highbd_masked_sad8x16 aom_highbd_masked_sad8x16_c
-
-unsigned int aom_highbd_masked_sad8x32_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-#define aom_highbd_masked_sad8x32 aom_highbd_masked_sad8x32_c
-
-unsigned int aom_highbd_masked_sad8x4_c(const uint8_t* src8,
-                                        int src_stride,
-                                        const uint8_t* ref8,
-                                        int ref_stride,
-                                        const uint8_t* second_pred8,
-                                        const uint8_t* msk,
-                                        int msk_stride,
-                                        int invert_mask);
-#define aom_highbd_masked_sad8x4 aom_highbd_masked_sad8x4_c
-
-unsigned int aom_highbd_masked_sad8x8_c(const uint8_t* src8,
-                                        int src_stride,
-                                        const uint8_t* ref8,
-                                        int ref_stride,
-                                        const uint8_t* second_pred8,
-                                        const uint8_t* msk,
-                                        int msk_stride,
-                                        int invert_mask);
-#define aom_highbd_masked_sad8x8 aom_highbd_masked_sad8x8_c
-
-void aom_highbd_minmax_8x8_c(const uint8_t* s,
-                             int p,
-                             const uint8_t* d,
-                             int dp,
-                             int* min,
-                             int* max);
-#define aom_highbd_minmax_8x8 aom_highbd_minmax_8x8_c
-
-unsigned int aom_highbd_obmc_sad128x128_c(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask);
-#define aom_highbd_obmc_sad128x128 aom_highbd_obmc_sad128x128_c
-
-unsigned int aom_highbd_obmc_sad128x64_c(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask);
-#define aom_highbd_obmc_sad128x64 aom_highbd_obmc_sad128x64_c
-
-unsigned int aom_highbd_obmc_sad16x16_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad16x16 aom_highbd_obmc_sad16x16_c
-
-unsigned int aom_highbd_obmc_sad16x32_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad16x32 aom_highbd_obmc_sad16x32_c
-
-unsigned int aom_highbd_obmc_sad16x4_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-#define aom_highbd_obmc_sad16x4 aom_highbd_obmc_sad16x4_c
-
-unsigned int aom_highbd_obmc_sad16x64_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad16x64 aom_highbd_obmc_sad16x64_c
-
-unsigned int aom_highbd_obmc_sad16x8_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-#define aom_highbd_obmc_sad16x8 aom_highbd_obmc_sad16x8_c
-
-unsigned int aom_highbd_obmc_sad32x16_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad32x16 aom_highbd_obmc_sad32x16_c
-
-unsigned int aom_highbd_obmc_sad32x32_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad32x32 aom_highbd_obmc_sad32x32_c
-
-unsigned int aom_highbd_obmc_sad32x64_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad32x64 aom_highbd_obmc_sad32x64_c
-
-unsigned int aom_highbd_obmc_sad32x8_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-#define aom_highbd_obmc_sad32x8 aom_highbd_obmc_sad32x8_c
-
-unsigned int aom_highbd_obmc_sad4x16_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-#define aom_highbd_obmc_sad4x16 aom_highbd_obmc_sad4x16_c
-
-unsigned int aom_highbd_obmc_sad4x4_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-#define aom_highbd_obmc_sad4x4 aom_highbd_obmc_sad4x4_c
-
-unsigned int aom_highbd_obmc_sad4x8_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-#define aom_highbd_obmc_sad4x8 aom_highbd_obmc_sad4x8_c
-
-unsigned int aom_highbd_obmc_sad64x128_c(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask);
-#define aom_highbd_obmc_sad64x128 aom_highbd_obmc_sad64x128_c
-
-unsigned int aom_highbd_obmc_sad64x16_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad64x16 aom_highbd_obmc_sad64x16_c
-
-unsigned int aom_highbd_obmc_sad64x32_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad64x32 aom_highbd_obmc_sad64x32_c
-
-unsigned int aom_highbd_obmc_sad64x64_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad64x64 aom_highbd_obmc_sad64x64_c
-
-unsigned int aom_highbd_obmc_sad8x16_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-#define aom_highbd_obmc_sad8x16 aom_highbd_obmc_sad8x16_c
-
-unsigned int aom_highbd_obmc_sad8x32_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-#define aom_highbd_obmc_sad8x32 aom_highbd_obmc_sad8x32_c
-
-unsigned int aom_highbd_obmc_sad8x4_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-#define aom_highbd_obmc_sad8x4 aom_highbd_obmc_sad8x4_c
-
-unsigned int aom_highbd_obmc_sad8x8_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-#define aom_highbd_obmc_sad8x8 aom_highbd_obmc_sad8x8_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance128x128_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance128x128 \
-  aom_highbd_obmc_sub_pixel_variance128x128_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance128x64_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance128x64 \
-  aom_highbd_obmc_sub_pixel_variance128x64_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance16x16_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance16x16 \
-  aom_highbd_obmc_sub_pixel_variance16x16_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance16x32_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance16x32 \
-  aom_highbd_obmc_sub_pixel_variance16x32_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance16x4_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance16x4 \
-  aom_highbd_obmc_sub_pixel_variance16x4_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance16x64_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance16x64 \
-  aom_highbd_obmc_sub_pixel_variance16x64_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance16x8_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance16x8 \
-  aom_highbd_obmc_sub_pixel_variance16x8_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance32x16_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance32x16 \
-  aom_highbd_obmc_sub_pixel_variance32x16_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance32x32_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance32x32 \
-  aom_highbd_obmc_sub_pixel_variance32x32_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance32x64_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance32x64 \
-  aom_highbd_obmc_sub_pixel_variance32x64_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance32x8_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance32x8 \
-  aom_highbd_obmc_sub_pixel_variance32x8_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance4x16_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance4x16 \
-  aom_highbd_obmc_sub_pixel_variance4x16_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance4x4_c(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance4x4 \
-  aom_highbd_obmc_sub_pixel_variance4x4_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance4x8_c(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance4x8 \
-  aom_highbd_obmc_sub_pixel_variance4x8_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance64x128_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance64x128 \
-  aom_highbd_obmc_sub_pixel_variance64x128_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance64x16_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance64x16 \
-  aom_highbd_obmc_sub_pixel_variance64x16_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance64x32_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance64x32 \
-  aom_highbd_obmc_sub_pixel_variance64x32_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance64x64_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance64x64 \
-  aom_highbd_obmc_sub_pixel_variance64x64_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance8x16_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance8x16 \
-  aom_highbd_obmc_sub_pixel_variance8x16_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance8x32_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance8x32 \
-  aom_highbd_obmc_sub_pixel_variance8x32_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance8x4_c(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance8x4 \
-  aom_highbd_obmc_sub_pixel_variance8x4_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance8x8_c(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance8x8 \
-  aom_highbd_obmc_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_obmc_variance128x128_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_obmc_variance128x128 aom_highbd_obmc_variance128x128_c
-
-unsigned int aom_highbd_obmc_variance128x64_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_obmc_variance128x64 aom_highbd_obmc_variance128x64_c
-
-unsigned int aom_highbd_obmc_variance16x16_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance16x16 aom_highbd_obmc_variance16x16_c
-
-unsigned int aom_highbd_obmc_variance16x32_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance16x32 aom_highbd_obmc_variance16x32_c
-
-unsigned int aom_highbd_obmc_variance16x4_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-#define aom_highbd_obmc_variance16x4 aom_highbd_obmc_variance16x4_c
-
-unsigned int aom_highbd_obmc_variance16x64_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance16x64 aom_highbd_obmc_variance16x64_c
-
-unsigned int aom_highbd_obmc_variance16x8_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-#define aom_highbd_obmc_variance16x8 aom_highbd_obmc_variance16x8_c
-
-unsigned int aom_highbd_obmc_variance32x16_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance32x16 aom_highbd_obmc_variance32x16_c
-
-unsigned int aom_highbd_obmc_variance32x32_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance32x32 aom_highbd_obmc_variance32x32_c
-
-unsigned int aom_highbd_obmc_variance32x64_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance32x64 aom_highbd_obmc_variance32x64_c
-
-unsigned int aom_highbd_obmc_variance32x8_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-#define aom_highbd_obmc_variance32x8 aom_highbd_obmc_variance32x8_c
-
-unsigned int aom_highbd_obmc_variance4x16_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-#define aom_highbd_obmc_variance4x16 aom_highbd_obmc_variance4x16_c
-
-unsigned int aom_highbd_obmc_variance4x4_c(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-#define aom_highbd_obmc_variance4x4 aom_highbd_obmc_variance4x4_c
-
-unsigned int aom_highbd_obmc_variance4x8_c(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-#define aom_highbd_obmc_variance4x8 aom_highbd_obmc_variance4x8_c
-
-unsigned int aom_highbd_obmc_variance64x128_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_obmc_variance64x128 aom_highbd_obmc_variance64x128_c
-
-unsigned int aom_highbd_obmc_variance64x16_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance64x16 aom_highbd_obmc_variance64x16_c
-
-unsigned int aom_highbd_obmc_variance64x32_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance64x32 aom_highbd_obmc_variance64x32_c
-
-unsigned int aom_highbd_obmc_variance64x64_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance64x64 aom_highbd_obmc_variance64x64_c
-
-unsigned int aom_highbd_obmc_variance8x16_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-#define aom_highbd_obmc_variance8x16 aom_highbd_obmc_variance8x16_c
-
-unsigned int aom_highbd_obmc_variance8x32_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-#define aom_highbd_obmc_variance8x32 aom_highbd_obmc_variance8x32_c
-
-unsigned int aom_highbd_obmc_variance8x4_c(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-#define aom_highbd_obmc_variance8x4 aom_highbd_obmc_variance8x4_c
-
-unsigned int aom_highbd_obmc_variance8x8_c(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-#define aom_highbd_obmc_variance8x8 aom_highbd_obmc_variance8x8_c
-
-void aom_highbd_paeth_predictor_16x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_16x16 aom_highbd_paeth_predictor_16x16_c
-
-void aom_highbd_paeth_predictor_16x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_16x32 aom_highbd_paeth_predictor_16x32_c
-
-void aom_highbd_paeth_predictor_16x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_16x4 aom_highbd_paeth_predictor_16x4_c
-
-void aom_highbd_paeth_predictor_16x64_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_16x64 aom_highbd_paeth_predictor_16x64_c
-
-void aom_highbd_paeth_predictor_16x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_16x8 aom_highbd_paeth_predictor_16x8_c
-
-void aom_highbd_paeth_predictor_2x2_c(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_paeth_predictor_2x2 aom_highbd_paeth_predictor_2x2_c
-
-void aom_highbd_paeth_predictor_32x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_32x16 aom_highbd_paeth_predictor_32x16_c
-
-void aom_highbd_paeth_predictor_32x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_32x32 aom_highbd_paeth_predictor_32x32_c
-
-void aom_highbd_paeth_predictor_32x64_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_32x64 aom_highbd_paeth_predictor_32x64_c
-
-void aom_highbd_paeth_predictor_32x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_32x8 aom_highbd_paeth_predictor_32x8_c
-
-void aom_highbd_paeth_predictor_4x16_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_4x16 aom_highbd_paeth_predictor_4x16_c
-
-void aom_highbd_paeth_predictor_4x4_c(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_paeth_predictor_4x4 aom_highbd_paeth_predictor_4x4_c
-
-void aom_highbd_paeth_predictor_4x8_c(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_paeth_predictor_4x8 aom_highbd_paeth_predictor_4x8_c
-
-void aom_highbd_paeth_predictor_64x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_64x16 aom_highbd_paeth_predictor_64x16_c
-
-void aom_highbd_paeth_predictor_64x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_64x32 aom_highbd_paeth_predictor_64x32_c
-
-void aom_highbd_paeth_predictor_64x64_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_64x64 aom_highbd_paeth_predictor_64x64_c
-
-void aom_highbd_paeth_predictor_8x16_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_8x16 aom_highbd_paeth_predictor_8x16_c
-
-void aom_highbd_paeth_predictor_8x32_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_8x32 aom_highbd_paeth_predictor_8x32_c
-
-void aom_highbd_paeth_predictor_8x4_c(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_paeth_predictor_8x4 aom_highbd_paeth_predictor_8x4_c
-
-void aom_highbd_paeth_predictor_8x8_c(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_paeth_predictor_8x8 aom_highbd_paeth_predictor_8x8_c
-
-void aom_highbd_quantize_b_c(const tran_low_t* coeff_ptr,
-                             intptr_t n_coeffs,
-                             const int16_t* zbin_ptr,
-                             const int16_t* round_ptr,
-                             const int16_t* quant_ptr,
-                             const int16_t* quant_shift_ptr,
-                             tran_low_t* qcoeff_ptr,
-                             tran_low_t* dqcoeff_ptr,
-                             const int16_t* dequant_ptr,
-                             uint16_t* eob_ptr,
-                             const int16_t* scan,
-                             const int16_t* iscan);
-#define aom_highbd_quantize_b aom_highbd_quantize_b_c
-
-void aom_highbd_quantize_b_32x32_c(const tran_low_t* coeff_ptr,
-                                   intptr_t n_coeffs,
-                                   const int16_t* zbin_ptr,
-                                   const int16_t* round_ptr,
-                                   const int16_t* quant_ptr,
-                                   const int16_t* quant_shift_ptr,
-                                   tran_low_t* qcoeff_ptr,
-                                   tran_low_t* dqcoeff_ptr,
-                                   const int16_t* dequant_ptr,
-                                   uint16_t* eob_ptr,
-                                   const int16_t* scan,
-                                   const int16_t* iscan);
-#define aom_highbd_quantize_b_32x32 aom_highbd_quantize_b_32x32_c
-
-void aom_highbd_quantize_b_32x32_adaptive_c(const tran_low_t* coeff_ptr,
-                                            intptr_t n_coeffs,
-                                            const int16_t* zbin_ptr,
-                                            const int16_t* round_ptr,
-                                            const int16_t* quant_ptr,
-                                            const int16_t* quant_shift_ptr,
-                                            tran_low_t* qcoeff_ptr,
-                                            tran_low_t* dqcoeff_ptr,
-                                            const int16_t* dequant_ptr,
-                                            uint16_t* eob_ptr,
-                                            const int16_t* scan,
-                                            const int16_t* iscan);
-#define aom_highbd_quantize_b_32x32_adaptive \
-  aom_highbd_quantize_b_32x32_adaptive_c
-
-void aom_highbd_quantize_b_64x64_c(const tran_low_t* coeff_ptr,
-                                   intptr_t n_coeffs,
-                                   const int16_t* zbin_ptr,
-                                   const int16_t* round_ptr,
-                                   const int16_t* quant_ptr,
-                                   const int16_t* quant_shift_ptr,
-                                   tran_low_t* qcoeff_ptr,
-                                   tran_low_t* dqcoeff_ptr,
-                                   const int16_t* dequant_ptr,
-                                   uint16_t* eob_ptr,
-                                   const int16_t* scan,
-                                   const int16_t* iscan);
-#define aom_highbd_quantize_b_64x64 aom_highbd_quantize_b_64x64_c
-
-void aom_highbd_quantize_b_64x64_adaptive_c(const tran_low_t* coeff_ptr,
-                                            intptr_t n_coeffs,
-                                            const int16_t* zbin_ptr,
-                                            const int16_t* round_ptr,
-                                            const int16_t* quant_ptr,
-                                            const int16_t* quant_shift_ptr,
-                                            tran_low_t* qcoeff_ptr,
-                                            tran_low_t* dqcoeff_ptr,
-                                            const int16_t* dequant_ptr,
-                                            uint16_t* eob_ptr,
-                                            const int16_t* scan,
-                                            const int16_t* iscan);
-#define aom_highbd_quantize_b_64x64_adaptive \
-  aom_highbd_quantize_b_64x64_adaptive_c
-
-void aom_highbd_quantize_b_adaptive_c(const tran_low_t* coeff_ptr,
-                                      intptr_t n_coeffs,
-                                      const int16_t* zbin_ptr,
-                                      const int16_t* round_ptr,
-                                      const int16_t* quant_ptr,
-                                      const int16_t* quant_shift_ptr,
-                                      tran_low_t* qcoeff_ptr,
-                                      tran_low_t* dqcoeff_ptr,
-                                      const int16_t* dequant_ptr,
-                                      uint16_t* eob_ptr,
-                                      const int16_t* scan,
-                                      const int16_t* iscan);
-#define aom_highbd_quantize_b_adaptive aom_highbd_quantize_b_adaptive_c
-
-unsigned int aom_highbd_sad128x128_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride);
-#define aom_highbd_sad128x128 aom_highbd_sad128x128_c
-
-unsigned int aom_highbd_sad128x128_avg_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         const uint8_t* second_pred);
-#define aom_highbd_sad128x128_avg aom_highbd_sad128x128_avg_c
-
-void aom_highbd_sad128x128x4d_c(const uint8_t* src_ptr,
-                                int src_stride,
-                                const uint8_t* const ref_ptr[],
-                                int ref_stride,
-                                uint32_t* sad_array);
-#define aom_highbd_sad128x128x4d aom_highbd_sad128x128x4d_c
-
-unsigned int aom_highbd_sad128x64_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* ref_ptr,
-                                    int ref_stride);
-#define aom_highbd_sad128x64 aom_highbd_sad128x64_c
-
-unsigned int aom_highbd_sad128x64_avg_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        const uint8_t* second_pred);
-#define aom_highbd_sad128x64_avg aom_highbd_sad128x64_avg_c
-
-void aom_highbd_sad128x64x4d_c(const uint8_t* src_ptr,
-                               int src_stride,
-                               const uint8_t* const ref_ptr[],
-                               int ref_stride,
-                               uint32_t* sad_array);
-#define aom_highbd_sad128x64x4d aom_highbd_sad128x64x4d_c
-
-unsigned int aom_highbd_sad16x16_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad16x16 aom_highbd_sad16x16_c
-
-unsigned int aom_highbd_sad16x16_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad16x16_avg aom_highbd_sad16x16_avg_c
-
-void aom_highbd_sad16x16x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad16x16x4d aom_highbd_sad16x16x4d_c
-
-unsigned int aom_highbd_sad16x32_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad16x32 aom_highbd_sad16x32_c
-
-unsigned int aom_highbd_sad16x32_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad16x32_avg aom_highbd_sad16x32_avg_c
-
-void aom_highbd_sad16x32x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad16x32x4d aom_highbd_sad16x32x4d_c
-
-unsigned int aom_highbd_sad16x4_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-#define aom_highbd_sad16x4 aom_highbd_sad16x4_c
-
-unsigned int aom_highbd_sad16x4_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-#define aom_highbd_sad16x4_avg aom_highbd_sad16x4_avg_c
-
-void aom_highbd_sad16x4x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-#define aom_highbd_sad16x4x4d aom_highbd_sad16x4x4d_c
-
-unsigned int aom_highbd_sad16x64_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad16x64 aom_highbd_sad16x64_c
-
-unsigned int aom_highbd_sad16x64_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad16x64_avg aom_highbd_sad16x64_avg_c
-
-void aom_highbd_sad16x64x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad16x64x4d aom_highbd_sad16x64x4d_c
-
-unsigned int aom_highbd_sad16x8_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-#define aom_highbd_sad16x8 aom_highbd_sad16x8_c
-
-unsigned int aom_highbd_sad16x8_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-#define aom_highbd_sad16x8_avg aom_highbd_sad16x8_avg_c
-
-void aom_highbd_sad16x8x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-#define aom_highbd_sad16x8x4d aom_highbd_sad16x8x4d_c
-
-unsigned int aom_highbd_sad32x16_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad32x16 aom_highbd_sad32x16_c
-
-unsigned int aom_highbd_sad32x16_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad32x16_avg aom_highbd_sad32x16_avg_c
-
-void aom_highbd_sad32x16x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad32x16x4d aom_highbd_sad32x16x4d_c
-
-unsigned int aom_highbd_sad32x32_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad32x32 aom_highbd_sad32x32_c
-
-unsigned int aom_highbd_sad32x32_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad32x32_avg aom_highbd_sad32x32_avg_c
-
-void aom_highbd_sad32x32x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad32x32x4d aom_highbd_sad32x32x4d_c
-
-unsigned int aom_highbd_sad32x64_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad32x64 aom_highbd_sad32x64_c
-
-unsigned int aom_highbd_sad32x64_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad32x64_avg aom_highbd_sad32x64_avg_c
-
-void aom_highbd_sad32x64x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad32x64x4d aom_highbd_sad32x64x4d_c
-
-unsigned int aom_highbd_sad32x8_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-#define aom_highbd_sad32x8 aom_highbd_sad32x8_c
-
-unsigned int aom_highbd_sad32x8_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-#define aom_highbd_sad32x8_avg aom_highbd_sad32x8_avg_c
-
-void aom_highbd_sad32x8x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-#define aom_highbd_sad32x8x4d aom_highbd_sad32x8x4d_c
-
-unsigned int aom_highbd_sad4x16_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-#define aom_highbd_sad4x16 aom_highbd_sad4x16_c
-
-unsigned int aom_highbd_sad4x16_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-#define aom_highbd_sad4x16_avg aom_highbd_sad4x16_avg_c
-
-void aom_highbd_sad4x16x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-#define aom_highbd_sad4x16x4d aom_highbd_sad4x16x4d_c
-
-unsigned int aom_highbd_sad4x4_c(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride);
-#define aom_highbd_sad4x4 aom_highbd_sad4x4_c
-
-unsigned int aom_highbd_sad4x4_avg_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride,
-                                     const uint8_t* second_pred);
-#define aom_highbd_sad4x4_avg aom_highbd_sad4x4_avg_c
-
-void aom_highbd_sad4x4x4d_c(const uint8_t* src_ptr,
-                            int src_stride,
-                            const uint8_t* const ref_ptr[],
-                            int ref_stride,
-                            uint32_t* sad_array);
-#define aom_highbd_sad4x4x4d aom_highbd_sad4x4x4d_c
-
-unsigned int aom_highbd_sad4x8_c(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride);
-#define aom_highbd_sad4x8 aom_highbd_sad4x8_c
-
-unsigned int aom_highbd_sad4x8_avg_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride,
-                                     const uint8_t* second_pred);
-#define aom_highbd_sad4x8_avg aom_highbd_sad4x8_avg_c
-
-void aom_highbd_sad4x8x4d_c(const uint8_t* src_ptr,
-                            int src_stride,
-                            const uint8_t* const ref_ptr[],
-                            int ref_stride,
-                            uint32_t* sad_array);
-#define aom_highbd_sad4x8x4d aom_highbd_sad4x8x4d_c
-
-unsigned int aom_highbd_sad64x128_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* ref_ptr,
-                                    int ref_stride);
-#define aom_highbd_sad64x128 aom_highbd_sad64x128_c
-
-unsigned int aom_highbd_sad64x128_avg_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        const uint8_t* second_pred);
-#define aom_highbd_sad64x128_avg aom_highbd_sad64x128_avg_c
-
-void aom_highbd_sad64x128x4d_c(const uint8_t* src_ptr,
-                               int src_stride,
-                               const uint8_t* const ref_ptr[],
-                               int ref_stride,
-                               uint32_t* sad_array);
-#define aom_highbd_sad64x128x4d aom_highbd_sad64x128x4d_c
-
-unsigned int aom_highbd_sad64x16_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad64x16 aom_highbd_sad64x16_c
-
-unsigned int aom_highbd_sad64x16_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad64x16_avg aom_highbd_sad64x16_avg_c
-
-void aom_highbd_sad64x16x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad64x16x4d aom_highbd_sad64x16x4d_c
-
-unsigned int aom_highbd_sad64x32_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad64x32 aom_highbd_sad64x32_c
-
-unsigned int aom_highbd_sad64x32_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad64x32_avg aom_highbd_sad64x32_avg_c
-
-void aom_highbd_sad64x32x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad64x32x4d aom_highbd_sad64x32x4d_c
-
-unsigned int aom_highbd_sad64x64_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad64x64 aom_highbd_sad64x64_c
-
-unsigned int aom_highbd_sad64x64_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad64x64_avg aom_highbd_sad64x64_avg_c
-
-void aom_highbd_sad64x64x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad64x64x4d aom_highbd_sad64x64x4d_c
-
-unsigned int aom_highbd_sad8x16_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-#define aom_highbd_sad8x16 aom_highbd_sad8x16_c
-
-unsigned int aom_highbd_sad8x16_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-#define aom_highbd_sad8x16_avg aom_highbd_sad8x16_avg_c
-
-void aom_highbd_sad8x16x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-#define aom_highbd_sad8x16x4d aom_highbd_sad8x16x4d_c
-
-unsigned int aom_highbd_sad8x32_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-#define aom_highbd_sad8x32 aom_highbd_sad8x32_c
-
-unsigned int aom_highbd_sad8x32_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-#define aom_highbd_sad8x32_avg aom_highbd_sad8x32_avg_c
-
-void aom_highbd_sad8x32x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-#define aom_highbd_sad8x32x4d aom_highbd_sad8x32x4d_c
-
-unsigned int aom_highbd_sad8x4_c(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride);
-#define aom_highbd_sad8x4 aom_highbd_sad8x4_c
-
-unsigned int aom_highbd_sad8x4_avg_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride,
-                                     const uint8_t* second_pred);
-#define aom_highbd_sad8x4_avg aom_highbd_sad8x4_avg_c
-
-void aom_highbd_sad8x4x4d_c(const uint8_t* src_ptr,
-                            int src_stride,
-                            const uint8_t* const ref_ptr[],
-                            int ref_stride,
-                            uint32_t* sad_array);
-#define aom_highbd_sad8x4x4d aom_highbd_sad8x4x4d_c
-
-unsigned int aom_highbd_sad8x8_c(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride);
-#define aom_highbd_sad8x8 aom_highbd_sad8x8_c
-
-unsigned int aom_highbd_sad8x8_avg_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride,
-                                     const uint8_t* second_pred);
-#define aom_highbd_sad8x8_avg aom_highbd_sad8x8_avg_c
-
-void aom_highbd_sad8x8x4d_c(const uint8_t* src_ptr,
-                            int src_stride,
-                            const uint8_t* const ref_ptr[],
-                            int ref_stride,
-                            uint32_t* sad_array);
-#define aom_highbd_sad8x8x4d aom_highbd_sad8x8x4d_c
-
-unsigned int aom_highbd_sad_skip_128x128_c(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride);
-#define aom_highbd_sad_skip_128x128 aom_highbd_sad_skip_128x128_c
-
-void aom_highbd_sad_skip_128x128x4d_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* const ref_ptr[],
-                                      int ref_stride,
-                                      uint32_t* sad_array);
-#define aom_highbd_sad_skip_128x128x4d aom_highbd_sad_skip_128x128x4d_c
-
-unsigned int aom_highbd_sad_skip_128x64_c(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride);
-#define aom_highbd_sad_skip_128x64 aom_highbd_sad_skip_128x64_c
-
-void aom_highbd_sad_skip_128x64x4d_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* const ref_ptr[],
-                                     int ref_stride,
-                                     uint32_t* sad_array);
-#define aom_highbd_sad_skip_128x64x4d aom_highbd_sad_skip_128x64x4d_c
-
-unsigned int aom_highbd_sad_skip_16x16_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_16x16 aom_highbd_sad_skip_16x16_c
-
-void aom_highbd_sad_skip_16x16x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_16x16x4d aom_highbd_sad_skip_16x16x4d_c
-
-unsigned int aom_highbd_sad_skip_16x32_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_16x32 aom_highbd_sad_skip_16x32_c
-
-void aom_highbd_sad_skip_16x32x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_16x32x4d aom_highbd_sad_skip_16x32x4d_c
-
-unsigned int aom_highbd_sad_skip_16x4_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-#define aom_highbd_sad_skip_16x4 aom_highbd_sad_skip_16x4_c
-
-void aom_highbd_sad_skip_16x4x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-#define aom_highbd_sad_skip_16x4x4d aom_highbd_sad_skip_16x4x4d_c
-
-unsigned int aom_highbd_sad_skip_16x64_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_16x64 aom_highbd_sad_skip_16x64_c
-
-void aom_highbd_sad_skip_16x64x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_16x64x4d aom_highbd_sad_skip_16x64x4d_c
-
-unsigned int aom_highbd_sad_skip_16x8_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-#define aom_highbd_sad_skip_16x8 aom_highbd_sad_skip_16x8_c
-
-void aom_highbd_sad_skip_16x8x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-#define aom_highbd_sad_skip_16x8x4d aom_highbd_sad_skip_16x8x4d_c
-
-unsigned int aom_highbd_sad_skip_32x16_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_32x16 aom_highbd_sad_skip_32x16_c
-
-void aom_highbd_sad_skip_32x16x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_32x16x4d aom_highbd_sad_skip_32x16x4d_c
-
-unsigned int aom_highbd_sad_skip_32x32_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_32x32 aom_highbd_sad_skip_32x32_c
-
-void aom_highbd_sad_skip_32x32x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_32x32x4d aom_highbd_sad_skip_32x32x4d_c
-
-unsigned int aom_highbd_sad_skip_32x64_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_32x64 aom_highbd_sad_skip_32x64_c
-
-void aom_highbd_sad_skip_32x64x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_32x64x4d aom_highbd_sad_skip_32x64x4d_c
-
-unsigned int aom_highbd_sad_skip_32x8_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-#define aom_highbd_sad_skip_32x8 aom_highbd_sad_skip_32x8_c
-
-void aom_highbd_sad_skip_32x8x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-#define aom_highbd_sad_skip_32x8x4d aom_highbd_sad_skip_32x8x4d_c
-
-unsigned int aom_highbd_sad_skip_4x16_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-#define aom_highbd_sad_skip_4x16 aom_highbd_sad_skip_4x16_c
-
-void aom_highbd_sad_skip_4x16x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-#define aom_highbd_sad_skip_4x16x4d aom_highbd_sad_skip_4x16x4d_c
-
-unsigned int aom_highbd_sad_skip_4x4_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride);
-#define aom_highbd_sad_skip_4x4 aom_highbd_sad_skip_4x4_c
-
-void aom_highbd_sad_skip_4x4x4d_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* const ref_ptr[],
-                                  int ref_stride,
-                                  uint32_t* sad_array);
-#define aom_highbd_sad_skip_4x4x4d aom_highbd_sad_skip_4x4x4d_c
-
-unsigned int aom_highbd_sad_skip_4x8_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride);
-#define aom_highbd_sad_skip_4x8 aom_highbd_sad_skip_4x8_c
-
-void aom_highbd_sad_skip_4x8x4d_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* const ref_ptr[],
-                                  int ref_stride,
-                                  uint32_t* sad_array);
-#define aom_highbd_sad_skip_4x8x4d aom_highbd_sad_skip_4x8x4d_c
-
-unsigned int aom_highbd_sad_skip_64x128_c(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride);
-#define aom_highbd_sad_skip_64x128 aom_highbd_sad_skip_64x128_c
-
-void aom_highbd_sad_skip_64x128x4d_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* const ref_ptr[],
-                                     int ref_stride,
-                                     uint32_t* sad_array);
-#define aom_highbd_sad_skip_64x128x4d aom_highbd_sad_skip_64x128x4d_c
-
-unsigned int aom_highbd_sad_skip_64x16_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_64x16 aom_highbd_sad_skip_64x16_c
-
-void aom_highbd_sad_skip_64x16x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_64x16x4d aom_highbd_sad_skip_64x16x4d_c
-
-unsigned int aom_highbd_sad_skip_64x32_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_64x32 aom_highbd_sad_skip_64x32_c
-
-void aom_highbd_sad_skip_64x32x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_64x32x4d aom_highbd_sad_skip_64x32x4d_c
-
-unsigned int aom_highbd_sad_skip_64x64_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_64x64 aom_highbd_sad_skip_64x64_c
-
-void aom_highbd_sad_skip_64x64x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_64x64x4d aom_highbd_sad_skip_64x64x4d_c
-
-unsigned int aom_highbd_sad_skip_8x16_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-#define aom_highbd_sad_skip_8x16 aom_highbd_sad_skip_8x16_c
-
-void aom_highbd_sad_skip_8x16x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-#define aom_highbd_sad_skip_8x16x4d aom_highbd_sad_skip_8x16x4d_c
-
-unsigned int aom_highbd_sad_skip_8x32_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-#define aom_highbd_sad_skip_8x32 aom_highbd_sad_skip_8x32_c
-
-void aom_highbd_sad_skip_8x32x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-#define aom_highbd_sad_skip_8x32x4d aom_highbd_sad_skip_8x32x4d_c
-
-unsigned int aom_highbd_sad_skip_8x4_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride);
-#define aom_highbd_sad_skip_8x4 aom_highbd_sad_skip_8x4_c
-
-void aom_highbd_sad_skip_8x4x4d_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* const ref_ptr[],
-                                  int ref_stride,
-                                  uint32_t* sad_array);
-#define aom_highbd_sad_skip_8x4x4d aom_highbd_sad_skip_8x4x4d_c
-
-unsigned int aom_highbd_sad_skip_8x8_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride);
-#define aom_highbd_sad_skip_8x8 aom_highbd_sad_skip_8x8_c
-
-void aom_highbd_sad_skip_8x8x4d_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* const ref_ptr[],
-                                  int ref_stride,
-                                  uint32_t* sad_array);
-#define aom_highbd_sad_skip_8x8x4d aom_highbd_sad_skip_8x8x4d_c
-
-void aom_highbd_smooth_h_predictor_16x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_16x16 \
-  aom_highbd_smooth_h_predictor_16x16_c
-
-void aom_highbd_smooth_h_predictor_16x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_16x32 \
-  aom_highbd_smooth_h_predictor_16x32_c
-
-void aom_highbd_smooth_h_predictor_16x4_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_16x4 aom_highbd_smooth_h_predictor_16x4_c
-
-void aom_highbd_smooth_h_predictor_16x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_16x64 \
-  aom_highbd_smooth_h_predictor_16x64_c
-
-void aom_highbd_smooth_h_predictor_16x8_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_16x8 aom_highbd_smooth_h_predictor_16x8_c
-
-void aom_highbd_smooth_h_predictor_2x2_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_h_predictor_2x2 aom_highbd_smooth_h_predictor_2x2_c
-
-void aom_highbd_smooth_h_predictor_32x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_32x16 \
-  aom_highbd_smooth_h_predictor_32x16_c
-
-void aom_highbd_smooth_h_predictor_32x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_32x32 \
-  aom_highbd_smooth_h_predictor_32x32_c
-
-void aom_highbd_smooth_h_predictor_32x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_32x64 \
-  aom_highbd_smooth_h_predictor_32x64_c
-
-void aom_highbd_smooth_h_predictor_32x8_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_32x8 aom_highbd_smooth_h_predictor_32x8_c
-
-void aom_highbd_smooth_h_predictor_4x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_4x16 aom_highbd_smooth_h_predictor_4x16_c
-
-void aom_highbd_smooth_h_predictor_4x4_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_h_predictor_4x4 aom_highbd_smooth_h_predictor_4x4_c
-
-void aom_highbd_smooth_h_predictor_4x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_h_predictor_4x8 aom_highbd_smooth_h_predictor_4x8_c
-
-void aom_highbd_smooth_h_predictor_64x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_64x16 \
-  aom_highbd_smooth_h_predictor_64x16_c
-
-void aom_highbd_smooth_h_predictor_64x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_64x32 \
-  aom_highbd_smooth_h_predictor_64x32_c
-
-void aom_highbd_smooth_h_predictor_64x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_64x64 \
-  aom_highbd_smooth_h_predictor_64x64_c
-
-void aom_highbd_smooth_h_predictor_8x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_8x16 aom_highbd_smooth_h_predictor_8x16_c
-
-void aom_highbd_smooth_h_predictor_8x32_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_8x32 aom_highbd_smooth_h_predictor_8x32_c
-
-void aom_highbd_smooth_h_predictor_8x4_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_h_predictor_8x4 aom_highbd_smooth_h_predictor_8x4_c
-
-void aom_highbd_smooth_h_predictor_8x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_h_predictor_8x8 aom_highbd_smooth_h_predictor_8x8_c
-
-void aom_highbd_smooth_predictor_16x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_16x16 aom_highbd_smooth_predictor_16x16_c
-
-void aom_highbd_smooth_predictor_16x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_16x32 aom_highbd_smooth_predictor_16x32_c
-
-void aom_highbd_smooth_predictor_16x4_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_16x4 aom_highbd_smooth_predictor_16x4_c
-
-void aom_highbd_smooth_predictor_16x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_16x64 aom_highbd_smooth_predictor_16x64_c
-
-void aom_highbd_smooth_predictor_16x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_16x8 aom_highbd_smooth_predictor_16x8_c
-
-void aom_highbd_smooth_predictor_2x2_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_smooth_predictor_2x2 aom_highbd_smooth_predictor_2x2_c
-
-void aom_highbd_smooth_predictor_32x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_32x16 aom_highbd_smooth_predictor_32x16_c
-
-void aom_highbd_smooth_predictor_32x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_32x32 aom_highbd_smooth_predictor_32x32_c
-
-void aom_highbd_smooth_predictor_32x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_32x64 aom_highbd_smooth_predictor_32x64_c
-
-void aom_highbd_smooth_predictor_32x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_32x8 aom_highbd_smooth_predictor_32x8_c
-
-void aom_highbd_smooth_predictor_4x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_4x16 aom_highbd_smooth_predictor_4x16_c
-
-void aom_highbd_smooth_predictor_4x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_smooth_predictor_4x4 aom_highbd_smooth_predictor_4x4_c
-
-void aom_highbd_smooth_predictor_4x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_smooth_predictor_4x8 aom_highbd_smooth_predictor_4x8_c
-
-void aom_highbd_smooth_predictor_64x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_64x16 aom_highbd_smooth_predictor_64x16_c
-
-void aom_highbd_smooth_predictor_64x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_64x32 aom_highbd_smooth_predictor_64x32_c
-
-void aom_highbd_smooth_predictor_64x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_64x64 aom_highbd_smooth_predictor_64x64_c
-
-void aom_highbd_smooth_predictor_8x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_8x16 aom_highbd_smooth_predictor_8x16_c
-
-void aom_highbd_smooth_predictor_8x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_8x32 aom_highbd_smooth_predictor_8x32_c
-
-void aom_highbd_smooth_predictor_8x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_smooth_predictor_8x4 aom_highbd_smooth_predictor_8x4_c
-
-void aom_highbd_smooth_predictor_8x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_smooth_predictor_8x8 aom_highbd_smooth_predictor_8x8_c
-
-void aom_highbd_smooth_v_predictor_16x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_16x16 \
-  aom_highbd_smooth_v_predictor_16x16_c
-
-void aom_highbd_smooth_v_predictor_16x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_16x32 \
-  aom_highbd_smooth_v_predictor_16x32_c
-
-void aom_highbd_smooth_v_predictor_16x4_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_16x4 aom_highbd_smooth_v_predictor_16x4_c
-
-void aom_highbd_smooth_v_predictor_16x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_16x64 \
-  aom_highbd_smooth_v_predictor_16x64_c
-
-void aom_highbd_smooth_v_predictor_16x8_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_16x8 aom_highbd_smooth_v_predictor_16x8_c
-
-void aom_highbd_smooth_v_predictor_2x2_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_v_predictor_2x2 aom_highbd_smooth_v_predictor_2x2_c
-
-void aom_highbd_smooth_v_predictor_32x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_32x16 \
-  aom_highbd_smooth_v_predictor_32x16_c
-
-void aom_highbd_smooth_v_predictor_32x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_32x32 \
-  aom_highbd_smooth_v_predictor_32x32_c
-
-void aom_highbd_smooth_v_predictor_32x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_32x64 \
-  aom_highbd_smooth_v_predictor_32x64_c
-
-void aom_highbd_smooth_v_predictor_32x8_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_32x8 aom_highbd_smooth_v_predictor_32x8_c
-
-void aom_highbd_smooth_v_predictor_4x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_4x16 aom_highbd_smooth_v_predictor_4x16_c
-
-void aom_highbd_smooth_v_predictor_4x4_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_v_predictor_4x4 aom_highbd_smooth_v_predictor_4x4_c
-
-void aom_highbd_smooth_v_predictor_4x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_v_predictor_4x8 aom_highbd_smooth_v_predictor_4x8_c
-
-void aom_highbd_smooth_v_predictor_64x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_64x16 \
-  aom_highbd_smooth_v_predictor_64x16_c
-
-void aom_highbd_smooth_v_predictor_64x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_64x32 \
-  aom_highbd_smooth_v_predictor_64x32_c
-
-void aom_highbd_smooth_v_predictor_64x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_64x64 \
-  aom_highbd_smooth_v_predictor_64x64_c
-
-void aom_highbd_smooth_v_predictor_8x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_8x16 aom_highbd_smooth_v_predictor_8x16_c
-
-void aom_highbd_smooth_v_predictor_8x32_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_8x32 aom_highbd_smooth_v_predictor_8x32_c
-
-void aom_highbd_smooth_v_predictor_8x4_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_v_predictor_8x4 aom_highbd_smooth_v_predictor_8x4_c
-
-void aom_highbd_smooth_v_predictor_8x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_v_predictor_8x8 aom_highbd_smooth_v_predictor_8x8_c
-
-int64_t aom_highbd_sse_c(const uint8_t* a8,
-                         int a_stride,
-                         const uint8_t* b8,
-                         int b_stride,
-                         int width,
-                         int height);
-int64_t aom_highbd_sse_neon(const uint8_t* a8,
-                            int a_stride,
-                            const uint8_t* b8,
-                            int b_stride,
-                            int width,
-                            int height);
-#define aom_highbd_sse aom_highbd_sse_neon
-
-void aom_highbd_subtract_block_c(int rows,
-                                 int cols,
-                                 int16_t* diff_ptr,
-                                 ptrdiff_t diff_stride,
-                                 const uint8_t* src_ptr,
-                                 ptrdiff_t src_stride,
-                                 const uint8_t* pred_ptr,
-                                 ptrdiff_t pred_stride,
-                                 int bd);
-#define aom_highbd_subtract_block aom_highbd_subtract_block_c
-
-void aom_highbd_upsampled_pred_c(MACROBLOCKD* xd,
-                                 const struct AV1Common* const cm,
-                                 int mi_row,
-                                 int mi_col,
-                                 const MV* const mv,
-                                 uint8_t* comp_pred8,
-                                 int width,
-                                 int height,
-                                 int subpel_x_q3,
-                                 int subpel_y_q3,
-                                 const uint8_t* ref8,
-                                 int ref_stride,
-                                 int bd,
-                                 int subpel_search);
-#define aom_highbd_upsampled_pred aom_highbd_upsampled_pred_c
-
-void aom_highbd_v_predictor_16x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_16x16 aom_highbd_v_predictor_16x16_c
-
-void aom_highbd_v_predictor_16x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_16x32 aom_highbd_v_predictor_16x32_c
-
-void aom_highbd_v_predictor_16x4_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_16x4 aom_highbd_v_predictor_16x4_c
-
-void aom_highbd_v_predictor_16x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_16x64 aom_highbd_v_predictor_16x64_c
-
-void aom_highbd_v_predictor_16x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_16x8 aom_highbd_v_predictor_16x8_c
-
-void aom_highbd_v_predictor_2x2_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_v_predictor_2x2 aom_highbd_v_predictor_2x2_c
-
-void aom_highbd_v_predictor_32x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_32x16 aom_highbd_v_predictor_32x16_c
-
-void aom_highbd_v_predictor_32x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_32x32 aom_highbd_v_predictor_32x32_c
-
-void aom_highbd_v_predictor_32x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_32x64 aom_highbd_v_predictor_32x64_c
-
-void aom_highbd_v_predictor_32x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_32x8 aom_highbd_v_predictor_32x8_c
-
-void aom_highbd_v_predictor_4x16_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_4x16 aom_highbd_v_predictor_4x16_c
-
-void aom_highbd_v_predictor_4x4_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_v_predictor_4x4 aom_highbd_v_predictor_4x4_c
-
-void aom_highbd_v_predictor_4x8_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_v_predictor_4x8 aom_highbd_v_predictor_4x8_c
-
-void aom_highbd_v_predictor_64x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_64x16 aom_highbd_v_predictor_64x16_c
-
-void aom_highbd_v_predictor_64x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_64x32 aom_highbd_v_predictor_64x32_c
-
-void aom_highbd_v_predictor_64x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_64x64 aom_highbd_v_predictor_64x64_c
-
-void aom_highbd_v_predictor_8x16_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_8x16 aom_highbd_v_predictor_8x16_c
-
-void aom_highbd_v_predictor_8x32_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_8x32 aom_highbd_v_predictor_8x32_c
-
-void aom_highbd_v_predictor_8x4_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_v_predictor_8x4 aom_highbd_v_predictor_8x4_c
-
-void aom_highbd_v_predictor_8x8_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_v_predictor_8x8 aom_highbd_v_predictor_8x8_c
-
 void aom_ifft16x16_float_c(const float* input, float* temp, float* output);
 #define aom_ifft16x16_float aom_ifft16x16_float_c
 
@@ -10727,498 +2507,6 @@
                              int h);
 #define aom_mse_wxh_16bit aom_mse_wxh_16bit_c
 
-uint64_t aom_mse_wxh_16bit_highbd_c(uint16_t* dst,
-                                    int dstride,
-                                    uint16_t* src,
-                                    int sstride,
-                                    int w,
-                                    int h);
-#define aom_mse_wxh_16bit_highbd aom_mse_wxh_16bit_highbd_c
-
-unsigned int aom_obmc_sad128x128_c(const uint8_t* pre,
-                                   int pre_stride,
-                                   const int32_t* wsrc,
-                                   const int32_t* mask);
-#define aom_obmc_sad128x128 aom_obmc_sad128x128_c
-
-unsigned int aom_obmc_sad128x64_c(const uint8_t* pre,
-                                  int pre_stride,
-                                  const int32_t* wsrc,
-                                  const int32_t* mask);
-#define aom_obmc_sad128x64 aom_obmc_sad128x64_c
-
-unsigned int aom_obmc_sad16x16_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad16x16 aom_obmc_sad16x16_c
-
-unsigned int aom_obmc_sad16x32_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad16x32 aom_obmc_sad16x32_c
-
-unsigned int aom_obmc_sad16x4_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-#define aom_obmc_sad16x4 aom_obmc_sad16x4_c
-
-unsigned int aom_obmc_sad16x64_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad16x64 aom_obmc_sad16x64_c
-
-unsigned int aom_obmc_sad16x8_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-#define aom_obmc_sad16x8 aom_obmc_sad16x8_c
-
-unsigned int aom_obmc_sad32x16_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad32x16 aom_obmc_sad32x16_c
-
-unsigned int aom_obmc_sad32x32_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad32x32 aom_obmc_sad32x32_c
-
-unsigned int aom_obmc_sad32x64_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad32x64 aom_obmc_sad32x64_c
-
-unsigned int aom_obmc_sad32x8_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-#define aom_obmc_sad32x8 aom_obmc_sad32x8_c
-
-unsigned int aom_obmc_sad4x16_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-#define aom_obmc_sad4x16 aom_obmc_sad4x16_c
-
-unsigned int aom_obmc_sad4x4_c(const uint8_t* pre,
-                               int pre_stride,
-                               const int32_t* wsrc,
-                               const int32_t* mask);
-#define aom_obmc_sad4x4 aom_obmc_sad4x4_c
-
-unsigned int aom_obmc_sad4x8_c(const uint8_t* pre,
-                               int pre_stride,
-                               const int32_t* wsrc,
-                               const int32_t* mask);
-#define aom_obmc_sad4x8 aom_obmc_sad4x8_c
-
-unsigned int aom_obmc_sad64x128_c(const uint8_t* pre,
-                                  int pre_stride,
-                                  const int32_t* wsrc,
-                                  const int32_t* mask);
-#define aom_obmc_sad64x128 aom_obmc_sad64x128_c
-
-unsigned int aom_obmc_sad64x16_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad64x16 aom_obmc_sad64x16_c
-
-unsigned int aom_obmc_sad64x32_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad64x32 aom_obmc_sad64x32_c
-
-unsigned int aom_obmc_sad64x64_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad64x64 aom_obmc_sad64x64_c
-
-unsigned int aom_obmc_sad8x16_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-#define aom_obmc_sad8x16 aom_obmc_sad8x16_c
-
-unsigned int aom_obmc_sad8x32_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-#define aom_obmc_sad8x32 aom_obmc_sad8x32_c
-
-unsigned int aom_obmc_sad8x4_c(const uint8_t* pre,
-                               int pre_stride,
-                               const int32_t* wsrc,
-                               const int32_t* mask);
-#define aom_obmc_sad8x4 aom_obmc_sad8x4_c
-
-unsigned int aom_obmc_sad8x8_c(const uint8_t* pre,
-                               int pre_stride,
-                               const int32_t* wsrc,
-                               const int32_t* mask);
-#define aom_obmc_sad8x8 aom_obmc_sad8x8_c
-
-unsigned int aom_obmc_sub_pixel_variance128x128_c(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-#define aom_obmc_sub_pixel_variance128x128 aom_obmc_sub_pixel_variance128x128_c
-
-unsigned int aom_obmc_sub_pixel_variance128x64_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-#define aom_obmc_sub_pixel_variance128x64 aom_obmc_sub_pixel_variance128x64_c
-
-unsigned int aom_obmc_sub_pixel_variance16x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance16x16 aom_obmc_sub_pixel_variance16x16_c
-
-unsigned int aom_obmc_sub_pixel_variance16x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance16x32 aom_obmc_sub_pixel_variance16x32_c
-
-unsigned int aom_obmc_sub_pixel_variance16x4_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_obmc_sub_pixel_variance16x4 aom_obmc_sub_pixel_variance16x4_c
-
-unsigned int aom_obmc_sub_pixel_variance16x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance16x64 aom_obmc_sub_pixel_variance16x64_c
-
-unsigned int aom_obmc_sub_pixel_variance16x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_obmc_sub_pixel_variance16x8 aom_obmc_sub_pixel_variance16x8_c
-
-unsigned int aom_obmc_sub_pixel_variance32x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance32x16 aom_obmc_sub_pixel_variance32x16_c
-
-unsigned int aom_obmc_sub_pixel_variance32x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance32x32 aom_obmc_sub_pixel_variance32x32_c
-
-unsigned int aom_obmc_sub_pixel_variance32x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance32x64 aom_obmc_sub_pixel_variance32x64_c
-
-unsigned int aom_obmc_sub_pixel_variance32x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_obmc_sub_pixel_variance32x8 aom_obmc_sub_pixel_variance32x8_c
-
-unsigned int aom_obmc_sub_pixel_variance4x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_obmc_sub_pixel_variance4x16 aom_obmc_sub_pixel_variance4x16_c
-
-unsigned int aom_obmc_sub_pixel_variance4x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_obmc_sub_pixel_variance4x4 aom_obmc_sub_pixel_variance4x4_c
-
-unsigned int aom_obmc_sub_pixel_variance4x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_obmc_sub_pixel_variance4x8 aom_obmc_sub_pixel_variance4x8_c
-
-unsigned int aom_obmc_sub_pixel_variance64x128_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-#define aom_obmc_sub_pixel_variance64x128 aom_obmc_sub_pixel_variance64x128_c
-
-unsigned int aom_obmc_sub_pixel_variance64x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance64x16 aom_obmc_sub_pixel_variance64x16_c
-
-unsigned int aom_obmc_sub_pixel_variance64x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance64x32 aom_obmc_sub_pixel_variance64x32_c
-
-unsigned int aom_obmc_sub_pixel_variance64x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance64x64 aom_obmc_sub_pixel_variance64x64_c
-
-unsigned int aom_obmc_sub_pixel_variance8x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_obmc_sub_pixel_variance8x16 aom_obmc_sub_pixel_variance8x16_c
-
-unsigned int aom_obmc_sub_pixel_variance8x32_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_obmc_sub_pixel_variance8x32 aom_obmc_sub_pixel_variance8x32_c
-
-unsigned int aom_obmc_sub_pixel_variance8x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_obmc_sub_pixel_variance8x4 aom_obmc_sub_pixel_variance8x4_c
-
-unsigned int aom_obmc_sub_pixel_variance8x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_obmc_sub_pixel_variance8x8 aom_obmc_sub_pixel_variance8x8_c
-
-unsigned int aom_obmc_variance128x128_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask,
-                                        unsigned int* sse);
-#define aom_obmc_variance128x128 aom_obmc_variance128x128_c
-
-unsigned int aom_obmc_variance128x64_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask,
-                                       unsigned int* sse);
-#define aom_obmc_variance128x64 aom_obmc_variance128x64_c
-
-unsigned int aom_obmc_variance16x16_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance16x16 aom_obmc_variance16x16_c
-
-unsigned int aom_obmc_variance16x32_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance16x32 aom_obmc_variance16x32_c
-
-unsigned int aom_obmc_variance16x4_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-#define aom_obmc_variance16x4 aom_obmc_variance16x4_c
-
-unsigned int aom_obmc_variance16x64_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance16x64 aom_obmc_variance16x64_c
-
-unsigned int aom_obmc_variance16x8_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-#define aom_obmc_variance16x8 aom_obmc_variance16x8_c
-
-unsigned int aom_obmc_variance32x16_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance32x16 aom_obmc_variance32x16_c
-
-unsigned int aom_obmc_variance32x32_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance32x32 aom_obmc_variance32x32_c
-
-unsigned int aom_obmc_variance32x64_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance32x64 aom_obmc_variance32x64_c
-
-unsigned int aom_obmc_variance32x8_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-#define aom_obmc_variance32x8 aom_obmc_variance32x8_c
-
-unsigned int aom_obmc_variance4x16_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-#define aom_obmc_variance4x16 aom_obmc_variance4x16_c
-
-unsigned int aom_obmc_variance4x4_c(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask,
-                                    unsigned int* sse);
-#define aom_obmc_variance4x4 aom_obmc_variance4x4_c
-
-unsigned int aom_obmc_variance4x8_c(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask,
-                                    unsigned int* sse);
-#define aom_obmc_variance4x8 aom_obmc_variance4x8_c
-
-unsigned int aom_obmc_variance64x128_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask,
-                                       unsigned int* sse);
-#define aom_obmc_variance64x128 aom_obmc_variance64x128_c
-
-unsigned int aom_obmc_variance64x16_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance64x16 aom_obmc_variance64x16_c
-
-unsigned int aom_obmc_variance64x32_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance64x32 aom_obmc_variance64x32_c
-
-unsigned int aom_obmc_variance64x64_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance64x64 aom_obmc_variance64x64_c
-
-unsigned int aom_obmc_variance8x16_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-#define aom_obmc_variance8x16 aom_obmc_variance8x16_c
-
-unsigned int aom_obmc_variance8x32_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-#define aom_obmc_variance8x32 aom_obmc_variance8x32_c
-
-unsigned int aom_obmc_variance8x4_c(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask,
-                                    unsigned int* sse);
-#define aom_obmc_variance8x4 aom_obmc_variance8x4_c
-
-unsigned int aom_obmc_variance8x8_c(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask,
-                                    unsigned int* sse);
-#define aom_obmc_variance8x8 aom_obmc_variance8x8_c
-
 void aom_paeth_predictor_16x16_c(uint8_t* dst,
                                  ptrdiff_t y_stride,
                                  const uint8_t* above,
diff --git a/third_party/libaom/source/config/ios/arm64/config/av1_rtcd.h b/third_party/libaom/source/config/ios/arm64/config/av1_rtcd.h
index d612ede3..c8b39bd0 100644
--- a/third_party/libaom/source/config/ios/arm64/config/av1_rtcd.h
+++ b/third_party/libaom/source/config/ios/arm64/config/av1_rtcd.h
@@ -114,46 +114,6 @@
                                 const int log_scale);
 #define aom_quantize_b_helper aom_quantize_b_helper_neon
 
-void av1_apply_selfguided_restoration_c(const uint8_t* dat,
-                                        int width,
-                                        int height,
-                                        int stride,
-                                        int eps,
-                                        const int* xqd,
-                                        uint8_t* dst,
-                                        int dst_stride,
-                                        int32_t* tmpbuf,
-                                        int bit_depth,
-                                        int highbd);
-void av1_apply_selfguided_restoration_neon(const uint8_t* dat,
-                                           int width,
-                                           int height,
-                                           int stride,
-                                           int eps,
-                                           const int* xqd,
-                                           uint8_t* dst,
-                                           int dst_stride,
-                                           int32_t* tmpbuf,
-                                           int bit_depth,
-                                           int highbd);
-#define av1_apply_selfguided_restoration av1_apply_selfguided_restoration_neon
-
-void av1_apply_temporal_filter_c(const struct yv12_buffer_config* ref_frame,
-                                 const struct macroblockd* mbd,
-                                 const BLOCK_SIZE block_size,
-                                 const int mb_row,
-                                 const int mb_col,
-                                 const int num_planes,
-                                 const double* noise_levels,
-                                 const MV* subblock_mvs,
-                                 const int* subblock_mses,
-                                 const int q_factor,
-                                 const int filter_strength,
-                                 const uint8_t* pred,
-                                 uint32_t* accum,
-                                 uint16_t* count);
-#define av1_apply_temporal_filter av1_apply_temporal_filter_c
-
 int64_t av1_block_error_c(const tran_low_t* coeff,
                           const tran_low_t* dqcoeff,
                           intptr_t block_size,
@@ -217,44 +177,6 @@
 #define av1_build_compound_diffwtd_mask_highbd \
   av1_build_compound_diffwtd_mask_highbd_c
 
-int64_t av1_calc_frame_error_c(const uint8_t* const ref,
-                               int stride,
-                               const uint8_t* const dst,
-                               int p_width,
-                               int p_height,
-                               int p_stride);
-#define av1_calc_frame_error av1_calc_frame_error_c
-
-void av1_calc_proj_params_c(const uint8_t* src8,
-                            int width,
-                            int height,
-                            int src_stride,
-                            const uint8_t* dat8,
-                            int dat_stride,
-                            int32_t* flt0,
-                            int flt0_stride,
-                            int32_t* flt1,
-                            int flt1_stride,
-                            int64_t H[2][2],
-                            int64_t C[2],
-                            const sgr_params_type* params);
-#define av1_calc_proj_params av1_calc_proj_params_c
-
-void av1_calc_proj_params_high_bd_c(const uint8_t* src8,
-                                    int width,
-                                    int height,
-                                    int src_stride,
-                                    const uint8_t* dat8,
-                                    int dat_stride,
-                                    int32_t* flt0,
-                                    int flt0_stride,
-                                    int32_t* flt1,
-                                    int flt1_stride,
-                                    int64_t H[2][2],
-                                    int64_t C[2],
-                                    const sgr_params_type* params);
-#define av1_calc_proj_params_high_bd av1_calc_proj_params_high_bd_c
-
 void av1_cnn_activate_c(float** input,
                         int channels,
                         int width,
@@ -321,33 +243,6 @@
                                        int y2);
 #define av1_compute_cross_correlation av1_compute_cross_correlation_c
 
-void av1_compute_stats_c(int wiener_win,
-                         const uint8_t* dgd8,
-                         const uint8_t* src8,
-                         int h_start,
-                         int h_end,
-                         int v_start,
-                         int v_end,
-                         int dgd_stride,
-                         int src_stride,
-                         int64_t* M,
-                         int64_t* H);
-#define av1_compute_stats av1_compute_stats_c
-
-void av1_compute_stats_highbd_c(int wiener_win,
-                                const uint8_t* dgd8,
-                                const uint8_t* src8,
-                                int h_start,
-                                int h_end,
-                                int v_start,
-                                int v_end,
-                                int dgd_stride,
-                                int src_stride,
-                                int64_t* M,
-                                int64_t* H,
-                                aom_bit_depth_t bit_depth);
-#define av1_compute_stats_highbd av1_compute_stats_highbd_c
-
 void av1_convolve_2d_scale_c(const uint8_t* src,
                              int src_stride,
                              uint8_t* dst,
@@ -863,30 +758,6 @@
                                   int8_t* const coeff_contexts);
 #define av1_get_nz_map_contexts av1_get_nz_map_contexts_neon
 
-void av1_highbd_apply_temporal_filter_c(
-    const struct yv12_buffer_config* ref_frame,
-    const struct macroblockd* mbd,
-    const BLOCK_SIZE block_size,
-    const int mb_row,
-    const int mb_col,
-    const int num_planes,
-    const double* noise_levels,
-    const MV* subblock_mvs,
-    const int* subblock_mses,
-    const int q_factor,
-    const int filter_strength,
-    const uint8_t* pred,
-    uint32_t* accum,
-    uint16_t* count);
-#define av1_highbd_apply_temporal_filter av1_highbd_apply_temporal_filter_c
-
-int64_t av1_highbd_block_error_c(const tran_low_t* coeff,
-                                 const tran_low_t* dqcoeff,
-                                 intptr_t block_size,
-                                 int64_t* ssz,
-                                 int bd);
-#define av1_highbd_block_error av1_highbd_block_error_c
-
 void av1_highbd_convolve8_c(const uint8_t* src,
                             ptrdiff_t src_stride,
                             uint8_t* dst,
@@ -926,36 +797,6 @@
                                  int bps);
 #define av1_highbd_convolve8_vert av1_highbd_convolve8_vert_c
 
-void av1_highbd_convolve_2d_scale_c(const uint16_t* src,
-                                    int src_stride,
-                                    uint16_t* dst,
-                                    int dst_stride,
-                                    int w,
-                                    int h,
-                                    const InterpFilterParams* filter_params_x,
-                                    const InterpFilterParams* filter_params_y,
-                                    const int subpel_x_qn,
-                                    const int x_step_qn,
-                                    const int subpel_y_qn,
-                                    const int y_step_qn,
-                                    ConvolveParams* conv_params,
-                                    int bd);
-#define av1_highbd_convolve_2d_scale av1_highbd_convolve_2d_scale_c
-
-void av1_highbd_convolve_2d_sr_c(const uint16_t* src,
-                                 int src_stride,
-                                 uint16_t* dst,
-                                 int dst_stride,
-                                 int w,
-                                 int h,
-                                 const InterpFilterParams* filter_params_x,
-                                 const InterpFilterParams* filter_params_y,
-                                 const int subpel_x_qn,
-                                 const int subpel_y_qn,
-                                 ConvolveParams* conv_params,
-                                 int bd);
-#define av1_highbd_convolve_2d_sr av1_highbd_convolve_2d_sr_c
-
 void av1_highbd_convolve_avg_c(const uint8_t* src,
                                ptrdiff_t src_stride,
                                uint8_t* dst,
@@ -982,128 +823,6 @@
                                 int bps);
 #define av1_highbd_convolve_copy av1_highbd_convolve_copy_c
 
-void av1_highbd_convolve_horiz_rs_c(const uint16_t* src,
-                                    int src_stride,
-                                    uint16_t* dst,
-                                    int dst_stride,
-                                    int w,
-                                    int h,
-                                    const int16_t* x_filters,
-                                    int x0_qn,
-                                    int x_step_qn,
-                                    int bd);
-#define av1_highbd_convolve_horiz_rs av1_highbd_convolve_horiz_rs_c
-
-void av1_highbd_convolve_x_sr_c(const uint16_t* src,
-                                int src_stride,
-                                uint16_t* dst,
-                                int dst_stride,
-                                int w,
-                                int h,
-                                const InterpFilterParams* filter_params_x,
-                                const int subpel_x_qn,
-                                ConvolveParams* conv_params,
-                                int bd);
-#define av1_highbd_convolve_x_sr av1_highbd_convolve_x_sr_c
-
-void av1_highbd_convolve_y_sr_c(const uint16_t* src,
-                                int src_stride,
-                                uint16_t* dst,
-                                int dst_stride,
-                                int w,
-                                int h,
-                                const InterpFilterParams* filter_params_y,
-                                const int subpel_y_qn,
-                                int bd);
-#define av1_highbd_convolve_y_sr av1_highbd_convolve_y_sr_c
-
-void av1_highbd_dist_wtd_convolve_2d_c(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_x,
-    const InterpFilterParams* filter_params_y,
-    const int subpel_x_qn,
-    const int subpel_y_qn,
-    ConvolveParams* conv_params,
-    int bd);
-#define av1_highbd_dist_wtd_convolve_2d av1_highbd_dist_wtd_convolve_2d_c
-
-void av1_highbd_dist_wtd_convolve_2d_copy_c(const uint16_t* src,
-                                            int src_stride,
-                                            uint16_t* dst,
-                                            int dst_stride,
-                                            int w,
-                                            int h,
-                                            ConvolveParams* conv_params,
-                                            int bd);
-#define av1_highbd_dist_wtd_convolve_2d_copy \
-  av1_highbd_dist_wtd_convolve_2d_copy_c
-
-void av1_highbd_dist_wtd_convolve_x_c(const uint16_t* src,
-                                      int src_stride,
-                                      uint16_t* dst,
-                                      int dst_stride,
-                                      int w,
-                                      int h,
-                                      const InterpFilterParams* filter_params_x,
-                                      const int subpel_x_qn,
-                                      ConvolveParams* conv_params,
-                                      int bd);
-#define av1_highbd_dist_wtd_convolve_x av1_highbd_dist_wtd_convolve_x_c
-
-void av1_highbd_dist_wtd_convolve_y_c(const uint16_t* src,
-                                      int src_stride,
-                                      uint16_t* dst,
-                                      int dst_stride,
-                                      int w,
-                                      int h,
-                                      const InterpFilterParams* filter_params_y,
-                                      const int subpel_y_qn,
-                                      ConvolveParams* conv_params,
-                                      int bd);
-#define av1_highbd_dist_wtd_convolve_y av1_highbd_dist_wtd_convolve_y_c
-
-void av1_highbd_dr_prediction_z1_c(uint16_t* dst,
-                                   ptrdiff_t stride,
-                                   int bw,
-                                   int bh,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int upsample_above,
-                                   int dx,
-                                   int dy,
-                                   int bd);
-#define av1_highbd_dr_prediction_z1 av1_highbd_dr_prediction_z1_c
-
-void av1_highbd_dr_prediction_z2_c(uint16_t* dst,
-                                   ptrdiff_t stride,
-                                   int bw,
-                                   int bh,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int upsample_above,
-                                   int upsample_left,
-                                   int dx,
-                                   int dy,
-                                   int bd);
-#define av1_highbd_dr_prediction_z2 av1_highbd_dr_prediction_z2_c
-
-void av1_highbd_dr_prediction_z3_c(uint16_t* dst,
-                                   ptrdiff_t stride,
-                                   int bw,
-                                   int bh,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int upsample_left,
-                                   int dx,
-                                   int dy,
-                                   int bd);
-#define av1_highbd_dr_prediction_z3 av1_highbd_dr_prediction_z3_c
-
 void av1_highbd_fwht4x4_c(const int16_t* input, tran_low_t* output, int stride);
 void av1_highbd_fwht4x4_neon(const int16_t* input,
                              tran_low_t* output,
@@ -1296,70 +1015,6 @@
                                 int bd);
 #define av1_highbd_iwht4x4_1_add av1_highbd_iwht4x4_1_add_c
 
-int64_t av1_highbd_pixel_proj_error_c(const uint8_t* src8,
-                                      int width,
-                                      int height,
-                                      int src_stride,
-                                      const uint8_t* dat8,
-                                      int dat_stride,
-                                      int32_t* flt0,
-                                      int flt0_stride,
-                                      int32_t* flt1,
-                                      int flt1_stride,
-                                      int xq[2],
-                                      const sgr_params_type* params);
-#define av1_highbd_pixel_proj_error av1_highbd_pixel_proj_error_c
-
-void av1_highbd_quantize_fp_c(const tran_low_t* coeff_ptr,
-                              intptr_t n_coeffs,
-                              const int16_t* zbin_ptr,
-                              const int16_t* round_ptr,
-                              const int16_t* quant_ptr,
-                              const int16_t* quant_shift_ptr,
-                              tran_low_t* qcoeff_ptr,
-                              tran_low_t* dqcoeff_ptr,
-                              const int16_t* dequant_ptr,
-                              uint16_t* eob_ptr,
-                              const int16_t* scan,
-                              const int16_t* iscan,
-                              int log_scale);
-#define av1_highbd_quantize_fp av1_highbd_quantize_fp_c
-
-void av1_highbd_warp_affine_c(const int32_t* mat,
-                              const uint16_t* ref,
-                              int width,
-                              int height,
-                              int stride,
-                              uint16_t* pred,
-                              int p_col,
-                              int p_row,
-                              int p_width,
-                              int p_height,
-                              int p_stride,
-                              int subsampling_x,
-                              int subsampling_y,
-                              int bd,
-                              ConvolveParams* conv_params,
-                              int16_t alpha,
-                              int16_t beta,
-                              int16_t gamma,
-                              int16_t delta);
-#define av1_highbd_warp_affine av1_highbd_warp_affine_c
-
-void av1_highbd_wiener_convolve_add_src_c(const uint8_t* src,
-                                          ptrdiff_t src_stride,
-                                          uint8_t* dst,
-                                          ptrdiff_t dst_stride,
-                                          const int16_t* filter_x,
-                                          int x_step_q4,
-                                          const int16_t* filter_y,
-                                          int y_step_q4,
-                                          int w,
-                                          int h,
-                                          const ConvolveParams* conv_params,
-                                          int bd);
-#define av1_highbd_wiener_convolve_add_src av1_highbd_wiener_convolve_add_src_c
-
 void av1_inv_txfm2d_add_16x16_c(const int32_t* input,
                                 uint16_t* output,
                                 int stride,
@@ -1603,32 +1258,6 @@
                              TxfmParam* txfm_param);
 #define av1_lowbd_fwd_txfm av1_lowbd_fwd_txfm_neon
 
-int64_t av1_lowbd_pixel_proj_error_c(const uint8_t* src8,
-                                     int width,
-                                     int height,
-                                     int src_stride,
-                                     const uint8_t* dat8,
-                                     int dat_stride,
-                                     int32_t* flt0,
-                                     int flt0_stride,
-                                     int32_t* flt1,
-                                     int flt1_stride,
-                                     int xq[2],
-                                     const sgr_params_type* params);
-int64_t av1_lowbd_pixel_proj_error_neon(const uint8_t* src8,
-                                        int width,
-                                        int height,
-                                        int src_stride,
-                                        const uint8_t* dat8,
-                                        int dat_stride,
-                                        int32_t* flt0,
-                                        int flt0_stride,
-                                        int32_t* flt1,
-                                        int flt1_stride,
-                                        int xq[2],
-                                        const sgr_params_type* params);
-#define av1_lowbd_pixel_proj_error av1_lowbd_pixel_proj_error_neon
-
 void av1_nn_predict_c(const float* input_nodes,
                       const NN_CONFIG* const nn_config,
                       int reduce_prec,
@@ -1770,28 +1399,6 @@
 void av1_round_shift_array_neon(int32_t* arr, int size, int bit);
 #define av1_round_shift_array av1_round_shift_array_neon
 
-int av1_selfguided_restoration_c(const uint8_t* dgd8,
-                                 int width,
-                                 int height,
-                                 int dgd_stride,
-                                 int32_t* flt0,
-                                 int32_t* flt1,
-                                 int flt_stride,
-                                 int sgr_params_idx,
-                                 int bit_depth,
-                                 int highbd);
-int av1_selfguided_restoration_neon(const uint8_t* dgd8,
-                                    int width,
-                                    int height,
-                                    int dgd_stride,
-                                    int32_t* flt0,
-                                    int32_t* flt1,
-                                    int flt_stride,
-                                    int sgr_params_idx,
-                                    int bit_depth,
-                                    int highbd);
-#define av1_selfguided_restoration av1_selfguided_restoration_neon
-
 void av1_txb_init_levels_c(const tran_low_t* const coeff,
                            const int width,
                            const int height,
@@ -1808,44 +1415,6 @@
 void av1_upsample_intra_edge_high_c(uint16_t* p, int sz, int bd);
 #define av1_upsample_intra_edge_high av1_upsample_intra_edge_high_c
 
-void av1_warp_affine_c(const int32_t* mat,
-                       const uint8_t* ref,
-                       int width,
-                       int height,
-                       int stride,
-                       uint8_t* pred,
-                       int p_col,
-                       int p_row,
-                       int p_width,
-                       int p_height,
-                       int p_stride,
-                       int subsampling_x,
-                       int subsampling_y,
-                       ConvolveParams* conv_params,
-                       int16_t alpha,
-                       int16_t beta,
-                       int16_t gamma,
-                       int16_t delta);
-void av1_warp_affine_neon(const int32_t* mat,
-                          const uint8_t* ref,
-                          int width,
-                          int height,
-                          int stride,
-                          uint8_t* pred,
-                          int p_col,
-                          int p_row,
-                          int p_width,
-                          int p_height,
-                          int p_stride,
-                          int subsampling_x,
-                          int subsampling_y,
-                          ConvolveParams* conv_params,
-                          int16_t alpha,
-                          int16_t beta,
-                          int16_t gamma,
-                          int16_t delta);
-#define av1_warp_affine av1_warp_affine_neon
-
 void av1_wedge_compute_delta_squares_c(int16_t* d,
                                        const int16_t* a,
                                        const int16_t* b,
@@ -1950,34 +1519,18 @@
                        int coeff_shift);
 #define cdef_find_dir cdef_find_dir_neon
 
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_420_hbd_c(TX_SIZE tx_size);
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_420_hbd_neon(TX_SIZE tx_size);
-#define cfl_get_luma_subsampling_420_hbd cfl_get_luma_subsampling_420_hbd_neon
-
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_420_lbd_c(TX_SIZE tx_size);
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_420_lbd_neon(TX_SIZE tx_size);
 #define cfl_get_luma_subsampling_420_lbd cfl_get_luma_subsampling_420_lbd_neon
 
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_422_hbd_c(TX_SIZE tx_size);
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_422_hbd_neon(TX_SIZE tx_size);
-#define cfl_get_luma_subsampling_422_hbd cfl_get_luma_subsampling_422_hbd_neon
-
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_422_lbd_c(TX_SIZE tx_size);
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_422_lbd_neon(TX_SIZE tx_size);
 #define cfl_get_luma_subsampling_422_lbd cfl_get_luma_subsampling_422_lbd_neon
 
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_444_hbd_c(TX_SIZE tx_size);
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_444_hbd_neon(TX_SIZE tx_size);
-#define cfl_get_luma_subsampling_444_hbd cfl_get_luma_subsampling_444_hbd_neon
-
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_444_lbd_c(TX_SIZE tx_size);
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_444_lbd_neon(TX_SIZE tx_size);
 #define cfl_get_luma_subsampling_444_lbd cfl_get_luma_subsampling_444_lbd_neon
 
-cfl_predict_hbd_fn cfl_get_predict_hbd_fn_c(TX_SIZE tx_size);
-cfl_predict_hbd_fn cfl_get_predict_hbd_fn_neon(TX_SIZE tx_size);
-#define cfl_get_predict_hbd_fn cfl_get_predict_hbd_fn_neon
-
 cfl_predict_lbd_fn cfl_get_predict_lbd_fn_c(TX_SIZE tx_size);
 cfl_predict_lbd_fn cfl_get_predict_lbd_fn_neon(TX_SIZE tx_size);
 #define cfl_get_predict_lbd_fn cfl_get_predict_lbd_fn_neon
diff --git a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.asm b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.asm
index 666128e..c49e1dd9 100644
--- a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.asm
+++ b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.asm
@@ -17,7 +17,7 @@
 CONFIG_ANALYZER equ 0
 CONFIG_AV1_DECODER equ 1
 CONFIG_AV1_ENCODER equ 1
-CONFIG_AV1_HIGHBITDEPTH equ 1
+CONFIG_AV1_HIGHBITDEPTH equ 0
 CONFIG_AV1_TEMPORAL_DENOISING equ 0
 CONFIG_BIG_ENDIAN equ 0
 CONFIG_BITSTREAM_DEBUG equ 0
@@ -47,7 +47,7 @@
 CONFIG_OS_SUPPORT equ 1
 CONFIG_PIC equ 0
 CONFIG_RD_DEBUG equ 0
-CONFIG_REALTIME_ONLY equ 0
+CONFIG_REALTIME_ONLY equ 1
 CONFIG_RUNTIME_CPU_DETECT equ 1
 CONFIG_SHARED equ 0
 CONFIG_SHARP_SETTINGS equ 0
diff --git a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.c b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.c
index 8f1a4c3..6ffe044fc 100644
--- a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.c
+++ b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.c
@@ -9,5 +9,5 @@
  * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
  */
 #include "aom/aom_codec.h"
-static const char* const cfg = "cmake ../source/libaom -G \"Unix Makefiles\" -DCMAKE_TOOLCHAIN_FILE=\"../source/libaom/build/cmake/toolchains/armv7-linux-gcc.cmake\" -DCONFIG_AV1_ENCODER=1 -DCONFIG_LIBYUV=0 -DCONFIG_MAX_DECODE_PROFILE=0 -DCONFIG_NORMAL_TILE_MODE=1 -DCONFIG_SIZE_LIMIT=1 -DDECODE_HEIGHT_LIMIT=16384 -DDECODE_WIDTH_LIMIT=16384";
+static const char* const cfg = "cmake ../source/libaom -G \"Unix Makefiles\" -DCMAKE_TOOLCHAIN_FILE=\"../source/libaom/build/cmake/toolchains/armv7-linux-gcc.cmake\" -DCONFIG_AV1_ENCODER=1 -DCONFIG_LIBYUV=0 -DCONFIG_MAX_DECODE_PROFILE=0 -DCONFIG_NORMAL_TILE_MODE=1 -DCONFIG_SIZE_LIMIT=1 -DDECODE_HEIGHT_LIMIT=16384 -DDECODE_WIDTH_LIMIT=16384 -DCONFIG_REALTIME_ONLY=1 -DCONFIG_AV1_HIGHBITDEPTH=0";
 const char *aom_codec_build_config(void) {return cfg;}
diff --git a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h
index 6681e971..8b5fb4a 100644
--- a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h
+++ b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h
@@ -19,7 +19,7 @@
 #define CONFIG_ANALYZER 0
 #define CONFIG_AV1_DECODER 1
 #define CONFIG_AV1_ENCODER 1
-#define CONFIG_AV1_HIGHBITDEPTH 1
+#define CONFIG_AV1_HIGHBITDEPTH 0
 #define CONFIG_AV1_TEMPORAL_DENOISING 0
 #define CONFIG_BIG_ENDIAN 0
 #define CONFIG_BITSTREAM_DEBUG 0
@@ -49,7 +49,7 @@
 #define CONFIG_OS_SUPPORT 1
 #define CONFIG_PIC 0
 #define CONFIG_RD_DEBUG 0
-#define CONFIG_REALTIME_ONLY 0
+#define CONFIG_REALTIME_ONLY 1
 #define CONFIG_RUNTIME_CPU_DETECT 1
 #define CONFIG_SHARED 0
 #define CONFIG_SHARP_SETTINGS 0
diff --git a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_dsp_rtcd.h b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_dsp_rtcd.h
index 473058e..6b41112 100644
--- a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_dsp_rtcd.h
+++ b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_dsp_rtcd.h
@@ -1582,8251 +1582,6 @@
                                         ptrdiff_t src_stride,
                                         int16_t* coeff);
 
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x128 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x64 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x16 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x16_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x32 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x32_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x4 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x4_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x64 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x64_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x8 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x8_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x16 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x16_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x32 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x32_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x64 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x64_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x8 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x8_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x16 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x4 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x4_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x8 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x128 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x16 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x16_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x32 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x32_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x64 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x64_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x16 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x16_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x32 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x32_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x4 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x4_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x8 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x8_c
-
-void aom_highbd_10_get16x16var_c(const uint8_t* src_ptr,
-                                 int source_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride,
-                                 unsigned int* sse,
-                                 int* sum);
-#define aom_highbd_10_get16x16var aom_highbd_10_get16x16var_c
-
-void aom_highbd_10_get8x8var_c(const uint8_t* src_ptr,
-                               int source_stride,
-                               const uint8_t* ref_ptr,
-                               int ref_stride,
-                               unsigned int* sse,
-                               int* sum);
-#define aom_highbd_10_get8x8var aom_highbd_10_get8x8var_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance128x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance128x128 \
-  aom_highbd_10_masked_sub_pixel_variance128x128_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance128x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance128x64 \
-  aom_highbd_10_masked_sub_pixel_variance128x64_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance16x16 \
-  aom_highbd_10_masked_sub_pixel_variance16x16_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance16x32 \
-  aom_highbd_10_masked_sub_pixel_variance16x32_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance16x4 \
-  aom_highbd_10_masked_sub_pixel_variance16x4_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance16x64 \
-  aom_highbd_10_masked_sub_pixel_variance16x64_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance16x8 \
-  aom_highbd_10_masked_sub_pixel_variance16x8_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance32x16 \
-  aom_highbd_10_masked_sub_pixel_variance32x16_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance32x32 \
-  aom_highbd_10_masked_sub_pixel_variance32x32_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance32x64 \
-  aom_highbd_10_masked_sub_pixel_variance32x64_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance32x8 \
-  aom_highbd_10_masked_sub_pixel_variance32x8_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance4x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance4x16 \
-  aom_highbd_10_masked_sub_pixel_variance4x16_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance4x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance4x4 \
-  aom_highbd_10_masked_sub_pixel_variance4x4_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance4x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance4x8 \
-  aom_highbd_10_masked_sub_pixel_variance4x8_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance64x128 \
-  aom_highbd_10_masked_sub_pixel_variance64x128_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance64x16 \
-  aom_highbd_10_masked_sub_pixel_variance64x16_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance64x32 \
-  aom_highbd_10_masked_sub_pixel_variance64x32_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance64x64 \
-  aom_highbd_10_masked_sub_pixel_variance64x64_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance8x16 \
-  aom_highbd_10_masked_sub_pixel_variance8x16_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance8x32 \
-  aom_highbd_10_masked_sub_pixel_variance8x32_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance8x4 \
-  aom_highbd_10_masked_sub_pixel_variance8x4_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance8x8 \
-  aom_highbd_10_masked_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_10_mse16x16_c(const uint8_t* src_ptr,
-                                      int source_stride,
-                                      const uint8_t* ref_ptr,
-                                      int recon_stride,
-                                      unsigned int* sse);
-#define aom_highbd_10_mse16x16 aom_highbd_10_mse16x16_c
-
-unsigned int aom_highbd_10_mse16x8_c(const uint8_t* src_ptr,
-                                     int source_stride,
-                                     const uint8_t* ref_ptr,
-                                     int recon_stride,
-                                     unsigned int* sse);
-#define aom_highbd_10_mse16x8 aom_highbd_10_mse16x8_c
-
-unsigned int aom_highbd_10_mse8x16_c(const uint8_t* src_ptr,
-                                     int source_stride,
-                                     const uint8_t* ref_ptr,
-                                     int recon_stride,
-                                     unsigned int* sse);
-#define aom_highbd_10_mse8x16 aom_highbd_10_mse8x16_c
-
-unsigned int aom_highbd_10_mse8x8_c(const uint8_t* src_ptr,
-                                    int source_stride,
-                                    const uint8_t* ref_ptr,
-                                    int recon_stride,
-                                    unsigned int* sse);
-#define aom_highbd_10_mse8x8 aom_highbd_10_mse8x8_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance128x128_c(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            int xoffset,
-                                                            int yoffset,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance128x128 \
-  aom_highbd_10_obmc_sub_pixel_variance128x128_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance128x64_c(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance128x64 \
-  aom_highbd_10_obmc_sub_pixel_variance128x64_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance16x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance16x16 \
-  aom_highbd_10_obmc_sub_pixel_variance16x16_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance16x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance16x32 \
-  aom_highbd_10_obmc_sub_pixel_variance16x32_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance16x4_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance16x4 \
-  aom_highbd_10_obmc_sub_pixel_variance16x4_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance16x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance16x64 \
-  aom_highbd_10_obmc_sub_pixel_variance16x64_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance16x8_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance16x8 \
-  aom_highbd_10_obmc_sub_pixel_variance16x8_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance32x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance32x16 \
-  aom_highbd_10_obmc_sub_pixel_variance32x16_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance32x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance32x32 \
-  aom_highbd_10_obmc_sub_pixel_variance32x32_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance32x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance32x64 \
-  aom_highbd_10_obmc_sub_pixel_variance32x64_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance32x8_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance32x8 \
-  aom_highbd_10_obmc_sub_pixel_variance32x8_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance4x16_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance4x16 \
-  aom_highbd_10_obmc_sub_pixel_variance4x16_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance4x4_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance4x4 \
-  aom_highbd_10_obmc_sub_pixel_variance4x4_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance4x8_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance4x8 \
-  aom_highbd_10_obmc_sub_pixel_variance4x8_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance64x128_c(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance64x128 \
-  aom_highbd_10_obmc_sub_pixel_variance64x128_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance64x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance64x16 \
-  aom_highbd_10_obmc_sub_pixel_variance64x16_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance64x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance64x32 \
-  aom_highbd_10_obmc_sub_pixel_variance64x32_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance64x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance64x64 \
-  aom_highbd_10_obmc_sub_pixel_variance64x64_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance8x16_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance8x16 \
-  aom_highbd_10_obmc_sub_pixel_variance8x16_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance8x32_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance8x32 \
-  aom_highbd_10_obmc_sub_pixel_variance8x32_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance8x4_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance8x4 \
-  aom_highbd_10_obmc_sub_pixel_variance8x4_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance8x8_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance8x8 \
-  aom_highbd_10_obmc_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_10_obmc_variance128x128_c(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-#define aom_highbd_10_obmc_variance128x128 aom_highbd_10_obmc_variance128x128_c
-
-unsigned int aom_highbd_10_obmc_variance128x64_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-#define aom_highbd_10_obmc_variance128x64 aom_highbd_10_obmc_variance128x64_c
-
-unsigned int aom_highbd_10_obmc_variance16x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance16x16 aom_highbd_10_obmc_variance16x16_c
-
-unsigned int aom_highbd_10_obmc_variance16x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance16x32 aom_highbd_10_obmc_variance16x32_c
-
-unsigned int aom_highbd_10_obmc_variance16x4_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_10_obmc_variance16x4 aom_highbd_10_obmc_variance16x4_c
-
-unsigned int aom_highbd_10_obmc_variance16x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance16x64 aom_highbd_10_obmc_variance16x64_c
-
-unsigned int aom_highbd_10_obmc_variance16x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_10_obmc_variance16x8 aom_highbd_10_obmc_variance16x8_c
-
-unsigned int aom_highbd_10_obmc_variance32x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance32x16 aom_highbd_10_obmc_variance32x16_c
-
-unsigned int aom_highbd_10_obmc_variance32x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance32x32 aom_highbd_10_obmc_variance32x32_c
-
-unsigned int aom_highbd_10_obmc_variance32x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance32x64 aom_highbd_10_obmc_variance32x64_c
-
-unsigned int aom_highbd_10_obmc_variance32x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_10_obmc_variance32x8 aom_highbd_10_obmc_variance32x8_c
-
-unsigned int aom_highbd_10_obmc_variance4x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_10_obmc_variance4x16 aom_highbd_10_obmc_variance4x16_c
-
-unsigned int aom_highbd_10_obmc_variance4x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_10_obmc_variance4x4 aom_highbd_10_obmc_variance4x4_c
-
-unsigned int aom_highbd_10_obmc_variance4x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_10_obmc_variance4x8 aom_highbd_10_obmc_variance4x8_c
-
-unsigned int aom_highbd_10_obmc_variance64x128_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-#define aom_highbd_10_obmc_variance64x128 aom_highbd_10_obmc_variance64x128_c
-
-unsigned int aom_highbd_10_obmc_variance64x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance64x16 aom_highbd_10_obmc_variance64x16_c
-
-unsigned int aom_highbd_10_obmc_variance64x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance64x32 aom_highbd_10_obmc_variance64x32_c
-
-unsigned int aom_highbd_10_obmc_variance64x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance64x64 aom_highbd_10_obmc_variance64x64_c
-
-unsigned int aom_highbd_10_obmc_variance8x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_10_obmc_variance8x16 aom_highbd_10_obmc_variance8x16_c
-
-unsigned int aom_highbd_10_obmc_variance8x32_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_10_obmc_variance8x32 aom_highbd_10_obmc_variance8x32_c
-
-unsigned int aom_highbd_10_obmc_variance8x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_10_obmc_variance8x4 aom_highbd_10_obmc_variance8x4_c
-
-unsigned int aom_highbd_10_obmc_variance8x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_10_obmc_variance8x8 aom_highbd_10_obmc_variance8x8_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance128x128 \
-  aom_highbd_10_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance128x64 \
-  aom_highbd_10_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance16x16 \
-  aom_highbd_10_sub_pixel_avg_variance16x16_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance16x32 \
-  aom_highbd_10_sub_pixel_avg_variance16x32_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x4_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance16x4 \
-  aom_highbd_10_sub_pixel_avg_variance16x4_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance16x64 \
-  aom_highbd_10_sub_pixel_avg_variance16x64_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance16x8 \
-  aom_highbd_10_sub_pixel_avg_variance16x8_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance32x16 \
-  aom_highbd_10_sub_pixel_avg_variance32x16_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance32x32 \
-  aom_highbd_10_sub_pixel_avg_variance32x32_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance32x64 \
-  aom_highbd_10_sub_pixel_avg_variance32x64_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x8_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance32x8 \
-  aom_highbd_10_sub_pixel_avg_variance32x8_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance4x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance4x16 \
-  aom_highbd_10_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance4x4 \
-  aom_highbd_10_sub_pixel_avg_variance4x4_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance4x8 \
-  aom_highbd_10_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance64x128 \
-  aom_highbd_10_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance64x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance64x16 \
-  aom_highbd_10_sub_pixel_avg_variance64x16_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance64x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance64x32 \
-  aom_highbd_10_sub_pixel_avg_variance64x32_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance64x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance64x64 \
-  aom_highbd_10_sub_pixel_avg_variance64x64_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance8x16 \
-  aom_highbd_10_sub_pixel_avg_variance8x16_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x32_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance8x32 \
-  aom_highbd_10_sub_pixel_avg_variance8x32_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance8x4 \
-  aom_highbd_10_sub_pixel_avg_variance8x4_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance8x8 \
-  aom_highbd_10_sub_pixel_avg_variance8x8_c
-
-uint32_t aom_highbd_10_sub_pixel_variance128x128_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance128x128 \
-  aom_highbd_10_sub_pixel_variance128x128_c
-
-uint32_t aom_highbd_10_sub_pixel_variance128x64_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance128x64 \
-  aom_highbd_10_sub_pixel_variance128x64_c
-
-uint32_t aom_highbd_10_sub_pixel_variance16x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance16x16 \
-  aom_highbd_10_sub_pixel_variance16x16_c
-
-uint32_t aom_highbd_10_sub_pixel_variance16x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance16x32 \
-  aom_highbd_10_sub_pixel_variance16x32_c
-
-uint32_t aom_highbd_10_sub_pixel_variance16x4_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance16x4 \
-  aom_highbd_10_sub_pixel_variance16x4_c
-
-uint32_t aom_highbd_10_sub_pixel_variance16x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance16x64 \
-  aom_highbd_10_sub_pixel_variance16x64_c
-
-uint32_t aom_highbd_10_sub_pixel_variance16x8_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance16x8 \
-  aom_highbd_10_sub_pixel_variance16x8_c
-
-uint32_t aom_highbd_10_sub_pixel_variance32x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance32x16 \
-  aom_highbd_10_sub_pixel_variance32x16_c
-
-uint32_t aom_highbd_10_sub_pixel_variance32x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance32x32 \
-  aom_highbd_10_sub_pixel_variance32x32_c
-
-uint32_t aom_highbd_10_sub_pixel_variance32x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance32x64 \
-  aom_highbd_10_sub_pixel_variance32x64_c
-
-uint32_t aom_highbd_10_sub_pixel_variance32x8_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance32x8 \
-  aom_highbd_10_sub_pixel_variance32x8_c
-
-uint32_t aom_highbd_10_sub_pixel_variance4x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance4x16 \
-  aom_highbd_10_sub_pixel_variance4x16_c
-
-uint32_t aom_highbd_10_sub_pixel_variance4x4_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance4x4 \
-  aom_highbd_10_sub_pixel_variance4x4_c
-
-uint32_t aom_highbd_10_sub_pixel_variance4x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance4x8 \
-  aom_highbd_10_sub_pixel_variance4x8_c
-
-uint32_t aom_highbd_10_sub_pixel_variance64x128_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance64x128 \
-  aom_highbd_10_sub_pixel_variance64x128_c
-
-uint32_t aom_highbd_10_sub_pixel_variance64x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance64x16 \
-  aom_highbd_10_sub_pixel_variance64x16_c
-
-uint32_t aom_highbd_10_sub_pixel_variance64x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance64x32 \
-  aom_highbd_10_sub_pixel_variance64x32_c
-
-uint32_t aom_highbd_10_sub_pixel_variance64x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance64x64 \
-  aom_highbd_10_sub_pixel_variance64x64_c
-
-uint32_t aom_highbd_10_sub_pixel_variance8x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance8x16 \
-  aom_highbd_10_sub_pixel_variance8x16_c
-
-uint32_t aom_highbd_10_sub_pixel_variance8x32_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance8x32 \
-  aom_highbd_10_sub_pixel_variance8x32_c
-
-uint32_t aom_highbd_10_sub_pixel_variance8x4_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance8x4 \
-  aom_highbd_10_sub_pixel_variance8x4_c
-
-uint32_t aom_highbd_10_sub_pixel_variance8x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance8x8 \
-  aom_highbd_10_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_10_variance128x128_c(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-#define aom_highbd_10_variance128x128 aom_highbd_10_variance128x128_c
-
-unsigned int aom_highbd_10_variance128x64_c(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-#define aom_highbd_10_variance128x64 aom_highbd_10_variance128x64_c
-
-unsigned int aom_highbd_10_variance16x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_10_variance16x16 aom_highbd_10_variance16x16_c
-
-unsigned int aom_highbd_10_variance16x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_10_variance16x32 aom_highbd_10_variance16x32_c
-
-unsigned int aom_highbd_10_variance16x4_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_10_variance16x4 aom_highbd_10_variance16x4_c
-
-unsigned int aom_highbd_10_variance16x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           uint32_t* sse);
-#define aom_highbd_10_variance16x64 aom_highbd_10_variance16x64_c
-
-unsigned int aom_highbd_10_variance16x8_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_10_variance16x8 aom_highbd_10_variance16x8_c
-
-unsigned int aom_highbd_10_variance2x2_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance2x2 aom_highbd_10_variance2x2_c
-
-unsigned int aom_highbd_10_variance2x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance2x4 aom_highbd_10_variance2x4_c
-
-unsigned int aom_highbd_10_variance32x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_10_variance32x16 aom_highbd_10_variance32x16_c
-
-unsigned int aom_highbd_10_variance32x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_10_variance32x32 aom_highbd_10_variance32x32_c
-
-unsigned int aom_highbd_10_variance32x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_10_variance32x64 aom_highbd_10_variance32x64_c
-
-unsigned int aom_highbd_10_variance32x8_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_10_variance32x8 aom_highbd_10_variance32x8_c
-
-unsigned int aom_highbd_10_variance4x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_10_variance4x16 aom_highbd_10_variance4x16_c
-
-unsigned int aom_highbd_10_variance4x2_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance4x2 aom_highbd_10_variance4x2_c
-
-unsigned int aom_highbd_10_variance4x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance4x4 aom_highbd_10_variance4x4_c
-
-unsigned int aom_highbd_10_variance4x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance4x8 aom_highbd_10_variance4x8_c
-
-unsigned int aom_highbd_10_variance64x128_c(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-#define aom_highbd_10_variance64x128 aom_highbd_10_variance64x128_c
-
-unsigned int aom_highbd_10_variance64x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           uint32_t* sse);
-#define aom_highbd_10_variance64x16 aom_highbd_10_variance64x16_c
-
-unsigned int aom_highbd_10_variance64x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_10_variance64x32 aom_highbd_10_variance64x32_c
-
-unsigned int aom_highbd_10_variance64x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_10_variance64x64 aom_highbd_10_variance64x64_c
-
-unsigned int aom_highbd_10_variance8x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_10_variance8x16 aom_highbd_10_variance8x16_c
-
-unsigned int aom_highbd_10_variance8x32_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_10_variance8x32 aom_highbd_10_variance8x32_c
-
-unsigned int aom_highbd_10_variance8x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance8x4 aom_highbd_10_variance8x4_c
-
-unsigned int aom_highbd_10_variance8x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance8x8 aom_highbd_10_variance8x8_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x128 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x64 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x16 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x16_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x32 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x32_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x4 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x4_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x64 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x64_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x8 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x8_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x16 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x16_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x32 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x32_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x64 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x64_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x8 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x8_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x16 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x4 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x4_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x8 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x128 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x16 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x16_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x32 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x32_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x64 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x64_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x16 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x16_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x32 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x32_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x4 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x4_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x8 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x8_c
-
-void aom_highbd_12_get16x16var_c(const uint8_t* src_ptr,
-                                 int source_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride,
-                                 unsigned int* sse,
-                                 int* sum);
-#define aom_highbd_12_get16x16var aom_highbd_12_get16x16var_c
-
-void aom_highbd_12_get8x8var_c(const uint8_t* src_ptr,
-                               int source_stride,
-                               const uint8_t* ref_ptr,
-                               int ref_stride,
-                               unsigned int* sse,
-                               int* sum);
-#define aom_highbd_12_get8x8var aom_highbd_12_get8x8var_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance128x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance128x128 \
-  aom_highbd_12_masked_sub_pixel_variance128x128_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance128x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance128x64 \
-  aom_highbd_12_masked_sub_pixel_variance128x64_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance16x16 \
-  aom_highbd_12_masked_sub_pixel_variance16x16_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance16x32 \
-  aom_highbd_12_masked_sub_pixel_variance16x32_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance16x4 \
-  aom_highbd_12_masked_sub_pixel_variance16x4_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance16x64 \
-  aom_highbd_12_masked_sub_pixel_variance16x64_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance16x8 \
-  aom_highbd_12_masked_sub_pixel_variance16x8_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance32x16 \
-  aom_highbd_12_masked_sub_pixel_variance32x16_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance32x32 \
-  aom_highbd_12_masked_sub_pixel_variance32x32_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance32x64 \
-  aom_highbd_12_masked_sub_pixel_variance32x64_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance32x8 \
-  aom_highbd_12_masked_sub_pixel_variance32x8_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance4x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance4x16 \
-  aom_highbd_12_masked_sub_pixel_variance4x16_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance4x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance4x4 \
-  aom_highbd_12_masked_sub_pixel_variance4x4_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance4x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance4x8 \
-  aom_highbd_12_masked_sub_pixel_variance4x8_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance64x128 \
-  aom_highbd_12_masked_sub_pixel_variance64x128_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance64x16 \
-  aom_highbd_12_masked_sub_pixel_variance64x16_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance64x32 \
-  aom_highbd_12_masked_sub_pixel_variance64x32_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance64x64 \
-  aom_highbd_12_masked_sub_pixel_variance64x64_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance8x16 \
-  aom_highbd_12_masked_sub_pixel_variance8x16_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance8x32 \
-  aom_highbd_12_masked_sub_pixel_variance8x32_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance8x4 \
-  aom_highbd_12_masked_sub_pixel_variance8x4_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance8x8 \
-  aom_highbd_12_masked_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_12_mse16x16_c(const uint8_t* src_ptr,
-                                      int source_stride,
-                                      const uint8_t* ref_ptr,
-                                      int recon_stride,
-                                      unsigned int* sse);
-#define aom_highbd_12_mse16x16 aom_highbd_12_mse16x16_c
-
-unsigned int aom_highbd_12_mse16x8_c(const uint8_t* src_ptr,
-                                     int source_stride,
-                                     const uint8_t* ref_ptr,
-                                     int recon_stride,
-                                     unsigned int* sse);
-#define aom_highbd_12_mse16x8 aom_highbd_12_mse16x8_c
-
-unsigned int aom_highbd_12_mse8x16_c(const uint8_t* src_ptr,
-                                     int source_stride,
-                                     const uint8_t* ref_ptr,
-                                     int recon_stride,
-                                     unsigned int* sse);
-#define aom_highbd_12_mse8x16 aom_highbd_12_mse8x16_c
-
-unsigned int aom_highbd_12_mse8x8_c(const uint8_t* src_ptr,
-                                    int source_stride,
-                                    const uint8_t* ref_ptr,
-                                    int recon_stride,
-                                    unsigned int* sse);
-#define aom_highbd_12_mse8x8 aom_highbd_12_mse8x8_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance128x128_c(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            int xoffset,
-                                                            int yoffset,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance128x128 \
-  aom_highbd_12_obmc_sub_pixel_variance128x128_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance128x64_c(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance128x64 \
-  aom_highbd_12_obmc_sub_pixel_variance128x64_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance16x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance16x16 \
-  aom_highbd_12_obmc_sub_pixel_variance16x16_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance16x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance16x32 \
-  aom_highbd_12_obmc_sub_pixel_variance16x32_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance16x4_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance16x4 \
-  aom_highbd_12_obmc_sub_pixel_variance16x4_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance16x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance16x64 \
-  aom_highbd_12_obmc_sub_pixel_variance16x64_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance16x8_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance16x8 \
-  aom_highbd_12_obmc_sub_pixel_variance16x8_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance32x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance32x16 \
-  aom_highbd_12_obmc_sub_pixel_variance32x16_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance32x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance32x32 \
-  aom_highbd_12_obmc_sub_pixel_variance32x32_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance32x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance32x64 \
-  aom_highbd_12_obmc_sub_pixel_variance32x64_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance32x8_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance32x8 \
-  aom_highbd_12_obmc_sub_pixel_variance32x8_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance4x16_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance4x16 \
-  aom_highbd_12_obmc_sub_pixel_variance4x16_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance4x4_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance4x4 \
-  aom_highbd_12_obmc_sub_pixel_variance4x4_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance4x8_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance4x8 \
-  aom_highbd_12_obmc_sub_pixel_variance4x8_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance64x128_c(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance64x128 \
-  aom_highbd_12_obmc_sub_pixel_variance64x128_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance64x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance64x16 \
-  aom_highbd_12_obmc_sub_pixel_variance64x16_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance64x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance64x32 \
-  aom_highbd_12_obmc_sub_pixel_variance64x32_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance64x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance64x64 \
-  aom_highbd_12_obmc_sub_pixel_variance64x64_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance8x16_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance8x16 \
-  aom_highbd_12_obmc_sub_pixel_variance8x16_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance8x32_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance8x32 \
-  aom_highbd_12_obmc_sub_pixel_variance8x32_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance8x4_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance8x4 \
-  aom_highbd_12_obmc_sub_pixel_variance8x4_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance8x8_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance8x8 \
-  aom_highbd_12_obmc_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_12_obmc_variance128x128_c(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-#define aom_highbd_12_obmc_variance128x128 aom_highbd_12_obmc_variance128x128_c
-
-unsigned int aom_highbd_12_obmc_variance128x64_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-#define aom_highbd_12_obmc_variance128x64 aom_highbd_12_obmc_variance128x64_c
-
-unsigned int aom_highbd_12_obmc_variance16x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance16x16 aom_highbd_12_obmc_variance16x16_c
-
-unsigned int aom_highbd_12_obmc_variance16x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance16x32 aom_highbd_12_obmc_variance16x32_c
-
-unsigned int aom_highbd_12_obmc_variance16x4_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_12_obmc_variance16x4 aom_highbd_12_obmc_variance16x4_c
-
-unsigned int aom_highbd_12_obmc_variance16x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance16x64 aom_highbd_12_obmc_variance16x64_c
-
-unsigned int aom_highbd_12_obmc_variance16x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_12_obmc_variance16x8 aom_highbd_12_obmc_variance16x8_c
-
-unsigned int aom_highbd_12_obmc_variance32x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance32x16 aom_highbd_12_obmc_variance32x16_c
-
-unsigned int aom_highbd_12_obmc_variance32x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance32x32 aom_highbd_12_obmc_variance32x32_c
-
-unsigned int aom_highbd_12_obmc_variance32x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance32x64 aom_highbd_12_obmc_variance32x64_c
-
-unsigned int aom_highbd_12_obmc_variance32x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_12_obmc_variance32x8 aom_highbd_12_obmc_variance32x8_c
-
-unsigned int aom_highbd_12_obmc_variance4x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_12_obmc_variance4x16 aom_highbd_12_obmc_variance4x16_c
-
-unsigned int aom_highbd_12_obmc_variance4x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_12_obmc_variance4x4 aom_highbd_12_obmc_variance4x4_c
-
-unsigned int aom_highbd_12_obmc_variance4x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_12_obmc_variance4x8 aom_highbd_12_obmc_variance4x8_c
-
-unsigned int aom_highbd_12_obmc_variance64x128_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-#define aom_highbd_12_obmc_variance64x128 aom_highbd_12_obmc_variance64x128_c
-
-unsigned int aom_highbd_12_obmc_variance64x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance64x16 aom_highbd_12_obmc_variance64x16_c
-
-unsigned int aom_highbd_12_obmc_variance64x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance64x32 aom_highbd_12_obmc_variance64x32_c
-
-unsigned int aom_highbd_12_obmc_variance64x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance64x64 aom_highbd_12_obmc_variance64x64_c
-
-unsigned int aom_highbd_12_obmc_variance8x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_12_obmc_variance8x16 aom_highbd_12_obmc_variance8x16_c
-
-unsigned int aom_highbd_12_obmc_variance8x32_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_12_obmc_variance8x32 aom_highbd_12_obmc_variance8x32_c
-
-unsigned int aom_highbd_12_obmc_variance8x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_12_obmc_variance8x4 aom_highbd_12_obmc_variance8x4_c
-
-unsigned int aom_highbd_12_obmc_variance8x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_12_obmc_variance8x8 aom_highbd_12_obmc_variance8x8_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance128x128 \
-  aom_highbd_12_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance128x64 \
-  aom_highbd_12_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance16x16 \
-  aom_highbd_12_sub_pixel_avg_variance16x16_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance16x32 \
-  aom_highbd_12_sub_pixel_avg_variance16x32_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x4_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance16x4 \
-  aom_highbd_12_sub_pixel_avg_variance16x4_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance16x64 \
-  aom_highbd_12_sub_pixel_avg_variance16x64_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance16x8 \
-  aom_highbd_12_sub_pixel_avg_variance16x8_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance32x16 \
-  aom_highbd_12_sub_pixel_avg_variance32x16_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance32x32 \
-  aom_highbd_12_sub_pixel_avg_variance32x32_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance32x64 \
-  aom_highbd_12_sub_pixel_avg_variance32x64_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x8_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance32x8 \
-  aom_highbd_12_sub_pixel_avg_variance32x8_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance4x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance4x16 \
-  aom_highbd_12_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance4x4 \
-  aom_highbd_12_sub_pixel_avg_variance4x4_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance4x8 \
-  aom_highbd_12_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance64x128 \
-  aom_highbd_12_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance64x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance64x16 \
-  aom_highbd_12_sub_pixel_avg_variance64x16_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance64x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance64x32 \
-  aom_highbd_12_sub_pixel_avg_variance64x32_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance64x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance64x64 \
-  aom_highbd_12_sub_pixel_avg_variance64x64_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance8x16 \
-  aom_highbd_12_sub_pixel_avg_variance8x16_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x32_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance8x32 \
-  aom_highbd_12_sub_pixel_avg_variance8x32_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance8x4 \
-  aom_highbd_12_sub_pixel_avg_variance8x4_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance8x8 \
-  aom_highbd_12_sub_pixel_avg_variance8x8_c
-
-uint32_t aom_highbd_12_sub_pixel_variance128x128_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance128x128 \
-  aom_highbd_12_sub_pixel_variance128x128_c
-
-uint32_t aom_highbd_12_sub_pixel_variance128x64_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance128x64 \
-  aom_highbd_12_sub_pixel_variance128x64_c
-
-uint32_t aom_highbd_12_sub_pixel_variance16x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance16x16 \
-  aom_highbd_12_sub_pixel_variance16x16_c
-
-uint32_t aom_highbd_12_sub_pixel_variance16x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance16x32 \
-  aom_highbd_12_sub_pixel_variance16x32_c
-
-uint32_t aom_highbd_12_sub_pixel_variance16x4_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance16x4 \
-  aom_highbd_12_sub_pixel_variance16x4_c
-
-uint32_t aom_highbd_12_sub_pixel_variance16x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance16x64 \
-  aom_highbd_12_sub_pixel_variance16x64_c
-
-uint32_t aom_highbd_12_sub_pixel_variance16x8_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance16x8 \
-  aom_highbd_12_sub_pixel_variance16x8_c
-
-uint32_t aom_highbd_12_sub_pixel_variance32x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance32x16 \
-  aom_highbd_12_sub_pixel_variance32x16_c
-
-uint32_t aom_highbd_12_sub_pixel_variance32x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance32x32 \
-  aom_highbd_12_sub_pixel_variance32x32_c
-
-uint32_t aom_highbd_12_sub_pixel_variance32x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance32x64 \
-  aom_highbd_12_sub_pixel_variance32x64_c
-
-uint32_t aom_highbd_12_sub_pixel_variance32x8_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance32x8 \
-  aom_highbd_12_sub_pixel_variance32x8_c
-
-uint32_t aom_highbd_12_sub_pixel_variance4x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance4x16 \
-  aom_highbd_12_sub_pixel_variance4x16_c
-
-uint32_t aom_highbd_12_sub_pixel_variance4x4_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance4x4 \
-  aom_highbd_12_sub_pixel_variance4x4_c
-
-uint32_t aom_highbd_12_sub_pixel_variance4x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance4x8 \
-  aom_highbd_12_sub_pixel_variance4x8_c
-
-uint32_t aom_highbd_12_sub_pixel_variance64x128_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance64x128 \
-  aom_highbd_12_sub_pixel_variance64x128_c
-
-uint32_t aom_highbd_12_sub_pixel_variance64x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance64x16 \
-  aom_highbd_12_sub_pixel_variance64x16_c
-
-uint32_t aom_highbd_12_sub_pixel_variance64x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance64x32 \
-  aom_highbd_12_sub_pixel_variance64x32_c
-
-uint32_t aom_highbd_12_sub_pixel_variance64x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance64x64 \
-  aom_highbd_12_sub_pixel_variance64x64_c
-
-uint32_t aom_highbd_12_sub_pixel_variance8x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance8x16 \
-  aom_highbd_12_sub_pixel_variance8x16_c
-
-uint32_t aom_highbd_12_sub_pixel_variance8x32_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance8x32 \
-  aom_highbd_12_sub_pixel_variance8x32_c
-
-uint32_t aom_highbd_12_sub_pixel_variance8x4_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance8x4 \
-  aom_highbd_12_sub_pixel_variance8x4_c
-
-uint32_t aom_highbd_12_sub_pixel_variance8x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance8x8 \
-  aom_highbd_12_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_12_variance128x128_c(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-#define aom_highbd_12_variance128x128 aom_highbd_12_variance128x128_c
-
-unsigned int aom_highbd_12_variance128x64_c(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-#define aom_highbd_12_variance128x64 aom_highbd_12_variance128x64_c
-
-unsigned int aom_highbd_12_variance16x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_12_variance16x16 aom_highbd_12_variance16x16_c
-
-unsigned int aom_highbd_12_variance16x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_12_variance16x32 aom_highbd_12_variance16x32_c
-
-unsigned int aom_highbd_12_variance16x4_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_12_variance16x4 aom_highbd_12_variance16x4_c
-
-unsigned int aom_highbd_12_variance16x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           uint32_t* sse);
-#define aom_highbd_12_variance16x64 aom_highbd_12_variance16x64_c
-
-unsigned int aom_highbd_12_variance16x8_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_12_variance16x8 aom_highbd_12_variance16x8_c
-
-unsigned int aom_highbd_12_variance2x2_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance2x2 aom_highbd_12_variance2x2_c
-
-unsigned int aom_highbd_12_variance2x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance2x4 aom_highbd_12_variance2x4_c
-
-unsigned int aom_highbd_12_variance32x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_12_variance32x16 aom_highbd_12_variance32x16_c
-
-unsigned int aom_highbd_12_variance32x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_12_variance32x32 aom_highbd_12_variance32x32_c
-
-unsigned int aom_highbd_12_variance32x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_12_variance32x64 aom_highbd_12_variance32x64_c
-
-unsigned int aom_highbd_12_variance32x8_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_12_variance32x8 aom_highbd_12_variance32x8_c
-
-unsigned int aom_highbd_12_variance4x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_12_variance4x16 aom_highbd_12_variance4x16_c
-
-unsigned int aom_highbd_12_variance4x2_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance4x2 aom_highbd_12_variance4x2_c
-
-unsigned int aom_highbd_12_variance4x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance4x4 aom_highbd_12_variance4x4_c
-
-unsigned int aom_highbd_12_variance4x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance4x8 aom_highbd_12_variance4x8_c
-
-unsigned int aom_highbd_12_variance64x128_c(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-#define aom_highbd_12_variance64x128 aom_highbd_12_variance64x128_c
-
-unsigned int aom_highbd_12_variance64x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           uint32_t* sse);
-#define aom_highbd_12_variance64x16 aom_highbd_12_variance64x16_c
-
-unsigned int aom_highbd_12_variance64x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_12_variance64x32 aom_highbd_12_variance64x32_c
-
-unsigned int aom_highbd_12_variance64x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_12_variance64x64 aom_highbd_12_variance64x64_c
-
-unsigned int aom_highbd_12_variance8x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_12_variance8x16 aom_highbd_12_variance8x16_c
-
-unsigned int aom_highbd_12_variance8x32_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_12_variance8x32 aom_highbd_12_variance8x32_c
-
-unsigned int aom_highbd_12_variance8x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance8x4 aom_highbd_12_variance8x4_c
-
-unsigned int aom_highbd_12_variance8x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance8x8 aom_highbd_12_variance8x8_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x128 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x64 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x16 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x16_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x32 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x32_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x4 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x4_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x64 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x64_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x8 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x8_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x16 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x16_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x32 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x32_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x64 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x64_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x8 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x8_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x16 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x4 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x4_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x8 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x128 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x16 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x16_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x32 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x32_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x64 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x64_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x16 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x16_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x32 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x32_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x4 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x4_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x8 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x8_c
-
-void aom_highbd_8_get16x16var_c(const uint8_t* src_ptr,
-                                int source_stride,
-                                const uint8_t* ref_ptr,
-                                int ref_stride,
-                                unsigned int* sse,
-                                int* sum);
-#define aom_highbd_8_get16x16var aom_highbd_8_get16x16var_c
-
-void aom_highbd_8_get8x8var_c(const uint8_t* src_ptr,
-                              int source_stride,
-                              const uint8_t* ref_ptr,
-                              int ref_stride,
-                              unsigned int* sse,
-                              int* sum);
-#define aom_highbd_8_get8x8var aom_highbd_8_get8x8var_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance128x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance128x128 \
-  aom_highbd_8_masked_sub_pixel_variance128x128_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance128x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance128x64 \
-  aom_highbd_8_masked_sub_pixel_variance128x64_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance16x16 \
-  aom_highbd_8_masked_sub_pixel_variance16x16_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance16x32 \
-  aom_highbd_8_masked_sub_pixel_variance16x32_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance16x4 \
-  aom_highbd_8_masked_sub_pixel_variance16x4_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance16x64 \
-  aom_highbd_8_masked_sub_pixel_variance16x64_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance16x8 \
-  aom_highbd_8_masked_sub_pixel_variance16x8_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance32x16 \
-  aom_highbd_8_masked_sub_pixel_variance32x16_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance32x32 \
-  aom_highbd_8_masked_sub_pixel_variance32x32_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance32x64 \
-  aom_highbd_8_masked_sub_pixel_variance32x64_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance32x8 \
-  aom_highbd_8_masked_sub_pixel_variance32x8_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance4x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance4x16 \
-  aom_highbd_8_masked_sub_pixel_variance4x16_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance4x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance4x4 \
-  aom_highbd_8_masked_sub_pixel_variance4x4_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance4x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance4x8 \
-  aom_highbd_8_masked_sub_pixel_variance4x8_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance64x128 \
-  aom_highbd_8_masked_sub_pixel_variance64x128_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance64x16 \
-  aom_highbd_8_masked_sub_pixel_variance64x16_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance64x32 \
-  aom_highbd_8_masked_sub_pixel_variance64x32_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance64x64 \
-  aom_highbd_8_masked_sub_pixel_variance64x64_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance8x16 \
-  aom_highbd_8_masked_sub_pixel_variance8x16_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance8x32 \
-  aom_highbd_8_masked_sub_pixel_variance8x32_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance8x4 \
-  aom_highbd_8_masked_sub_pixel_variance8x4_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance8x8 \
-  aom_highbd_8_masked_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_8_mse16x16_c(const uint8_t* src_ptr,
-                                     int source_stride,
-                                     const uint8_t* ref_ptr,
-                                     int recon_stride,
-                                     unsigned int* sse);
-#define aom_highbd_8_mse16x16 aom_highbd_8_mse16x16_c
-
-unsigned int aom_highbd_8_mse16x8_c(const uint8_t* src_ptr,
-                                    int source_stride,
-                                    const uint8_t* ref_ptr,
-                                    int recon_stride,
-                                    unsigned int* sse);
-#define aom_highbd_8_mse16x8 aom_highbd_8_mse16x8_c
-
-unsigned int aom_highbd_8_mse8x16_c(const uint8_t* src_ptr,
-                                    int source_stride,
-                                    const uint8_t* ref_ptr,
-                                    int recon_stride,
-                                    unsigned int* sse);
-#define aom_highbd_8_mse8x16 aom_highbd_8_mse8x16_c
-
-unsigned int aom_highbd_8_mse8x8_c(const uint8_t* src_ptr,
-                                   int source_stride,
-                                   const uint8_t* ref_ptr,
-                                   int recon_stride,
-                                   unsigned int* sse);
-#define aom_highbd_8_mse8x8 aom_highbd_8_mse8x8_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance128x128 \
-  aom_highbd_8_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance128x64 \
-  aom_highbd_8_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance16x16 \
-  aom_highbd_8_sub_pixel_avg_variance16x16_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x32_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance16x32 \
-  aom_highbd_8_sub_pixel_avg_variance16x32_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x4_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance16x4 \
-  aom_highbd_8_sub_pixel_avg_variance16x4_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x64_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance16x64 \
-  aom_highbd_8_sub_pixel_avg_variance16x64_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance16x8 \
-  aom_highbd_8_sub_pixel_avg_variance16x8_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance32x16 \
-  aom_highbd_8_sub_pixel_avg_variance32x16_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x32_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance32x32 \
-  aom_highbd_8_sub_pixel_avg_variance32x32_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x64_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance32x64 \
-  aom_highbd_8_sub_pixel_avg_variance32x64_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance32x8 \
-  aom_highbd_8_sub_pixel_avg_variance32x8_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance4x16_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance4x16 \
-  aom_highbd_8_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse,
-                                                  const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance4x4 \
-  aom_highbd_8_sub_pixel_avg_variance4x4_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse,
-                                                  const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance4x8 \
-  aom_highbd_8_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance64x128 \
-  aom_highbd_8_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance64x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance64x16 \
-  aom_highbd_8_sub_pixel_avg_variance64x16_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance64x32_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance64x32 \
-  aom_highbd_8_sub_pixel_avg_variance64x32_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance64x64_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance64x64 \
-  aom_highbd_8_sub_pixel_avg_variance64x64_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance8x16 \
-  aom_highbd_8_sub_pixel_avg_variance8x16_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x32_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance8x32 \
-  aom_highbd_8_sub_pixel_avg_variance8x32_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse,
-                                                  const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance8x4 \
-  aom_highbd_8_sub_pixel_avg_variance8x4_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse,
-                                                  const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance8x8 \
-  aom_highbd_8_sub_pixel_avg_variance8x8_c
-
-uint32_t aom_highbd_8_sub_pixel_variance128x128_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance128x128 \
-  aom_highbd_8_sub_pixel_variance128x128_c
-
-uint32_t aom_highbd_8_sub_pixel_variance128x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance128x64 \
-  aom_highbd_8_sub_pixel_variance128x64_c
-
-uint32_t aom_highbd_8_sub_pixel_variance16x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance16x16 \
-  aom_highbd_8_sub_pixel_variance16x16_c
-
-uint32_t aom_highbd_8_sub_pixel_variance16x32_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance16x32 \
-  aom_highbd_8_sub_pixel_variance16x32_c
-
-uint32_t aom_highbd_8_sub_pixel_variance16x4_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance16x4 \
-  aom_highbd_8_sub_pixel_variance16x4_c
-
-uint32_t aom_highbd_8_sub_pixel_variance16x64_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance16x64 \
-  aom_highbd_8_sub_pixel_variance16x64_c
-
-uint32_t aom_highbd_8_sub_pixel_variance16x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance16x8 \
-  aom_highbd_8_sub_pixel_variance16x8_c
-
-uint32_t aom_highbd_8_sub_pixel_variance32x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance32x16 \
-  aom_highbd_8_sub_pixel_variance32x16_c
-
-uint32_t aom_highbd_8_sub_pixel_variance32x32_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance32x32 \
-  aom_highbd_8_sub_pixel_variance32x32_c
-
-uint32_t aom_highbd_8_sub_pixel_variance32x64_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance32x64 \
-  aom_highbd_8_sub_pixel_variance32x64_c
-
-uint32_t aom_highbd_8_sub_pixel_variance32x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance32x8 \
-  aom_highbd_8_sub_pixel_variance32x8_c
-
-uint32_t aom_highbd_8_sub_pixel_variance4x16_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance4x16 \
-  aom_highbd_8_sub_pixel_variance4x16_c
-
-uint32_t aom_highbd_8_sub_pixel_variance4x4_c(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance4x4 aom_highbd_8_sub_pixel_variance4x4_c
-
-uint32_t aom_highbd_8_sub_pixel_variance4x8_c(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance4x8 aom_highbd_8_sub_pixel_variance4x8_c
-
-uint32_t aom_highbd_8_sub_pixel_variance64x128_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance64x128 \
-  aom_highbd_8_sub_pixel_variance64x128_c
-
-uint32_t aom_highbd_8_sub_pixel_variance64x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance64x16 \
-  aom_highbd_8_sub_pixel_variance64x16_c
-
-uint32_t aom_highbd_8_sub_pixel_variance64x32_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance64x32 \
-  aom_highbd_8_sub_pixel_variance64x32_c
-
-uint32_t aom_highbd_8_sub_pixel_variance64x64_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance64x64 \
-  aom_highbd_8_sub_pixel_variance64x64_c
-
-uint32_t aom_highbd_8_sub_pixel_variance8x16_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance8x16 \
-  aom_highbd_8_sub_pixel_variance8x16_c
-
-uint32_t aom_highbd_8_sub_pixel_variance8x32_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance8x32 \
-  aom_highbd_8_sub_pixel_variance8x32_c
-
-uint32_t aom_highbd_8_sub_pixel_variance8x4_c(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance8x4 aom_highbd_8_sub_pixel_variance8x4_c
-
-uint32_t aom_highbd_8_sub_pixel_variance8x8_c(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance8x8 aom_highbd_8_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_8_variance128x128_c(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-#define aom_highbd_8_variance128x128 aom_highbd_8_variance128x128_c
-
-unsigned int aom_highbd_8_variance128x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_8_variance128x64 aom_highbd_8_variance128x64_c
-
-unsigned int aom_highbd_8_variance16x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_8_variance16x16 aom_highbd_8_variance16x16_c
-
-unsigned int aom_highbd_8_variance16x32_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_8_variance16x32 aom_highbd_8_variance16x32_c
-
-unsigned int aom_highbd_8_variance16x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         uint32_t* sse);
-#define aom_highbd_8_variance16x4 aom_highbd_8_variance16x4_c
-
-unsigned int aom_highbd_8_variance16x64_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_8_variance16x64 aom_highbd_8_variance16x64_c
-
-unsigned int aom_highbd_8_variance16x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_8_variance16x8 aom_highbd_8_variance16x8_c
-
-unsigned int aom_highbd_8_variance2x2_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance2x2 aom_highbd_8_variance2x2_c
-
-unsigned int aom_highbd_8_variance2x4_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance2x4 aom_highbd_8_variance2x4_c
-
-unsigned int aom_highbd_8_variance32x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_8_variance32x16 aom_highbd_8_variance32x16_c
-
-unsigned int aom_highbd_8_variance32x32_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_8_variance32x32 aom_highbd_8_variance32x32_c
-
-unsigned int aom_highbd_8_variance32x64_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_8_variance32x64 aom_highbd_8_variance32x64_c
-
-unsigned int aom_highbd_8_variance32x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         uint32_t* sse);
-#define aom_highbd_8_variance32x8 aom_highbd_8_variance32x8_c
-
-unsigned int aom_highbd_8_variance4x16_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         uint32_t* sse);
-#define aom_highbd_8_variance4x16 aom_highbd_8_variance4x16_c
-
-unsigned int aom_highbd_8_variance4x2_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance4x2 aom_highbd_8_variance4x2_c
-
-unsigned int aom_highbd_8_variance4x4_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance4x4 aom_highbd_8_variance4x4_c
-
-unsigned int aom_highbd_8_variance4x8_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance4x8 aom_highbd_8_variance4x8_c
-
-unsigned int aom_highbd_8_variance64x128_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_8_variance64x128 aom_highbd_8_variance64x128_c
-
-unsigned int aom_highbd_8_variance64x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_8_variance64x16 aom_highbd_8_variance64x16_c
-
-unsigned int aom_highbd_8_variance64x32_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_8_variance64x32 aom_highbd_8_variance64x32_c
-
-unsigned int aom_highbd_8_variance64x64_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_8_variance64x64 aom_highbd_8_variance64x64_c
-
-unsigned int aom_highbd_8_variance8x16_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_8_variance8x16 aom_highbd_8_variance8x16_c
-
-unsigned int aom_highbd_8_variance8x32_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         uint32_t* sse);
-#define aom_highbd_8_variance8x32 aom_highbd_8_variance8x32_c
-
-unsigned int aom_highbd_8_variance8x4_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance8x4 aom_highbd_8_variance8x4_c
-
-unsigned int aom_highbd_8_variance8x8_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance8x8 aom_highbd_8_variance8x8_c
-
-unsigned int aom_highbd_avg_4x4_c(const uint8_t*, int p);
-#define aom_highbd_avg_4x4 aom_highbd_avg_4x4_c
-
-unsigned int aom_highbd_avg_8x8_c(const uint8_t*, int p);
-#define aom_highbd_avg_8x8 aom_highbd_avg_8x8_c
-
-void aom_highbd_blend_a64_d16_mask_c(uint8_t* dst,
-                                     uint32_t dst_stride,
-                                     const CONV_BUF_TYPE* src0,
-                                     uint32_t src0_stride,
-                                     const CONV_BUF_TYPE* src1,
-                                     uint32_t src1_stride,
-                                     const uint8_t* mask,
-                                     uint32_t mask_stride,
-                                     int w,
-                                     int h,
-                                     int subw,
-                                     int subh,
-                                     ConvolveParams* conv_params,
-                                     const int bd);
-#define aom_highbd_blend_a64_d16_mask aom_highbd_blend_a64_d16_mask_c
-
-void aom_highbd_blend_a64_hmask_c(uint8_t* dst,
-                                  uint32_t dst_stride,
-                                  const uint8_t* src0,
-                                  uint32_t src0_stride,
-                                  const uint8_t* src1,
-                                  uint32_t src1_stride,
-                                  const uint8_t* mask,
-                                  int w,
-                                  int h,
-                                  int bd);
-#define aom_highbd_blend_a64_hmask aom_highbd_blend_a64_hmask_c
-
-void aom_highbd_blend_a64_mask_c(uint8_t* dst,
-                                 uint32_t dst_stride,
-                                 const uint8_t* src0,
-                                 uint32_t src0_stride,
-                                 const uint8_t* src1,
-                                 uint32_t src1_stride,
-                                 const uint8_t* mask,
-                                 uint32_t mask_stride,
-                                 int w,
-                                 int h,
-                                 int subw,
-                                 int subh,
-                                 int bd);
-#define aom_highbd_blend_a64_mask aom_highbd_blend_a64_mask_c
-
-void aom_highbd_blend_a64_vmask_c(uint8_t* dst,
-                                  uint32_t dst_stride,
-                                  const uint8_t* src0,
-                                  uint32_t src0_stride,
-                                  const uint8_t* src1,
-                                  uint32_t src1_stride,
-                                  const uint8_t* mask,
-                                  int w,
-                                  int h,
-                                  int bd);
-#define aom_highbd_blend_a64_vmask aom_highbd_blend_a64_vmask_c
-
-void aom_highbd_comp_avg_pred_c(uint8_t* comp_pred8,
-                                const uint8_t* pred8,
-                                int width,
-                                int height,
-                                const uint8_t* ref8,
-                                int ref_stride);
-#define aom_highbd_comp_avg_pred aom_highbd_comp_avg_pred_c
-
-void aom_highbd_comp_avg_upsampled_pred_c(MACROBLOCKD* xd,
-                                          const struct AV1Common* const cm,
-                                          int mi_row,
-                                          int mi_col,
-                                          const MV* const mv,
-                                          uint8_t* comp_pred8,
-                                          const uint8_t* pred8,
-                                          int width,
-                                          int height,
-                                          int subpel_x_q3,
-                                          int subpel_y_q3,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          int bd,
-                                          int subpel_search);
-#define aom_highbd_comp_avg_upsampled_pred aom_highbd_comp_avg_upsampled_pred_c
-
-void aom_highbd_comp_mask_pred_c(uint8_t* comp_pred,
-                                 const uint8_t* pred8,
-                                 int width,
-                                 int height,
-                                 const uint8_t* ref8,
-                                 int ref_stride,
-                                 const uint8_t* mask,
-                                 int mask_stride,
-                                 int invert_mask);
-#define aom_highbd_comp_mask_pred aom_highbd_comp_mask_pred_c
-
-void aom_highbd_convolve8_horiz_c(const uint8_t* src,
-                                  ptrdiff_t src_stride,
-                                  uint8_t* dst,
-                                  ptrdiff_t dst_stride,
-                                  const int16_t* filter_x,
-                                  int x_step_q4,
-                                  const int16_t* filter_y,
-                                  int y_step_q4,
-                                  int w,
-                                  int h,
-                                  int bd);
-#define aom_highbd_convolve8_horiz aom_highbd_convolve8_horiz_c
-
-void aom_highbd_convolve8_vert_c(const uint8_t* src,
-                                 ptrdiff_t src_stride,
-                                 uint8_t* dst,
-                                 ptrdiff_t dst_stride,
-                                 const int16_t* filter_x,
-                                 int x_step_q4,
-                                 const int16_t* filter_y,
-                                 int y_step_q4,
-                                 int w,
-                                 int h,
-                                 int bd);
-#define aom_highbd_convolve8_vert aom_highbd_convolve8_vert_c
-
-void aom_highbd_convolve_copy_c(const uint16_t* src,
-                                ptrdiff_t src_stride,
-                                uint16_t* dst,
-                                ptrdiff_t dst_stride,
-                                int w,
-                                int h);
-#define aom_highbd_convolve_copy aom_highbd_convolve_copy_c
-
-void aom_highbd_dc_128_predictor_16x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_16x16 aom_highbd_dc_128_predictor_16x16_c
-
-void aom_highbd_dc_128_predictor_16x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_16x32 aom_highbd_dc_128_predictor_16x32_c
-
-void aom_highbd_dc_128_predictor_16x4_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_16x4 aom_highbd_dc_128_predictor_16x4_c
-
-void aom_highbd_dc_128_predictor_16x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_16x64 aom_highbd_dc_128_predictor_16x64_c
-
-void aom_highbd_dc_128_predictor_16x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_16x8 aom_highbd_dc_128_predictor_16x8_c
-
-void aom_highbd_dc_128_predictor_2x2_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_128_predictor_2x2 aom_highbd_dc_128_predictor_2x2_c
-
-void aom_highbd_dc_128_predictor_32x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_32x16 aom_highbd_dc_128_predictor_32x16_c
-
-void aom_highbd_dc_128_predictor_32x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_32x32 aom_highbd_dc_128_predictor_32x32_c
-
-void aom_highbd_dc_128_predictor_32x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_32x64 aom_highbd_dc_128_predictor_32x64_c
-
-void aom_highbd_dc_128_predictor_32x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_32x8 aom_highbd_dc_128_predictor_32x8_c
-
-void aom_highbd_dc_128_predictor_4x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_4x16 aom_highbd_dc_128_predictor_4x16_c
-
-void aom_highbd_dc_128_predictor_4x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_128_predictor_4x4 aom_highbd_dc_128_predictor_4x4_c
-
-void aom_highbd_dc_128_predictor_4x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_128_predictor_4x8 aom_highbd_dc_128_predictor_4x8_c
-
-void aom_highbd_dc_128_predictor_64x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_64x16 aom_highbd_dc_128_predictor_64x16_c
-
-void aom_highbd_dc_128_predictor_64x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_64x32 aom_highbd_dc_128_predictor_64x32_c
-
-void aom_highbd_dc_128_predictor_64x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_64x64 aom_highbd_dc_128_predictor_64x64_c
-
-void aom_highbd_dc_128_predictor_8x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_8x16 aom_highbd_dc_128_predictor_8x16_c
-
-void aom_highbd_dc_128_predictor_8x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_8x32 aom_highbd_dc_128_predictor_8x32_c
-
-void aom_highbd_dc_128_predictor_8x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_128_predictor_8x4 aom_highbd_dc_128_predictor_8x4_c
-
-void aom_highbd_dc_128_predictor_8x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_128_predictor_8x8 aom_highbd_dc_128_predictor_8x8_c
-
-void aom_highbd_dc_left_predictor_16x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_16x16 aom_highbd_dc_left_predictor_16x16_c
-
-void aom_highbd_dc_left_predictor_16x32_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_16x32 aom_highbd_dc_left_predictor_16x32_c
-
-void aom_highbd_dc_left_predictor_16x4_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_16x4 aom_highbd_dc_left_predictor_16x4_c
-
-void aom_highbd_dc_left_predictor_16x64_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_16x64 aom_highbd_dc_left_predictor_16x64_c
-
-void aom_highbd_dc_left_predictor_16x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_16x8 aom_highbd_dc_left_predictor_16x8_c
-
-void aom_highbd_dc_left_predictor_2x2_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_left_predictor_2x2 aom_highbd_dc_left_predictor_2x2_c
-
-void aom_highbd_dc_left_predictor_32x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_32x16 aom_highbd_dc_left_predictor_32x16_c
-
-void aom_highbd_dc_left_predictor_32x32_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_32x32 aom_highbd_dc_left_predictor_32x32_c
-
-void aom_highbd_dc_left_predictor_32x64_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_32x64 aom_highbd_dc_left_predictor_32x64_c
-
-void aom_highbd_dc_left_predictor_32x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_32x8 aom_highbd_dc_left_predictor_32x8_c
-
-void aom_highbd_dc_left_predictor_4x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_4x16 aom_highbd_dc_left_predictor_4x16_c
-
-void aom_highbd_dc_left_predictor_4x4_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_left_predictor_4x4 aom_highbd_dc_left_predictor_4x4_c
-
-void aom_highbd_dc_left_predictor_4x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_left_predictor_4x8 aom_highbd_dc_left_predictor_4x8_c
-
-void aom_highbd_dc_left_predictor_64x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_64x16 aom_highbd_dc_left_predictor_64x16_c
-
-void aom_highbd_dc_left_predictor_64x32_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_64x32 aom_highbd_dc_left_predictor_64x32_c
-
-void aom_highbd_dc_left_predictor_64x64_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_64x64 aom_highbd_dc_left_predictor_64x64_c
-
-void aom_highbd_dc_left_predictor_8x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_8x16 aom_highbd_dc_left_predictor_8x16_c
-
-void aom_highbd_dc_left_predictor_8x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_8x32 aom_highbd_dc_left_predictor_8x32_c
-
-void aom_highbd_dc_left_predictor_8x4_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_left_predictor_8x4 aom_highbd_dc_left_predictor_8x4_c
-
-void aom_highbd_dc_left_predictor_8x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_left_predictor_8x8 aom_highbd_dc_left_predictor_8x8_c
-
-void aom_highbd_dc_predictor_16x16_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-void aom_highbd_dc_predictor_16x16_neon(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-RTCD_EXTERN void (*aom_highbd_dc_predictor_16x16)(uint16_t* dst,
-                                                  ptrdiff_t y_stride,
-                                                  const uint16_t* above,
-                                                  const uint16_t* left,
-                                                  int bd);
-
-void aom_highbd_dc_predictor_16x32_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_16x32 aom_highbd_dc_predictor_16x32_c
-
-void aom_highbd_dc_predictor_16x4_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_16x4 aom_highbd_dc_predictor_16x4_c
-
-void aom_highbd_dc_predictor_16x64_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_16x64 aom_highbd_dc_predictor_16x64_c
-
-void aom_highbd_dc_predictor_16x8_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_16x8 aom_highbd_dc_predictor_16x8_c
-
-void aom_highbd_dc_predictor_2x2_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_dc_predictor_2x2 aom_highbd_dc_predictor_2x2_c
-
-void aom_highbd_dc_predictor_32x16_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_32x16 aom_highbd_dc_predictor_32x16_c
-
-void aom_highbd_dc_predictor_32x32_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-void aom_highbd_dc_predictor_32x32_neon(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-RTCD_EXTERN void (*aom_highbd_dc_predictor_32x32)(uint16_t* dst,
-                                                  ptrdiff_t y_stride,
-                                                  const uint16_t* above,
-                                                  const uint16_t* left,
-                                                  int bd);
-
-void aom_highbd_dc_predictor_32x64_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_32x64 aom_highbd_dc_predictor_32x64_c
-
-void aom_highbd_dc_predictor_32x8_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_32x8 aom_highbd_dc_predictor_32x8_c
-
-void aom_highbd_dc_predictor_4x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_4x16 aom_highbd_dc_predictor_4x16_c
-
-void aom_highbd_dc_predictor_4x4_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-void aom_highbd_dc_predictor_4x4_neon(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-RTCD_EXTERN void (*aom_highbd_dc_predictor_4x4)(uint16_t* dst,
-                                                ptrdiff_t y_stride,
-                                                const uint16_t* above,
-                                                const uint16_t* left,
-                                                int bd);
-
-void aom_highbd_dc_predictor_4x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_dc_predictor_4x8 aom_highbd_dc_predictor_4x8_c
-
-void aom_highbd_dc_predictor_64x16_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_64x16 aom_highbd_dc_predictor_64x16_c
-
-void aom_highbd_dc_predictor_64x32_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_64x32 aom_highbd_dc_predictor_64x32_c
-
-void aom_highbd_dc_predictor_64x64_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-void aom_highbd_dc_predictor_64x64_neon(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-RTCD_EXTERN void (*aom_highbd_dc_predictor_64x64)(uint16_t* dst,
-                                                  ptrdiff_t y_stride,
-                                                  const uint16_t* above,
-                                                  const uint16_t* left,
-                                                  int bd);
-
-void aom_highbd_dc_predictor_8x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_8x16 aom_highbd_dc_predictor_8x16_c
-
-void aom_highbd_dc_predictor_8x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_8x32 aom_highbd_dc_predictor_8x32_c
-
-void aom_highbd_dc_predictor_8x4_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_dc_predictor_8x4 aom_highbd_dc_predictor_8x4_c
-
-void aom_highbd_dc_predictor_8x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-void aom_highbd_dc_predictor_8x8_neon(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-RTCD_EXTERN void (*aom_highbd_dc_predictor_8x8)(uint16_t* dst,
-                                                ptrdiff_t y_stride,
-                                                const uint16_t* above,
-                                                const uint16_t* left,
-                                                int bd);
-
-void aom_highbd_dc_top_predictor_16x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_16x16 aom_highbd_dc_top_predictor_16x16_c
-
-void aom_highbd_dc_top_predictor_16x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_16x32 aom_highbd_dc_top_predictor_16x32_c
-
-void aom_highbd_dc_top_predictor_16x4_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_16x4 aom_highbd_dc_top_predictor_16x4_c
-
-void aom_highbd_dc_top_predictor_16x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_16x64 aom_highbd_dc_top_predictor_16x64_c
-
-void aom_highbd_dc_top_predictor_16x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_16x8 aom_highbd_dc_top_predictor_16x8_c
-
-void aom_highbd_dc_top_predictor_2x2_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_top_predictor_2x2 aom_highbd_dc_top_predictor_2x2_c
-
-void aom_highbd_dc_top_predictor_32x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_32x16 aom_highbd_dc_top_predictor_32x16_c
-
-void aom_highbd_dc_top_predictor_32x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_32x32 aom_highbd_dc_top_predictor_32x32_c
-
-void aom_highbd_dc_top_predictor_32x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_32x64 aom_highbd_dc_top_predictor_32x64_c
-
-void aom_highbd_dc_top_predictor_32x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_32x8 aom_highbd_dc_top_predictor_32x8_c
-
-void aom_highbd_dc_top_predictor_4x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_4x16 aom_highbd_dc_top_predictor_4x16_c
-
-void aom_highbd_dc_top_predictor_4x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_top_predictor_4x4 aom_highbd_dc_top_predictor_4x4_c
-
-void aom_highbd_dc_top_predictor_4x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_top_predictor_4x8 aom_highbd_dc_top_predictor_4x8_c
-
-void aom_highbd_dc_top_predictor_64x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_64x16 aom_highbd_dc_top_predictor_64x16_c
-
-void aom_highbd_dc_top_predictor_64x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_64x32 aom_highbd_dc_top_predictor_64x32_c
-
-void aom_highbd_dc_top_predictor_64x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_64x64 aom_highbd_dc_top_predictor_64x64_c
-
-void aom_highbd_dc_top_predictor_8x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_8x16 aom_highbd_dc_top_predictor_8x16_c
-
-void aom_highbd_dc_top_predictor_8x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_8x32 aom_highbd_dc_top_predictor_8x32_c
-
-void aom_highbd_dc_top_predictor_8x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_top_predictor_8x4 aom_highbd_dc_top_predictor_8x4_c
-
-void aom_highbd_dc_top_predictor_8x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_top_predictor_8x8 aom_highbd_dc_top_predictor_8x8_c
-
-void aom_highbd_dist_wtd_comp_avg_pred_c(uint8_t* comp_pred8,
-                                         const uint8_t* pred8,
-                                         int width,
-                                         int height,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_comp_avg_pred aom_highbd_dist_wtd_comp_avg_pred_c
-
-void aom_highbd_dist_wtd_comp_avg_upsampled_pred_c(
-    MACROBLOCKD* xd,
-    const struct AV1Common* const cm,
-    int mi_row,
-    int mi_col,
-    const MV* const mv,
-    uint8_t* comp_pred8,
-    const uint8_t* pred8,
-    int width,
-    int height,
-    int subpel_x_q3,
-    int subpel_y_q3,
-    const uint8_t* ref8,
-    int ref_stride,
-    int bd,
-    const DIST_WTD_COMP_PARAMS* jcp_param,
-    int subpel_search);
-#define aom_highbd_dist_wtd_comp_avg_upsampled_pred \
-  aom_highbd_dist_wtd_comp_avg_upsampled_pred_c
-
-unsigned int aom_highbd_dist_wtd_sad128x128_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad128x128_avg aom_highbd_dist_wtd_sad128x128_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad128x64_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad128x64_avg aom_highbd_dist_wtd_sad128x64_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad16x16_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad16x16_avg aom_highbd_dist_wtd_sad16x16_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad16x32_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad16x32_avg aom_highbd_dist_wtd_sad16x32_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad16x4_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad16x4_avg aom_highbd_dist_wtd_sad16x4_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad16x64_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad16x64_avg aom_highbd_dist_wtd_sad16x64_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad16x8_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad16x8_avg aom_highbd_dist_wtd_sad16x8_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad32x16_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad32x16_avg aom_highbd_dist_wtd_sad32x16_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad32x32_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad32x32_avg aom_highbd_dist_wtd_sad32x32_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad32x64_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad32x64_avg aom_highbd_dist_wtd_sad32x64_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad32x8_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad32x8_avg aom_highbd_dist_wtd_sad32x8_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad4x16_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad4x16_avg aom_highbd_dist_wtd_sad4x16_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad4x4_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad4x4_avg aom_highbd_dist_wtd_sad4x4_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad4x8_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad4x8_avg aom_highbd_dist_wtd_sad4x8_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad64x128_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad64x128_avg aom_highbd_dist_wtd_sad64x128_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad64x16_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad64x16_avg aom_highbd_dist_wtd_sad64x16_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad64x32_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad64x32_avg aom_highbd_dist_wtd_sad64x32_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad64x64_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad64x64_avg aom_highbd_dist_wtd_sad64x64_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad8x16_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad8x16_avg aom_highbd_dist_wtd_sad8x16_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad8x32_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad8x32_avg aom_highbd_dist_wtd_sad8x32_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad8x4_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad8x4_avg aom_highbd_dist_wtd_sad8x4_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad8x8_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad8x8_avg aom_highbd_dist_wtd_sad8x8_avg_c
-
-void aom_highbd_fdct8x8_c(const int16_t* input, tran_low_t* output, int stride);
-#define aom_highbd_fdct8x8 aom_highbd_fdct8x8_c
-
-void aom_highbd_h_predictor_16x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_16x16 aom_highbd_h_predictor_16x16_c
-
-void aom_highbd_h_predictor_16x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_16x32 aom_highbd_h_predictor_16x32_c
-
-void aom_highbd_h_predictor_16x4_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_16x4 aom_highbd_h_predictor_16x4_c
-
-void aom_highbd_h_predictor_16x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_16x64 aom_highbd_h_predictor_16x64_c
-
-void aom_highbd_h_predictor_16x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_16x8 aom_highbd_h_predictor_16x8_c
-
-void aom_highbd_h_predictor_2x2_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_h_predictor_2x2 aom_highbd_h_predictor_2x2_c
-
-void aom_highbd_h_predictor_32x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_32x16 aom_highbd_h_predictor_32x16_c
-
-void aom_highbd_h_predictor_32x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_32x32 aom_highbd_h_predictor_32x32_c
-
-void aom_highbd_h_predictor_32x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_32x64 aom_highbd_h_predictor_32x64_c
-
-void aom_highbd_h_predictor_32x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_32x8 aom_highbd_h_predictor_32x8_c
-
-void aom_highbd_h_predictor_4x16_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_4x16 aom_highbd_h_predictor_4x16_c
-
-void aom_highbd_h_predictor_4x4_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_h_predictor_4x4 aom_highbd_h_predictor_4x4_c
-
-void aom_highbd_h_predictor_4x8_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_h_predictor_4x8 aom_highbd_h_predictor_4x8_c
-
-void aom_highbd_h_predictor_64x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_64x16 aom_highbd_h_predictor_64x16_c
-
-void aom_highbd_h_predictor_64x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_64x32 aom_highbd_h_predictor_64x32_c
-
-void aom_highbd_h_predictor_64x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_64x64 aom_highbd_h_predictor_64x64_c
-
-void aom_highbd_h_predictor_8x16_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_8x16 aom_highbd_h_predictor_8x16_c
-
-void aom_highbd_h_predictor_8x32_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_8x32 aom_highbd_h_predictor_8x32_c
-
-void aom_highbd_h_predictor_8x4_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_h_predictor_8x4 aom_highbd_h_predictor_8x4_c
-
-void aom_highbd_h_predictor_8x8_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_h_predictor_8x8 aom_highbd_h_predictor_8x8_c
-
-void aom_highbd_hadamard_16x16_c(const int16_t* src_diff,
-                                 ptrdiff_t src_stride,
-                                 tran_low_t* coeff);
-#define aom_highbd_hadamard_16x16 aom_highbd_hadamard_16x16_c
-
-void aom_highbd_hadamard_32x32_c(const int16_t* src_diff,
-                                 ptrdiff_t src_stride,
-                                 tran_low_t* coeff);
-#define aom_highbd_hadamard_32x32 aom_highbd_hadamard_32x32_c
-
-void aom_highbd_hadamard_8x8_c(const int16_t* src_diff,
-                               ptrdiff_t src_stride,
-                               tran_low_t* coeff);
-#define aom_highbd_hadamard_8x8 aom_highbd_hadamard_8x8_c
-
-void aom_highbd_lpf_horizontal_14_c(uint16_t* s,
-                                    int pitch,
-                                    const uint8_t* blimit,
-                                    const uint8_t* limit,
-                                    const uint8_t* thresh,
-                                    int bd);
-#define aom_highbd_lpf_horizontal_14 aom_highbd_lpf_horizontal_14_c
-
-void aom_highbd_lpf_horizontal_14_dual_c(uint16_t* s,
-                                         int pitch,
-                                         const uint8_t* blimit0,
-                                         const uint8_t* limit0,
-                                         const uint8_t* thresh0,
-                                         const uint8_t* blimit1,
-                                         const uint8_t* limit1,
-                                         const uint8_t* thresh1,
-                                         int bd);
-#define aom_highbd_lpf_horizontal_14_dual aom_highbd_lpf_horizontal_14_dual_c
-
-void aom_highbd_lpf_horizontal_4_c(uint16_t* s,
-                                   int pitch,
-                                   const uint8_t* blimit,
-                                   const uint8_t* limit,
-                                   const uint8_t* thresh,
-                                   int bd);
-#define aom_highbd_lpf_horizontal_4 aom_highbd_lpf_horizontal_4_c
-
-void aom_highbd_lpf_horizontal_4_dual_c(uint16_t* s,
-                                        int pitch,
-                                        const uint8_t* blimit0,
-                                        const uint8_t* limit0,
-                                        const uint8_t* thresh0,
-                                        const uint8_t* blimit1,
-                                        const uint8_t* limit1,
-                                        const uint8_t* thresh1,
-                                        int bd);
-#define aom_highbd_lpf_horizontal_4_dual aom_highbd_lpf_horizontal_4_dual_c
-
-void aom_highbd_lpf_horizontal_6_c(uint16_t* s,
-                                   int pitch,
-                                   const uint8_t* blimit,
-                                   const uint8_t* limit,
-                                   const uint8_t* thresh,
-                                   int bd);
-#define aom_highbd_lpf_horizontal_6 aom_highbd_lpf_horizontal_6_c
-
-void aom_highbd_lpf_horizontal_6_dual_c(uint16_t* s,
-                                        int pitch,
-                                        const uint8_t* blimit0,
-                                        const uint8_t* limit0,
-                                        const uint8_t* thresh0,
-                                        const uint8_t* blimit1,
-                                        const uint8_t* limit1,
-                                        const uint8_t* thresh1,
-                                        int bd);
-#define aom_highbd_lpf_horizontal_6_dual aom_highbd_lpf_horizontal_6_dual_c
-
-void aom_highbd_lpf_horizontal_8_c(uint16_t* s,
-                                   int pitch,
-                                   const uint8_t* blimit,
-                                   const uint8_t* limit,
-                                   const uint8_t* thresh,
-                                   int bd);
-#define aom_highbd_lpf_horizontal_8 aom_highbd_lpf_horizontal_8_c
-
-void aom_highbd_lpf_horizontal_8_dual_c(uint16_t* s,
-                                        int pitch,
-                                        const uint8_t* blimit0,
-                                        const uint8_t* limit0,
-                                        const uint8_t* thresh0,
-                                        const uint8_t* blimit1,
-                                        const uint8_t* limit1,
-                                        const uint8_t* thresh1,
-                                        int bd);
-#define aom_highbd_lpf_horizontal_8_dual aom_highbd_lpf_horizontal_8_dual_c
-
-void aom_highbd_lpf_vertical_14_c(uint16_t* s,
-                                  int pitch,
-                                  const uint8_t* blimit,
-                                  const uint8_t* limit,
-                                  const uint8_t* thresh,
-                                  int bd);
-#define aom_highbd_lpf_vertical_14 aom_highbd_lpf_vertical_14_c
-
-void aom_highbd_lpf_vertical_14_dual_c(uint16_t* s,
-                                       int pitch,
-                                       const uint8_t* blimit0,
-                                       const uint8_t* limit0,
-                                       const uint8_t* thresh0,
-                                       const uint8_t* blimit1,
-                                       const uint8_t* limit1,
-                                       const uint8_t* thresh1,
-                                       int bd);
-#define aom_highbd_lpf_vertical_14_dual aom_highbd_lpf_vertical_14_dual_c
-
-void aom_highbd_lpf_vertical_4_c(uint16_t* s,
-                                 int pitch,
-                                 const uint8_t* blimit,
-                                 const uint8_t* limit,
-                                 const uint8_t* thresh,
-                                 int bd);
-#define aom_highbd_lpf_vertical_4 aom_highbd_lpf_vertical_4_c
-
-void aom_highbd_lpf_vertical_4_dual_c(uint16_t* s,
-                                      int pitch,
-                                      const uint8_t* blimit0,
-                                      const uint8_t* limit0,
-                                      const uint8_t* thresh0,
-                                      const uint8_t* blimit1,
-                                      const uint8_t* limit1,
-                                      const uint8_t* thresh1,
-                                      int bd);
-#define aom_highbd_lpf_vertical_4_dual aom_highbd_lpf_vertical_4_dual_c
-
-void aom_highbd_lpf_vertical_6_c(uint16_t* s,
-                                 int pitch,
-                                 const uint8_t* blimit,
-                                 const uint8_t* limit,
-                                 const uint8_t* thresh,
-                                 int bd);
-#define aom_highbd_lpf_vertical_6 aom_highbd_lpf_vertical_6_c
-
-void aom_highbd_lpf_vertical_6_dual_c(uint16_t* s,
-                                      int pitch,
-                                      const uint8_t* blimit0,
-                                      const uint8_t* limit0,
-                                      const uint8_t* thresh0,
-                                      const uint8_t* blimit1,
-                                      const uint8_t* limit1,
-                                      const uint8_t* thresh1,
-                                      int bd);
-#define aom_highbd_lpf_vertical_6_dual aom_highbd_lpf_vertical_6_dual_c
-
-void aom_highbd_lpf_vertical_8_c(uint16_t* s,
-                                 int pitch,
-                                 const uint8_t* blimit,
-                                 const uint8_t* limit,
-                                 const uint8_t* thresh,
-                                 int bd);
-#define aom_highbd_lpf_vertical_8 aom_highbd_lpf_vertical_8_c
-
-void aom_highbd_lpf_vertical_8_dual_c(uint16_t* s,
-                                      int pitch,
-                                      const uint8_t* blimit0,
-                                      const uint8_t* limit0,
-                                      const uint8_t* thresh0,
-                                      const uint8_t* blimit1,
-                                      const uint8_t* limit1,
-                                      const uint8_t* thresh1,
-                                      int bd);
-#define aom_highbd_lpf_vertical_8_dual aom_highbd_lpf_vertical_8_dual_c
-
-unsigned int aom_highbd_masked_sad128x128_c(const uint8_t* src8,
-                                            int src_stride,
-                                            const uint8_t* ref8,
-                                            int ref_stride,
-                                            const uint8_t* second_pred8,
-                                            const uint8_t* msk,
-                                            int msk_stride,
-                                            int invert_mask);
-#define aom_highbd_masked_sad128x128 aom_highbd_masked_sad128x128_c
-
-unsigned int aom_highbd_masked_sad128x64_c(const uint8_t* src8,
-                                           int src_stride,
-                                           const uint8_t* ref8,
-                                           int ref_stride,
-                                           const uint8_t* second_pred8,
-                                           const uint8_t* msk,
-                                           int msk_stride,
-                                           int invert_mask);
-#define aom_highbd_masked_sad128x64 aom_highbd_masked_sad128x64_c
-
-unsigned int aom_highbd_masked_sad16x16_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad16x16 aom_highbd_masked_sad16x16_c
-
-unsigned int aom_highbd_masked_sad16x32_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad16x32 aom_highbd_masked_sad16x32_c
-
-unsigned int aom_highbd_masked_sad16x4_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-#define aom_highbd_masked_sad16x4 aom_highbd_masked_sad16x4_c
-
-unsigned int aom_highbd_masked_sad16x64_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad16x64 aom_highbd_masked_sad16x64_c
-
-unsigned int aom_highbd_masked_sad16x8_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-#define aom_highbd_masked_sad16x8 aom_highbd_masked_sad16x8_c
-
-unsigned int aom_highbd_masked_sad32x16_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad32x16 aom_highbd_masked_sad32x16_c
-
-unsigned int aom_highbd_masked_sad32x32_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad32x32 aom_highbd_masked_sad32x32_c
-
-unsigned int aom_highbd_masked_sad32x64_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad32x64 aom_highbd_masked_sad32x64_c
-
-unsigned int aom_highbd_masked_sad32x8_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-#define aom_highbd_masked_sad32x8 aom_highbd_masked_sad32x8_c
-
-unsigned int aom_highbd_masked_sad4x16_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-#define aom_highbd_masked_sad4x16 aom_highbd_masked_sad4x16_c
-
-unsigned int aom_highbd_masked_sad4x4_c(const uint8_t* src8,
-                                        int src_stride,
-                                        const uint8_t* ref8,
-                                        int ref_stride,
-                                        const uint8_t* second_pred8,
-                                        const uint8_t* msk,
-                                        int msk_stride,
-                                        int invert_mask);
-#define aom_highbd_masked_sad4x4 aom_highbd_masked_sad4x4_c
-
-unsigned int aom_highbd_masked_sad4x8_c(const uint8_t* src8,
-                                        int src_stride,
-                                        const uint8_t* ref8,
-                                        int ref_stride,
-                                        const uint8_t* second_pred8,
-                                        const uint8_t* msk,
-                                        int msk_stride,
-                                        int invert_mask);
-#define aom_highbd_masked_sad4x8 aom_highbd_masked_sad4x8_c
-
-unsigned int aom_highbd_masked_sad64x128_c(const uint8_t* src8,
-                                           int src_stride,
-                                           const uint8_t* ref8,
-                                           int ref_stride,
-                                           const uint8_t* second_pred8,
-                                           const uint8_t* msk,
-                                           int msk_stride,
-                                           int invert_mask);
-#define aom_highbd_masked_sad64x128 aom_highbd_masked_sad64x128_c
-
-unsigned int aom_highbd_masked_sad64x16_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad64x16 aom_highbd_masked_sad64x16_c
-
-unsigned int aom_highbd_masked_sad64x32_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad64x32 aom_highbd_masked_sad64x32_c
-
-unsigned int aom_highbd_masked_sad64x64_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad64x64 aom_highbd_masked_sad64x64_c
-
-unsigned int aom_highbd_masked_sad8x16_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-#define aom_highbd_masked_sad8x16 aom_highbd_masked_sad8x16_c
-
-unsigned int aom_highbd_masked_sad8x32_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-#define aom_highbd_masked_sad8x32 aom_highbd_masked_sad8x32_c
-
-unsigned int aom_highbd_masked_sad8x4_c(const uint8_t* src8,
-                                        int src_stride,
-                                        const uint8_t* ref8,
-                                        int ref_stride,
-                                        const uint8_t* second_pred8,
-                                        const uint8_t* msk,
-                                        int msk_stride,
-                                        int invert_mask);
-#define aom_highbd_masked_sad8x4 aom_highbd_masked_sad8x4_c
-
-unsigned int aom_highbd_masked_sad8x8_c(const uint8_t* src8,
-                                        int src_stride,
-                                        const uint8_t* ref8,
-                                        int ref_stride,
-                                        const uint8_t* second_pred8,
-                                        const uint8_t* msk,
-                                        int msk_stride,
-                                        int invert_mask);
-#define aom_highbd_masked_sad8x8 aom_highbd_masked_sad8x8_c
-
-void aom_highbd_minmax_8x8_c(const uint8_t* s,
-                             int p,
-                             const uint8_t* d,
-                             int dp,
-                             int* min,
-                             int* max);
-#define aom_highbd_minmax_8x8 aom_highbd_minmax_8x8_c
-
-unsigned int aom_highbd_obmc_sad128x128_c(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask);
-#define aom_highbd_obmc_sad128x128 aom_highbd_obmc_sad128x128_c
-
-unsigned int aom_highbd_obmc_sad128x64_c(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask);
-#define aom_highbd_obmc_sad128x64 aom_highbd_obmc_sad128x64_c
-
-unsigned int aom_highbd_obmc_sad16x16_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad16x16 aom_highbd_obmc_sad16x16_c
-
-unsigned int aom_highbd_obmc_sad16x32_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad16x32 aom_highbd_obmc_sad16x32_c
-
-unsigned int aom_highbd_obmc_sad16x4_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-#define aom_highbd_obmc_sad16x4 aom_highbd_obmc_sad16x4_c
-
-unsigned int aom_highbd_obmc_sad16x64_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad16x64 aom_highbd_obmc_sad16x64_c
-
-unsigned int aom_highbd_obmc_sad16x8_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-#define aom_highbd_obmc_sad16x8 aom_highbd_obmc_sad16x8_c
-
-unsigned int aom_highbd_obmc_sad32x16_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad32x16 aom_highbd_obmc_sad32x16_c
-
-unsigned int aom_highbd_obmc_sad32x32_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad32x32 aom_highbd_obmc_sad32x32_c
-
-unsigned int aom_highbd_obmc_sad32x64_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad32x64 aom_highbd_obmc_sad32x64_c
-
-unsigned int aom_highbd_obmc_sad32x8_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-#define aom_highbd_obmc_sad32x8 aom_highbd_obmc_sad32x8_c
-
-unsigned int aom_highbd_obmc_sad4x16_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-#define aom_highbd_obmc_sad4x16 aom_highbd_obmc_sad4x16_c
-
-unsigned int aom_highbd_obmc_sad4x4_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-#define aom_highbd_obmc_sad4x4 aom_highbd_obmc_sad4x4_c
-
-unsigned int aom_highbd_obmc_sad4x8_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-#define aom_highbd_obmc_sad4x8 aom_highbd_obmc_sad4x8_c
-
-unsigned int aom_highbd_obmc_sad64x128_c(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask);
-#define aom_highbd_obmc_sad64x128 aom_highbd_obmc_sad64x128_c
-
-unsigned int aom_highbd_obmc_sad64x16_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad64x16 aom_highbd_obmc_sad64x16_c
-
-unsigned int aom_highbd_obmc_sad64x32_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad64x32 aom_highbd_obmc_sad64x32_c
-
-unsigned int aom_highbd_obmc_sad64x64_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad64x64 aom_highbd_obmc_sad64x64_c
-
-unsigned int aom_highbd_obmc_sad8x16_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-#define aom_highbd_obmc_sad8x16 aom_highbd_obmc_sad8x16_c
-
-unsigned int aom_highbd_obmc_sad8x32_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-#define aom_highbd_obmc_sad8x32 aom_highbd_obmc_sad8x32_c
-
-unsigned int aom_highbd_obmc_sad8x4_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-#define aom_highbd_obmc_sad8x4 aom_highbd_obmc_sad8x4_c
-
-unsigned int aom_highbd_obmc_sad8x8_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-#define aom_highbd_obmc_sad8x8 aom_highbd_obmc_sad8x8_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance128x128_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance128x128 \
-  aom_highbd_obmc_sub_pixel_variance128x128_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance128x64_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance128x64 \
-  aom_highbd_obmc_sub_pixel_variance128x64_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance16x16_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance16x16 \
-  aom_highbd_obmc_sub_pixel_variance16x16_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance16x32_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance16x32 \
-  aom_highbd_obmc_sub_pixel_variance16x32_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance16x4_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance16x4 \
-  aom_highbd_obmc_sub_pixel_variance16x4_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance16x64_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance16x64 \
-  aom_highbd_obmc_sub_pixel_variance16x64_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance16x8_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance16x8 \
-  aom_highbd_obmc_sub_pixel_variance16x8_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance32x16_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance32x16 \
-  aom_highbd_obmc_sub_pixel_variance32x16_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance32x32_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance32x32 \
-  aom_highbd_obmc_sub_pixel_variance32x32_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance32x64_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance32x64 \
-  aom_highbd_obmc_sub_pixel_variance32x64_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance32x8_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance32x8 \
-  aom_highbd_obmc_sub_pixel_variance32x8_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance4x16_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance4x16 \
-  aom_highbd_obmc_sub_pixel_variance4x16_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance4x4_c(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance4x4 \
-  aom_highbd_obmc_sub_pixel_variance4x4_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance4x8_c(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance4x8 \
-  aom_highbd_obmc_sub_pixel_variance4x8_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance64x128_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance64x128 \
-  aom_highbd_obmc_sub_pixel_variance64x128_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance64x16_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance64x16 \
-  aom_highbd_obmc_sub_pixel_variance64x16_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance64x32_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance64x32 \
-  aom_highbd_obmc_sub_pixel_variance64x32_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance64x64_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance64x64 \
-  aom_highbd_obmc_sub_pixel_variance64x64_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance8x16_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance8x16 \
-  aom_highbd_obmc_sub_pixel_variance8x16_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance8x32_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance8x32 \
-  aom_highbd_obmc_sub_pixel_variance8x32_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance8x4_c(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance8x4 \
-  aom_highbd_obmc_sub_pixel_variance8x4_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance8x8_c(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance8x8 \
-  aom_highbd_obmc_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_obmc_variance128x128_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_obmc_variance128x128 aom_highbd_obmc_variance128x128_c
-
-unsigned int aom_highbd_obmc_variance128x64_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_obmc_variance128x64 aom_highbd_obmc_variance128x64_c
-
-unsigned int aom_highbd_obmc_variance16x16_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance16x16 aom_highbd_obmc_variance16x16_c
-
-unsigned int aom_highbd_obmc_variance16x32_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance16x32 aom_highbd_obmc_variance16x32_c
-
-unsigned int aom_highbd_obmc_variance16x4_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-#define aom_highbd_obmc_variance16x4 aom_highbd_obmc_variance16x4_c
-
-unsigned int aom_highbd_obmc_variance16x64_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance16x64 aom_highbd_obmc_variance16x64_c
-
-unsigned int aom_highbd_obmc_variance16x8_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-#define aom_highbd_obmc_variance16x8 aom_highbd_obmc_variance16x8_c
-
-unsigned int aom_highbd_obmc_variance32x16_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance32x16 aom_highbd_obmc_variance32x16_c
-
-unsigned int aom_highbd_obmc_variance32x32_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance32x32 aom_highbd_obmc_variance32x32_c
-
-unsigned int aom_highbd_obmc_variance32x64_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance32x64 aom_highbd_obmc_variance32x64_c
-
-unsigned int aom_highbd_obmc_variance32x8_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-#define aom_highbd_obmc_variance32x8 aom_highbd_obmc_variance32x8_c
-
-unsigned int aom_highbd_obmc_variance4x16_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-#define aom_highbd_obmc_variance4x16 aom_highbd_obmc_variance4x16_c
-
-unsigned int aom_highbd_obmc_variance4x4_c(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-#define aom_highbd_obmc_variance4x4 aom_highbd_obmc_variance4x4_c
-
-unsigned int aom_highbd_obmc_variance4x8_c(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-#define aom_highbd_obmc_variance4x8 aom_highbd_obmc_variance4x8_c
-
-unsigned int aom_highbd_obmc_variance64x128_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_obmc_variance64x128 aom_highbd_obmc_variance64x128_c
-
-unsigned int aom_highbd_obmc_variance64x16_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance64x16 aom_highbd_obmc_variance64x16_c
-
-unsigned int aom_highbd_obmc_variance64x32_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance64x32 aom_highbd_obmc_variance64x32_c
-
-unsigned int aom_highbd_obmc_variance64x64_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance64x64 aom_highbd_obmc_variance64x64_c
-
-unsigned int aom_highbd_obmc_variance8x16_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-#define aom_highbd_obmc_variance8x16 aom_highbd_obmc_variance8x16_c
-
-unsigned int aom_highbd_obmc_variance8x32_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-#define aom_highbd_obmc_variance8x32 aom_highbd_obmc_variance8x32_c
-
-unsigned int aom_highbd_obmc_variance8x4_c(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-#define aom_highbd_obmc_variance8x4 aom_highbd_obmc_variance8x4_c
-
-unsigned int aom_highbd_obmc_variance8x8_c(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-#define aom_highbd_obmc_variance8x8 aom_highbd_obmc_variance8x8_c
-
-void aom_highbd_paeth_predictor_16x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_16x16 aom_highbd_paeth_predictor_16x16_c
-
-void aom_highbd_paeth_predictor_16x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_16x32 aom_highbd_paeth_predictor_16x32_c
-
-void aom_highbd_paeth_predictor_16x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_16x4 aom_highbd_paeth_predictor_16x4_c
-
-void aom_highbd_paeth_predictor_16x64_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_16x64 aom_highbd_paeth_predictor_16x64_c
-
-void aom_highbd_paeth_predictor_16x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_16x8 aom_highbd_paeth_predictor_16x8_c
-
-void aom_highbd_paeth_predictor_2x2_c(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_paeth_predictor_2x2 aom_highbd_paeth_predictor_2x2_c
-
-void aom_highbd_paeth_predictor_32x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_32x16 aom_highbd_paeth_predictor_32x16_c
-
-void aom_highbd_paeth_predictor_32x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_32x32 aom_highbd_paeth_predictor_32x32_c
-
-void aom_highbd_paeth_predictor_32x64_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_32x64 aom_highbd_paeth_predictor_32x64_c
-
-void aom_highbd_paeth_predictor_32x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_32x8 aom_highbd_paeth_predictor_32x8_c
-
-void aom_highbd_paeth_predictor_4x16_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_4x16 aom_highbd_paeth_predictor_4x16_c
-
-void aom_highbd_paeth_predictor_4x4_c(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_paeth_predictor_4x4 aom_highbd_paeth_predictor_4x4_c
-
-void aom_highbd_paeth_predictor_4x8_c(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_paeth_predictor_4x8 aom_highbd_paeth_predictor_4x8_c
-
-void aom_highbd_paeth_predictor_64x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_64x16 aom_highbd_paeth_predictor_64x16_c
-
-void aom_highbd_paeth_predictor_64x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_64x32 aom_highbd_paeth_predictor_64x32_c
-
-void aom_highbd_paeth_predictor_64x64_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_64x64 aom_highbd_paeth_predictor_64x64_c
-
-void aom_highbd_paeth_predictor_8x16_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_8x16 aom_highbd_paeth_predictor_8x16_c
-
-void aom_highbd_paeth_predictor_8x32_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_8x32 aom_highbd_paeth_predictor_8x32_c
-
-void aom_highbd_paeth_predictor_8x4_c(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_paeth_predictor_8x4 aom_highbd_paeth_predictor_8x4_c
-
-void aom_highbd_paeth_predictor_8x8_c(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_paeth_predictor_8x8 aom_highbd_paeth_predictor_8x8_c
-
-void aom_highbd_quantize_b_c(const tran_low_t* coeff_ptr,
-                             intptr_t n_coeffs,
-                             const int16_t* zbin_ptr,
-                             const int16_t* round_ptr,
-                             const int16_t* quant_ptr,
-                             const int16_t* quant_shift_ptr,
-                             tran_low_t* qcoeff_ptr,
-                             tran_low_t* dqcoeff_ptr,
-                             const int16_t* dequant_ptr,
-                             uint16_t* eob_ptr,
-                             const int16_t* scan,
-                             const int16_t* iscan);
-#define aom_highbd_quantize_b aom_highbd_quantize_b_c
-
-void aom_highbd_quantize_b_32x32_c(const tran_low_t* coeff_ptr,
-                                   intptr_t n_coeffs,
-                                   const int16_t* zbin_ptr,
-                                   const int16_t* round_ptr,
-                                   const int16_t* quant_ptr,
-                                   const int16_t* quant_shift_ptr,
-                                   tran_low_t* qcoeff_ptr,
-                                   tran_low_t* dqcoeff_ptr,
-                                   const int16_t* dequant_ptr,
-                                   uint16_t* eob_ptr,
-                                   const int16_t* scan,
-                                   const int16_t* iscan);
-#define aom_highbd_quantize_b_32x32 aom_highbd_quantize_b_32x32_c
-
-void aom_highbd_quantize_b_32x32_adaptive_c(const tran_low_t* coeff_ptr,
-                                            intptr_t n_coeffs,
-                                            const int16_t* zbin_ptr,
-                                            const int16_t* round_ptr,
-                                            const int16_t* quant_ptr,
-                                            const int16_t* quant_shift_ptr,
-                                            tran_low_t* qcoeff_ptr,
-                                            tran_low_t* dqcoeff_ptr,
-                                            const int16_t* dequant_ptr,
-                                            uint16_t* eob_ptr,
-                                            const int16_t* scan,
-                                            const int16_t* iscan);
-#define aom_highbd_quantize_b_32x32_adaptive \
-  aom_highbd_quantize_b_32x32_adaptive_c
-
-void aom_highbd_quantize_b_64x64_c(const tran_low_t* coeff_ptr,
-                                   intptr_t n_coeffs,
-                                   const int16_t* zbin_ptr,
-                                   const int16_t* round_ptr,
-                                   const int16_t* quant_ptr,
-                                   const int16_t* quant_shift_ptr,
-                                   tran_low_t* qcoeff_ptr,
-                                   tran_low_t* dqcoeff_ptr,
-                                   const int16_t* dequant_ptr,
-                                   uint16_t* eob_ptr,
-                                   const int16_t* scan,
-                                   const int16_t* iscan);
-#define aom_highbd_quantize_b_64x64 aom_highbd_quantize_b_64x64_c
-
-void aom_highbd_quantize_b_64x64_adaptive_c(const tran_low_t* coeff_ptr,
-                                            intptr_t n_coeffs,
-                                            const int16_t* zbin_ptr,
-                                            const int16_t* round_ptr,
-                                            const int16_t* quant_ptr,
-                                            const int16_t* quant_shift_ptr,
-                                            tran_low_t* qcoeff_ptr,
-                                            tran_low_t* dqcoeff_ptr,
-                                            const int16_t* dequant_ptr,
-                                            uint16_t* eob_ptr,
-                                            const int16_t* scan,
-                                            const int16_t* iscan);
-#define aom_highbd_quantize_b_64x64_adaptive \
-  aom_highbd_quantize_b_64x64_adaptive_c
-
-void aom_highbd_quantize_b_adaptive_c(const tran_low_t* coeff_ptr,
-                                      intptr_t n_coeffs,
-                                      const int16_t* zbin_ptr,
-                                      const int16_t* round_ptr,
-                                      const int16_t* quant_ptr,
-                                      const int16_t* quant_shift_ptr,
-                                      tran_low_t* qcoeff_ptr,
-                                      tran_low_t* dqcoeff_ptr,
-                                      const int16_t* dequant_ptr,
-                                      uint16_t* eob_ptr,
-                                      const int16_t* scan,
-                                      const int16_t* iscan);
-#define aom_highbd_quantize_b_adaptive aom_highbd_quantize_b_adaptive_c
-
-unsigned int aom_highbd_sad128x128_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride);
-#define aom_highbd_sad128x128 aom_highbd_sad128x128_c
-
-unsigned int aom_highbd_sad128x128_avg_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         const uint8_t* second_pred);
-#define aom_highbd_sad128x128_avg aom_highbd_sad128x128_avg_c
-
-void aom_highbd_sad128x128x4d_c(const uint8_t* src_ptr,
-                                int src_stride,
-                                const uint8_t* const ref_ptr[],
-                                int ref_stride,
-                                uint32_t* sad_array);
-#define aom_highbd_sad128x128x4d aom_highbd_sad128x128x4d_c
-
-unsigned int aom_highbd_sad128x64_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* ref_ptr,
-                                    int ref_stride);
-#define aom_highbd_sad128x64 aom_highbd_sad128x64_c
-
-unsigned int aom_highbd_sad128x64_avg_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        const uint8_t* second_pred);
-#define aom_highbd_sad128x64_avg aom_highbd_sad128x64_avg_c
-
-void aom_highbd_sad128x64x4d_c(const uint8_t* src_ptr,
-                               int src_stride,
-                               const uint8_t* const ref_ptr[],
-                               int ref_stride,
-                               uint32_t* sad_array);
-#define aom_highbd_sad128x64x4d aom_highbd_sad128x64x4d_c
-
-unsigned int aom_highbd_sad16x16_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad16x16 aom_highbd_sad16x16_c
-
-unsigned int aom_highbd_sad16x16_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad16x16_avg aom_highbd_sad16x16_avg_c
-
-void aom_highbd_sad16x16x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad16x16x4d aom_highbd_sad16x16x4d_c
-
-unsigned int aom_highbd_sad16x32_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad16x32 aom_highbd_sad16x32_c
-
-unsigned int aom_highbd_sad16x32_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad16x32_avg aom_highbd_sad16x32_avg_c
-
-void aom_highbd_sad16x32x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad16x32x4d aom_highbd_sad16x32x4d_c
-
-unsigned int aom_highbd_sad16x4_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-#define aom_highbd_sad16x4 aom_highbd_sad16x4_c
-
-unsigned int aom_highbd_sad16x4_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-#define aom_highbd_sad16x4_avg aom_highbd_sad16x4_avg_c
-
-void aom_highbd_sad16x4x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-#define aom_highbd_sad16x4x4d aom_highbd_sad16x4x4d_c
-
-unsigned int aom_highbd_sad16x64_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad16x64 aom_highbd_sad16x64_c
-
-unsigned int aom_highbd_sad16x64_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad16x64_avg aom_highbd_sad16x64_avg_c
-
-void aom_highbd_sad16x64x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad16x64x4d aom_highbd_sad16x64x4d_c
-
-unsigned int aom_highbd_sad16x8_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-#define aom_highbd_sad16x8 aom_highbd_sad16x8_c
-
-unsigned int aom_highbd_sad16x8_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-#define aom_highbd_sad16x8_avg aom_highbd_sad16x8_avg_c
-
-void aom_highbd_sad16x8x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-#define aom_highbd_sad16x8x4d aom_highbd_sad16x8x4d_c
-
-unsigned int aom_highbd_sad32x16_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad32x16 aom_highbd_sad32x16_c
-
-unsigned int aom_highbd_sad32x16_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad32x16_avg aom_highbd_sad32x16_avg_c
-
-void aom_highbd_sad32x16x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad32x16x4d aom_highbd_sad32x16x4d_c
-
-unsigned int aom_highbd_sad32x32_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad32x32 aom_highbd_sad32x32_c
-
-unsigned int aom_highbd_sad32x32_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad32x32_avg aom_highbd_sad32x32_avg_c
-
-void aom_highbd_sad32x32x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad32x32x4d aom_highbd_sad32x32x4d_c
-
-unsigned int aom_highbd_sad32x64_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad32x64 aom_highbd_sad32x64_c
-
-unsigned int aom_highbd_sad32x64_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad32x64_avg aom_highbd_sad32x64_avg_c
-
-void aom_highbd_sad32x64x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad32x64x4d aom_highbd_sad32x64x4d_c
-
-unsigned int aom_highbd_sad32x8_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-#define aom_highbd_sad32x8 aom_highbd_sad32x8_c
-
-unsigned int aom_highbd_sad32x8_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-#define aom_highbd_sad32x8_avg aom_highbd_sad32x8_avg_c
-
-void aom_highbd_sad32x8x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-#define aom_highbd_sad32x8x4d aom_highbd_sad32x8x4d_c
-
-unsigned int aom_highbd_sad4x16_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-#define aom_highbd_sad4x16 aom_highbd_sad4x16_c
-
-unsigned int aom_highbd_sad4x16_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-#define aom_highbd_sad4x16_avg aom_highbd_sad4x16_avg_c
-
-void aom_highbd_sad4x16x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-#define aom_highbd_sad4x16x4d aom_highbd_sad4x16x4d_c
-
-unsigned int aom_highbd_sad4x4_c(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride);
-#define aom_highbd_sad4x4 aom_highbd_sad4x4_c
-
-unsigned int aom_highbd_sad4x4_avg_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride,
-                                     const uint8_t* second_pred);
-#define aom_highbd_sad4x4_avg aom_highbd_sad4x4_avg_c
-
-void aom_highbd_sad4x4x4d_c(const uint8_t* src_ptr,
-                            int src_stride,
-                            const uint8_t* const ref_ptr[],
-                            int ref_stride,
-                            uint32_t* sad_array);
-#define aom_highbd_sad4x4x4d aom_highbd_sad4x4x4d_c
-
-unsigned int aom_highbd_sad4x8_c(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride);
-#define aom_highbd_sad4x8 aom_highbd_sad4x8_c
-
-unsigned int aom_highbd_sad4x8_avg_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride,
-                                     const uint8_t* second_pred);
-#define aom_highbd_sad4x8_avg aom_highbd_sad4x8_avg_c
-
-void aom_highbd_sad4x8x4d_c(const uint8_t* src_ptr,
-                            int src_stride,
-                            const uint8_t* const ref_ptr[],
-                            int ref_stride,
-                            uint32_t* sad_array);
-#define aom_highbd_sad4x8x4d aom_highbd_sad4x8x4d_c
-
-unsigned int aom_highbd_sad64x128_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* ref_ptr,
-                                    int ref_stride);
-#define aom_highbd_sad64x128 aom_highbd_sad64x128_c
-
-unsigned int aom_highbd_sad64x128_avg_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        const uint8_t* second_pred);
-#define aom_highbd_sad64x128_avg aom_highbd_sad64x128_avg_c
-
-void aom_highbd_sad64x128x4d_c(const uint8_t* src_ptr,
-                               int src_stride,
-                               const uint8_t* const ref_ptr[],
-                               int ref_stride,
-                               uint32_t* sad_array);
-#define aom_highbd_sad64x128x4d aom_highbd_sad64x128x4d_c
-
-unsigned int aom_highbd_sad64x16_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad64x16 aom_highbd_sad64x16_c
-
-unsigned int aom_highbd_sad64x16_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad64x16_avg aom_highbd_sad64x16_avg_c
-
-void aom_highbd_sad64x16x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad64x16x4d aom_highbd_sad64x16x4d_c
-
-unsigned int aom_highbd_sad64x32_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad64x32 aom_highbd_sad64x32_c
-
-unsigned int aom_highbd_sad64x32_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad64x32_avg aom_highbd_sad64x32_avg_c
-
-void aom_highbd_sad64x32x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad64x32x4d aom_highbd_sad64x32x4d_c
-
-unsigned int aom_highbd_sad64x64_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad64x64 aom_highbd_sad64x64_c
-
-unsigned int aom_highbd_sad64x64_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad64x64_avg aom_highbd_sad64x64_avg_c
-
-void aom_highbd_sad64x64x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad64x64x4d aom_highbd_sad64x64x4d_c
-
-unsigned int aom_highbd_sad8x16_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-#define aom_highbd_sad8x16 aom_highbd_sad8x16_c
-
-unsigned int aom_highbd_sad8x16_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-#define aom_highbd_sad8x16_avg aom_highbd_sad8x16_avg_c
-
-void aom_highbd_sad8x16x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-#define aom_highbd_sad8x16x4d aom_highbd_sad8x16x4d_c
-
-unsigned int aom_highbd_sad8x32_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-#define aom_highbd_sad8x32 aom_highbd_sad8x32_c
-
-unsigned int aom_highbd_sad8x32_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-#define aom_highbd_sad8x32_avg aom_highbd_sad8x32_avg_c
-
-void aom_highbd_sad8x32x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-#define aom_highbd_sad8x32x4d aom_highbd_sad8x32x4d_c
-
-unsigned int aom_highbd_sad8x4_c(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride);
-#define aom_highbd_sad8x4 aom_highbd_sad8x4_c
-
-unsigned int aom_highbd_sad8x4_avg_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride,
-                                     const uint8_t* second_pred);
-#define aom_highbd_sad8x4_avg aom_highbd_sad8x4_avg_c
-
-void aom_highbd_sad8x4x4d_c(const uint8_t* src_ptr,
-                            int src_stride,
-                            const uint8_t* const ref_ptr[],
-                            int ref_stride,
-                            uint32_t* sad_array);
-#define aom_highbd_sad8x4x4d aom_highbd_sad8x4x4d_c
-
-unsigned int aom_highbd_sad8x8_c(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride);
-#define aom_highbd_sad8x8 aom_highbd_sad8x8_c
-
-unsigned int aom_highbd_sad8x8_avg_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride,
-                                     const uint8_t* second_pred);
-#define aom_highbd_sad8x8_avg aom_highbd_sad8x8_avg_c
-
-void aom_highbd_sad8x8x4d_c(const uint8_t* src_ptr,
-                            int src_stride,
-                            const uint8_t* const ref_ptr[],
-                            int ref_stride,
-                            uint32_t* sad_array);
-#define aom_highbd_sad8x8x4d aom_highbd_sad8x8x4d_c
-
-unsigned int aom_highbd_sad_skip_128x128_c(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride);
-#define aom_highbd_sad_skip_128x128 aom_highbd_sad_skip_128x128_c
-
-void aom_highbd_sad_skip_128x128x4d_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* const ref_ptr[],
-                                      int ref_stride,
-                                      uint32_t* sad_array);
-#define aom_highbd_sad_skip_128x128x4d aom_highbd_sad_skip_128x128x4d_c
-
-unsigned int aom_highbd_sad_skip_128x64_c(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride);
-#define aom_highbd_sad_skip_128x64 aom_highbd_sad_skip_128x64_c
-
-void aom_highbd_sad_skip_128x64x4d_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* const ref_ptr[],
-                                     int ref_stride,
-                                     uint32_t* sad_array);
-#define aom_highbd_sad_skip_128x64x4d aom_highbd_sad_skip_128x64x4d_c
-
-unsigned int aom_highbd_sad_skip_16x16_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_16x16 aom_highbd_sad_skip_16x16_c
-
-void aom_highbd_sad_skip_16x16x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_16x16x4d aom_highbd_sad_skip_16x16x4d_c
-
-unsigned int aom_highbd_sad_skip_16x32_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_16x32 aom_highbd_sad_skip_16x32_c
-
-void aom_highbd_sad_skip_16x32x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_16x32x4d aom_highbd_sad_skip_16x32x4d_c
-
-unsigned int aom_highbd_sad_skip_16x4_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-#define aom_highbd_sad_skip_16x4 aom_highbd_sad_skip_16x4_c
-
-void aom_highbd_sad_skip_16x4x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-#define aom_highbd_sad_skip_16x4x4d aom_highbd_sad_skip_16x4x4d_c
-
-unsigned int aom_highbd_sad_skip_16x64_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_16x64 aom_highbd_sad_skip_16x64_c
-
-void aom_highbd_sad_skip_16x64x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_16x64x4d aom_highbd_sad_skip_16x64x4d_c
-
-unsigned int aom_highbd_sad_skip_16x8_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-#define aom_highbd_sad_skip_16x8 aom_highbd_sad_skip_16x8_c
-
-void aom_highbd_sad_skip_16x8x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-#define aom_highbd_sad_skip_16x8x4d aom_highbd_sad_skip_16x8x4d_c
-
-unsigned int aom_highbd_sad_skip_32x16_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_32x16 aom_highbd_sad_skip_32x16_c
-
-void aom_highbd_sad_skip_32x16x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_32x16x4d aom_highbd_sad_skip_32x16x4d_c
-
-unsigned int aom_highbd_sad_skip_32x32_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_32x32 aom_highbd_sad_skip_32x32_c
-
-void aom_highbd_sad_skip_32x32x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_32x32x4d aom_highbd_sad_skip_32x32x4d_c
-
-unsigned int aom_highbd_sad_skip_32x64_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_32x64 aom_highbd_sad_skip_32x64_c
-
-void aom_highbd_sad_skip_32x64x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_32x64x4d aom_highbd_sad_skip_32x64x4d_c
-
-unsigned int aom_highbd_sad_skip_32x8_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-#define aom_highbd_sad_skip_32x8 aom_highbd_sad_skip_32x8_c
-
-void aom_highbd_sad_skip_32x8x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-#define aom_highbd_sad_skip_32x8x4d aom_highbd_sad_skip_32x8x4d_c
-
-unsigned int aom_highbd_sad_skip_4x16_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-#define aom_highbd_sad_skip_4x16 aom_highbd_sad_skip_4x16_c
-
-void aom_highbd_sad_skip_4x16x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-#define aom_highbd_sad_skip_4x16x4d aom_highbd_sad_skip_4x16x4d_c
-
-unsigned int aom_highbd_sad_skip_4x4_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride);
-#define aom_highbd_sad_skip_4x4 aom_highbd_sad_skip_4x4_c
-
-void aom_highbd_sad_skip_4x4x4d_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* const ref_ptr[],
-                                  int ref_stride,
-                                  uint32_t* sad_array);
-#define aom_highbd_sad_skip_4x4x4d aom_highbd_sad_skip_4x4x4d_c
-
-unsigned int aom_highbd_sad_skip_4x8_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride);
-#define aom_highbd_sad_skip_4x8 aom_highbd_sad_skip_4x8_c
-
-void aom_highbd_sad_skip_4x8x4d_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* const ref_ptr[],
-                                  int ref_stride,
-                                  uint32_t* sad_array);
-#define aom_highbd_sad_skip_4x8x4d aom_highbd_sad_skip_4x8x4d_c
-
-unsigned int aom_highbd_sad_skip_64x128_c(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride);
-#define aom_highbd_sad_skip_64x128 aom_highbd_sad_skip_64x128_c
-
-void aom_highbd_sad_skip_64x128x4d_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* const ref_ptr[],
-                                     int ref_stride,
-                                     uint32_t* sad_array);
-#define aom_highbd_sad_skip_64x128x4d aom_highbd_sad_skip_64x128x4d_c
-
-unsigned int aom_highbd_sad_skip_64x16_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_64x16 aom_highbd_sad_skip_64x16_c
-
-void aom_highbd_sad_skip_64x16x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_64x16x4d aom_highbd_sad_skip_64x16x4d_c
-
-unsigned int aom_highbd_sad_skip_64x32_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_64x32 aom_highbd_sad_skip_64x32_c
-
-void aom_highbd_sad_skip_64x32x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_64x32x4d aom_highbd_sad_skip_64x32x4d_c
-
-unsigned int aom_highbd_sad_skip_64x64_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_64x64 aom_highbd_sad_skip_64x64_c
-
-void aom_highbd_sad_skip_64x64x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_64x64x4d aom_highbd_sad_skip_64x64x4d_c
-
-unsigned int aom_highbd_sad_skip_8x16_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-#define aom_highbd_sad_skip_8x16 aom_highbd_sad_skip_8x16_c
-
-void aom_highbd_sad_skip_8x16x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-#define aom_highbd_sad_skip_8x16x4d aom_highbd_sad_skip_8x16x4d_c
-
-unsigned int aom_highbd_sad_skip_8x32_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-#define aom_highbd_sad_skip_8x32 aom_highbd_sad_skip_8x32_c
-
-void aom_highbd_sad_skip_8x32x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-#define aom_highbd_sad_skip_8x32x4d aom_highbd_sad_skip_8x32x4d_c
-
-unsigned int aom_highbd_sad_skip_8x4_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride);
-#define aom_highbd_sad_skip_8x4 aom_highbd_sad_skip_8x4_c
-
-void aom_highbd_sad_skip_8x4x4d_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* const ref_ptr[],
-                                  int ref_stride,
-                                  uint32_t* sad_array);
-#define aom_highbd_sad_skip_8x4x4d aom_highbd_sad_skip_8x4x4d_c
-
-unsigned int aom_highbd_sad_skip_8x8_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride);
-#define aom_highbd_sad_skip_8x8 aom_highbd_sad_skip_8x8_c
-
-void aom_highbd_sad_skip_8x8x4d_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* const ref_ptr[],
-                                  int ref_stride,
-                                  uint32_t* sad_array);
-#define aom_highbd_sad_skip_8x8x4d aom_highbd_sad_skip_8x8x4d_c
-
-void aom_highbd_smooth_h_predictor_16x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_16x16 \
-  aom_highbd_smooth_h_predictor_16x16_c
-
-void aom_highbd_smooth_h_predictor_16x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_16x32 \
-  aom_highbd_smooth_h_predictor_16x32_c
-
-void aom_highbd_smooth_h_predictor_16x4_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_16x4 aom_highbd_smooth_h_predictor_16x4_c
-
-void aom_highbd_smooth_h_predictor_16x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_16x64 \
-  aom_highbd_smooth_h_predictor_16x64_c
-
-void aom_highbd_smooth_h_predictor_16x8_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_16x8 aom_highbd_smooth_h_predictor_16x8_c
-
-void aom_highbd_smooth_h_predictor_2x2_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_h_predictor_2x2 aom_highbd_smooth_h_predictor_2x2_c
-
-void aom_highbd_smooth_h_predictor_32x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_32x16 \
-  aom_highbd_smooth_h_predictor_32x16_c
-
-void aom_highbd_smooth_h_predictor_32x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_32x32 \
-  aom_highbd_smooth_h_predictor_32x32_c
-
-void aom_highbd_smooth_h_predictor_32x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_32x64 \
-  aom_highbd_smooth_h_predictor_32x64_c
-
-void aom_highbd_smooth_h_predictor_32x8_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_32x8 aom_highbd_smooth_h_predictor_32x8_c
-
-void aom_highbd_smooth_h_predictor_4x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_4x16 aom_highbd_smooth_h_predictor_4x16_c
-
-void aom_highbd_smooth_h_predictor_4x4_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_h_predictor_4x4 aom_highbd_smooth_h_predictor_4x4_c
-
-void aom_highbd_smooth_h_predictor_4x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_h_predictor_4x8 aom_highbd_smooth_h_predictor_4x8_c
-
-void aom_highbd_smooth_h_predictor_64x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_64x16 \
-  aom_highbd_smooth_h_predictor_64x16_c
-
-void aom_highbd_smooth_h_predictor_64x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_64x32 \
-  aom_highbd_smooth_h_predictor_64x32_c
-
-void aom_highbd_smooth_h_predictor_64x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_64x64 \
-  aom_highbd_smooth_h_predictor_64x64_c
-
-void aom_highbd_smooth_h_predictor_8x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_8x16 aom_highbd_smooth_h_predictor_8x16_c
-
-void aom_highbd_smooth_h_predictor_8x32_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_8x32 aom_highbd_smooth_h_predictor_8x32_c
-
-void aom_highbd_smooth_h_predictor_8x4_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_h_predictor_8x4 aom_highbd_smooth_h_predictor_8x4_c
-
-void aom_highbd_smooth_h_predictor_8x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_h_predictor_8x8 aom_highbd_smooth_h_predictor_8x8_c
-
-void aom_highbd_smooth_predictor_16x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_16x16 aom_highbd_smooth_predictor_16x16_c
-
-void aom_highbd_smooth_predictor_16x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_16x32 aom_highbd_smooth_predictor_16x32_c
-
-void aom_highbd_smooth_predictor_16x4_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_16x4 aom_highbd_smooth_predictor_16x4_c
-
-void aom_highbd_smooth_predictor_16x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_16x64 aom_highbd_smooth_predictor_16x64_c
-
-void aom_highbd_smooth_predictor_16x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_16x8 aom_highbd_smooth_predictor_16x8_c
-
-void aom_highbd_smooth_predictor_2x2_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_smooth_predictor_2x2 aom_highbd_smooth_predictor_2x2_c
-
-void aom_highbd_smooth_predictor_32x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_32x16 aom_highbd_smooth_predictor_32x16_c
-
-void aom_highbd_smooth_predictor_32x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_32x32 aom_highbd_smooth_predictor_32x32_c
-
-void aom_highbd_smooth_predictor_32x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_32x64 aom_highbd_smooth_predictor_32x64_c
-
-void aom_highbd_smooth_predictor_32x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_32x8 aom_highbd_smooth_predictor_32x8_c
-
-void aom_highbd_smooth_predictor_4x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_4x16 aom_highbd_smooth_predictor_4x16_c
-
-void aom_highbd_smooth_predictor_4x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_smooth_predictor_4x4 aom_highbd_smooth_predictor_4x4_c
-
-void aom_highbd_smooth_predictor_4x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_smooth_predictor_4x8 aom_highbd_smooth_predictor_4x8_c
-
-void aom_highbd_smooth_predictor_64x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_64x16 aom_highbd_smooth_predictor_64x16_c
-
-void aom_highbd_smooth_predictor_64x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_64x32 aom_highbd_smooth_predictor_64x32_c
-
-void aom_highbd_smooth_predictor_64x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_64x64 aom_highbd_smooth_predictor_64x64_c
-
-void aom_highbd_smooth_predictor_8x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_8x16 aom_highbd_smooth_predictor_8x16_c
-
-void aom_highbd_smooth_predictor_8x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_8x32 aom_highbd_smooth_predictor_8x32_c
-
-void aom_highbd_smooth_predictor_8x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_smooth_predictor_8x4 aom_highbd_smooth_predictor_8x4_c
-
-void aom_highbd_smooth_predictor_8x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_smooth_predictor_8x8 aom_highbd_smooth_predictor_8x8_c
-
-void aom_highbd_smooth_v_predictor_16x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_16x16 \
-  aom_highbd_smooth_v_predictor_16x16_c
-
-void aom_highbd_smooth_v_predictor_16x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_16x32 \
-  aom_highbd_smooth_v_predictor_16x32_c
-
-void aom_highbd_smooth_v_predictor_16x4_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_16x4 aom_highbd_smooth_v_predictor_16x4_c
-
-void aom_highbd_smooth_v_predictor_16x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_16x64 \
-  aom_highbd_smooth_v_predictor_16x64_c
-
-void aom_highbd_smooth_v_predictor_16x8_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_16x8 aom_highbd_smooth_v_predictor_16x8_c
-
-void aom_highbd_smooth_v_predictor_2x2_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_v_predictor_2x2 aom_highbd_smooth_v_predictor_2x2_c
-
-void aom_highbd_smooth_v_predictor_32x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_32x16 \
-  aom_highbd_smooth_v_predictor_32x16_c
-
-void aom_highbd_smooth_v_predictor_32x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_32x32 \
-  aom_highbd_smooth_v_predictor_32x32_c
-
-void aom_highbd_smooth_v_predictor_32x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_32x64 \
-  aom_highbd_smooth_v_predictor_32x64_c
-
-void aom_highbd_smooth_v_predictor_32x8_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_32x8 aom_highbd_smooth_v_predictor_32x8_c
-
-void aom_highbd_smooth_v_predictor_4x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_4x16 aom_highbd_smooth_v_predictor_4x16_c
-
-void aom_highbd_smooth_v_predictor_4x4_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_v_predictor_4x4 aom_highbd_smooth_v_predictor_4x4_c
-
-void aom_highbd_smooth_v_predictor_4x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_v_predictor_4x8 aom_highbd_smooth_v_predictor_4x8_c
-
-void aom_highbd_smooth_v_predictor_64x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_64x16 \
-  aom_highbd_smooth_v_predictor_64x16_c
-
-void aom_highbd_smooth_v_predictor_64x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_64x32 \
-  aom_highbd_smooth_v_predictor_64x32_c
-
-void aom_highbd_smooth_v_predictor_64x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_64x64 \
-  aom_highbd_smooth_v_predictor_64x64_c
-
-void aom_highbd_smooth_v_predictor_8x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_8x16 aom_highbd_smooth_v_predictor_8x16_c
-
-void aom_highbd_smooth_v_predictor_8x32_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_8x32 aom_highbd_smooth_v_predictor_8x32_c
-
-void aom_highbd_smooth_v_predictor_8x4_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_v_predictor_8x4 aom_highbd_smooth_v_predictor_8x4_c
-
-void aom_highbd_smooth_v_predictor_8x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_v_predictor_8x8 aom_highbd_smooth_v_predictor_8x8_c
-
-int64_t aom_highbd_sse_c(const uint8_t* a8,
-                         int a_stride,
-                         const uint8_t* b8,
-                         int b_stride,
-                         int width,
-                         int height);
-int64_t aom_highbd_sse_neon(const uint8_t* a8,
-                            int a_stride,
-                            const uint8_t* b8,
-                            int b_stride,
-                            int width,
-                            int height);
-RTCD_EXTERN int64_t (*aom_highbd_sse)(const uint8_t* a8,
-                                      int a_stride,
-                                      const uint8_t* b8,
-                                      int b_stride,
-                                      int width,
-                                      int height);
-
-void aom_highbd_subtract_block_c(int rows,
-                                 int cols,
-                                 int16_t* diff_ptr,
-                                 ptrdiff_t diff_stride,
-                                 const uint8_t* src_ptr,
-                                 ptrdiff_t src_stride,
-                                 const uint8_t* pred_ptr,
-                                 ptrdiff_t pred_stride,
-                                 int bd);
-#define aom_highbd_subtract_block aom_highbd_subtract_block_c
-
-void aom_highbd_upsampled_pred_c(MACROBLOCKD* xd,
-                                 const struct AV1Common* const cm,
-                                 int mi_row,
-                                 int mi_col,
-                                 const MV* const mv,
-                                 uint8_t* comp_pred8,
-                                 int width,
-                                 int height,
-                                 int subpel_x_q3,
-                                 int subpel_y_q3,
-                                 const uint8_t* ref8,
-                                 int ref_stride,
-                                 int bd,
-                                 int subpel_search);
-#define aom_highbd_upsampled_pred aom_highbd_upsampled_pred_c
-
-void aom_highbd_v_predictor_16x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_16x16 aom_highbd_v_predictor_16x16_c
-
-void aom_highbd_v_predictor_16x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_16x32 aom_highbd_v_predictor_16x32_c
-
-void aom_highbd_v_predictor_16x4_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_16x4 aom_highbd_v_predictor_16x4_c
-
-void aom_highbd_v_predictor_16x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_16x64 aom_highbd_v_predictor_16x64_c
-
-void aom_highbd_v_predictor_16x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_16x8 aom_highbd_v_predictor_16x8_c
-
-void aom_highbd_v_predictor_2x2_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_v_predictor_2x2 aom_highbd_v_predictor_2x2_c
-
-void aom_highbd_v_predictor_32x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_32x16 aom_highbd_v_predictor_32x16_c
-
-void aom_highbd_v_predictor_32x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_32x32 aom_highbd_v_predictor_32x32_c
-
-void aom_highbd_v_predictor_32x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_32x64 aom_highbd_v_predictor_32x64_c
-
-void aom_highbd_v_predictor_32x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_32x8 aom_highbd_v_predictor_32x8_c
-
-void aom_highbd_v_predictor_4x16_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_4x16 aom_highbd_v_predictor_4x16_c
-
-void aom_highbd_v_predictor_4x4_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_v_predictor_4x4 aom_highbd_v_predictor_4x4_c
-
-void aom_highbd_v_predictor_4x8_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_v_predictor_4x8 aom_highbd_v_predictor_4x8_c
-
-void aom_highbd_v_predictor_64x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_64x16 aom_highbd_v_predictor_64x16_c
-
-void aom_highbd_v_predictor_64x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_64x32 aom_highbd_v_predictor_64x32_c
-
-void aom_highbd_v_predictor_64x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_64x64 aom_highbd_v_predictor_64x64_c
-
-void aom_highbd_v_predictor_8x16_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_8x16 aom_highbd_v_predictor_8x16_c
-
-void aom_highbd_v_predictor_8x32_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_8x32 aom_highbd_v_predictor_8x32_c
-
-void aom_highbd_v_predictor_8x4_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_v_predictor_8x4 aom_highbd_v_predictor_8x4_c
-
-void aom_highbd_v_predictor_8x8_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_v_predictor_8x8 aom_highbd_v_predictor_8x8_c
-
 void aom_ifft16x16_float_c(const float* input, float* temp, float* output);
 #define aom_ifft16x16_float aom_ifft16x16_float_c
 
@@ -10911,498 +2666,6 @@
                              int h);
 #define aom_mse_wxh_16bit aom_mse_wxh_16bit_c
 
-uint64_t aom_mse_wxh_16bit_highbd_c(uint16_t* dst,
-                                    int dstride,
-                                    uint16_t* src,
-                                    int sstride,
-                                    int w,
-                                    int h);
-#define aom_mse_wxh_16bit_highbd aom_mse_wxh_16bit_highbd_c
-
-unsigned int aom_obmc_sad128x128_c(const uint8_t* pre,
-                                   int pre_stride,
-                                   const int32_t* wsrc,
-                                   const int32_t* mask);
-#define aom_obmc_sad128x128 aom_obmc_sad128x128_c
-
-unsigned int aom_obmc_sad128x64_c(const uint8_t* pre,
-                                  int pre_stride,
-                                  const int32_t* wsrc,
-                                  const int32_t* mask);
-#define aom_obmc_sad128x64 aom_obmc_sad128x64_c
-
-unsigned int aom_obmc_sad16x16_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad16x16 aom_obmc_sad16x16_c
-
-unsigned int aom_obmc_sad16x32_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad16x32 aom_obmc_sad16x32_c
-
-unsigned int aom_obmc_sad16x4_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-#define aom_obmc_sad16x4 aom_obmc_sad16x4_c
-
-unsigned int aom_obmc_sad16x64_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad16x64 aom_obmc_sad16x64_c
-
-unsigned int aom_obmc_sad16x8_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-#define aom_obmc_sad16x8 aom_obmc_sad16x8_c
-
-unsigned int aom_obmc_sad32x16_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad32x16 aom_obmc_sad32x16_c
-
-unsigned int aom_obmc_sad32x32_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad32x32 aom_obmc_sad32x32_c
-
-unsigned int aom_obmc_sad32x64_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad32x64 aom_obmc_sad32x64_c
-
-unsigned int aom_obmc_sad32x8_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-#define aom_obmc_sad32x8 aom_obmc_sad32x8_c
-
-unsigned int aom_obmc_sad4x16_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-#define aom_obmc_sad4x16 aom_obmc_sad4x16_c
-
-unsigned int aom_obmc_sad4x4_c(const uint8_t* pre,
-                               int pre_stride,
-                               const int32_t* wsrc,
-                               const int32_t* mask);
-#define aom_obmc_sad4x4 aom_obmc_sad4x4_c
-
-unsigned int aom_obmc_sad4x8_c(const uint8_t* pre,
-                               int pre_stride,
-                               const int32_t* wsrc,
-                               const int32_t* mask);
-#define aom_obmc_sad4x8 aom_obmc_sad4x8_c
-
-unsigned int aom_obmc_sad64x128_c(const uint8_t* pre,
-                                  int pre_stride,
-                                  const int32_t* wsrc,
-                                  const int32_t* mask);
-#define aom_obmc_sad64x128 aom_obmc_sad64x128_c
-
-unsigned int aom_obmc_sad64x16_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad64x16 aom_obmc_sad64x16_c
-
-unsigned int aom_obmc_sad64x32_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad64x32 aom_obmc_sad64x32_c
-
-unsigned int aom_obmc_sad64x64_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad64x64 aom_obmc_sad64x64_c
-
-unsigned int aom_obmc_sad8x16_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-#define aom_obmc_sad8x16 aom_obmc_sad8x16_c
-
-unsigned int aom_obmc_sad8x32_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-#define aom_obmc_sad8x32 aom_obmc_sad8x32_c
-
-unsigned int aom_obmc_sad8x4_c(const uint8_t* pre,
-                               int pre_stride,
-                               const int32_t* wsrc,
-                               const int32_t* mask);
-#define aom_obmc_sad8x4 aom_obmc_sad8x4_c
-
-unsigned int aom_obmc_sad8x8_c(const uint8_t* pre,
-                               int pre_stride,
-                               const int32_t* wsrc,
-                               const int32_t* mask);
-#define aom_obmc_sad8x8 aom_obmc_sad8x8_c
-
-unsigned int aom_obmc_sub_pixel_variance128x128_c(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-#define aom_obmc_sub_pixel_variance128x128 aom_obmc_sub_pixel_variance128x128_c
-
-unsigned int aom_obmc_sub_pixel_variance128x64_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-#define aom_obmc_sub_pixel_variance128x64 aom_obmc_sub_pixel_variance128x64_c
-
-unsigned int aom_obmc_sub_pixel_variance16x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance16x16 aom_obmc_sub_pixel_variance16x16_c
-
-unsigned int aom_obmc_sub_pixel_variance16x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance16x32 aom_obmc_sub_pixel_variance16x32_c
-
-unsigned int aom_obmc_sub_pixel_variance16x4_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_obmc_sub_pixel_variance16x4 aom_obmc_sub_pixel_variance16x4_c
-
-unsigned int aom_obmc_sub_pixel_variance16x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance16x64 aom_obmc_sub_pixel_variance16x64_c
-
-unsigned int aom_obmc_sub_pixel_variance16x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_obmc_sub_pixel_variance16x8 aom_obmc_sub_pixel_variance16x8_c
-
-unsigned int aom_obmc_sub_pixel_variance32x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance32x16 aom_obmc_sub_pixel_variance32x16_c
-
-unsigned int aom_obmc_sub_pixel_variance32x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance32x32 aom_obmc_sub_pixel_variance32x32_c
-
-unsigned int aom_obmc_sub_pixel_variance32x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance32x64 aom_obmc_sub_pixel_variance32x64_c
-
-unsigned int aom_obmc_sub_pixel_variance32x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_obmc_sub_pixel_variance32x8 aom_obmc_sub_pixel_variance32x8_c
-
-unsigned int aom_obmc_sub_pixel_variance4x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_obmc_sub_pixel_variance4x16 aom_obmc_sub_pixel_variance4x16_c
-
-unsigned int aom_obmc_sub_pixel_variance4x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_obmc_sub_pixel_variance4x4 aom_obmc_sub_pixel_variance4x4_c
-
-unsigned int aom_obmc_sub_pixel_variance4x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_obmc_sub_pixel_variance4x8 aom_obmc_sub_pixel_variance4x8_c
-
-unsigned int aom_obmc_sub_pixel_variance64x128_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-#define aom_obmc_sub_pixel_variance64x128 aom_obmc_sub_pixel_variance64x128_c
-
-unsigned int aom_obmc_sub_pixel_variance64x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance64x16 aom_obmc_sub_pixel_variance64x16_c
-
-unsigned int aom_obmc_sub_pixel_variance64x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance64x32 aom_obmc_sub_pixel_variance64x32_c
-
-unsigned int aom_obmc_sub_pixel_variance64x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance64x64 aom_obmc_sub_pixel_variance64x64_c
-
-unsigned int aom_obmc_sub_pixel_variance8x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_obmc_sub_pixel_variance8x16 aom_obmc_sub_pixel_variance8x16_c
-
-unsigned int aom_obmc_sub_pixel_variance8x32_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_obmc_sub_pixel_variance8x32 aom_obmc_sub_pixel_variance8x32_c
-
-unsigned int aom_obmc_sub_pixel_variance8x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_obmc_sub_pixel_variance8x4 aom_obmc_sub_pixel_variance8x4_c
-
-unsigned int aom_obmc_sub_pixel_variance8x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_obmc_sub_pixel_variance8x8 aom_obmc_sub_pixel_variance8x8_c
-
-unsigned int aom_obmc_variance128x128_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask,
-                                        unsigned int* sse);
-#define aom_obmc_variance128x128 aom_obmc_variance128x128_c
-
-unsigned int aom_obmc_variance128x64_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask,
-                                       unsigned int* sse);
-#define aom_obmc_variance128x64 aom_obmc_variance128x64_c
-
-unsigned int aom_obmc_variance16x16_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance16x16 aom_obmc_variance16x16_c
-
-unsigned int aom_obmc_variance16x32_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance16x32 aom_obmc_variance16x32_c
-
-unsigned int aom_obmc_variance16x4_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-#define aom_obmc_variance16x4 aom_obmc_variance16x4_c
-
-unsigned int aom_obmc_variance16x64_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance16x64 aom_obmc_variance16x64_c
-
-unsigned int aom_obmc_variance16x8_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-#define aom_obmc_variance16x8 aom_obmc_variance16x8_c
-
-unsigned int aom_obmc_variance32x16_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance32x16 aom_obmc_variance32x16_c
-
-unsigned int aom_obmc_variance32x32_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance32x32 aom_obmc_variance32x32_c
-
-unsigned int aom_obmc_variance32x64_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance32x64 aom_obmc_variance32x64_c
-
-unsigned int aom_obmc_variance32x8_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-#define aom_obmc_variance32x8 aom_obmc_variance32x8_c
-
-unsigned int aom_obmc_variance4x16_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-#define aom_obmc_variance4x16 aom_obmc_variance4x16_c
-
-unsigned int aom_obmc_variance4x4_c(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask,
-                                    unsigned int* sse);
-#define aom_obmc_variance4x4 aom_obmc_variance4x4_c
-
-unsigned int aom_obmc_variance4x8_c(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask,
-                                    unsigned int* sse);
-#define aom_obmc_variance4x8 aom_obmc_variance4x8_c
-
-unsigned int aom_obmc_variance64x128_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask,
-                                       unsigned int* sse);
-#define aom_obmc_variance64x128 aom_obmc_variance64x128_c
-
-unsigned int aom_obmc_variance64x16_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance64x16 aom_obmc_variance64x16_c
-
-unsigned int aom_obmc_variance64x32_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance64x32 aom_obmc_variance64x32_c
-
-unsigned int aom_obmc_variance64x64_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance64x64 aom_obmc_variance64x64_c
-
-unsigned int aom_obmc_variance8x16_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-#define aom_obmc_variance8x16 aom_obmc_variance8x16_c
-
-unsigned int aom_obmc_variance8x32_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-#define aom_obmc_variance8x32 aom_obmc_variance8x32_c
-
-unsigned int aom_obmc_variance8x4_c(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask,
-                                    unsigned int* sse);
-#define aom_obmc_variance8x4 aom_obmc_variance8x4_c
-
-unsigned int aom_obmc_variance8x8_c(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask,
-                                    unsigned int* sse);
-#define aom_obmc_variance8x8 aom_obmc_variance8x8_c
-
 void aom_paeth_predictor_16x16_c(uint8_t* dst,
                                  ptrdiff_t y_stride,
                                  const uint8_t* above,
@@ -14929,24 +6192,6 @@
   aom_hadamard_lp_8x8 = aom_hadamard_lp_8x8_c;
   if (flags & HAS_NEON)
     aom_hadamard_lp_8x8 = aom_hadamard_lp_8x8_neon;
-  aom_highbd_dc_predictor_16x16 = aom_highbd_dc_predictor_16x16_c;
-  if (flags & HAS_NEON)
-    aom_highbd_dc_predictor_16x16 = aom_highbd_dc_predictor_16x16_neon;
-  aom_highbd_dc_predictor_32x32 = aom_highbd_dc_predictor_32x32_c;
-  if (flags & HAS_NEON)
-    aom_highbd_dc_predictor_32x32 = aom_highbd_dc_predictor_32x32_neon;
-  aom_highbd_dc_predictor_4x4 = aom_highbd_dc_predictor_4x4_c;
-  if (flags & HAS_NEON)
-    aom_highbd_dc_predictor_4x4 = aom_highbd_dc_predictor_4x4_neon;
-  aom_highbd_dc_predictor_64x64 = aom_highbd_dc_predictor_64x64_c;
-  if (flags & HAS_NEON)
-    aom_highbd_dc_predictor_64x64 = aom_highbd_dc_predictor_64x64_neon;
-  aom_highbd_dc_predictor_8x8 = aom_highbd_dc_predictor_8x8_c;
-  if (flags & HAS_NEON)
-    aom_highbd_dc_predictor_8x8 = aom_highbd_dc_predictor_8x8_neon;
-  aom_highbd_sse = aom_highbd_sse_c;
-  if (flags & HAS_NEON)
-    aom_highbd_sse = aom_highbd_sse_neon;
   aom_int_pro_col = aom_int_pro_col_c;
   if (flags & HAS_NEON)
     aom_int_pro_col = aom_int_pro_col_neon;
diff --git a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/av1_rtcd.h b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/av1_rtcd.h
index 8a1a29dc..c5f81d756 100644
--- a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/av1_rtcd.h
+++ b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/av1_rtcd.h
@@ -128,56 +128,6 @@
                                           const qm_val_t* iqm_ptr,
                                           const int log_scale);
 
-void av1_apply_selfguided_restoration_c(const uint8_t* dat,
-                                        int width,
-                                        int height,
-                                        int stride,
-                                        int eps,
-                                        const int* xqd,
-                                        uint8_t* dst,
-                                        int dst_stride,
-                                        int32_t* tmpbuf,
-                                        int bit_depth,
-                                        int highbd);
-void av1_apply_selfguided_restoration_neon(const uint8_t* dat,
-                                           int width,
-                                           int height,
-                                           int stride,
-                                           int eps,
-                                           const int* xqd,
-                                           uint8_t* dst,
-                                           int dst_stride,
-                                           int32_t* tmpbuf,
-                                           int bit_depth,
-                                           int highbd);
-RTCD_EXTERN void (*av1_apply_selfguided_restoration)(const uint8_t* dat,
-                                                     int width,
-                                                     int height,
-                                                     int stride,
-                                                     int eps,
-                                                     const int* xqd,
-                                                     uint8_t* dst,
-                                                     int dst_stride,
-                                                     int32_t* tmpbuf,
-                                                     int bit_depth,
-                                                     int highbd);
-
-void av1_apply_temporal_filter_c(const struct yv12_buffer_config* ref_frame,
-                                 const struct macroblockd* mbd,
-                                 const BLOCK_SIZE block_size,
-                                 const int mb_row,
-                                 const int mb_col,
-                                 const int num_planes,
-                                 const double* noise_levels,
-                                 const MV* subblock_mvs,
-                                 const int* subblock_mses,
-                                 const int q_factor,
-                                 const int filter_strength,
-                                 const uint8_t* pred,
-                                 uint32_t* accum,
-                                 uint16_t* count);
-#define av1_apply_temporal_filter av1_apply_temporal_filter_c
-
 int64_t av1_block_error_c(const tran_low_t* coeff,
                           const tran_low_t* dqcoeff,
                           intptr_t block_size,
@@ -255,44 +205,6 @@
 #define av1_build_compound_diffwtd_mask_highbd \
   av1_build_compound_diffwtd_mask_highbd_c
 
-int64_t av1_calc_frame_error_c(const uint8_t* const ref,
-                               int stride,
-                               const uint8_t* const dst,
-                               int p_width,
-                               int p_height,
-                               int p_stride);
-#define av1_calc_frame_error av1_calc_frame_error_c
-
-void av1_calc_proj_params_c(const uint8_t* src8,
-                            int width,
-                            int height,
-                            int src_stride,
-                            const uint8_t* dat8,
-                            int dat_stride,
-                            int32_t* flt0,
-                            int flt0_stride,
-                            int32_t* flt1,
-                            int flt1_stride,
-                            int64_t H[2][2],
-                            int64_t C[2],
-                            const sgr_params_type* params);
-#define av1_calc_proj_params av1_calc_proj_params_c
-
-void av1_calc_proj_params_high_bd_c(const uint8_t* src8,
-                                    int width,
-                                    int height,
-                                    int src_stride,
-                                    const uint8_t* dat8,
-                                    int dat_stride,
-                                    int32_t* flt0,
-                                    int flt0_stride,
-                                    int32_t* flt1,
-                                    int flt1_stride,
-                                    int64_t H[2][2],
-                                    int64_t C[2],
-                                    const sgr_params_type* params);
-#define av1_calc_proj_params_high_bd av1_calc_proj_params_high_bd_c
-
 void av1_cnn_activate_c(float** input,
                         int channels,
                         int width,
@@ -359,33 +271,6 @@
                                        int y2);
 #define av1_compute_cross_correlation av1_compute_cross_correlation_c
 
-void av1_compute_stats_c(int wiener_win,
-                         const uint8_t* dgd8,
-                         const uint8_t* src8,
-                         int h_start,
-                         int h_end,
-                         int v_start,
-                         int v_end,
-                         int dgd_stride,
-                         int src_stride,
-                         int64_t* M,
-                         int64_t* H);
-#define av1_compute_stats av1_compute_stats_c
-
-void av1_compute_stats_highbd_c(int wiener_win,
-                                const uint8_t* dgd8,
-                                const uint8_t* src8,
-                                int h_start,
-                                int h_end,
-                                int v_start,
-                                int v_end,
-                                int dgd_stride,
-                                int src_stride,
-                                int64_t* M,
-                                int64_t* H,
-                                aom_bit_depth_t bit_depth);
-#define av1_compute_stats_highbd av1_compute_stats_highbd_c
-
 void av1_convolve_2d_scale_c(const uint8_t* src,
                              int src_stride,
                              uint8_t* dst,
@@ -1080,30 +965,6 @@
                                             const TX_CLASS tx_class,
                                             int8_t* const coeff_contexts);
 
-void av1_highbd_apply_temporal_filter_c(
-    const struct yv12_buffer_config* ref_frame,
-    const struct macroblockd* mbd,
-    const BLOCK_SIZE block_size,
-    const int mb_row,
-    const int mb_col,
-    const int num_planes,
-    const double* noise_levels,
-    const MV* subblock_mvs,
-    const int* subblock_mses,
-    const int q_factor,
-    const int filter_strength,
-    const uint8_t* pred,
-    uint32_t* accum,
-    uint16_t* count);
-#define av1_highbd_apply_temporal_filter av1_highbd_apply_temporal_filter_c
-
-int64_t av1_highbd_block_error_c(const tran_low_t* coeff,
-                                 const tran_low_t* dqcoeff,
-                                 intptr_t block_size,
-                                 int64_t* ssz,
-                                 int bd);
-#define av1_highbd_block_error av1_highbd_block_error_c
-
 void av1_highbd_convolve8_c(const uint8_t* src,
                             ptrdiff_t src_stride,
                             uint8_t* dst,
@@ -1143,36 +1004,6 @@
                                  int bps);
 #define av1_highbd_convolve8_vert av1_highbd_convolve8_vert_c
 
-void av1_highbd_convolve_2d_scale_c(const uint16_t* src,
-                                    int src_stride,
-                                    uint16_t* dst,
-                                    int dst_stride,
-                                    int w,
-                                    int h,
-                                    const InterpFilterParams* filter_params_x,
-                                    const InterpFilterParams* filter_params_y,
-                                    const int subpel_x_qn,
-                                    const int x_step_qn,
-                                    const int subpel_y_qn,
-                                    const int y_step_qn,
-                                    ConvolveParams* conv_params,
-                                    int bd);
-#define av1_highbd_convolve_2d_scale av1_highbd_convolve_2d_scale_c
-
-void av1_highbd_convolve_2d_sr_c(const uint16_t* src,
-                                 int src_stride,
-                                 uint16_t* dst,
-                                 int dst_stride,
-                                 int w,
-                                 int h,
-                                 const InterpFilterParams* filter_params_x,
-                                 const InterpFilterParams* filter_params_y,
-                                 const int subpel_x_qn,
-                                 const int subpel_y_qn,
-                                 ConvolveParams* conv_params,
-                                 int bd);
-#define av1_highbd_convolve_2d_sr av1_highbd_convolve_2d_sr_c
-
 void av1_highbd_convolve_avg_c(const uint8_t* src,
                                ptrdiff_t src_stride,
                                uint8_t* dst,
@@ -1199,128 +1030,6 @@
                                 int bps);
 #define av1_highbd_convolve_copy av1_highbd_convolve_copy_c
 
-void av1_highbd_convolve_horiz_rs_c(const uint16_t* src,
-                                    int src_stride,
-                                    uint16_t* dst,
-                                    int dst_stride,
-                                    int w,
-                                    int h,
-                                    const int16_t* x_filters,
-                                    int x0_qn,
-                                    int x_step_qn,
-                                    int bd);
-#define av1_highbd_convolve_horiz_rs av1_highbd_convolve_horiz_rs_c
-
-void av1_highbd_convolve_x_sr_c(const uint16_t* src,
-                                int src_stride,
-                                uint16_t* dst,
-                                int dst_stride,
-                                int w,
-                                int h,
-                                const InterpFilterParams* filter_params_x,
-                                const int subpel_x_qn,
-                                ConvolveParams* conv_params,
-                                int bd);
-#define av1_highbd_convolve_x_sr av1_highbd_convolve_x_sr_c
-
-void av1_highbd_convolve_y_sr_c(const uint16_t* src,
-                                int src_stride,
-                                uint16_t* dst,
-                                int dst_stride,
-                                int w,
-                                int h,
-                                const InterpFilterParams* filter_params_y,
-                                const int subpel_y_qn,
-                                int bd);
-#define av1_highbd_convolve_y_sr av1_highbd_convolve_y_sr_c
-
-void av1_highbd_dist_wtd_convolve_2d_c(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_x,
-    const InterpFilterParams* filter_params_y,
-    const int subpel_x_qn,
-    const int subpel_y_qn,
-    ConvolveParams* conv_params,
-    int bd);
-#define av1_highbd_dist_wtd_convolve_2d av1_highbd_dist_wtd_convolve_2d_c
-
-void av1_highbd_dist_wtd_convolve_2d_copy_c(const uint16_t* src,
-                                            int src_stride,
-                                            uint16_t* dst,
-                                            int dst_stride,
-                                            int w,
-                                            int h,
-                                            ConvolveParams* conv_params,
-                                            int bd);
-#define av1_highbd_dist_wtd_convolve_2d_copy \
-  av1_highbd_dist_wtd_convolve_2d_copy_c
-
-void av1_highbd_dist_wtd_convolve_x_c(const uint16_t* src,
-                                      int src_stride,
-                                      uint16_t* dst,
-                                      int dst_stride,
-                                      int w,
-                                      int h,
-                                      const InterpFilterParams* filter_params_x,
-                                      const int subpel_x_qn,
-                                      ConvolveParams* conv_params,
-                                      int bd);
-#define av1_highbd_dist_wtd_convolve_x av1_highbd_dist_wtd_convolve_x_c
-
-void av1_highbd_dist_wtd_convolve_y_c(const uint16_t* src,
-                                      int src_stride,
-                                      uint16_t* dst,
-                                      int dst_stride,
-                                      int w,
-                                      int h,
-                                      const InterpFilterParams* filter_params_y,
-                                      const int subpel_y_qn,
-                                      ConvolveParams* conv_params,
-                                      int bd);
-#define av1_highbd_dist_wtd_convolve_y av1_highbd_dist_wtd_convolve_y_c
-
-void av1_highbd_dr_prediction_z1_c(uint16_t* dst,
-                                   ptrdiff_t stride,
-                                   int bw,
-                                   int bh,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int upsample_above,
-                                   int dx,
-                                   int dy,
-                                   int bd);
-#define av1_highbd_dr_prediction_z1 av1_highbd_dr_prediction_z1_c
-
-void av1_highbd_dr_prediction_z2_c(uint16_t* dst,
-                                   ptrdiff_t stride,
-                                   int bw,
-                                   int bh,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int upsample_above,
-                                   int upsample_left,
-                                   int dx,
-                                   int dy,
-                                   int bd);
-#define av1_highbd_dr_prediction_z2 av1_highbd_dr_prediction_z2_c
-
-void av1_highbd_dr_prediction_z3_c(uint16_t* dst,
-                                   ptrdiff_t stride,
-                                   int bw,
-                                   int bh,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int upsample_left,
-                                   int dx,
-                                   int dy,
-                                   int bd);
-#define av1_highbd_dr_prediction_z3 av1_highbd_dr_prediction_z3_c
-
 void av1_highbd_fwht4x4_c(const int16_t* input, tran_low_t* output, int stride);
 void av1_highbd_fwht4x4_neon(const int16_t* input,
                              tran_low_t* output,
@@ -1560,70 +1269,6 @@
                                 int bd);
 #define av1_highbd_iwht4x4_1_add av1_highbd_iwht4x4_1_add_c
 
-int64_t av1_highbd_pixel_proj_error_c(const uint8_t* src8,
-                                      int width,
-                                      int height,
-                                      int src_stride,
-                                      const uint8_t* dat8,
-                                      int dat_stride,
-                                      int32_t* flt0,
-                                      int flt0_stride,
-                                      int32_t* flt1,
-                                      int flt1_stride,
-                                      int xq[2],
-                                      const sgr_params_type* params);
-#define av1_highbd_pixel_proj_error av1_highbd_pixel_proj_error_c
-
-void av1_highbd_quantize_fp_c(const tran_low_t* coeff_ptr,
-                              intptr_t n_coeffs,
-                              const int16_t* zbin_ptr,
-                              const int16_t* round_ptr,
-                              const int16_t* quant_ptr,
-                              const int16_t* quant_shift_ptr,
-                              tran_low_t* qcoeff_ptr,
-                              tran_low_t* dqcoeff_ptr,
-                              const int16_t* dequant_ptr,
-                              uint16_t* eob_ptr,
-                              const int16_t* scan,
-                              const int16_t* iscan,
-                              int log_scale);
-#define av1_highbd_quantize_fp av1_highbd_quantize_fp_c
-
-void av1_highbd_warp_affine_c(const int32_t* mat,
-                              const uint16_t* ref,
-                              int width,
-                              int height,
-                              int stride,
-                              uint16_t* pred,
-                              int p_col,
-                              int p_row,
-                              int p_width,
-                              int p_height,
-                              int p_stride,
-                              int subsampling_x,
-                              int subsampling_y,
-                              int bd,
-                              ConvolveParams* conv_params,
-                              int16_t alpha,
-                              int16_t beta,
-                              int16_t gamma,
-                              int16_t delta);
-#define av1_highbd_warp_affine av1_highbd_warp_affine_c
-
-void av1_highbd_wiener_convolve_add_src_c(const uint8_t* src,
-                                          ptrdiff_t src_stride,
-                                          uint8_t* dst,
-                                          ptrdiff_t dst_stride,
-                                          const int16_t* filter_x,
-                                          int x_step_q4,
-                                          const int16_t* filter_y,
-                                          int y_step_q4,
-                                          int w,
-                                          int h,
-                                          const ConvolveParams* conv_params,
-                                          int bd);
-#define av1_highbd_wiener_convolve_add_src av1_highbd_wiener_convolve_add_src_c
-
 void av1_inv_txfm2d_add_16x16_c(const int32_t* input,
                                 uint16_t* output,
                                 int stride,
@@ -1945,44 +1590,6 @@
                                        int diff_stride,
                                        TxfmParam* txfm_param);
 
-int64_t av1_lowbd_pixel_proj_error_c(const uint8_t* src8,
-                                     int width,
-                                     int height,
-                                     int src_stride,
-                                     const uint8_t* dat8,
-                                     int dat_stride,
-                                     int32_t* flt0,
-                                     int flt0_stride,
-                                     int32_t* flt1,
-                                     int flt1_stride,
-                                     int xq[2],
-                                     const sgr_params_type* params);
-int64_t av1_lowbd_pixel_proj_error_neon(const uint8_t* src8,
-                                        int width,
-                                        int height,
-                                        int src_stride,
-                                        const uint8_t* dat8,
-                                        int dat_stride,
-                                        int32_t* flt0,
-                                        int flt0_stride,
-                                        int32_t* flt1,
-                                        int flt1_stride,
-                                        int xq[2],
-                                        const sgr_params_type* params);
-RTCD_EXTERN int64_t (*av1_lowbd_pixel_proj_error)(
-    const uint8_t* src8,
-    int width,
-    int height,
-    int src_stride,
-    const uint8_t* dat8,
-    int dat_stride,
-    int32_t* flt0,
-    int flt0_stride,
-    int32_t* flt1,
-    int flt1_stride,
-    int xq[2],
-    const sgr_params_type* params);
-
 void av1_nn_predict_c(const float* input_nodes,
                       const NN_CONFIG* const nn_config,
                       int reduce_prec,
@@ -2172,37 +1779,6 @@
 void av1_round_shift_array_neon(int32_t* arr, int size, int bit);
 RTCD_EXTERN void (*av1_round_shift_array)(int32_t* arr, int size, int bit);
 
-int av1_selfguided_restoration_c(const uint8_t* dgd8,
-                                 int width,
-                                 int height,
-                                 int dgd_stride,
-                                 int32_t* flt0,
-                                 int32_t* flt1,
-                                 int flt_stride,
-                                 int sgr_params_idx,
-                                 int bit_depth,
-                                 int highbd);
-int av1_selfguided_restoration_neon(const uint8_t* dgd8,
-                                    int width,
-                                    int height,
-                                    int dgd_stride,
-                                    int32_t* flt0,
-                                    int32_t* flt1,
-                                    int flt_stride,
-                                    int sgr_params_idx,
-                                    int bit_depth,
-                                    int highbd);
-RTCD_EXTERN int (*av1_selfguided_restoration)(const uint8_t* dgd8,
-                                              int width,
-                                              int height,
-                                              int dgd_stride,
-                                              int32_t* flt0,
-                                              int32_t* flt1,
-                                              int flt_stride,
-                                              int sgr_params_idx,
-                                              int bit_depth,
-                                              int highbd);
-
 void av1_txb_init_levels_c(const tran_low_t* const coeff,
                            const int width,
                            const int height,
@@ -2222,61 +1798,6 @@
 void av1_upsample_intra_edge_high_c(uint16_t* p, int sz, int bd);
 #define av1_upsample_intra_edge_high av1_upsample_intra_edge_high_c
 
-void av1_warp_affine_c(const int32_t* mat,
-                       const uint8_t* ref,
-                       int width,
-                       int height,
-                       int stride,
-                       uint8_t* pred,
-                       int p_col,
-                       int p_row,
-                       int p_width,
-                       int p_height,
-                       int p_stride,
-                       int subsampling_x,
-                       int subsampling_y,
-                       ConvolveParams* conv_params,
-                       int16_t alpha,
-                       int16_t beta,
-                       int16_t gamma,
-                       int16_t delta);
-void av1_warp_affine_neon(const int32_t* mat,
-                          const uint8_t* ref,
-                          int width,
-                          int height,
-                          int stride,
-                          uint8_t* pred,
-                          int p_col,
-                          int p_row,
-                          int p_width,
-                          int p_height,
-                          int p_stride,
-                          int subsampling_x,
-                          int subsampling_y,
-                          ConvolveParams* conv_params,
-                          int16_t alpha,
-                          int16_t beta,
-                          int16_t gamma,
-                          int16_t delta);
-RTCD_EXTERN void (*av1_warp_affine)(const int32_t* mat,
-                                    const uint8_t* ref,
-                                    int width,
-                                    int height,
-                                    int stride,
-                                    uint8_t* pred,
-                                    int p_col,
-                                    int p_row,
-                                    int p_width,
-                                    int p_height,
-                                    int p_stride,
-                                    int subsampling_x,
-                                    int subsampling_y,
-                                    ConvolveParams* conv_params,
-                                    int16_t alpha,
-                                    int16_t beta,
-                                    int16_t gamma,
-                                    int16_t delta);
-
 void av1_wedge_compute_delta_squares_c(int16_t* d,
                                        const int16_t* a,
                                        const int16_t* b,
@@ -2415,40 +1936,21 @@
                                  int32_t* var,
                                  int coeff_shift);
 
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_420_hbd_c(TX_SIZE tx_size);
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_420_hbd_neon(TX_SIZE tx_size);
-RTCD_EXTERN cfl_subsample_hbd_fn (*cfl_get_luma_subsampling_420_hbd)(
-    TX_SIZE tx_size);
-
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_420_lbd_c(TX_SIZE tx_size);
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_420_lbd_neon(TX_SIZE tx_size);
 RTCD_EXTERN cfl_subsample_lbd_fn (*cfl_get_luma_subsampling_420_lbd)(
     TX_SIZE tx_size);
 
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_422_hbd_c(TX_SIZE tx_size);
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_422_hbd_neon(TX_SIZE tx_size);
-RTCD_EXTERN cfl_subsample_hbd_fn (*cfl_get_luma_subsampling_422_hbd)(
-    TX_SIZE tx_size);
-
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_422_lbd_c(TX_SIZE tx_size);
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_422_lbd_neon(TX_SIZE tx_size);
 RTCD_EXTERN cfl_subsample_lbd_fn (*cfl_get_luma_subsampling_422_lbd)(
     TX_SIZE tx_size);
 
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_444_hbd_c(TX_SIZE tx_size);
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_444_hbd_neon(TX_SIZE tx_size);
-RTCD_EXTERN cfl_subsample_hbd_fn (*cfl_get_luma_subsampling_444_hbd)(
-    TX_SIZE tx_size);
-
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_444_lbd_c(TX_SIZE tx_size);
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_444_lbd_neon(TX_SIZE tx_size);
 RTCD_EXTERN cfl_subsample_lbd_fn (*cfl_get_luma_subsampling_444_lbd)(
     TX_SIZE tx_size);
 
-cfl_predict_hbd_fn cfl_get_predict_hbd_fn_c(TX_SIZE tx_size);
-cfl_predict_hbd_fn cfl_get_predict_hbd_fn_neon(TX_SIZE tx_size);
-RTCD_EXTERN cfl_predict_hbd_fn (*cfl_get_predict_hbd_fn)(TX_SIZE tx_size);
-
 cfl_predict_lbd_fn cfl_get_predict_lbd_fn_c(TX_SIZE tx_size);
 cfl_predict_lbd_fn cfl_get_predict_lbd_fn_neon(TX_SIZE tx_size);
 RTCD_EXTERN cfl_predict_lbd_fn (*cfl_get_predict_lbd_fn)(TX_SIZE tx_size);
@@ -2472,9 +1974,6 @@
   aom_quantize_b_helper = aom_quantize_b_helper_c;
   if (flags & HAS_NEON)
     aom_quantize_b_helper = aom_quantize_b_helper_neon;
-  av1_apply_selfguided_restoration = av1_apply_selfguided_restoration_c;
-  if (flags & HAS_NEON)
-    av1_apply_selfguided_restoration = av1_apply_selfguided_restoration_neon;
   av1_block_error = av1_block_error_c;
   if (flags & HAS_NEON)
     av1_block_error = av1_block_error_neon;
@@ -2692,9 +2191,6 @@
   av1_lowbd_fwd_txfm = av1_lowbd_fwd_txfm_c;
   if (flags & HAS_NEON)
     av1_lowbd_fwd_txfm = av1_lowbd_fwd_txfm_neon;
-  av1_lowbd_pixel_proj_error = av1_lowbd_pixel_proj_error_c;
-  if (flags & HAS_NEON)
-    av1_lowbd_pixel_proj_error = av1_lowbd_pixel_proj_error_neon;
   av1_nn_predict = av1_nn_predict_c;
   if (flags & HAS_NEON)
     av1_nn_predict = av1_nn_predict_neon;
@@ -2716,15 +2212,9 @@
   av1_round_shift_array = av1_round_shift_array_c;
   if (flags & HAS_NEON)
     av1_round_shift_array = av1_round_shift_array_neon;
-  av1_selfguided_restoration = av1_selfguided_restoration_c;
-  if (flags & HAS_NEON)
-    av1_selfguided_restoration = av1_selfguided_restoration_neon;
   av1_txb_init_levels = av1_txb_init_levels_c;
   if (flags & HAS_NEON)
     av1_txb_init_levels = av1_txb_init_levels_neon;
-  av1_warp_affine = av1_warp_affine_c;
-  if (flags & HAS_NEON)
-    av1_warp_affine = av1_warp_affine_neon;
   av1_wiener_convolve_add_src = av1_wiener_convolve_add_src_c;
   if (flags & HAS_NEON)
     av1_wiener_convolve_add_src = av1_wiener_convolve_add_src_neon;
@@ -2740,27 +2230,15 @@
   cdef_find_dir = cdef_find_dir_c;
   if (flags & HAS_NEON)
     cdef_find_dir = cdef_find_dir_neon;
-  cfl_get_luma_subsampling_420_hbd = cfl_get_luma_subsampling_420_hbd_c;
-  if (flags & HAS_NEON)
-    cfl_get_luma_subsampling_420_hbd = cfl_get_luma_subsampling_420_hbd_neon;
   cfl_get_luma_subsampling_420_lbd = cfl_get_luma_subsampling_420_lbd_c;
   if (flags & HAS_NEON)
     cfl_get_luma_subsampling_420_lbd = cfl_get_luma_subsampling_420_lbd_neon;
-  cfl_get_luma_subsampling_422_hbd = cfl_get_luma_subsampling_422_hbd_c;
-  if (flags & HAS_NEON)
-    cfl_get_luma_subsampling_422_hbd = cfl_get_luma_subsampling_422_hbd_neon;
   cfl_get_luma_subsampling_422_lbd = cfl_get_luma_subsampling_422_lbd_c;
   if (flags & HAS_NEON)
     cfl_get_luma_subsampling_422_lbd = cfl_get_luma_subsampling_422_lbd_neon;
-  cfl_get_luma_subsampling_444_hbd = cfl_get_luma_subsampling_444_hbd_c;
-  if (flags & HAS_NEON)
-    cfl_get_luma_subsampling_444_hbd = cfl_get_luma_subsampling_444_hbd_neon;
   cfl_get_luma_subsampling_444_lbd = cfl_get_luma_subsampling_444_lbd_c;
   if (flags & HAS_NEON)
     cfl_get_luma_subsampling_444_lbd = cfl_get_luma_subsampling_444_lbd_neon;
-  cfl_get_predict_hbd_fn = cfl_get_predict_hbd_fn_c;
-  if (flags & HAS_NEON)
-    cfl_get_predict_hbd_fn = cfl_get_predict_hbd_fn_neon;
   cfl_get_predict_lbd_fn = cfl_get_predict_lbd_fn_c;
   if (flags & HAS_NEON)
     cfl_get_predict_lbd_fn = cfl_get_predict_lbd_fn_neon;
diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm
index c803d9fe..8fbd732d 100644
--- a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm
+++ b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm
@@ -17,7 +17,7 @@
 CONFIG_ANALYZER equ 0
 CONFIG_AV1_DECODER equ 1
 CONFIG_AV1_ENCODER equ 1
-CONFIG_AV1_HIGHBITDEPTH equ 1
+CONFIG_AV1_HIGHBITDEPTH equ 0
 CONFIG_AV1_TEMPORAL_DENOISING equ 0
 CONFIG_BIG_ENDIAN equ 0
 CONFIG_BITSTREAM_DEBUG equ 0
@@ -47,7 +47,7 @@
 CONFIG_OS_SUPPORT equ 1
 CONFIG_PIC equ 0
 CONFIG_RD_DEBUG equ 0
-CONFIG_REALTIME_ONLY equ 0
+CONFIG_REALTIME_ONLY equ 1
 CONFIG_RUNTIME_CPU_DETECT equ 0
 CONFIG_SHARED equ 0
 CONFIG_SHARP_SETTINGS equ 0
diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.c b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.c
index 8f1a4c3..6ffe044fc 100644
--- a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.c
+++ b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.c
@@ -9,5 +9,5 @@
  * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
  */
 #include "aom/aom_codec.h"
-static const char* const cfg = "cmake ../source/libaom -G \"Unix Makefiles\" -DCMAKE_TOOLCHAIN_FILE=\"../source/libaom/build/cmake/toolchains/armv7-linux-gcc.cmake\" -DCONFIG_AV1_ENCODER=1 -DCONFIG_LIBYUV=0 -DCONFIG_MAX_DECODE_PROFILE=0 -DCONFIG_NORMAL_TILE_MODE=1 -DCONFIG_SIZE_LIMIT=1 -DDECODE_HEIGHT_LIMIT=16384 -DDECODE_WIDTH_LIMIT=16384";
+static const char* const cfg = "cmake ../source/libaom -G \"Unix Makefiles\" -DCMAKE_TOOLCHAIN_FILE=\"../source/libaom/build/cmake/toolchains/armv7-linux-gcc.cmake\" -DCONFIG_AV1_ENCODER=1 -DCONFIG_LIBYUV=0 -DCONFIG_MAX_DECODE_PROFILE=0 -DCONFIG_NORMAL_TILE_MODE=1 -DCONFIG_SIZE_LIMIT=1 -DDECODE_HEIGHT_LIMIT=16384 -DDECODE_WIDTH_LIMIT=16384 -DCONFIG_REALTIME_ONLY=1 -DCONFIG_AV1_HIGHBITDEPTH=0";
 const char *aom_codec_build_config(void) {return cfg;}
diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h
index 71185c9f..fa9522d 100644
--- a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h
+++ b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h
@@ -19,7 +19,7 @@
 #define CONFIG_ANALYZER 0
 #define CONFIG_AV1_DECODER 1
 #define CONFIG_AV1_ENCODER 1
-#define CONFIG_AV1_HIGHBITDEPTH 1
+#define CONFIG_AV1_HIGHBITDEPTH 0
 #define CONFIG_AV1_TEMPORAL_DENOISING 0
 #define CONFIG_BIG_ENDIAN 0
 #define CONFIG_BITSTREAM_DEBUG 0
@@ -49,7 +49,7 @@
 #define CONFIG_OS_SUPPORT 1
 #define CONFIG_PIC 0
 #define CONFIG_RD_DEBUG 0
-#define CONFIG_REALTIME_ONLY 0
+#define CONFIG_REALTIME_ONLY 1
 #define CONFIG_RUNTIME_CPU_DETECT 0
 #define CONFIG_SHARED 0
 #define CONFIG_SHARP_SETTINGS 0
diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_dsp_rtcd.h b/third_party/libaom/source/config/linux/arm-neon/config/aom_dsp_rtcd.h
index 5bf7631..5bc4d69e 100644
--- a/third_party/libaom/source/config/linux/arm-neon/config/aom_dsp_rtcd.h
+++ b/third_party/libaom/source/config/linux/arm-neon/config/aom_dsp_rtcd.h
@@ -1474,8226 +1474,6 @@
                               int16_t* coeff);
 #define aom_hadamard_lp_8x8 aom_hadamard_lp_8x8_neon
 
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x128 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x64 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x16 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x16_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x32 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x32_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x4 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x4_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x64 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x64_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x8 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x8_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x16 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x16_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x32 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x32_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x64 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x64_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x8 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x8_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x16 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x4 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x4_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x8 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x128 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x16 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x16_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x32 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x32_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x64 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x64_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x16 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x16_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x32 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x32_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x4 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x4_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x8 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x8_c
-
-void aom_highbd_10_get16x16var_c(const uint8_t* src_ptr,
-                                 int source_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride,
-                                 unsigned int* sse,
-                                 int* sum);
-#define aom_highbd_10_get16x16var aom_highbd_10_get16x16var_c
-
-void aom_highbd_10_get8x8var_c(const uint8_t* src_ptr,
-                               int source_stride,
-                               const uint8_t* ref_ptr,
-                               int ref_stride,
-                               unsigned int* sse,
-                               int* sum);
-#define aom_highbd_10_get8x8var aom_highbd_10_get8x8var_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance128x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance128x128 \
-  aom_highbd_10_masked_sub_pixel_variance128x128_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance128x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance128x64 \
-  aom_highbd_10_masked_sub_pixel_variance128x64_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance16x16 \
-  aom_highbd_10_masked_sub_pixel_variance16x16_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance16x32 \
-  aom_highbd_10_masked_sub_pixel_variance16x32_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance16x4 \
-  aom_highbd_10_masked_sub_pixel_variance16x4_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance16x64 \
-  aom_highbd_10_masked_sub_pixel_variance16x64_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance16x8 \
-  aom_highbd_10_masked_sub_pixel_variance16x8_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance32x16 \
-  aom_highbd_10_masked_sub_pixel_variance32x16_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance32x32 \
-  aom_highbd_10_masked_sub_pixel_variance32x32_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance32x64 \
-  aom_highbd_10_masked_sub_pixel_variance32x64_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance32x8 \
-  aom_highbd_10_masked_sub_pixel_variance32x8_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance4x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance4x16 \
-  aom_highbd_10_masked_sub_pixel_variance4x16_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance4x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance4x4 \
-  aom_highbd_10_masked_sub_pixel_variance4x4_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance4x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance4x8 \
-  aom_highbd_10_masked_sub_pixel_variance4x8_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance64x128 \
-  aom_highbd_10_masked_sub_pixel_variance64x128_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance64x16 \
-  aom_highbd_10_masked_sub_pixel_variance64x16_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance64x32 \
-  aom_highbd_10_masked_sub_pixel_variance64x32_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance64x64 \
-  aom_highbd_10_masked_sub_pixel_variance64x64_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance8x16 \
-  aom_highbd_10_masked_sub_pixel_variance8x16_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance8x32 \
-  aom_highbd_10_masked_sub_pixel_variance8x32_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance8x4 \
-  aom_highbd_10_masked_sub_pixel_variance8x4_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance8x8 \
-  aom_highbd_10_masked_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_10_mse16x16_c(const uint8_t* src_ptr,
-                                      int source_stride,
-                                      const uint8_t* ref_ptr,
-                                      int recon_stride,
-                                      unsigned int* sse);
-#define aom_highbd_10_mse16x16 aom_highbd_10_mse16x16_c
-
-unsigned int aom_highbd_10_mse16x8_c(const uint8_t* src_ptr,
-                                     int source_stride,
-                                     const uint8_t* ref_ptr,
-                                     int recon_stride,
-                                     unsigned int* sse);
-#define aom_highbd_10_mse16x8 aom_highbd_10_mse16x8_c
-
-unsigned int aom_highbd_10_mse8x16_c(const uint8_t* src_ptr,
-                                     int source_stride,
-                                     const uint8_t* ref_ptr,
-                                     int recon_stride,
-                                     unsigned int* sse);
-#define aom_highbd_10_mse8x16 aom_highbd_10_mse8x16_c
-
-unsigned int aom_highbd_10_mse8x8_c(const uint8_t* src_ptr,
-                                    int source_stride,
-                                    const uint8_t* ref_ptr,
-                                    int recon_stride,
-                                    unsigned int* sse);
-#define aom_highbd_10_mse8x8 aom_highbd_10_mse8x8_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance128x128_c(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            int xoffset,
-                                                            int yoffset,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance128x128 \
-  aom_highbd_10_obmc_sub_pixel_variance128x128_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance128x64_c(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance128x64 \
-  aom_highbd_10_obmc_sub_pixel_variance128x64_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance16x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance16x16 \
-  aom_highbd_10_obmc_sub_pixel_variance16x16_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance16x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance16x32 \
-  aom_highbd_10_obmc_sub_pixel_variance16x32_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance16x4_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance16x4 \
-  aom_highbd_10_obmc_sub_pixel_variance16x4_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance16x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance16x64 \
-  aom_highbd_10_obmc_sub_pixel_variance16x64_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance16x8_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance16x8 \
-  aom_highbd_10_obmc_sub_pixel_variance16x8_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance32x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance32x16 \
-  aom_highbd_10_obmc_sub_pixel_variance32x16_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance32x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance32x32 \
-  aom_highbd_10_obmc_sub_pixel_variance32x32_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance32x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance32x64 \
-  aom_highbd_10_obmc_sub_pixel_variance32x64_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance32x8_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance32x8 \
-  aom_highbd_10_obmc_sub_pixel_variance32x8_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance4x16_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance4x16 \
-  aom_highbd_10_obmc_sub_pixel_variance4x16_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance4x4_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance4x4 \
-  aom_highbd_10_obmc_sub_pixel_variance4x4_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance4x8_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance4x8 \
-  aom_highbd_10_obmc_sub_pixel_variance4x8_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance64x128_c(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance64x128 \
-  aom_highbd_10_obmc_sub_pixel_variance64x128_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance64x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance64x16 \
-  aom_highbd_10_obmc_sub_pixel_variance64x16_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance64x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance64x32 \
-  aom_highbd_10_obmc_sub_pixel_variance64x32_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance64x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance64x64 \
-  aom_highbd_10_obmc_sub_pixel_variance64x64_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance8x16_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance8x16 \
-  aom_highbd_10_obmc_sub_pixel_variance8x16_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance8x32_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance8x32 \
-  aom_highbd_10_obmc_sub_pixel_variance8x32_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance8x4_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance8x4 \
-  aom_highbd_10_obmc_sub_pixel_variance8x4_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance8x8_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance8x8 \
-  aom_highbd_10_obmc_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_10_obmc_variance128x128_c(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-#define aom_highbd_10_obmc_variance128x128 aom_highbd_10_obmc_variance128x128_c
-
-unsigned int aom_highbd_10_obmc_variance128x64_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-#define aom_highbd_10_obmc_variance128x64 aom_highbd_10_obmc_variance128x64_c
-
-unsigned int aom_highbd_10_obmc_variance16x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance16x16 aom_highbd_10_obmc_variance16x16_c
-
-unsigned int aom_highbd_10_obmc_variance16x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance16x32 aom_highbd_10_obmc_variance16x32_c
-
-unsigned int aom_highbd_10_obmc_variance16x4_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_10_obmc_variance16x4 aom_highbd_10_obmc_variance16x4_c
-
-unsigned int aom_highbd_10_obmc_variance16x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance16x64 aom_highbd_10_obmc_variance16x64_c
-
-unsigned int aom_highbd_10_obmc_variance16x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_10_obmc_variance16x8 aom_highbd_10_obmc_variance16x8_c
-
-unsigned int aom_highbd_10_obmc_variance32x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance32x16 aom_highbd_10_obmc_variance32x16_c
-
-unsigned int aom_highbd_10_obmc_variance32x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance32x32 aom_highbd_10_obmc_variance32x32_c
-
-unsigned int aom_highbd_10_obmc_variance32x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance32x64 aom_highbd_10_obmc_variance32x64_c
-
-unsigned int aom_highbd_10_obmc_variance32x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_10_obmc_variance32x8 aom_highbd_10_obmc_variance32x8_c
-
-unsigned int aom_highbd_10_obmc_variance4x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_10_obmc_variance4x16 aom_highbd_10_obmc_variance4x16_c
-
-unsigned int aom_highbd_10_obmc_variance4x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_10_obmc_variance4x4 aom_highbd_10_obmc_variance4x4_c
-
-unsigned int aom_highbd_10_obmc_variance4x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_10_obmc_variance4x8 aom_highbd_10_obmc_variance4x8_c
-
-unsigned int aom_highbd_10_obmc_variance64x128_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-#define aom_highbd_10_obmc_variance64x128 aom_highbd_10_obmc_variance64x128_c
-
-unsigned int aom_highbd_10_obmc_variance64x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance64x16 aom_highbd_10_obmc_variance64x16_c
-
-unsigned int aom_highbd_10_obmc_variance64x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance64x32 aom_highbd_10_obmc_variance64x32_c
-
-unsigned int aom_highbd_10_obmc_variance64x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance64x64 aom_highbd_10_obmc_variance64x64_c
-
-unsigned int aom_highbd_10_obmc_variance8x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_10_obmc_variance8x16 aom_highbd_10_obmc_variance8x16_c
-
-unsigned int aom_highbd_10_obmc_variance8x32_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_10_obmc_variance8x32 aom_highbd_10_obmc_variance8x32_c
-
-unsigned int aom_highbd_10_obmc_variance8x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_10_obmc_variance8x4 aom_highbd_10_obmc_variance8x4_c
-
-unsigned int aom_highbd_10_obmc_variance8x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_10_obmc_variance8x8 aom_highbd_10_obmc_variance8x8_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance128x128 \
-  aom_highbd_10_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance128x64 \
-  aom_highbd_10_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance16x16 \
-  aom_highbd_10_sub_pixel_avg_variance16x16_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance16x32 \
-  aom_highbd_10_sub_pixel_avg_variance16x32_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x4_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance16x4 \
-  aom_highbd_10_sub_pixel_avg_variance16x4_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance16x64 \
-  aom_highbd_10_sub_pixel_avg_variance16x64_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance16x8 \
-  aom_highbd_10_sub_pixel_avg_variance16x8_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance32x16 \
-  aom_highbd_10_sub_pixel_avg_variance32x16_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance32x32 \
-  aom_highbd_10_sub_pixel_avg_variance32x32_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance32x64 \
-  aom_highbd_10_sub_pixel_avg_variance32x64_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x8_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance32x8 \
-  aom_highbd_10_sub_pixel_avg_variance32x8_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance4x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance4x16 \
-  aom_highbd_10_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance4x4 \
-  aom_highbd_10_sub_pixel_avg_variance4x4_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance4x8 \
-  aom_highbd_10_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance64x128 \
-  aom_highbd_10_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance64x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance64x16 \
-  aom_highbd_10_sub_pixel_avg_variance64x16_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance64x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance64x32 \
-  aom_highbd_10_sub_pixel_avg_variance64x32_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance64x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance64x64 \
-  aom_highbd_10_sub_pixel_avg_variance64x64_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance8x16 \
-  aom_highbd_10_sub_pixel_avg_variance8x16_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x32_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance8x32 \
-  aom_highbd_10_sub_pixel_avg_variance8x32_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance8x4 \
-  aom_highbd_10_sub_pixel_avg_variance8x4_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance8x8 \
-  aom_highbd_10_sub_pixel_avg_variance8x8_c
-
-uint32_t aom_highbd_10_sub_pixel_variance128x128_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance128x128 \
-  aom_highbd_10_sub_pixel_variance128x128_c
-
-uint32_t aom_highbd_10_sub_pixel_variance128x64_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance128x64 \
-  aom_highbd_10_sub_pixel_variance128x64_c
-
-uint32_t aom_highbd_10_sub_pixel_variance16x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance16x16 \
-  aom_highbd_10_sub_pixel_variance16x16_c
-
-uint32_t aom_highbd_10_sub_pixel_variance16x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance16x32 \
-  aom_highbd_10_sub_pixel_variance16x32_c
-
-uint32_t aom_highbd_10_sub_pixel_variance16x4_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance16x4 \
-  aom_highbd_10_sub_pixel_variance16x4_c
-
-uint32_t aom_highbd_10_sub_pixel_variance16x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance16x64 \
-  aom_highbd_10_sub_pixel_variance16x64_c
-
-uint32_t aom_highbd_10_sub_pixel_variance16x8_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance16x8 \
-  aom_highbd_10_sub_pixel_variance16x8_c
-
-uint32_t aom_highbd_10_sub_pixel_variance32x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance32x16 \
-  aom_highbd_10_sub_pixel_variance32x16_c
-
-uint32_t aom_highbd_10_sub_pixel_variance32x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance32x32 \
-  aom_highbd_10_sub_pixel_variance32x32_c
-
-uint32_t aom_highbd_10_sub_pixel_variance32x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance32x64 \
-  aom_highbd_10_sub_pixel_variance32x64_c
-
-uint32_t aom_highbd_10_sub_pixel_variance32x8_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance32x8 \
-  aom_highbd_10_sub_pixel_variance32x8_c
-
-uint32_t aom_highbd_10_sub_pixel_variance4x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance4x16 \
-  aom_highbd_10_sub_pixel_variance4x16_c
-
-uint32_t aom_highbd_10_sub_pixel_variance4x4_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance4x4 \
-  aom_highbd_10_sub_pixel_variance4x4_c
-
-uint32_t aom_highbd_10_sub_pixel_variance4x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance4x8 \
-  aom_highbd_10_sub_pixel_variance4x8_c
-
-uint32_t aom_highbd_10_sub_pixel_variance64x128_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance64x128 \
-  aom_highbd_10_sub_pixel_variance64x128_c
-
-uint32_t aom_highbd_10_sub_pixel_variance64x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance64x16 \
-  aom_highbd_10_sub_pixel_variance64x16_c
-
-uint32_t aom_highbd_10_sub_pixel_variance64x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance64x32 \
-  aom_highbd_10_sub_pixel_variance64x32_c
-
-uint32_t aom_highbd_10_sub_pixel_variance64x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance64x64 \
-  aom_highbd_10_sub_pixel_variance64x64_c
-
-uint32_t aom_highbd_10_sub_pixel_variance8x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance8x16 \
-  aom_highbd_10_sub_pixel_variance8x16_c
-
-uint32_t aom_highbd_10_sub_pixel_variance8x32_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance8x32 \
-  aom_highbd_10_sub_pixel_variance8x32_c
-
-uint32_t aom_highbd_10_sub_pixel_variance8x4_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance8x4 \
-  aom_highbd_10_sub_pixel_variance8x4_c
-
-uint32_t aom_highbd_10_sub_pixel_variance8x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance8x8 \
-  aom_highbd_10_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_10_variance128x128_c(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-#define aom_highbd_10_variance128x128 aom_highbd_10_variance128x128_c
-
-unsigned int aom_highbd_10_variance128x64_c(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-#define aom_highbd_10_variance128x64 aom_highbd_10_variance128x64_c
-
-unsigned int aom_highbd_10_variance16x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_10_variance16x16 aom_highbd_10_variance16x16_c
-
-unsigned int aom_highbd_10_variance16x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_10_variance16x32 aom_highbd_10_variance16x32_c
-
-unsigned int aom_highbd_10_variance16x4_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_10_variance16x4 aom_highbd_10_variance16x4_c
-
-unsigned int aom_highbd_10_variance16x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           uint32_t* sse);
-#define aom_highbd_10_variance16x64 aom_highbd_10_variance16x64_c
-
-unsigned int aom_highbd_10_variance16x8_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_10_variance16x8 aom_highbd_10_variance16x8_c
-
-unsigned int aom_highbd_10_variance2x2_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance2x2 aom_highbd_10_variance2x2_c
-
-unsigned int aom_highbd_10_variance2x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance2x4 aom_highbd_10_variance2x4_c
-
-unsigned int aom_highbd_10_variance32x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_10_variance32x16 aom_highbd_10_variance32x16_c
-
-unsigned int aom_highbd_10_variance32x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_10_variance32x32 aom_highbd_10_variance32x32_c
-
-unsigned int aom_highbd_10_variance32x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_10_variance32x64 aom_highbd_10_variance32x64_c
-
-unsigned int aom_highbd_10_variance32x8_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_10_variance32x8 aom_highbd_10_variance32x8_c
-
-unsigned int aom_highbd_10_variance4x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_10_variance4x16 aom_highbd_10_variance4x16_c
-
-unsigned int aom_highbd_10_variance4x2_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance4x2 aom_highbd_10_variance4x2_c
-
-unsigned int aom_highbd_10_variance4x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance4x4 aom_highbd_10_variance4x4_c
-
-unsigned int aom_highbd_10_variance4x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance4x8 aom_highbd_10_variance4x8_c
-
-unsigned int aom_highbd_10_variance64x128_c(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-#define aom_highbd_10_variance64x128 aom_highbd_10_variance64x128_c
-
-unsigned int aom_highbd_10_variance64x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           uint32_t* sse);
-#define aom_highbd_10_variance64x16 aom_highbd_10_variance64x16_c
-
-unsigned int aom_highbd_10_variance64x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_10_variance64x32 aom_highbd_10_variance64x32_c
-
-unsigned int aom_highbd_10_variance64x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_10_variance64x64 aom_highbd_10_variance64x64_c
-
-unsigned int aom_highbd_10_variance8x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_10_variance8x16 aom_highbd_10_variance8x16_c
-
-unsigned int aom_highbd_10_variance8x32_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_10_variance8x32 aom_highbd_10_variance8x32_c
-
-unsigned int aom_highbd_10_variance8x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance8x4 aom_highbd_10_variance8x4_c
-
-unsigned int aom_highbd_10_variance8x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance8x8 aom_highbd_10_variance8x8_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x128 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x64 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x16 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x16_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x32 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x32_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x4 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x4_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x64 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x64_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x8 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x8_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x16 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x16_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x32 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x32_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x64 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x64_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x8 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x8_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x16 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x4 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x4_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x8 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x128 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x16 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x16_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x32 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x32_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x64 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x64_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x16 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x16_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x32 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x32_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x4 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x4_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x8 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x8_c
-
-void aom_highbd_12_get16x16var_c(const uint8_t* src_ptr,
-                                 int source_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride,
-                                 unsigned int* sse,
-                                 int* sum);
-#define aom_highbd_12_get16x16var aom_highbd_12_get16x16var_c
-
-void aom_highbd_12_get8x8var_c(const uint8_t* src_ptr,
-                               int source_stride,
-                               const uint8_t* ref_ptr,
-                               int ref_stride,
-                               unsigned int* sse,
-                               int* sum);
-#define aom_highbd_12_get8x8var aom_highbd_12_get8x8var_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance128x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance128x128 \
-  aom_highbd_12_masked_sub_pixel_variance128x128_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance128x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance128x64 \
-  aom_highbd_12_masked_sub_pixel_variance128x64_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance16x16 \
-  aom_highbd_12_masked_sub_pixel_variance16x16_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance16x32 \
-  aom_highbd_12_masked_sub_pixel_variance16x32_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance16x4 \
-  aom_highbd_12_masked_sub_pixel_variance16x4_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance16x64 \
-  aom_highbd_12_masked_sub_pixel_variance16x64_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance16x8 \
-  aom_highbd_12_masked_sub_pixel_variance16x8_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance32x16 \
-  aom_highbd_12_masked_sub_pixel_variance32x16_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance32x32 \
-  aom_highbd_12_masked_sub_pixel_variance32x32_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance32x64 \
-  aom_highbd_12_masked_sub_pixel_variance32x64_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance32x8 \
-  aom_highbd_12_masked_sub_pixel_variance32x8_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance4x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance4x16 \
-  aom_highbd_12_masked_sub_pixel_variance4x16_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance4x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance4x4 \
-  aom_highbd_12_masked_sub_pixel_variance4x4_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance4x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance4x8 \
-  aom_highbd_12_masked_sub_pixel_variance4x8_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance64x128 \
-  aom_highbd_12_masked_sub_pixel_variance64x128_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance64x16 \
-  aom_highbd_12_masked_sub_pixel_variance64x16_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance64x32 \
-  aom_highbd_12_masked_sub_pixel_variance64x32_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance64x64 \
-  aom_highbd_12_masked_sub_pixel_variance64x64_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance8x16 \
-  aom_highbd_12_masked_sub_pixel_variance8x16_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance8x32 \
-  aom_highbd_12_masked_sub_pixel_variance8x32_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance8x4 \
-  aom_highbd_12_masked_sub_pixel_variance8x4_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance8x8 \
-  aom_highbd_12_masked_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_12_mse16x16_c(const uint8_t* src_ptr,
-                                      int source_stride,
-                                      const uint8_t* ref_ptr,
-                                      int recon_stride,
-                                      unsigned int* sse);
-#define aom_highbd_12_mse16x16 aom_highbd_12_mse16x16_c
-
-unsigned int aom_highbd_12_mse16x8_c(const uint8_t* src_ptr,
-                                     int source_stride,
-                                     const uint8_t* ref_ptr,
-                                     int recon_stride,
-                                     unsigned int* sse);
-#define aom_highbd_12_mse16x8 aom_highbd_12_mse16x8_c
-
-unsigned int aom_highbd_12_mse8x16_c(const uint8_t* src_ptr,
-                                     int source_stride,
-                                     const uint8_t* ref_ptr,
-                                     int recon_stride,
-                                     unsigned int* sse);
-#define aom_highbd_12_mse8x16 aom_highbd_12_mse8x16_c
-
-unsigned int aom_highbd_12_mse8x8_c(const uint8_t* src_ptr,
-                                    int source_stride,
-                                    const uint8_t* ref_ptr,
-                                    int recon_stride,
-                                    unsigned int* sse);
-#define aom_highbd_12_mse8x8 aom_highbd_12_mse8x8_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance128x128_c(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            int xoffset,
-                                                            int yoffset,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance128x128 \
-  aom_highbd_12_obmc_sub_pixel_variance128x128_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance128x64_c(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance128x64 \
-  aom_highbd_12_obmc_sub_pixel_variance128x64_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance16x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance16x16 \
-  aom_highbd_12_obmc_sub_pixel_variance16x16_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance16x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance16x32 \
-  aom_highbd_12_obmc_sub_pixel_variance16x32_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance16x4_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance16x4 \
-  aom_highbd_12_obmc_sub_pixel_variance16x4_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance16x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance16x64 \
-  aom_highbd_12_obmc_sub_pixel_variance16x64_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance16x8_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance16x8 \
-  aom_highbd_12_obmc_sub_pixel_variance16x8_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance32x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance32x16 \
-  aom_highbd_12_obmc_sub_pixel_variance32x16_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance32x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance32x32 \
-  aom_highbd_12_obmc_sub_pixel_variance32x32_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance32x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance32x64 \
-  aom_highbd_12_obmc_sub_pixel_variance32x64_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance32x8_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance32x8 \
-  aom_highbd_12_obmc_sub_pixel_variance32x8_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance4x16_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance4x16 \
-  aom_highbd_12_obmc_sub_pixel_variance4x16_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance4x4_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance4x4 \
-  aom_highbd_12_obmc_sub_pixel_variance4x4_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance4x8_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance4x8 \
-  aom_highbd_12_obmc_sub_pixel_variance4x8_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance64x128_c(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance64x128 \
-  aom_highbd_12_obmc_sub_pixel_variance64x128_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance64x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance64x16 \
-  aom_highbd_12_obmc_sub_pixel_variance64x16_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance64x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance64x32 \
-  aom_highbd_12_obmc_sub_pixel_variance64x32_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance64x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance64x64 \
-  aom_highbd_12_obmc_sub_pixel_variance64x64_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance8x16_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance8x16 \
-  aom_highbd_12_obmc_sub_pixel_variance8x16_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance8x32_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance8x32 \
-  aom_highbd_12_obmc_sub_pixel_variance8x32_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance8x4_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance8x4 \
-  aom_highbd_12_obmc_sub_pixel_variance8x4_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance8x8_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance8x8 \
-  aom_highbd_12_obmc_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_12_obmc_variance128x128_c(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-#define aom_highbd_12_obmc_variance128x128 aom_highbd_12_obmc_variance128x128_c
-
-unsigned int aom_highbd_12_obmc_variance128x64_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-#define aom_highbd_12_obmc_variance128x64 aom_highbd_12_obmc_variance128x64_c
-
-unsigned int aom_highbd_12_obmc_variance16x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance16x16 aom_highbd_12_obmc_variance16x16_c
-
-unsigned int aom_highbd_12_obmc_variance16x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance16x32 aom_highbd_12_obmc_variance16x32_c
-
-unsigned int aom_highbd_12_obmc_variance16x4_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_12_obmc_variance16x4 aom_highbd_12_obmc_variance16x4_c
-
-unsigned int aom_highbd_12_obmc_variance16x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance16x64 aom_highbd_12_obmc_variance16x64_c
-
-unsigned int aom_highbd_12_obmc_variance16x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_12_obmc_variance16x8 aom_highbd_12_obmc_variance16x8_c
-
-unsigned int aom_highbd_12_obmc_variance32x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance32x16 aom_highbd_12_obmc_variance32x16_c
-
-unsigned int aom_highbd_12_obmc_variance32x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance32x32 aom_highbd_12_obmc_variance32x32_c
-
-unsigned int aom_highbd_12_obmc_variance32x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance32x64 aom_highbd_12_obmc_variance32x64_c
-
-unsigned int aom_highbd_12_obmc_variance32x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_12_obmc_variance32x8 aom_highbd_12_obmc_variance32x8_c
-
-unsigned int aom_highbd_12_obmc_variance4x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_12_obmc_variance4x16 aom_highbd_12_obmc_variance4x16_c
-
-unsigned int aom_highbd_12_obmc_variance4x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_12_obmc_variance4x4 aom_highbd_12_obmc_variance4x4_c
-
-unsigned int aom_highbd_12_obmc_variance4x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_12_obmc_variance4x8 aom_highbd_12_obmc_variance4x8_c
-
-unsigned int aom_highbd_12_obmc_variance64x128_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-#define aom_highbd_12_obmc_variance64x128 aom_highbd_12_obmc_variance64x128_c
-
-unsigned int aom_highbd_12_obmc_variance64x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance64x16 aom_highbd_12_obmc_variance64x16_c
-
-unsigned int aom_highbd_12_obmc_variance64x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance64x32 aom_highbd_12_obmc_variance64x32_c
-
-unsigned int aom_highbd_12_obmc_variance64x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance64x64 aom_highbd_12_obmc_variance64x64_c
-
-unsigned int aom_highbd_12_obmc_variance8x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_12_obmc_variance8x16 aom_highbd_12_obmc_variance8x16_c
-
-unsigned int aom_highbd_12_obmc_variance8x32_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_12_obmc_variance8x32 aom_highbd_12_obmc_variance8x32_c
-
-unsigned int aom_highbd_12_obmc_variance8x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_12_obmc_variance8x4 aom_highbd_12_obmc_variance8x4_c
-
-unsigned int aom_highbd_12_obmc_variance8x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_12_obmc_variance8x8 aom_highbd_12_obmc_variance8x8_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance128x128 \
-  aom_highbd_12_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance128x64 \
-  aom_highbd_12_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance16x16 \
-  aom_highbd_12_sub_pixel_avg_variance16x16_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance16x32 \
-  aom_highbd_12_sub_pixel_avg_variance16x32_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x4_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance16x4 \
-  aom_highbd_12_sub_pixel_avg_variance16x4_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance16x64 \
-  aom_highbd_12_sub_pixel_avg_variance16x64_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance16x8 \
-  aom_highbd_12_sub_pixel_avg_variance16x8_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance32x16 \
-  aom_highbd_12_sub_pixel_avg_variance32x16_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance32x32 \
-  aom_highbd_12_sub_pixel_avg_variance32x32_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance32x64 \
-  aom_highbd_12_sub_pixel_avg_variance32x64_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x8_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance32x8 \
-  aom_highbd_12_sub_pixel_avg_variance32x8_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance4x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance4x16 \
-  aom_highbd_12_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance4x4 \
-  aom_highbd_12_sub_pixel_avg_variance4x4_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance4x8 \
-  aom_highbd_12_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance64x128 \
-  aom_highbd_12_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance64x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance64x16 \
-  aom_highbd_12_sub_pixel_avg_variance64x16_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance64x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance64x32 \
-  aom_highbd_12_sub_pixel_avg_variance64x32_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance64x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance64x64 \
-  aom_highbd_12_sub_pixel_avg_variance64x64_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance8x16 \
-  aom_highbd_12_sub_pixel_avg_variance8x16_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x32_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance8x32 \
-  aom_highbd_12_sub_pixel_avg_variance8x32_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance8x4 \
-  aom_highbd_12_sub_pixel_avg_variance8x4_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance8x8 \
-  aom_highbd_12_sub_pixel_avg_variance8x8_c
-
-uint32_t aom_highbd_12_sub_pixel_variance128x128_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance128x128 \
-  aom_highbd_12_sub_pixel_variance128x128_c
-
-uint32_t aom_highbd_12_sub_pixel_variance128x64_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance128x64 \
-  aom_highbd_12_sub_pixel_variance128x64_c
-
-uint32_t aom_highbd_12_sub_pixel_variance16x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance16x16 \
-  aom_highbd_12_sub_pixel_variance16x16_c
-
-uint32_t aom_highbd_12_sub_pixel_variance16x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance16x32 \
-  aom_highbd_12_sub_pixel_variance16x32_c
-
-uint32_t aom_highbd_12_sub_pixel_variance16x4_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance16x4 \
-  aom_highbd_12_sub_pixel_variance16x4_c
-
-uint32_t aom_highbd_12_sub_pixel_variance16x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance16x64 \
-  aom_highbd_12_sub_pixel_variance16x64_c
-
-uint32_t aom_highbd_12_sub_pixel_variance16x8_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance16x8 \
-  aom_highbd_12_sub_pixel_variance16x8_c
-
-uint32_t aom_highbd_12_sub_pixel_variance32x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance32x16 \
-  aom_highbd_12_sub_pixel_variance32x16_c
-
-uint32_t aom_highbd_12_sub_pixel_variance32x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance32x32 \
-  aom_highbd_12_sub_pixel_variance32x32_c
-
-uint32_t aom_highbd_12_sub_pixel_variance32x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance32x64 \
-  aom_highbd_12_sub_pixel_variance32x64_c
-
-uint32_t aom_highbd_12_sub_pixel_variance32x8_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance32x8 \
-  aom_highbd_12_sub_pixel_variance32x8_c
-
-uint32_t aom_highbd_12_sub_pixel_variance4x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance4x16 \
-  aom_highbd_12_sub_pixel_variance4x16_c
-
-uint32_t aom_highbd_12_sub_pixel_variance4x4_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance4x4 \
-  aom_highbd_12_sub_pixel_variance4x4_c
-
-uint32_t aom_highbd_12_sub_pixel_variance4x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance4x8 \
-  aom_highbd_12_sub_pixel_variance4x8_c
-
-uint32_t aom_highbd_12_sub_pixel_variance64x128_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance64x128 \
-  aom_highbd_12_sub_pixel_variance64x128_c
-
-uint32_t aom_highbd_12_sub_pixel_variance64x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance64x16 \
-  aom_highbd_12_sub_pixel_variance64x16_c
-
-uint32_t aom_highbd_12_sub_pixel_variance64x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance64x32 \
-  aom_highbd_12_sub_pixel_variance64x32_c
-
-uint32_t aom_highbd_12_sub_pixel_variance64x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance64x64 \
-  aom_highbd_12_sub_pixel_variance64x64_c
-
-uint32_t aom_highbd_12_sub_pixel_variance8x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance8x16 \
-  aom_highbd_12_sub_pixel_variance8x16_c
-
-uint32_t aom_highbd_12_sub_pixel_variance8x32_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance8x32 \
-  aom_highbd_12_sub_pixel_variance8x32_c
-
-uint32_t aom_highbd_12_sub_pixel_variance8x4_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance8x4 \
-  aom_highbd_12_sub_pixel_variance8x4_c
-
-uint32_t aom_highbd_12_sub_pixel_variance8x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance8x8 \
-  aom_highbd_12_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_12_variance128x128_c(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-#define aom_highbd_12_variance128x128 aom_highbd_12_variance128x128_c
-
-unsigned int aom_highbd_12_variance128x64_c(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-#define aom_highbd_12_variance128x64 aom_highbd_12_variance128x64_c
-
-unsigned int aom_highbd_12_variance16x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_12_variance16x16 aom_highbd_12_variance16x16_c
-
-unsigned int aom_highbd_12_variance16x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_12_variance16x32 aom_highbd_12_variance16x32_c
-
-unsigned int aom_highbd_12_variance16x4_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_12_variance16x4 aom_highbd_12_variance16x4_c
-
-unsigned int aom_highbd_12_variance16x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           uint32_t* sse);
-#define aom_highbd_12_variance16x64 aom_highbd_12_variance16x64_c
-
-unsigned int aom_highbd_12_variance16x8_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_12_variance16x8 aom_highbd_12_variance16x8_c
-
-unsigned int aom_highbd_12_variance2x2_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance2x2 aom_highbd_12_variance2x2_c
-
-unsigned int aom_highbd_12_variance2x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance2x4 aom_highbd_12_variance2x4_c
-
-unsigned int aom_highbd_12_variance32x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_12_variance32x16 aom_highbd_12_variance32x16_c
-
-unsigned int aom_highbd_12_variance32x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_12_variance32x32 aom_highbd_12_variance32x32_c
-
-unsigned int aom_highbd_12_variance32x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_12_variance32x64 aom_highbd_12_variance32x64_c
-
-unsigned int aom_highbd_12_variance32x8_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_12_variance32x8 aom_highbd_12_variance32x8_c
-
-unsigned int aom_highbd_12_variance4x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_12_variance4x16 aom_highbd_12_variance4x16_c
-
-unsigned int aom_highbd_12_variance4x2_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance4x2 aom_highbd_12_variance4x2_c
-
-unsigned int aom_highbd_12_variance4x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance4x4 aom_highbd_12_variance4x4_c
-
-unsigned int aom_highbd_12_variance4x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance4x8 aom_highbd_12_variance4x8_c
-
-unsigned int aom_highbd_12_variance64x128_c(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-#define aom_highbd_12_variance64x128 aom_highbd_12_variance64x128_c
-
-unsigned int aom_highbd_12_variance64x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           uint32_t* sse);
-#define aom_highbd_12_variance64x16 aom_highbd_12_variance64x16_c
-
-unsigned int aom_highbd_12_variance64x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_12_variance64x32 aom_highbd_12_variance64x32_c
-
-unsigned int aom_highbd_12_variance64x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_12_variance64x64 aom_highbd_12_variance64x64_c
-
-unsigned int aom_highbd_12_variance8x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_12_variance8x16 aom_highbd_12_variance8x16_c
-
-unsigned int aom_highbd_12_variance8x32_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_12_variance8x32 aom_highbd_12_variance8x32_c
-
-unsigned int aom_highbd_12_variance8x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance8x4 aom_highbd_12_variance8x4_c
-
-unsigned int aom_highbd_12_variance8x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance8x8 aom_highbd_12_variance8x8_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x128 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x64 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x16 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x16_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x32 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x32_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x4 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x4_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x64 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x64_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x8 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x8_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x16 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x16_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x32 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x32_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x64 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x64_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x8 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x8_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x16 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x4 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x4_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x8 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x128 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x16 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x16_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x32 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x32_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x64 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x64_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x16 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x16_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x32 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x32_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x4 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x4_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x8 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x8_c
-
-void aom_highbd_8_get16x16var_c(const uint8_t* src_ptr,
-                                int source_stride,
-                                const uint8_t* ref_ptr,
-                                int ref_stride,
-                                unsigned int* sse,
-                                int* sum);
-#define aom_highbd_8_get16x16var aom_highbd_8_get16x16var_c
-
-void aom_highbd_8_get8x8var_c(const uint8_t* src_ptr,
-                              int source_stride,
-                              const uint8_t* ref_ptr,
-                              int ref_stride,
-                              unsigned int* sse,
-                              int* sum);
-#define aom_highbd_8_get8x8var aom_highbd_8_get8x8var_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance128x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance128x128 \
-  aom_highbd_8_masked_sub_pixel_variance128x128_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance128x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance128x64 \
-  aom_highbd_8_masked_sub_pixel_variance128x64_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance16x16 \
-  aom_highbd_8_masked_sub_pixel_variance16x16_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance16x32 \
-  aom_highbd_8_masked_sub_pixel_variance16x32_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance16x4 \
-  aom_highbd_8_masked_sub_pixel_variance16x4_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance16x64 \
-  aom_highbd_8_masked_sub_pixel_variance16x64_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance16x8 \
-  aom_highbd_8_masked_sub_pixel_variance16x8_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance32x16 \
-  aom_highbd_8_masked_sub_pixel_variance32x16_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance32x32 \
-  aom_highbd_8_masked_sub_pixel_variance32x32_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance32x64 \
-  aom_highbd_8_masked_sub_pixel_variance32x64_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance32x8 \
-  aom_highbd_8_masked_sub_pixel_variance32x8_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance4x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance4x16 \
-  aom_highbd_8_masked_sub_pixel_variance4x16_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance4x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance4x4 \
-  aom_highbd_8_masked_sub_pixel_variance4x4_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance4x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance4x8 \
-  aom_highbd_8_masked_sub_pixel_variance4x8_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance64x128 \
-  aom_highbd_8_masked_sub_pixel_variance64x128_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance64x16 \
-  aom_highbd_8_masked_sub_pixel_variance64x16_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance64x32 \
-  aom_highbd_8_masked_sub_pixel_variance64x32_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance64x64 \
-  aom_highbd_8_masked_sub_pixel_variance64x64_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance8x16 \
-  aom_highbd_8_masked_sub_pixel_variance8x16_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance8x32 \
-  aom_highbd_8_masked_sub_pixel_variance8x32_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance8x4 \
-  aom_highbd_8_masked_sub_pixel_variance8x4_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance8x8 \
-  aom_highbd_8_masked_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_8_mse16x16_c(const uint8_t* src_ptr,
-                                     int source_stride,
-                                     const uint8_t* ref_ptr,
-                                     int recon_stride,
-                                     unsigned int* sse);
-#define aom_highbd_8_mse16x16 aom_highbd_8_mse16x16_c
-
-unsigned int aom_highbd_8_mse16x8_c(const uint8_t* src_ptr,
-                                    int source_stride,
-                                    const uint8_t* ref_ptr,
-                                    int recon_stride,
-                                    unsigned int* sse);
-#define aom_highbd_8_mse16x8 aom_highbd_8_mse16x8_c
-
-unsigned int aom_highbd_8_mse8x16_c(const uint8_t* src_ptr,
-                                    int source_stride,
-                                    const uint8_t* ref_ptr,
-                                    int recon_stride,
-                                    unsigned int* sse);
-#define aom_highbd_8_mse8x16 aom_highbd_8_mse8x16_c
-
-unsigned int aom_highbd_8_mse8x8_c(const uint8_t* src_ptr,
-                                   int source_stride,
-                                   const uint8_t* ref_ptr,
-                                   int recon_stride,
-                                   unsigned int* sse);
-#define aom_highbd_8_mse8x8 aom_highbd_8_mse8x8_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance128x128 \
-  aom_highbd_8_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance128x64 \
-  aom_highbd_8_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance16x16 \
-  aom_highbd_8_sub_pixel_avg_variance16x16_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x32_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance16x32 \
-  aom_highbd_8_sub_pixel_avg_variance16x32_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x4_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance16x4 \
-  aom_highbd_8_sub_pixel_avg_variance16x4_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x64_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance16x64 \
-  aom_highbd_8_sub_pixel_avg_variance16x64_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance16x8 \
-  aom_highbd_8_sub_pixel_avg_variance16x8_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance32x16 \
-  aom_highbd_8_sub_pixel_avg_variance32x16_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x32_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance32x32 \
-  aom_highbd_8_sub_pixel_avg_variance32x32_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x64_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance32x64 \
-  aom_highbd_8_sub_pixel_avg_variance32x64_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance32x8 \
-  aom_highbd_8_sub_pixel_avg_variance32x8_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance4x16_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance4x16 \
-  aom_highbd_8_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse,
-                                                  const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance4x4 \
-  aom_highbd_8_sub_pixel_avg_variance4x4_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse,
-                                                  const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance4x8 \
-  aom_highbd_8_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance64x128 \
-  aom_highbd_8_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance64x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance64x16 \
-  aom_highbd_8_sub_pixel_avg_variance64x16_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance64x32_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance64x32 \
-  aom_highbd_8_sub_pixel_avg_variance64x32_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance64x64_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance64x64 \
-  aom_highbd_8_sub_pixel_avg_variance64x64_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance8x16 \
-  aom_highbd_8_sub_pixel_avg_variance8x16_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x32_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance8x32 \
-  aom_highbd_8_sub_pixel_avg_variance8x32_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse,
-                                                  const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance8x4 \
-  aom_highbd_8_sub_pixel_avg_variance8x4_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse,
-                                                  const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance8x8 \
-  aom_highbd_8_sub_pixel_avg_variance8x8_c
-
-uint32_t aom_highbd_8_sub_pixel_variance128x128_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance128x128 \
-  aom_highbd_8_sub_pixel_variance128x128_c
-
-uint32_t aom_highbd_8_sub_pixel_variance128x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance128x64 \
-  aom_highbd_8_sub_pixel_variance128x64_c
-
-uint32_t aom_highbd_8_sub_pixel_variance16x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance16x16 \
-  aom_highbd_8_sub_pixel_variance16x16_c
-
-uint32_t aom_highbd_8_sub_pixel_variance16x32_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance16x32 \
-  aom_highbd_8_sub_pixel_variance16x32_c
-
-uint32_t aom_highbd_8_sub_pixel_variance16x4_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance16x4 \
-  aom_highbd_8_sub_pixel_variance16x4_c
-
-uint32_t aom_highbd_8_sub_pixel_variance16x64_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance16x64 \
-  aom_highbd_8_sub_pixel_variance16x64_c
-
-uint32_t aom_highbd_8_sub_pixel_variance16x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance16x8 \
-  aom_highbd_8_sub_pixel_variance16x8_c
-
-uint32_t aom_highbd_8_sub_pixel_variance32x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance32x16 \
-  aom_highbd_8_sub_pixel_variance32x16_c
-
-uint32_t aom_highbd_8_sub_pixel_variance32x32_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance32x32 \
-  aom_highbd_8_sub_pixel_variance32x32_c
-
-uint32_t aom_highbd_8_sub_pixel_variance32x64_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance32x64 \
-  aom_highbd_8_sub_pixel_variance32x64_c
-
-uint32_t aom_highbd_8_sub_pixel_variance32x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance32x8 \
-  aom_highbd_8_sub_pixel_variance32x8_c
-
-uint32_t aom_highbd_8_sub_pixel_variance4x16_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance4x16 \
-  aom_highbd_8_sub_pixel_variance4x16_c
-
-uint32_t aom_highbd_8_sub_pixel_variance4x4_c(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance4x4 aom_highbd_8_sub_pixel_variance4x4_c
-
-uint32_t aom_highbd_8_sub_pixel_variance4x8_c(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance4x8 aom_highbd_8_sub_pixel_variance4x8_c
-
-uint32_t aom_highbd_8_sub_pixel_variance64x128_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance64x128 \
-  aom_highbd_8_sub_pixel_variance64x128_c
-
-uint32_t aom_highbd_8_sub_pixel_variance64x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance64x16 \
-  aom_highbd_8_sub_pixel_variance64x16_c
-
-uint32_t aom_highbd_8_sub_pixel_variance64x32_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance64x32 \
-  aom_highbd_8_sub_pixel_variance64x32_c
-
-uint32_t aom_highbd_8_sub_pixel_variance64x64_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance64x64 \
-  aom_highbd_8_sub_pixel_variance64x64_c
-
-uint32_t aom_highbd_8_sub_pixel_variance8x16_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance8x16 \
-  aom_highbd_8_sub_pixel_variance8x16_c
-
-uint32_t aom_highbd_8_sub_pixel_variance8x32_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance8x32 \
-  aom_highbd_8_sub_pixel_variance8x32_c
-
-uint32_t aom_highbd_8_sub_pixel_variance8x4_c(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance8x4 aom_highbd_8_sub_pixel_variance8x4_c
-
-uint32_t aom_highbd_8_sub_pixel_variance8x8_c(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance8x8 aom_highbd_8_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_8_variance128x128_c(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-#define aom_highbd_8_variance128x128 aom_highbd_8_variance128x128_c
-
-unsigned int aom_highbd_8_variance128x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_8_variance128x64 aom_highbd_8_variance128x64_c
-
-unsigned int aom_highbd_8_variance16x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_8_variance16x16 aom_highbd_8_variance16x16_c
-
-unsigned int aom_highbd_8_variance16x32_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_8_variance16x32 aom_highbd_8_variance16x32_c
-
-unsigned int aom_highbd_8_variance16x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         uint32_t* sse);
-#define aom_highbd_8_variance16x4 aom_highbd_8_variance16x4_c
-
-unsigned int aom_highbd_8_variance16x64_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_8_variance16x64 aom_highbd_8_variance16x64_c
-
-unsigned int aom_highbd_8_variance16x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_8_variance16x8 aom_highbd_8_variance16x8_c
-
-unsigned int aom_highbd_8_variance2x2_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance2x2 aom_highbd_8_variance2x2_c
-
-unsigned int aom_highbd_8_variance2x4_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance2x4 aom_highbd_8_variance2x4_c
-
-unsigned int aom_highbd_8_variance32x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_8_variance32x16 aom_highbd_8_variance32x16_c
-
-unsigned int aom_highbd_8_variance32x32_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_8_variance32x32 aom_highbd_8_variance32x32_c
-
-unsigned int aom_highbd_8_variance32x64_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_8_variance32x64 aom_highbd_8_variance32x64_c
-
-unsigned int aom_highbd_8_variance32x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         uint32_t* sse);
-#define aom_highbd_8_variance32x8 aom_highbd_8_variance32x8_c
-
-unsigned int aom_highbd_8_variance4x16_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         uint32_t* sse);
-#define aom_highbd_8_variance4x16 aom_highbd_8_variance4x16_c
-
-unsigned int aom_highbd_8_variance4x2_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance4x2 aom_highbd_8_variance4x2_c
-
-unsigned int aom_highbd_8_variance4x4_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance4x4 aom_highbd_8_variance4x4_c
-
-unsigned int aom_highbd_8_variance4x8_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance4x8 aom_highbd_8_variance4x8_c
-
-unsigned int aom_highbd_8_variance64x128_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_8_variance64x128 aom_highbd_8_variance64x128_c
-
-unsigned int aom_highbd_8_variance64x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_8_variance64x16 aom_highbd_8_variance64x16_c
-
-unsigned int aom_highbd_8_variance64x32_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_8_variance64x32 aom_highbd_8_variance64x32_c
-
-unsigned int aom_highbd_8_variance64x64_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_8_variance64x64 aom_highbd_8_variance64x64_c
-
-unsigned int aom_highbd_8_variance8x16_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_8_variance8x16 aom_highbd_8_variance8x16_c
-
-unsigned int aom_highbd_8_variance8x32_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         uint32_t* sse);
-#define aom_highbd_8_variance8x32 aom_highbd_8_variance8x32_c
-
-unsigned int aom_highbd_8_variance8x4_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance8x4 aom_highbd_8_variance8x4_c
-
-unsigned int aom_highbd_8_variance8x8_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance8x8 aom_highbd_8_variance8x8_c
-
-unsigned int aom_highbd_avg_4x4_c(const uint8_t*, int p);
-#define aom_highbd_avg_4x4 aom_highbd_avg_4x4_c
-
-unsigned int aom_highbd_avg_8x8_c(const uint8_t*, int p);
-#define aom_highbd_avg_8x8 aom_highbd_avg_8x8_c
-
-void aom_highbd_blend_a64_d16_mask_c(uint8_t* dst,
-                                     uint32_t dst_stride,
-                                     const CONV_BUF_TYPE* src0,
-                                     uint32_t src0_stride,
-                                     const CONV_BUF_TYPE* src1,
-                                     uint32_t src1_stride,
-                                     const uint8_t* mask,
-                                     uint32_t mask_stride,
-                                     int w,
-                                     int h,
-                                     int subw,
-                                     int subh,
-                                     ConvolveParams* conv_params,
-                                     const int bd);
-#define aom_highbd_blend_a64_d16_mask aom_highbd_blend_a64_d16_mask_c
-
-void aom_highbd_blend_a64_hmask_c(uint8_t* dst,
-                                  uint32_t dst_stride,
-                                  const uint8_t* src0,
-                                  uint32_t src0_stride,
-                                  const uint8_t* src1,
-                                  uint32_t src1_stride,
-                                  const uint8_t* mask,
-                                  int w,
-                                  int h,
-                                  int bd);
-#define aom_highbd_blend_a64_hmask aom_highbd_blend_a64_hmask_c
-
-void aom_highbd_blend_a64_mask_c(uint8_t* dst,
-                                 uint32_t dst_stride,
-                                 const uint8_t* src0,
-                                 uint32_t src0_stride,
-                                 const uint8_t* src1,
-                                 uint32_t src1_stride,
-                                 const uint8_t* mask,
-                                 uint32_t mask_stride,
-                                 int w,
-                                 int h,
-                                 int subw,
-                                 int subh,
-                                 int bd);
-#define aom_highbd_blend_a64_mask aom_highbd_blend_a64_mask_c
-
-void aom_highbd_blend_a64_vmask_c(uint8_t* dst,
-                                  uint32_t dst_stride,
-                                  const uint8_t* src0,
-                                  uint32_t src0_stride,
-                                  const uint8_t* src1,
-                                  uint32_t src1_stride,
-                                  const uint8_t* mask,
-                                  int w,
-                                  int h,
-                                  int bd);
-#define aom_highbd_blend_a64_vmask aom_highbd_blend_a64_vmask_c
-
-void aom_highbd_comp_avg_pred_c(uint8_t* comp_pred8,
-                                const uint8_t* pred8,
-                                int width,
-                                int height,
-                                const uint8_t* ref8,
-                                int ref_stride);
-#define aom_highbd_comp_avg_pred aom_highbd_comp_avg_pred_c
-
-void aom_highbd_comp_avg_upsampled_pred_c(MACROBLOCKD* xd,
-                                          const struct AV1Common* const cm,
-                                          int mi_row,
-                                          int mi_col,
-                                          const MV* const mv,
-                                          uint8_t* comp_pred8,
-                                          const uint8_t* pred8,
-                                          int width,
-                                          int height,
-                                          int subpel_x_q3,
-                                          int subpel_y_q3,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          int bd,
-                                          int subpel_search);
-#define aom_highbd_comp_avg_upsampled_pred aom_highbd_comp_avg_upsampled_pred_c
-
-void aom_highbd_comp_mask_pred_c(uint8_t* comp_pred,
-                                 const uint8_t* pred8,
-                                 int width,
-                                 int height,
-                                 const uint8_t* ref8,
-                                 int ref_stride,
-                                 const uint8_t* mask,
-                                 int mask_stride,
-                                 int invert_mask);
-#define aom_highbd_comp_mask_pred aom_highbd_comp_mask_pred_c
-
-void aom_highbd_convolve8_horiz_c(const uint8_t* src,
-                                  ptrdiff_t src_stride,
-                                  uint8_t* dst,
-                                  ptrdiff_t dst_stride,
-                                  const int16_t* filter_x,
-                                  int x_step_q4,
-                                  const int16_t* filter_y,
-                                  int y_step_q4,
-                                  int w,
-                                  int h,
-                                  int bd);
-#define aom_highbd_convolve8_horiz aom_highbd_convolve8_horiz_c
-
-void aom_highbd_convolve8_vert_c(const uint8_t* src,
-                                 ptrdiff_t src_stride,
-                                 uint8_t* dst,
-                                 ptrdiff_t dst_stride,
-                                 const int16_t* filter_x,
-                                 int x_step_q4,
-                                 const int16_t* filter_y,
-                                 int y_step_q4,
-                                 int w,
-                                 int h,
-                                 int bd);
-#define aom_highbd_convolve8_vert aom_highbd_convolve8_vert_c
-
-void aom_highbd_convolve_copy_c(const uint16_t* src,
-                                ptrdiff_t src_stride,
-                                uint16_t* dst,
-                                ptrdiff_t dst_stride,
-                                int w,
-                                int h);
-#define aom_highbd_convolve_copy aom_highbd_convolve_copy_c
-
-void aom_highbd_dc_128_predictor_16x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_16x16 aom_highbd_dc_128_predictor_16x16_c
-
-void aom_highbd_dc_128_predictor_16x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_16x32 aom_highbd_dc_128_predictor_16x32_c
-
-void aom_highbd_dc_128_predictor_16x4_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_16x4 aom_highbd_dc_128_predictor_16x4_c
-
-void aom_highbd_dc_128_predictor_16x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_16x64 aom_highbd_dc_128_predictor_16x64_c
-
-void aom_highbd_dc_128_predictor_16x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_16x8 aom_highbd_dc_128_predictor_16x8_c
-
-void aom_highbd_dc_128_predictor_2x2_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_128_predictor_2x2 aom_highbd_dc_128_predictor_2x2_c
-
-void aom_highbd_dc_128_predictor_32x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_32x16 aom_highbd_dc_128_predictor_32x16_c
-
-void aom_highbd_dc_128_predictor_32x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_32x32 aom_highbd_dc_128_predictor_32x32_c
-
-void aom_highbd_dc_128_predictor_32x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_32x64 aom_highbd_dc_128_predictor_32x64_c
-
-void aom_highbd_dc_128_predictor_32x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_32x8 aom_highbd_dc_128_predictor_32x8_c
-
-void aom_highbd_dc_128_predictor_4x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_4x16 aom_highbd_dc_128_predictor_4x16_c
-
-void aom_highbd_dc_128_predictor_4x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_128_predictor_4x4 aom_highbd_dc_128_predictor_4x4_c
-
-void aom_highbd_dc_128_predictor_4x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_128_predictor_4x8 aom_highbd_dc_128_predictor_4x8_c
-
-void aom_highbd_dc_128_predictor_64x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_64x16 aom_highbd_dc_128_predictor_64x16_c
-
-void aom_highbd_dc_128_predictor_64x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_64x32 aom_highbd_dc_128_predictor_64x32_c
-
-void aom_highbd_dc_128_predictor_64x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_64x64 aom_highbd_dc_128_predictor_64x64_c
-
-void aom_highbd_dc_128_predictor_8x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_8x16 aom_highbd_dc_128_predictor_8x16_c
-
-void aom_highbd_dc_128_predictor_8x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_8x32 aom_highbd_dc_128_predictor_8x32_c
-
-void aom_highbd_dc_128_predictor_8x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_128_predictor_8x4 aom_highbd_dc_128_predictor_8x4_c
-
-void aom_highbd_dc_128_predictor_8x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_128_predictor_8x8 aom_highbd_dc_128_predictor_8x8_c
-
-void aom_highbd_dc_left_predictor_16x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_16x16 aom_highbd_dc_left_predictor_16x16_c
-
-void aom_highbd_dc_left_predictor_16x32_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_16x32 aom_highbd_dc_left_predictor_16x32_c
-
-void aom_highbd_dc_left_predictor_16x4_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_16x4 aom_highbd_dc_left_predictor_16x4_c
-
-void aom_highbd_dc_left_predictor_16x64_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_16x64 aom_highbd_dc_left_predictor_16x64_c
-
-void aom_highbd_dc_left_predictor_16x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_16x8 aom_highbd_dc_left_predictor_16x8_c
-
-void aom_highbd_dc_left_predictor_2x2_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_left_predictor_2x2 aom_highbd_dc_left_predictor_2x2_c
-
-void aom_highbd_dc_left_predictor_32x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_32x16 aom_highbd_dc_left_predictor_32x16_c
-
-void aom_highbd_dc_left_predictor_32x32_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_32x32 aom_highbd_dc_left_predictor_32x32_c
-
-void aom_highbd_dc_left_predictor_32x64_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_32x64 aom_highbd_dc_left_predictor_32x64_c
-
-void aom_highbd_dc_left_predictor_32x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_32x8 aom_highbd_dc_left_predictor_32x8_c
-
-void aom_highbd_dc_left_predictor_4x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_4x16 aom_highbd_dc_left_predictor_4x16_c
-
-void aom_highbd_dc_left_predictor_4x4_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_left_predictor_4x4 aom_highbd_dc_left_predictor_4x4_c
-
-void aom_highbd_dc_left_predictor_4x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_left_predictor_4x8 aom_highbd_dc_left_predictor_4x8_c
-
-void aom_highbd_dc_left_predictor_64x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_64x16 aom_highbd_dc_left_predictor_64x16_c
-
-void aom_highbd_dc_left_predictor_64x32_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_64x32 aom_highbd_dc_left_predictor_64x32_c
-
-void aom_highbd_dc_left_predictor_64x64_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_64x64 aom_highbd_dc_left_predictor_64x64_c
-
-void aom_highbd_dc_left_predictor_8x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_8x16 aom_highbd_dc_left_predictor_8x16_c
-
-void aom_highbd_dc_left_predictor_8x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_8x32 aom_highbd_dc_left_predictor_8x32_c
-
-void aom_highbd_dc_left_predictor_8x4_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_left_predictor_8x4 aom_highbd_dc_left_predictor_8x4_c
-
-void aom_highbd_dc_left_predictor_8x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_left_predictor_8x8 aom_highbd_dc_left_predictor_8x8_c
-
-void aom_highbd_dc_predictor_16x16_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-void aom_highbd_dc_predictor_16x16_neon(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_predictor_16x16 aom_highbd_dc_predictor_16x16_neon
-
-void aom_highbd_dc_predictor_16x32_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_16x32 aom_highbd_dc_predictor_16x32_c
-
-void aom_highbd_dc_predictor_16x4_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_16x4 aom_highbd_dc_predictor_16x4_c
-
-void aom_highbd_dc_predictor_16x64_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_16x64 aom_highbd_dc_predictor_16x64_c
-
-void aom_highbd_dc_predictor_16x8_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_16x8 aom_highbd_dc_predictor_16x8_c
-
-void aom_highbd_dc_predictor_2x2_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_dc_predictor_2x2 aom_highbd_dc_predictor_2x2_c
-
-void aom_highbd_dc_predictor_32x16_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_32x16 aom_highbd_dc_predictor_32x16_c
-
-void aom_highbd_dc_predictor_32x32_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-void aom_highbd_dc_predictor_32x32_neon(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_predictor_32x32 aom_highbd_dc_predictor_32x32_neon
-
-void aom_highbd_dc_predictor_32x64_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_32x64 aom_highbd_dc_predictor_32x64_c
-
-void aom_highbd_dc_predictor_32x8_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_32x8 aom_highbd_dc_predictor_32x8_c
-
-void aom_highbd_dc_predictor_4x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_4x16 aom_highbd_dc_predictor_4x16_c
-
-void aom_highbd_dc_predictor_4x4_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-void aom_highbd_dc_predictor_4x4_neon(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_dc_predictor_4x4 aom_highbd_dc_predictor_4x4_neon
-
-void aom_highbd_dc_predictor_4x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_dc_predictor_4x8 aom_highbd_dc_predictor_4x8_c
-
-void aom_highbd_dc_predictor_64x16_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_64x16 aom_highbd_dc_predictor_64x16_c
-
-void aom_highbd_dc_predictor_64x32_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_64x32 aom_highbd_dc_predictor_64x32_c
-
-void aom_highbd_dc_predictor_64x64_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-void aom_highbd_dc_predictor_64x64_neon(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_predictor_64x64 aom_highbd_dc_predictor_64x64_neon
-
-void aom_highbd_dc_predictor_8x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_8x16 aom_highbd_dc_predictor_8x16_c
-
-void aom_highbd_dc_predictor_8x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_8x32 aom_highbd_dc_predictor_8x32_c
-
-void aom_highbd_dc_predictor_8x4_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_dc_predictor_8x4 aom_highbd_dc_predictor_8x4_c
-
-void aom_highbd_dc_predictor_8x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-void aom_highbd_dc_predictor_8x8_neon(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_dc_predictor_8x8 aom_highbd_dc_predictor_8x8_neon
-
-void aom_highbd_dc_top_predictor_16x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_16x16 aom_highbd_dc_top_predictor_16x16_c
-
-void aom_highbd_dc_top_predictor_16x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_16x32 aom_highbd_dc_top_predictor_16x32_c
-
-void aom_highbd_dc_top_predictor_16x4_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_16x4 aom_highbd_dc_top_predictor_16x4_c
-
-void aom_highbd_dc_top_predictor_16x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_16x64 aom_highbd_dc_top_predictor_16x64_c
-
-void aom_highbd_dc_top_predictor_16x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_16x8 aom_highbd_dc_top_predictor_16x8_c
-
-void aom_highbd_dc_top_predictor_2x2_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_top_predictor_2x2 aom_highbd_dc_top_predictor_2x2_c
-
-void aom_highbd_dc_top_predictor_32x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_32x16 aom_highbd_dc_top_predictor_32x16_c
-
-void aom_highbd_dc_top_predictor_32x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_32x32 aom_highbd_dc_top_predictor_32x32_c
-
-void aom_highbd_dc_top_predictor_32x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_32x64 aom_highbd_dc_top_predictor_32x64_c
-
-void aom_highbd_dc_top_predictor_32x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_32x8 aom_highbd_dc_top_predictor_32x8_c
-
-void aom_highbd_dc_top_predictor_4x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_4x16 aom_highbd_dc_top_predictor_4x16_c
-
-void aom_highbd_dc_top_predictor_4x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_top_predictor_4x4 aom_highbd_dc_top_predictor_4x4_c
-
-void aom_highbd_dc_top_predictor_4x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_top_predictor_4x8 aom_highbd_dc_top_predictor_4x8_c
-
-void aom_highbd_dc_top_predictor_64x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_64x16 aom_highbd_dc_top_predictor_64x16_c
-
-void aom_highbd_dc_top_predictor_64x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_64x32 aom_highbd_dc_top_predictor_64x32_c
-
-void aom_highbd_dc_top_predictor_64x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_64x64 aom_highbd_dc_top_predictor_64x64_c
-
-void aom_highbd_dc_top_predictor_8x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_8x16 aom_highbd_dc_top_predictor_8x16_c
-
-void aom_highbd_dc_top_predictor_8x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_8x32 aom_highbd_dc_top_predictor_8x32_c
-
-void aom_highbd_dc_top_predictor_8x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_top_predictor_8x4 aom_highbd_dc_top_predictor_8x4_c
-
-void aom_highbd_dc_top_predictor_8x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_top_predictor_8x8 aom_highbd_dc_top_predictor_8x8_c
-
-void aom_highbd_dist_wtd_comp_avg_pred_c(uint8_t* comp_pred8,
-                                         const uint8_t* pred8,
-                                         int width,
-                                         int height,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_comp_avg_pred aom_highbd_dist_wtd_comp_avg_pred_c
-
-void aom_highbd_dist_wtd_comp_avg_upsampled_pred_c(
-    MACROBLOCKD* xd,
-    const struct AV1Common* const cm,
-    int mi_row,
-    int mi_col,
-    const MV* const mv,
-    uint8_t* comp_pred8,
-    const uint8_t* pred8,
-    int width,
-    int height,
-    int subpel_x_q3,
-    int subpel_y_q3,
-    const uint8_t* ref8,
-    int ref_stride,
-    int bd,
-    const DIST_WTD_COMP_PARAMS* jcp_param,
-    int subpel_search);
-#define aom_highbd_dist_wtd_comp_avg_upsampled_pred \
-  aom_highbd_dist_wtd_comp_avg_upsampled_pred_c
-
-unsigned int aom_highbd_dist_wtd_sad128x128_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad128x128_avg aom_highbd_dist_wtd_sad128x128_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad128x64_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad128x64_avg aom_highbd_dist_wtd_sad128x64_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad16x16_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad16x16_avg aom_highbd_dist_wtd_sad16x16_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad16x32_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad16x32_avg aom_highbd_dist_wtd_sad16x32_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad16x4_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad16x4_avg aom_highbd_dist_wtd_sad16x4_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad16x64_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad16x64_avg aom_highbd_dist_wtd_sad16x64_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad16x8_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad16x8_avg aom_highbd_dist_wtd_sad16x8_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad32x16_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad32x16_avg aom_highbd_dist_wtd_sad32x16_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad32x32_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad32x32_avg aom_highbd_dist_wtd_sad32x32_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad32x64_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad32x64_avg aom_highbd_dist_wtd_sad32x64_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad32x8_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad32x8_avg aom_highbd_dist_wtd_sad32x8_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad4x16_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad4x16_avg aom_highbd_dist_wtd_sad4x16_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad4x4_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad4x4_avg aom_highbd_dist_wtd_sad4x4_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad4x8_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad4x8_avg aom_highbd_dist_wtd_sad4x8_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad64x128_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad64x128_avg aom_highbd_dist_wtd_sad64x128_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad64x16_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad64x16_avg aom_highbd_dist_wtd_sad64x16_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad64x32_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad64x32_avg aom_highbd_dist_wtd_sad64x32_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad64x64_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad64x64_avg aom_highbd_dist_wtd_sad64x64_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad8x16_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad8x16_avg aom_highbd_dist_wtd_sad8x16_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad8x32_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad8x32_avg aom_highbd_dist_wtd_sad8x32_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad8x4_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad8x4_avg aom_highbd_dist_wtd_sad8x4_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad8x8_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad8x8_avg aom_highbd_dist_wtd_sad8x8_avg_c
-
-void aom_highbd_fdct8x8_c(const int16_t* input, tran_low_t* output, int stride);
-#define aom_highbd_fdct8x8 aom_highbd_fdct8x8_c
-
-void aom_highbd_h_predictor_16x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_16x16 aom_highbd_h_predictor_16x16_c
-
-void aom_highbd_h_predictor_16x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_16x32 aom_highbd_h_predictor_16x32_c
-
-void aom_highbd_h_predictor_16x4_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_16x4 aom_highbd_h_predictor_16x4_c
-
-void aom_highbd_h_predictor_16x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_16x64 aom_highbd_h_predictor_16x64_c
-
-void aom_highbd_h_predictor_16x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_16x8 aom_highbd_h_predictor_16x8_c
-
-void aom_highbd_h_predictor_2x2_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_h_predictor_2x2 aom_highbd_h_predictor_2x2_c
-
-void aom_highbd_h_predictor_32x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_32x16 aom_highbd_h_predictor_32x16_c
-
-void aom_highbd_h_predictor_32x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_32x32 aom_highbd_h_predictor_32x32_c
-
-void aom_highbd_h_predictor_32x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_32x64 aom_highbd_h_predictor_32x64_c
-
-void aom_highbd_h_predictor_32x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_32x8 aom_highbd_h_predictor_32x8_c
-
-void aom_highbd_h_predictor_4x16_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_4x16 aom_highbd_h_predictor_4x16_c
-
-void aom_highbd_h_predictor_4x4_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_h_predictor_4x4 aom_highbd_h_predictor_4x4_c
-
-void aom_highbd_h_predictor_4x8_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_h_predictor_4x8 aom_highbd_h_predictor_4x8_c
-
-void aom_highbd_h_predictor_64x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_64x16 aom_highbd_h_predictor_64x16_c
-
-void aom_highbd_h_predictor_64x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_64x32 aom_highbd_h_predictor_64x32_c
-
-void aom_highbd_h_predictor_64x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_64x64 aom_highbd_h_predictor_64x64_c
-
-void aom_highbd_h_predictor_8x16_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_8x16 aom_highbd_h_predictor_8x16_c
-
-void aom_highbd_h_predictor_8x32_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_8x32 aom_highbd_h_predictor_8x32_c
-
-void aom_highbd_h_predictor_8x4_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_h_predictor_8x4 aom_highbd_h_predictor_8x4_c
-
-void aom_highbd_h_predictor_8x8_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_h_predictor_8x8 aom_highbd_h_predictor_8x8_c
-
-void aom_highbd_hadamard_16x16_c(const int16_t* src_diff,
-                                 ptrdiff_t src_stride,
-                                 tran_low_t* coeff);
-#define aom_highbd_hadamard_16x16 aom_highbd_hadamard_16x16_c
-
-void aom_highbd_hadamard_32x32_c(const int16_t* src_diff,
-                                 ptrdiff_t src_stride,
-                                 tran_low_t* coeff);
-#define aom_highbd_hadamard_32x32 aom_highbd_hadamard_32x32_c
-
-void aom_highbd_hadamard_8x8_c(const int16_t* src_diff,
-                               ptrdiff_t src_stride,
-                               tran_low_t* coeff);
-#define aom_highbd_hadamard_8x8 aom_highbd_hadamard_8x8_c
-
-void aom_highbd_lpf_horizontal_14_c(uint16_t* s,
-                                    int pitch,
-                                    const uint8_t* blimit,
-                                    const uint8_t* limit,
-                                    const uint8_t* thresh,
-                                    int bd);
-#define aom_highbd_lpf_horizontal_14 aom_highbd_lpf_horizontal_14_c
-
-void aom_highbd_lpf_horizontal_14_dual_c(uint16_t* s,
-                                         int pitch,
-                                         const uint8_t* blimit0,
-                                         const uint8_t* limit0,
-                                         const uint8_t* thresh0,
-                                         const uint8_t* blimit1,
-                                         const uint8_t* limit1,
-                                         const uint8_t* thresh1,
-                                         int bd);
-#define aom_highbd_lpf_horizontal_14_dual aom_highbd_lpf_horizontal_14_dual_c
-
-void aom_highbd_lpf_horizontal_4_c(uint16_t* s,
-                                   int pitch,
-                                   const uint8_t* blimit,
-                                   const uint8_t* limit,
-                                   const uint8_t* thresh,
-                                   int bd);
-#define aom_highbd_lpf_horizontal_4 aom_highbd_lpf_horizontal_4_c
-
-void aom_highbd_lpf_horizontal_4_dual_c(uint16_t* s,
-                                        int pitch,
-                                        const uint8_t* blimit0,
-                                        const uint8_t* limit0,
-                                        const uint8_t* thresh0,
-                                        const uint8_t* blimit1,
-                                        const uint8_t* limit1,
-                                        const uint8_t* thresh1,
-                                        int bd);
-#define aom_highbd_lpf_horizontal_4_dual aom_highbd_lpf_horizontal_4_dual_c
-
-void aom_highbd_lpf_horizontal_6_c(uint16_t* s,
-                                   int pitch,
-                                   const uint8_t* blimit,
-                                   const uint8_t* limit,
-                                   const uint8_t* thresh,
-                                   int bd);
-#define aom_highbd_lpf_horizontal_6 aom_highbd_lpf_horizontal_6_c
-
-void aom_highbd_lpf_horizontal_6_dual_c(uint16_t* s,
-                                        int pitch,
-                                        const uint8_t* blimit0,
-                                        const uint8_t* limit0,
-                                        const uint8_t* thresh0,
-                                        const uint8_t* blimit1,
-                                        const uint8_t* limit1,
-                                        const uint8_t* thresh1,
-                                        int bd);
-#define aom_highbd_lpf_horizontal_6_dual aom_highbd_lpf_horizontal_6_dual_c
-
-void aom_highbd_lpf_horizontal_8_c(uint16_t* s,
-                                   int pitch,
-                                   const uint8_t* blimit,
-                                   const uint8_t* limit,
-                                   const uint8_t* thresh,
-                                   int bd);
-#define aom_highbd_lpf_horizontal_8 aom_highbd_lpf_horizontal_8_c
-
-void aom_highbd_lpf_horizontal_8_dual_c(uint16_t* s,
-                                        int pitch,
-                                        const uint8_t* blimit0,
-                                        const uint8_t* limit0,
-                                        const uint8_t* thresh0,
-                                        const uint8_t* blimit1,
-                                        const uint8_t* limit1,
-                                        const uint8_t* thresh1,
-                                        int bd);
-#define aom_highbd_lpf_horizontal_8_dual aom_highbd_lpf_horizontal_8_dual_c
-
-void aom_highbd_lpf_vertical_14_c(uint16_t* s,
-                                  int pitch,
-                                  const uint8_t* blimit,
-                                  const uint8_t* limit,
-                                  const uint8_t* thresh,
-                                  int bd);
-#define aom_highbd_lpf_vertical_14 aom_highbd_lpf_vertical_14_c
-
-void aom_highbd_lpf_vertical_14_dual_c(uint16_t* s,
-                                       int pitch,
-                                       const uint8_t* blimit0,
-                                       const uint8_t* limit0,
-                                       const uint8_t* thresh0,
-                                       const uint8_t* blimit1,
-                                       const uint8_t* limit1,
-                                       const uint8_t* thresh1,
-                                       int bd);
-#define aom_highbd_lpf_vertical_14_dual aom_highbd_lpf_vertical_14_dual_c
-
-void aom_highbd_lpf_vertical_4_c(uint16_t* s,
-                                 int pitch,
-                                 const uint8_t* blimit,
-                                 const uint8_t* limit,
-                                 const uint8_t* thresh,
-                                 int bd);
-#define aom_highbd_lpf_vertical_4 aom_highbd_lpf_vertical_4_c
-
-void aom_highbd_lpf_vertical_4_dual_c(uint16_t* s,
-                                      int pitch,
-                                      const uint8_t* blimit0,
-                                      const uint8_t* limit0,
-                                      const uint8_t* thresh0,
-                                      const uint8_t* blimit1,
-                                      const uint8_t* limit1,
-                                      const uint8_t* thresh1,
-                                      int bd);
-#define aom_highbd_lpf_vertical_4_dual aom_highbd_lpf_vertical_4_dual_c
-
-void aom_highbd_lpf_vertical_6_c(uint16_t* s,
-                                 int pitch,
-                                 const uint8_t* blimit,
-                                 const uint8_t* limit,
-                                 const uint8_t* thresh,
-                                 int bd);
-#define aom_highbd_lpf_vertical_6 aom_highbd_lpf_vertical_6_c
-
-void aom_highbd_lpf_vertical_6_dual_c(uint16_t* s,
-                                      int pitch,
-                                      const uint8_t* blimit0,
-                                      const uint8_t* limit0,
-                                      const uint8_t* thresh0,
-                                      const uint8_t* blimit1,
-                                      const uint8_t* limit1,
-                                      const uint8_t* thresh1,
-                                      int bd);
-#define aom_highbd_lpf_vertical_6_dual aom_highbd_lpf_vertical_6_dual_c
-
-void aom_highbd_lpf_vertical_8_c(uint16_t* s,
-                                 int pitch,
-                                 const uint8_t* blimit,
-                                 const uint8_t* limit,
-                                 const uint8_t* thresh,
-                                 int bd);
-#define aom_highbd_lpf_vertical_8 aom_highbd_lpf_vertical_8_c
-
-void aom_highbd_lpf_vertical_8_dual_c(uint16_t* s,
-                                      int pitch,
-                                      const uint8_t* blimit0,
-                                      const uint8_t* limit0,
-                                      const uint8_t* thresh0,
-                                      const uint8_t* blimit1,
-                                      const uint8_t* limit1,
-                                      const uint8_t* thresh1,
-                                      int bd);
-#define aom_highbd_lpf_vertical_8_dual aom_highbd_lpf_vertical_8_dual_c
-
-unsigned int aom_highbd_masked_sad128x128_c(const uint8_t* src8,
-                                            int src_stride,
-                                            const uint8_t* ref8,
-                                            int ref_stride,
-                                            const uint8_t* second_pred8,
-                                            const uint8_t* msk,
-                                            int msk_stride,
-                                            int invert_mask);
-#define aom_highbd_masked_sad128x128 aom_highbd_masked_sad128x128_c
-
-unsigned int aom_highbd_masked_sad128x64_c(const uint8_t* src8,
-                                           int src_stride,
-                                           const uint8_t* ref8,
-                                           int ref_stride,
-                                           const uint8_t* second_pred8,
-                                           const uint8_t* msk,
-                                           int msk_stride,
-                                           int invert_mask);
-#define aom_highbd_masked_sad128x64 aom_highbd_masked_sad128x64_c
-
-unsigned int aom_highbd_masked_sad16x16_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad16x16 aom_highbd_masked_sad16x16_c
-
-unsigned int aom_highbd_masked_sad16x32_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad16x32 aom_highbd_masked_sad16x32_c
-
-unsigned int aom_highbd_masked_sad16x4_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-#define aom_highbd_masked_sad16x4 aom_highbd_masked_sad16x4_c
-
-unsigned int aom_highbd_masked_sad16x64_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad16x64 aom_highbd_masked_sad16x64_c
-
-unsigned int aom_highbd_masked_sad16x8_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-#define aom_highbd_masked_sad16x8 aom_highbd_masked_sad16x8_c
-
-unsigned int aom_highbd_masked_sad32x16_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad32x16 aom_highbd_masked_sad32x16_c
-
-unsigned int aom_highbd_masked_sad32x32_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad32x32 aom_highbd_masked_sad32x32_c
-
-unsigned int aom_highbd_masked_sad32x64_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad32x64 aom_highbd_masked_sad32x64_c
-
-unsigned int aom_highbd_masked_sad32x8_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-#define aom_highbd_masked_sad32x8 aom_highbd_masked_sad32x8_c
-
-unsigned int aom_highbd_masked_sad4x16_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-#define aom_highbd_masked_sad4x16 aom_highbd_masked_sad4x16_c
-
-unsigned int aom_highbd_masked_sad4x4_c(const uint8_t* src8,
-                                        int src_stride,
-                                        const uint8_t* ref8,
-                                        int ref_stride,
-                                        const uint8_t* second_pred8,
-                                        const uint8_t* msk,
-                                        int msk_stride,
-                                        int invert_mask);
-#define aom_highbd_masked_sad4x4 aom_highbd_masked_sad4x4_c
-
-unsigned int aom_highbd_masked_sad4x8_c(const uint8_t* src8,
-                                        int src_stride,
-                                        const uint8_t* ref8,
-                                        int ref_stride,
-                                        const uint8_t* second_pred8,
-                                        const uint8_t* msk,
-                                        int msk_stride,
-                                        int invert_mask);
-#define aom_highbd_masked_sad4x8 aom_highbd_masked_sad4x8_c
-
-unsigned int aom_highbd_masked_sad64x128_c(const uint8_t* src8,
-                                           int src_stride,
-                                           const uint8_t* ref8,
-                                           int ref_stride,
-                                           const uint8_t* second_pred8,
-                                           const uint8_t* msk,
-                                           int msk_stride,
-                                           int invert_mask);
-#define aom_highbd_masked_sad64x128 aom_highbd_masked_sad64x128_c
-
-unsigned int aom_highbd_masked_sad64x16_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad64x16 aom_highbd_masked_sad64x16_c
-
-unsigned int aom_highbd_masked_sad64x32_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad64x32 aom_highbd_masked_sad64x32_c
-
-unsigned int aom_highbd_masked_sad64x64_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad64x64 aom_highbd_masked_sad64x64_c
-
-unsigned int aom_highbd_masked_sad8x16_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-#define aom_highbd_masked_sad8x16 aom_highbd_masked_sad8x16_c
-
-unsigned int aom_highbd_masked_sad8x32_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-#define aom_highbd_masked_sad8x32 aom_highbd_masked_sad8x32_c
-
-unsigned int aom_highbd_masked_sad8x4_c(const uint8_t* src8,
-                                        int src_stride,
-                                        const uint8_t* ref8,
-                                        int ref_stride,
-                                        const uint8_t* second_pred8,
-                                        const uint8_t* msk,
-                                        int msk_stride,
-                                        int invert_mask);
-#define aom_highbd_masked_sad8x4 aom_highbd_masked_sad8x4_c
-
-unsigned int aom_highbd_masked_sad8x8_c(const uint8_t* src8,
-                                        int src_stride,
-                                        const uint8_t* ref8,
-                                        int ref_stride,
-                                        const uint8_t* second_pred8,
-                                        const uint8_t* msk,
-                                        int msk_stride,
-                                        int invert_mask);
-#define aom_highbd_masked_sad8x8 aom_highbd_masked_sad8x8_c
-
-void aom_highbd_minmax_8x8_c(const uint8_t* s,
-                             int p,
-                             const uint8_t* d,
-                             int dp,
-                             int* min,
-                             int* max);
-#define aom_highbd_minmax_8x8 aom_highbd_minmax_8x8_c
-
-unsigned int aom_highbd_obmc_sad128x128_c(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask);
-#define aom_highbd_obmc_sad128x128 aom_highbd_obmc_sad128x128_c
-
-unsigned int aom_highbd_obmc_sad128x64_c(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask);
-#define aom_highbd_obmc_sad128x64 aom_highbd_obmc_sad128x64_c
-
-unsigned int aom_highbd_obmc_sad16x16_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad16x16 aom_highbd_obmc_sad16x16_c
-
-unsigned int aom_highbd_obmc_sad16x32_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad16x32 aom_highbd_obmc_sad16x32_c
-
-unsigned int aom_highbd_obmc_sad16x4_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-#define aom_highbd_obmc_sad16x4 aom_highbd_obmc_sad16x4_c
-
-unsigned int aom_highbd_obmc_sad16x64_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad16x64 aom_highbd_obmc_sad16x64_c
-
-unsigned int aom_highbd_obmc_sad16x8_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-#define aom_highbd_obmc_sad16x8 aom_highbd_obmc_sad16x8_c
-
-unsigned int aom_highbd_obmc_sad32x16_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad32x16 aom_highbd_obmc_sad32x16_c
-
-unsigned int aom_highbd_obmc_sad32x32_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad32x32 aom_highbd_obmc_sad32x32_c
-
-unsigned int aom_highbd_obmc_sad32x64_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad32x64 aom_highbd_obmc_sad32x64_c
-
-unsigned int aom_highbd_obmc_sad32x8_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-#define aom_highbd_obmc_sad32x8 aom_highbd_obmc_sad32x8_c
-
-unsigned int aom_highbd_obmc_sad4x16_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-#define aom_highbd_obmc_sad4x16 aom_highbd_obmc_sad4x16_c
-
-unsigned int aom_highbd_obmc_sad4x4_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-#define aom_highbd_obmc_sad4x4 aom_highbd_obmc_sad4x4_c
-
-unsigned int aom_highbd_obmc_sad4x8_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-#define aom_highbd_obmc_sad4x8 aom_highbd_obmc_sad4x8_c
-
-unsigned int aom_highbd_obmc_sad64x128_c(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask);
-#define aom_highbd_obmc_sad64x128 aom_highbd_obmc_sad64x128_c
-
-unsigned int aom_highbd_obmc_sad64x16_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad64x16 aom_highbd_obmc_sad64x16_c
-
-unsigned int aom_highbd_obmc_sad64x32_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad64x32 aom_highbd_obmc_sad64x32_c
-
-unsigned int aom_highbd_obmc_sad64x64_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad64x64 aom_highbd_obmc_sad64x64_c
-
-unsigned int aom_highbd_obmc_sad8x16_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-#define aom_highbd_obmc_sad8x16 aom_highbd_obmc_sad8x16_c
-
-unsigned int aom_highbd_obmc_sad8x32_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-#define aom_highbd_obmc_sad8x32 aom_highbd_obmc_sad8x32_c
-
-unsigned int aom_highbd_obmc_sad8x4_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-#define aom_highbd_obmc_sad8x4 aom_highbd_obmc_sad8x4_c
-
-unsigned int aom_highbd_obmc_sad8x8_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-#define aom_highbd_obmc_sad8x8 aom_highbd_obmc_sad8x8_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance128x128_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance128x128 \
-  aom_highbd_obmc_sub_pixel_variance128x128_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance128x64_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance128x64 \
-  aom_highbd_obmc_sub_pixel_variance128x64_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance16x16_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance16x16 \
-  aom_highbd_obmc_sub_pixel_variance16x16_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance16x32_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance16x32 \
-  aom_highbd_obmc_sub_pixel_variance16x32_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance16x4_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance16x4 \
-  aom_highbd_obmc_sub_pixel_variance16x4_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance16x64_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance16x64 \
-  aom_highbd_obmc_sub_pixel_variance16x64_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance16x8_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance16x8 \
-  aom_highbd_obmc_sub_pixel_variance16x8_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance32x16_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance32x16 \
-  aom_highbd_obmc_sub_pixel_variance32x16_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance32x32_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance32x32 \
-  aom_highbd_obmc_sub_pixel_variance32x32_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance32x64_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance32x64 \
-  aom_highbd_obmc_sub_pixel_variance32x64_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance32x8_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance32x8 \
-  aom_highbd_obmc_sub_pixel_variance32x8_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance4x16_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance4x16 \
-  aom_highbd_obmc_sub_pixel_variance4x16_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance4x4_c(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance4x4 \
-  aom_highbd_obmc_sub_pixel_variance4x4_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance4x8_c(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance4x8 \
-  aom_highbd_obmc_sub_pixel_variance4x8_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance64x128_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance64x128 \
-  aom_highbd_obmc_sub_pixel_variance64x128_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance64x16_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance64x16 \
-  aom_highbd_obmc_sub_pixel_variance64x16_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance64x32_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance64x32 \
-  aom_highbd_obmc_sub_pixel_variance64x32_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance64x64_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance64x64 \
-  aom_highbd_obmc_sub_pixel_variance64x64_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance8x16_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance8x16 \
-  aom_highbd_obmc_sub_pixel_variance8x16_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance8x32_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance8x32 \
-  aom_highbd_obmc_sub_pixel_variance8x32_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance8x4_c(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance8x4 \
-  aom_highbd_obmc_sub_pixel_variance8x4_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance8x8_c(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance8x8 \
-  aom_highbd_obmc_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_obmc_variance128x128_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_obmc_variance128x128 aom_highbd_obmc_variance128x128_c
-
-unsigned int aom_highbd_obmc_variance128x64_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_obmc_variance128x64 aom_highbd_obmc_variance128x64_c
-
-unsigned int aom_highbd_obmc_variance16x16_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance16x16 aom_highbd_obmc_variance16x16_c
-
-unsigned int aom_highbd_obmc_variance16x32_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance16x32 aom_highbd_obmc_variance16x32_c
-
-unsigned int aom_highbd_obmc_variance16x4_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-#define aom_highbd_obmc_variance16x4 aom_highbd_obmc_variance16x4_c
-
-unsigned int aom_highbd_obmc_variance16x64_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance16x64 aom_highbd_obmc_variance16x64_c
-
-unsigned int aom_highbd_obmc_variance16x8_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-#define aom_highbd_obmc_variance16x8 aom_highbd_obmc_variance16x8_c
-
-unsigned int aom_highbd_obmc_variance32x16_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance32x16 aom_highbd_obmc_variance32x16_c
-
-unsigned int aom_highbd_obmc_variance32x32_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance32x32 aom_highbd_obmc_variance32x32_c
-
-unsigned int aom_highbd_obmc_variance32x64_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance32x64 aom_highbd_obmc_variance32x64_c
-
-unsigned int aom_highbd_obmc_variance32x8_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-#define aom_highbd_obmc_variance32x8 aom_highbd_obmc_variance32x8_c
-
-unsigned int aom_highbd_obmc_variance4x16_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-#define aom_highbd_obmc_variance4x16 aom_highbd_obmc_variance4x16_c
-
-unsigned int aom_highbd_obmc_variance4x4_c(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-#define aom_highbd_obmc_variance4x4 aom_highbd_obmc_variance4x4_c
-
-unsigned int aom_highbd_obmc_variance4x8_c(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-#define aom_highbd_obmc_variance4x8 aom_highbd_obmc_variance4x8_c
-
-unsigned int aom_highbd_obmc_variance64x128_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_obmc_variance64x128 aom_highbd_obmc_variance64x128_c
-
-unsigned int aom_highbd_obmc_variance64x16_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance64x16 aom_highbd_obmc_variance64x16_c
-
-unsigned int aom_highbd_obmc_variance64x32_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance64x32 aom_highbd_obmc_variance64x32_c
-
-unsigned int aom_highbd_obmc_variance64x64_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance64x64 aom_highbd_obmc_variance64x64_c
-
-unsigned int aom_highbd_obmc_variance8x16_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-#define aom_highbd_obmc_variance8x16 aom_highbd_obmc_variance8x16_c
-
-unsigned int aom_highbd_obmc_variance8x32_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-#define aom_highbd_obmc_variance8x32 aom_highbd_obmc_variance8x32_c
-
-unsigned int aom_highbd_obmc_variance8x4_c(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-#define aom_highbd_obmc_variance8x4 aom_highbd_obmc_variance8x4_c
-
-unsigned int aom_highbd_obmc_variance8x8_c(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-#define aom_highbd_obmc_variance8x8 aom_highbd_obmc_variance8x8_c
-
-void aom_highbd_paeth_predictor_16x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_16x16 aom_highbd_paeth_predictor_16x16_c
-
-void aom_highbd_paeth_predictor_16x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_16x32 aom_highbd_paeth_predictor_16x32_c
-
-void aom_highbd_paeth_predictor_16x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_16x4 aom_highbd_paeth_predictor_16x4_c
-
-void aom_highbd_paeth_predictor_16x64_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_16x64 aom_highbd_paeth_predictor_16x64_c
-
-void aom_highbd_paeth_predictor_16x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_16x8 aom_highbd_paeth_predictor_16x8_c
-
-void aom_highbd_paeth_predictor_2x2_c(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_paeth_predictor_2x2 aom_highbd_paeth_predictor_2x2_c
-
-void aom_highbd_paeth_predictor_32x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_32x16 aom_highbd_paeth_predictor_32x16_c
-
-void aom_highbd_paeth_predictor_32x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_32x32 aom_highbd_paeth_predictor_32x32_c
-
-void aom_highbd_paeth_predictor_32x64_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_32x64 aom_highbd_paeth_predictor_32x64_c
-
-void aom_highbd_paeth_predictor_32x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_32x8 aom_highbd_paeth_predictor_32x8_c
-
-void aom_highbd_paeth_predictor_4x16_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_4x16 aom_highbd_paeth_predictor_4x16_c
-
-void aom_highbd_paeth_predictor_4x4_c(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_paeth_predictor_4x4 aom_highbd_paeth_predictor_4x4_c
-
-void aom_highbd_paeth_predictor_4x8_c(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_paeth_predictor_4x8 aom_highbd_paeth_predictor_4x8_c
-
-void aom_highbd_paeth_predictor_64x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_64x16 aom_highbd_paeth_predictor_64x16_c
-
-void aom_highbd_paeth_predictor_64x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_64x32 aom_highbd_paeth_predictor_64x32_c
-
-void aom_highbd_paeth_predictor_64x64_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_64x64 aom_highbd_paeth_predictor_64x64_c
-
-void aom_highbd_paeth_predictor_8x16_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_8x16 aom_highbd_paeth_predictor_8x16_c
-
-void aom_highbd_paeth_predictor_8x32_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_8x32 aom_highbd_paeth_predictor_8x32_c
-
-void aom_highbd_paeth_predictor_8x4_c(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_paeth_predictor_8x4 aom_highbd_paeth_predictor_8x4_c
-
-void aom_highbd_paeth_predictor_8x8_c(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_paeth_predictor_8x8 aom_highbd_paeth_predictor_8x8_c
-
-void aom_highbd_quantize_b_c(const tran_low_t* coeff_ptr,
-                             intptr_t n_coeffs,
-                             const int16_t* zbin_ptr,
-                             const int16_t* round_ptr,
-                             const int16_t* quant_ptr,
-                             const int16_t* quant_shift_ptr,
-                             tran_low_t* qcoeff_ptr,
-                             tran_low_t* dqcoeff_ptr,
-                             const int16_t* dequant_ptr,
-                             uint16_t* eob_ptr,
-                             const int16_t* scan,
-                             const int16_t* iscan);
-#define aom_highbd_quantize_b aom_highbd_quantize_b_c
-
-void aom_highbd_quantize_b_32x32_c(const tran_low_t* coeff_ptr,
-                                   intptr_t n_coeffs,
-                                   const int16_t* zbin_ptr,
-                                   const int16_t* round_ptr,
-                                   const int16_t* quant_ptr,
-                                   const int16_t* quant_shift_ptr,
-                                   tran_low_t* qcoeff_ptr,
-                                   tran_low_t* dqcoeff_ptr,
-                                   const int16_t* dequant_ptr,
-                                   uint16_t* eob_ptr,
-                                   const int16_t* scan,
-                                   const int16_t* iscan);
-#define aom_highbd_quantize_b_32x32 aom_highbd_quantize_b_32x32_c
-
-void aom_highbd_quantize_b_32x32_adaptive_c(const tran_low_t* coeff_ptr,
-                                            intptr_t n_coeffs,
-                                            const int16_t* zbin_ptr,
-                                            const int16_t* round_ptr,
-                                            const int16_t* quant_ptr,
-                                            const int16_t* quant_shift_ptr,
-                                            tran_low_t* qcoeff_ptr,
-                                            tran_low_t* dqcoeff_ptr,
-                                            const int16_t* dequant_ptr,
-                                            uint16_t* eob_ptr,
-                                            const int16_t* scan,
-                                            const int16_t* iscan);
-#define aom_highbd_quantize_b_32x32_adaptive \
-  aom_highbd_quantize_b_32x32_adaptive_c
-
-void aom_highbd_quantize_b_64x64_c(const tran_low_t* coeff_ptr,
-                                   intptr_t n_coeffs,
-                                   const int16_t* zbin_ptr,
-                                   const int16_t* round_ptr,
-                                   const int16_t* quant_ptr,
-                                   const int16_t* quant_shift_ptr,
-                                   tran_low_t* qcoeff_ptr,
-                                   tran_low_t* dqcoeff_ptr,
-                                   const int16_t* dequant_ptr,
-                                   uint16_t* eob_ptr,
-                                   const int16_t* scan,
-                                   const int16_t* iscan);
-#define aom_highbd_quantize_b_64x64 aom_highbd_quantize_b_64x64_c
-
-void aom_highbd_quantize_b_64x64_adaptive_c(const tran_low_t* coeff_ptr,
-                                            intptr_t n_coeffs,
-                                            const int16_t* zbin_ptr,
-                                            const int16_t* round_ptr,
-                                            const int16_t* quant_ptr,
-                                            const int16_t* quant_shift_ptr,
-                                            tran_low_t* qcoeff_ptr,
-                                            tran_low_t* dqcoeff_ptr,
-                                            const int16_t* dequant_ptr,
-                                            uint16_t* eob_ptr,
-                                            const int16_t* scan,
-                                            const int16_t* iscan);
-#define aom_highbd_quantize_b_64x64_adaptive \
-  aom_highbd_quantize_b_64x64_adaptive_c
-
-void aom_highbd_quantize_b_adaptive_c(const tran_low_t* coeff_ptr,
-                                      intptr_t n_coeffs,
-                                      const int16_t* zbin_ptr,
-                                      const int16_t* round_ptr,
-                                      const int16_t* quant_ptr,
-                                      const int16_t* quant_shift_ptr,
-                                      tran_low_t* qcoeff_ptr,
-                                      tran_low_t* dqcoeff_ptr,
-                                      const int16_t* dequant_ptr,
-                                      uint16_t* eob_ptr,
-                                      const int16_t* scan,
-                                      const int16_t* iscan);
-#define aom_highbd_quantize_b_adaptive aom_highbd_quantize_b_adaptive_c
-
-unsigned int aom_highbd_sad128x128_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride);
-#define aom_highbd_sad128x128 aom_highbd_sad128x128_c
-
-unsigned int aom_highbd_sad128x128_avg_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         const uint8_t* second_pred);
-#define aom_highbd_sad128x128_avg aom_highbd_sad128x128_avg_c
-
-void aom_highbd_sad128x128x4d_c(const uint8_t* src_ptr,
-                                int src_stride,
-                                const uint8_t* const ref_ptr[],
-                                int ref_stride,
-                                uint32_t* sad_array);
-#define aom_highbd_sad128x128x4d aom_highbd_sad128x128x4d_c
-
-unsigned int aom_highbd_sad128x64_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* ref_ptr,
-                                    int ref_stride);
-#define aom_highbd_sad128x64 aom_highbd_sad128x64_c
-
-unsigned int aom_highbd_sad128x64_avg_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        const uint8_t* second_pred);
-#define aom_highbd_sad128x64_avg aom_highbd_sad128x64_avg_c
-
-void aom_highbd_sad128x64x4d_c(const uint8_t* src_ptr,
-                               int src_stride,
-                               const uint8_t* const ref_ptr[],
-                               int ref_stride,
-                               uint32_t* sad_array);
-#define aom_highbd_sad128x64x4d aom_highbd_sad128x64x4d_c
-
-unsigned int aom_highbd_sad16x16_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad16x16 aom_highbd_sad16x16_c
-
-unsigned int aom_highbd_sad16x16_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad16x16_avg aom_highbd_sad16x16_avg_c
-
-void aom_highbd_sad16x16x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad16x16x4d aom_highbd_sad16x16x4d_c
-
-unsigned int aom_highbd_sad16x32_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad16x32 aom_highbd_sad16x32_c
-
-unsigned int aom_highbd_sad16x32_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad16x32_avg aom_highbd_sad16x32_avg_c
-
-void aom_highbd_sad16x32x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad16x32x4d aom_highbd_sad16x32x4d_c
-
-unsigned int aom_highbd_sad16x4_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-#define aom_highbd_sad16x4 aom_highbd_sad16x4_c
-
-unsigned int aom_highbd_sad16x4_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-#define aom_highbd_sad16x4_avg aom_highbd_sad16x4_avg_c
-
-void aom_highbd_sad16x4x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-#define aom_highbd_sad16x4x4d aom_highbd_sad16x4x4d_c
-
-unsigned int aom_highbd_sad16x64_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad16x64 aom_highbd_sad16x64_c
-
-unsigned int aom_highbd_sad16x64_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad16x64_avg aom_highbd_sad16x64_avg_c
-
-void aom_highbd_sad16x64x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad16x64x4d aom_highbd_sad16x64x4d_c
-
-unsigned int aom_highbd_sad16x8_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-#define aom_highbd_sad16x8 aom_highbd_sad16x8_c
-
-unsigned int aom_highbd_sad16x8_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-#define aom_highbd_sad16x8_avg aom_highbd_sad16x8_avg_c
-
-void aom_highbd_sad16x8x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-#define aom_highbd_sad16x8x4d aom_highbd_sad16x8x4d_c
-
-unsigned int aom_highbd_sad32x16_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad32x16 aom_highbd_sad32x16_c
-
-unsigned int aom_highbd_sad32x16_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad32x16_avg aom_highbd_sad32x16_avg_c
-
-void aom_highbd_sad32x16x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad32x16x4d aom_highbd_sad32x16x4d_c
-
-unsigned int aom_highbd_sad32x32_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad32x32 aom_highbd_sad32x32_c
-
-unsigned int aom_highbd_sad32x32_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad32x32_avg aom_highbd_sad32x32_avg_c
-
-void aom_highbd_sad32x32x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad32x32x4d aom_highbd_sad32x32x4d_c
-
-unsigned int aom_highbd_sad32x64_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad32x64 aom_highbd_sad32x64_c
-
-unsigned int aom_highbd_sad32x64_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad32x64_avg aom_highbd_sad32x64_avg_c
-
-void aom_highbd_sad32x64x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad32x64x4d aom_highbd_sad32x64x4d_c
-
-unsigned int aom_highbd_sad32x8_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-#define aom_highbd_sad32x8 aom_highbd_sad32x8_c
-
-unsigned int aom_highbd_sad32x8_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-#define aom_highbd_sad32x8_avg aom_highbd_sad32x8_avg_c
-
-void aom_highbd_sad32x8x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-#define aom_highbd_sad32x8x4d aom_highbd_sad32x8x4d_c
-
-unsigned int aom_highbd_sad4x16_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-#define aom_highbd_sad4x16 aom_highbd_sad4x16_c
-
-unsigned int aom_highbd_sad4x16_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-#define aom_highbd_sad4x16_avg aom_highbd_sad4x16_avg_c
-
-void aom_highbd_sad4x16x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-#define aom_highbd_sad4x16x4d aom_highbd_sad4x16x4d_c
-
-unsigned int aom_highbd_sad4x4_c(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride);
-#define aom_highbd_sad4x4 aom_highbd_sad4x4_c
-
-unsigned int aom_highbd_sad4x4_avg_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride,
-                                     const uint8_t* second_pred);
-#define aom_highbd_sad4x4_avg aom_highbd_sad4x4_avg_c
-
-void aom_highbd_sad4x4x4d_c(const uint8_t* src_ptr,
-                            int src_stride,
-                            const uint8_t* const ref_ptr[],
-                            int ref_stride,
-                            uint32_t* sad_array);
-#define aom_highbd_sad4x4x4d aom_highbd_sad4x4x4d_c
-
-unsigned int aom_highbd_sad4x8_c(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride);
-#define aom_highbd_sad4x8 aom_highbd_sad4x8_c
-
-unsigned int aom_highbd_sad4x8_avg_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride,
-                                     const uint8_t* second_pred);
-#define aom_highbd_sad4x8_avg aom_highbd_sad4x8_avg_c
-
-void aom_highbd_sad4x8x4d_c(const uint8_t* src_ptr,
-                            int src_stride,
-                            const uint8_t* const ref_ptr[],
-                            int ref_stride,
-                            uint32_t* sad_array);
-#define aom_highbd_sad4x8x4d aom_highbd_sad4x8x4d_c
-
-unsigned int aom_highbd_sad64x128_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* ref_ptr,
-                                    int ref_stride);
-#define aom_highbd_sad64x128 aom_highbd_sad64x128_c
-
-unsigned int aom_highbd_sad64x128_avg_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        const uint8_t* second_pred);
-#define aom_highbd_sad64x128_avg aom_highbd_sad64x128_avg_c
-
-void aom_highbd_sad64x128x4d_c(const uint8_t* src_ptr,
-                               int src_stride,
-                               const uint8_t* const ref_ptr[],
-                               int ref_stride,
-                               uint32_t* sad_array);
-#define aom_highbd_sad64x128x4d aom_highbd_sad64x128x4d_c
-
-unsigned int aom_highbd_sad64x16_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad64x16 aom_highbd_sad64x16_c
-
-unsigned int aom_highbd_sad64x16_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad64x16_avg aom_highbd_sad64x16_avg_c
-
-void aom_highbd_sad64x16x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad64x16x4d aom_highbd_sad64x16x4d_c
-
-unsigned int aom_highbd_sad64x32_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad64x32 aom_highbd_sad64x32_c
-
-unsigned int aom_highbd_sad64x32_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad64x32_avg aom_highbd_sad64x32_avg_c
-
-void aom_highbd_sad64x32x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad64x32x4d aom_highbd_sad64x32x4d_c
-
-unsigned int aom_highbd_sad64x64_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad64x64 aom_highbd_sad64x64_c
-
-unsigned int aom_highbd_sad64x64_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad64x64_avg aom_highbd_sad64x64_avg_c
-
-void aom_highbd_sad64x64x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad64x64x4d aom_highbd_sad64x64x4d_c
-
-unsigned int aom_highbd_sad8x16_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-#define aom_highbd_sad8x16 aom_highbd_sad8x16_c
-
-unsigned int aom_highbd_sad8x16_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-#define aom_highbd_sad8x16_avg aom_highbd_sad8x16_avg_c
-
-void aom_highbd_sad8x16x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-#define aom_highbd_sad8x16x4d aom_highbd_sad8x16x4d_c
-
-unsigned int aom_highbd_sad8x32_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-#define aom_highbd_sad8x32 aom_highbd_sad8x32_c
-
-unsigned int aom_highbd_sad8x32_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-#define aom_highbd_sad8x32_avg aom_highbd_sad8x32_avg_c
-
-void aom_highbd_sad8x32x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-#define aom_highbd_sad8x32x4d aom_highbd_sad8x32x4d_c
-
-unsigned int aom_highbd_sad8x4_c(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride);
-#define aom_highbd_sad8x4 aom_highbd_sad8x4_c
-
-unsigned int aom_highbd_sad8x4_avg_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride,
-                                     const uint8_t* second_pred);
-#define aom_highbd_sad8x4_avg aom_highbd_sad8x4_avg_c
-
-void aom_highbd_sad8x4x4d_c(const uint8_t* src_ptr,
-                            int src_stride,
-                            const uint8_t* const ref_ptr[],
-                            int ref_stride,
-                            uint32_t* sad_array);
-#define aom_highbd_sad8x4x4d aom_highbd_sad8x4x4d_c
-
-unsigned int aom_highbd_sad8x8_c(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride);
-#define aom_highbd_sad8x8 aom_highbd_sad8x8_c
-
-unsigned int aom_highbd_sad8x8_avg_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride,
-                                     const uint8_t* second_pred);
-#define aom_highbd_sad8x8_avg aom_highbd_sad8x8_avg_c
-
-void aom_highbd_sad8x8x4d_c(const uint8_t* src_ptr,
-                            int src_stride,
-                            const uint8_t* const ref_ptr[],
-                            int ref_stride,
-                            uint32_t* sad_array);
-#define aom_highbd_sad8x8x4d aom_highbd_sad8x8x4d_c
-
-unsigned int aom_highbd_sad_skip_128x128_c(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride);
-#define aom_highbd_sad_skip_128x128 aom_highbd_sad_skip_128x128_c
-
-void aom_highbd_sad_skip_128x128x4d_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* const ref_ptr[],
-                                      int ref_stride,
-                                      uint32_t* sad_array);
-#define aom_highbd_sad_skip_128x128x4d aom_highbd_sad_skip_128x128x4d_c
-
-unsigned int aom_highbd_sad_skip_128x64_c(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride);
-#define aom_highbd_sad_skip_128x64 aom_highbd_sad_skip_128x64_c
-
-void aom_highbd_sad_skip_128x64x4d_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* const ref_ptr[],
-                                     int ref_stride,
-                                     uint32_t* sad_array);
-#define aom_highbd_sad_skip_128x64x4d aom_highbd_sad_skip_128x64x4d_c
-
-unsigned int aom_highbd_sad_skip_16x16_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_16x16 aom_highbd_sad_skip_16x16_c
-
-void aom_highbd_sad_skip_16x16x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_16x16x4d aom_highbd_sad_skip_16x16x4d_c
-
-unsigned int aom_highbd_sad_skip_16x32_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_16x32 aom_highbd_sad_skip_16x32_c
-
-void aom_highbd_sad_skip_16x32x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_16x32x4d aom_highbd_sad_skip_16x32x4d_c
-
-unsigned int aom_highbd_sad_skip_16x4_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-#define aom_highbd_sad_skip_16x4 aom_highbd_sad_skip_16x4_c
-
-void aom_highbd_sad_skip_16x4x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-#define aom_highbd_sad_skip_16x4x4d aom_highbd_sad_skip_16x4x4d_c
-
-unsigned int aom_highbd_sad_skip_16x64_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_16x64 aom_highbd_sad_skip_16x64_c
-
-void aom_highbd_sad_skip_16x64x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_16x64x4d aom_highbd_sad_skip_16x64x4d_c
-
-unsigned int aom_highbd_sad_skip_16x8_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-#define aom_highbd_sad_skip_16x8 aom_highbd_sad_skip_16x8_c
-
-void aom_highbd_sad_skip_16x8x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-#define aom_highbd_sad_skip_16x8x4d aom_highbd_sad_skip_16x8x4d_c
-
-unsigned int aom_highbd_sad_skip_32x16_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_32x16 aom_highbd_sad_skip_32x16_c
-
-void aom_highbd_sad_skip_32x16x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_32x16x4d aom_highbd_sad_skip_32x16x4d_c
-
-unsigned int aom_highbd_sad_skip_32x32_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_32x32 aom_highbd_sad_skip_32x32_c
-
-void aom_highbd_sad_skip_32x32x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_32x32x4d aom_highbd_sad_skip_32x32x4d_c
-
-unsigned int aom_highbd_sad_skip_32x64_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_32x64 aom_highbd_sad_skip_32x64_c
-
-void aom_highbd_sad_skip_32x64x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_32x64x4d aom_highbd_sad_skip_32x64x4d_c
-
-unsigned int aom_highbd_sad_skip_32x8_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-#define aom_highbd_sad_skip_32x8 aom_highbd_sad_skip_32x8_c
-
-void aom_highbd_sad_skip_32x8x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-#define aom_highbd_sad_skip_32x8x4d aom_highbd_sad_skip_32x8x4d_c
-
-unsigned int aom_highbd_sad_skip_4x16_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-#define aom_highbd_sad_skip_4x16 aom_highbd_sad_skip_4x16_c
-
-void aom_highbd_sad_skip_4x16x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-#define aom_highbd_sad_skip_4x16x4d aom_highbd_sad_skip_4x16x4d_c
-
-unsigned int aom_highbd_sad_skip_4x4_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride);
-#define aom_highbd_sad_skip_4x4 aom_highbd_sad_skip_4x4_c
-
-void aom_highbd_sad_skip_4x4x4d_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* const ref_ptr[],
-                                  int ref_stride,
-                                  uint32_t* sad_array);
-#define aom_highbd_sad_skip_4x4x4d aom_highbd_sad_skip_4x4x4d_c
-
-unsigned int aom_highbd_sad_skip_4x8_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride);
-#define aom_highbd_sad_skip_4x8 aom_highbd_sad_skip_4x8_c
-
-void aom_highbd_sad_skip_4x8x4d_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* const ref_ptr[],
-                                  int ref_stride,
-                                  uint32_t* sad_array);
-#define aom_highbd_sad_skip_4x8x4d aom_highbd_sad_skip_4x8x4d_c
-
-unsigned int aom_highbd_sad_skip_64x128_c(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride);
-#define aom_highbd_sad_skip_64x128 aom_highbd_sad_skip_64x128_c
-
-void aom_highbd_sad_skip_64x128x4d_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* const ref_ptr[],
-                                     int ref_stride,
-                                     uint32_t* sad_array);
-#define aom_highbd_sad_skip_64x128x4d aom_highbd_sad_skip_64x128x4d_c
-
-unsigned int aom_highbd_sad_skip_64x16_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_64x16 aom_highbd_sad_skip_64x16_c
-
-void aom_highbd_sad_skip_64x16x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_64x16x4d aom_highbd_sad_skip_64x16x4d_c
-
-unsigned int aom_highbd_sad_skip_64x32_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_64x32 aom_highbd_sad_skip_64x32_c
-
-void aom_highbd_sad_skip_64x32x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_64x32x4d aom_highbd_sad_skip_64x32x4d_c
-
-unsigned int aom_highbd_sad_skip_64x64_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_64x64 aom_highbd_sad_skip_64x64_c
-
-void aom_highbd_sad_skip_64x64x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_64x64x4d aom_highbd_sad_skip_64x64x4d_c
-
-unsigned int aom_highbd_sad_skip_8x16_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-#define aom_highbd_sad_skip_8x16 aom_highbd_sad_skip_8x16_c
-
-void aom_highbd_sad_skip_8x16x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-#define aom_highbd_sad_skip_8x16x4d aom_highbd_sad_skip_8x16x4d_c
-
-unsigned int aom_highbd_sad_skip_8x32_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-#define aom_highbd_sad_skip_8x32 aom_highbd_sad_skip_8x32_c
-
-void aom_highbd_sad_skip_8x32x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-#define aom_highbd_sad_skip_8x32x4d aom_highbd_sad_skip_8x32x4d_c
-
-unsigned int aom_highbd_sad_skip_8x4_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride);
-#define aom_highbd_sad_skip_8x4 aom_highbd_sad_skip_8x4_c
-
-void aom_highbd_sad_skip_8x4x4d_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* const ref_ptr[],
-                                  int ref_stride,
-                                  uint32_t* sad_array);
-#define aom_highbd_sad_skip_8x4x4d aom_highbd_sad_skip_8x4x4d_c
-
-unsigned int aom_highbd_sad_skip_8x8_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride);
-#define aom_highbd_sad_skip_8x8 aom_highbd_sad_skip_8x8_c
-
-void aom_highbd_sad_skip_8x8x4d_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* const ref_ptr[],
-                                  int ref_stride,
-                                  uint32_t* sad_array);
-#define aom_highbd_sad_skip_8x8x4d aom_highbd_sad_skip_8x8x4d_c
-
-void aom_highbd_smooth_h_predictor_16x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_16x16 \
-  aom_highbd_smooth_h_predictor_16x16_c
-
-void aom_highbd_smooth_h_predictor_16x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_16x32 \
-  aom_highbd_smooth_h_predictor_16x32_c
-
-void aom_highbd_smooth_h_predictor_16x4_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_16x4 aom_highbd_smooth_h_predictor_16x4_c
-
-void aom_highbd_smooth_h_predictor_16x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_16x64 \
-  aom_highbd_smooth_h_predictor_16x64_c
-
-void aom_highbd_smooth_h_predictor_16x8_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_16x8 aom_highbd_smooth_h_predictor_16x8_c
-
-void aom_highbd_smooth_h_predictor_2x2_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_h_predictor_2x2 aom_highbd_smooth_h_predictor_2x2_c
-
-void aom_highbd_smooth_h_predictor_32x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_32x16 \
-  aom_highbd_smooth_h_predictor_32x16_c
-
-void aom_highbd_smooth_h_predictor_32x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_32x32 \
-  aom_highbd_smooth_h_predictor_32x32_c
-
-void aom_highbd_smooth_h_predictor_32x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_32x64 \
-  aom_highbd_smooth_h_predictor_32x64_c
-
-void aom_highbd_smooth_h_predictor_32x8_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_32x8 aom_highbd_smooth_h_predictor_32x8_c
-
-void aom_highbd_smooth_h_predictor_4x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_4x16 aom_highbd_smooth_h_predictor_4x16_c
-
-void aom_highbd_smooth_h_predictor_4x4_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_h_predictor_4x4 aom_highbd_smooth_h_predictor_4x4_c
-
-void aom_highbd_smooth_h_predictor_4x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_h_predictor_4x8 aom_highbd_smooth_h_predictor_4x8_c
-
-void aom_highbd_smooth_h_predictor_64x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_64x16 \
-  aom_highbd_smooth_h_predictor_64x16_c
-
-void aom_highbd_smooth_h_predictor_64x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_64x32 \
-  aom_highbd_smooth_h_predictor_64x32_c
-
-void aom_highbd_smooth_h_predictor_64x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_64x64 \
-  aom_highbd_smooth_h_predictor_64x64_c
-
-void aom_highbd_smooth_h_predictor_8x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_8x16 aom_highbd_smooth_h_predictor_8x16_c
-
-void aom_highbd_smooth_h_predictor_8x32_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_8x32 aom_highbd_smooth_h_predictor_8x32_c
-
-void aom_highbd_smooth_h_predictor_8x4_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_h_predictor_8x4 aom_highbd_smooth_h_predictor_8x4_c
-
-void aom_highbd_smooth_h_predictor_8x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_h_predictor_8x8 aom_highbd_smooth_h_predictor_8x8_c
-
-void aom_highbd_smooth_predictor_16x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_16x16 aom_highbd_smooth_predictor_16x16_c
-
-void aom_highbd_smooth_predictor_16x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_16x32 aom_highbd_smooth_predictor_16x32_c
-
-void aom_highbd_smooth_predictor_16x4_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_16x4 aom_highbd_smooth_predictor_16x4_c
-
-void aom_highbd_smooth_predictor_16x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_16x64 aom_highbd_smooth_predictor_16x64_c
-
-void aom_highbd_smooth_predictor_16x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_16x8 aom_highbd_smooth_predictor_16x8_c
-
-void aom_highbd_smooth_predictor_2x2_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_smooth_predictor_2x2 aom_highbd_smooth_predictor_2x2_c
-
-void aom_highbd_smooth_predictor_32x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_32x16 aom_highbd_smooth_predictor_32x16_c
-
-void aom_highbd_smooth_predictor_32x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_32x32 aom_highbd_smooth_predictor_32x32_c
-
-void aom_highbd_smooth_predictor_32x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_32x64 aom_highbd_smooth_predictor_32x64_c
-
-void aom_highbd_smooth_predictor_32x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_32x8 aom_highbd_smooth_predictor_32x8_c
-
-void aom_highbd_smooth_predictor_4x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_4x16 aom_highbd_smooth_predictor_4x16_c
-
-void aom_highbd_smooth_predictor_4x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_smooth_predictor_4x4 aom_highbd_smooth_predictor_4x4_c
-
-void aom_highbd_smooth_predictor_4x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_smooth_predictor_4x8 aom_highbd_smooth_predictor_4x8_c
-
-void aom_highbd_smooth_predictor_64x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_64x16 aom_highbd_smooth_predictor_64x16_c
-
-void aom_highbd_smooth_predictor_64x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_64x32 aom_highbd_smooth_predictor_64x32_c
-
-void aom_highbd_smooth_predictor_64x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_64x64 aom_highbd_smooth_predictor_64x64_c
-
-void aom_highbd_smooth_predictor_8x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_8x16 aom_highbd_smooth_predictor_8x16_c
-
-void aom_highbd_smooth_predictor_8x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_8x32 aom_highbd_smooth_predictor_8x32_c
-
-void aom_highbd_smooth_predictor_8x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_smooth_predictor_8x4 aom_highbd_smooth_predictor_8x4_c
-
-void aom_highbd_smooth_predictor_8x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_smooth_predictor_8x8 aom_highbd_smooth_predictor_8x8_c
-
-void aom_highbd_smooth_v_predictor_16x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_16x16 \
-  aom_highbd_smooth_v_predictor_16x16_c
-
-void aom_highbd_smooth_v_predictor_16x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_16x32 \
-  aom_highbd_smooth_v_predictor_16x32_c
-
-void aom_highbd_smooth_v_predictor_16x4_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_16x4 aom_highbd_smooth_v_predictor_16x4_c
-
-void aom_highbd_smooth_v_predictor_16x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_16x64 \
-  aom_highbd_smooth_v_predictor_16x64_c
-
-void aom_highbd_smooth_v_predictor_16x8_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_16x8 aom_highbd_smooth_v_predictor_16x8_c
-
-void aom_highbd_smooth_v_predictor_2x2_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_v_predictor_2x2 aom_highbd_smooth_v_predictor_2x2_c
-
-void aom_highbd_smooth_v_predictor_32x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_32x16 \
-  aom_highbd_smooth_v_predictor_32x16_c
-
-void aom_highbd_smooth_v_predictor_32x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_32x32 \
-  aom_highbd_smooth_v_predictor_32x32_c
-
-void aom_highbd_smooth_v_predictor_32x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_32x64 \
-  aom_highbd_smooth_v_predictor_32x64_c
-
-void aom_highbd_smooth_v_predictor_32x8_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_32x8 aom_highbd_smooth_v_predictor_32x8_c
-
-void aom_highbd_smooth_v_predictor_4x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_4x16 aom_highbd_smooth_v_predictor_4x16_c
-
-void aom_highbd_smooth_v_predictor_4x4_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_v_predictor_4x4 aom_highbd_smooth_v_predictor_4x4_c
-
-void aom_highbd_smooth_v_predictor_4x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_v_predictor_4x8 aom_highbd_smooth_v_predictor_4x8_c
-
-void aom_highbd_smooth_v_predictor_64x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_64x16 \
-  aom_highbd_smooth_v_predictor_64x16_c
-
-void aom_highbd_smooth_v_predictor_64x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_64x32 \
-  aom_highbd_smooth_v_predictor_64x32_c
-
-void aom_highbd_smooth_v_predictor_64x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_64x64 \
-  aom_highbd_smooth_v_predictor_64x64_c
-
-void aom_highbd_smooth_v_predictor_8x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_8x16 aom_highbd_smooth_v_predictor_8x16_c
-
-void aom_highbd_smooth_v_predictor_8x32_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_8x32 aom_highbd_smooth_v_predictor_8x32_c
-
-void aom_highbd_smooth_v_predictor_8x4_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_v_predictor_8x4 aom_highbd_smooth_v_predictor_8x4_c
-
-void aom_highbd_smooth_v_predictor_8x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_v_predictor_8x8 aom_highbd_smooth_v_predictor_8x8_c
-
-int64_t aom_highbd_sse_c(const uint8_t* a8,
-                         int a_stride,
-                         const uint8_t* b8,
-                         int b_stride,
-                         int width,
-                         int height);
-int64_t aom_highbd_sse_neon(const uint8_t* a8,
-                            int a_stride,
-                            const uint8_t* b8,
-                            int b_stride,
-                            int width,
-                            int height);
-#define aom_highbd_sse aom_highbd_sse_neon
-
-void aom_highbd_subtract_block_c(int rows,
-                                 int cols,
-                                 int16_t* diff_ptr,
-                                 ptrdiff_t diff_stride,
-                                 const uint8_t* src_ptr,
-                                 ptrdiff_t src_stride,
-                                 const uint8_t* pred_ptr,
-                                 ptrdiff_t pred_stride,
-                                 int bd);
-#define aom_highbd_subtract_block aom_highbd_subtract_block_c
-
-void aom_highbd_upsampled_pred_c(MACROBLOCKD* xd,
-                                 const struct AV1Common* const cm,
-                                 int mi_row,
-                                 int mi_col,
-                                 const MV* const mv,
-                                 uint8_t* comp_pred8,
-                                 int width,
-                                 int height,
-                                 int subpel_x_q3,
-                                 int subpel_y_q3,
-                                 const uint8_t* ref8,
-                                 int ref_stride,
-                                 int bd,
-                                 int subpel_search);
-#define aom_highbd_upsampled_pred aom_highbd_upsampled_pred_c
-
-void aom_highbd_v_predictor_16x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_16x16 aom_highbd_v_predictor_16x16_c
-
-void aom_highbd_v_predictor_16x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_16x32 aom_highbd_v_predictor_16x32_c
-
-void aom_highbd_v_predictor_16x4_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_16x4 aom_highbd_v_predictor_16x4_c
-
-void aom_highbd_v_predictor_16x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_16x64 aom_highbd_v_predictor_16x64_c
-
-void aom_highbd_v_predictor_16x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_16x8 aom_highbd_v_predictor_16x8_c
-
-void aom_highbd_v_predictor_2x2_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_v_predictor_2x2 aom_highbd_v_predictor_2x2_c
-
-void aom_highbd_v_predictor_32x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_32x16 aom_highbd_v_predictor_32x16_c
-
-void aom_highbd_v_predictor_32x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_32x32 aom_highbd_v_predictor_32x32_c
-
-void aom_highbd_v_predictor_32x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_32x64 aom_highbd_v_predictor_32x64_c
-
-void aom_highbd_v_predictor_32x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_32x8 aom_highbd_v_predictor_32x8_c
-
-void aom_highbd_v_predictor_4x16_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_4x16 aom_highbd_v_predictor_4x16_c
-
-void aom_highbd_v_predictor_4x4_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_v_predictor_4x4 aom_highbd_v_predictor_4x4_c
-
-void aom_highbd_v_predictor_4x8_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_v_predictor_4x8 aom_highbd_v_predictor_4x8_c
-
-void aom_highbd_v_predictor_64x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_64x16 aom_highbd_v_predictor_64x16_c
-
-void aom_highbd_v_predictor_64x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_64x32 aom_highbd_v_predictor_64x32_c
-
-void aom_highbd_v_predictor_64x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_64x64 aom_highbd_v_predictor_64x64_c
-
-void aom_highbd_v_predictor_8x16_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_8x16 aom_highbd_v_predictor_8x16_c
-
-void aom_highbd_v_predictor_8x32_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_8x32 aom_highbd_v_predictor_8x32_c
-
-void aom_highbd_v_predictor_8x4_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_v_predictor_8x4 aom_highbd_v_predictor_8x4_c
-
-void aom_highbd_v_predictor_8x8_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_v_predictor_8x8 aom_highbd_v_predictor_8x8_c
-
 void aom_ifft16x16_float_c(const float* input, float* temp, float* output);
 #define aom_ifft16x16_float aom_ifft16x16_float_c
 
@@ -10727,498 +2507,6 @@
                              int h);
 #define aom_mse_wxh_16bit aom_mse_wxh_16bit_c
 
-uint64_t aom_mse_wxh_16bit_highbd_c(uint16_t* dst,
-                                    int dstride,
-                                    uint16_t* src,
-                                    int sstride,
-                                    int w,
-                                    int h);
-#define aom_mse_wxh_16bit_highbd aom_mse_wxh_16bit_highbd_c
-
-unsigned int aom_obmc_sad128x128_c(const uint8_t* pre,
-                                   int pre_stride,
-                                   const int32_t* wsrc,
-                                   const int32_t* mask);
-#define aom_obmc_sad128x128 aom_obmc_sad128x128_c
-
-unsigned int aom_obmc_sad128x64_c(const uint8_t* pre,
-                                  int pre_stride,
-                                  const int32_t* wsrc,
-                                  const int32_t* mask);
-#define aom_obmc_sad128x64 aom_obmc_sad128x64_c
-
-unsigned int aom_obmc_sad16x16_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad16x16 aom_obmc_sad16x16_c
-
-unsigned int aom_obmc_sad16x32_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad16x32 aom_obmc_sad16x32_c
-
-unsigned int aom_obmc_sad16x4_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-#define aom_obmc_sad16x4 aom_obmc_sad16x4_c
-
-unsigned int aom_obmc_sad16x64_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad16x64 aom_obmc_sad16x64_c
-
-unsigned int aom_obmc_sad16x8_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-#define aom_obmc_sad16x8 aom_obmc_sad16x8_c
-
-unsigned int aom_obmc_sad32x16_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad32x16 aom_obmc_sad32x16_c
-
-unsigned int aom_obmc_sad32x32_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad32x32 aom_obmc_sad32x32_c
-
-unsigned int aom_obmc_sad32x64_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad32x64 aom_obmc_sad32x64_c
-
-unsigned int aom_obmc_sad32x8_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-#define aom_obmc_sad32x8 aom_obmc_sad32x8_c
-
-unsigned int aom_obmc_sad4x16_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-#define aom_obmc_sad4x16 aom_obmc_sad4x16_c
-
-unsigned int aom_obmc_sad4x4_c(const uint8_t* pre,
-                               int pre_stride,
-                               const int32_t* wsrc,
-                               const int32_t* mask);
-#define aom_obmc_sad4x4 aom_obmc_sad4x4_c
-
-unsigned int aom_obmc_sad4x8_c(const uint8_t* pre,
-                               int pre_stride,
-                               const int32_t* wsrc,
-                               const int32_t* mask);
-#define aom_obmc_sad4x8 aom_obmc_sad4x8_c
-
-unsigned int aom_obmc_sad64x128_c(const uint8_t* pre,
-                                  int pre_stride,
-                                  const int32_t* wsrc,
-                                  const int32_t* mask);
-#define aom_obmc_sad64x128 aom_obmc_sad64x128_c
-
-unsigned int aom_obmc_sad64x16_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad64x16 aom_obmc_sad64x16_c
-
-unsigned int aom_obmc_sad64x32_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad64x32 aom_obmc_sad64x32_c
-
-unsigned int aom_obmc_sad64x64_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad64x64 aom_obmc_sad64x64_c
-
-unsigned int aom_obmc_sad8x16_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-#define aom_obmc_sad8x16 aom_obmc_sad8x16_c
-
-unsigned int aom_obmc_sad8x32_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-#define aom_obmc_sad8x32 aom_obmc_sad8x32_c
-
-unsigned int aom_obmc_sad8x4_c(const uint8_t* pre,
-                               int pre_stride,
-                               const int32_t* wsrc,
-                               const int32_t* mask);
-#define aom_obmc_sad8x4 aom_obmc_sad8x4_c
-
-unsigned int aom_obmc_sad8x8_c(const uint8_t* pre,
-                               int pre_stride,
-                               const int32_t* wsrc,
-                               const int32_t* mask);
-#define aom_obmc_sad8x8 aom_obmc_sad8x8_c
-
-unsigned int aom_obmc_sub_pixel_variance128x128_c(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-#define aom_obmc_sub_pixel_variance128x128 aom_obmc_sub_pixel_variance128x128_c
-
-unsigned int aom_obmc_sub_pixel_variance128x64_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-#define aom_obmc_sub_pixel_variance128x64 aom_obmc_sub_pixel_variance128x64_c
-
-unsigned int aom_obmc_sub_pixel_variance16x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance16x16 aom_obmc_sub_pixel_variance16x16_c
-
-unsigned int aom_obmc_sub_pixel_variance16x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance16x32 aom_obmc_sub_pixel_variance16x32_c
-
-unsigned int aom_obmc_sub_pixel_variance16x4_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_obmc_sub_pixel_variance16x4 aom_obmc_sub_pixel_variance16x4_c
-
-unsigned int aom_obmc_sub_pixel_variance16x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance16x64 aom_obmc_sub_pixel_variance16x64_c
-
-unsigned int aom_obmc_sub_pixel_variance16x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_obmc_sub_pixel_variance16x8 aom_obmc_sub_pixel_variance16x8_c
-
-unsigned int aom_obmc_sub_pixel_variance32x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance32x16 aom_obmc_sub_pixel_variance32x16_c
-
-unsigned int aom_obmc_sub_pixel_variance32x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance32x32 aom_obmc_sub_pixel_variance32x32_c
-
-unsigned int aom_obmc_sub_pixel_variance32x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance32x64 aom_obmc_sub_pixel_variance32x64_c
-
-unsigned int aom_obmc_sub_pixel_variance32x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_obmc_sub_pixel_variance32x8 aom_obmc_sub_pixel_variance32x8_c
-
-unsigned int aom_obmc_sub_pixel_variance4x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_obmc_sub_pixel_variance4x16 aom_obmc_sub_pixel_variance4x16_c
-
-unsigned int aom_obmc_sub_pixel_variance4x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_obmc_sub_pixel_variance4x4 aom_obmc_sub_pixel_variance4x4_c
-
-unsigned int aom_obmc_sub_pixel_variance4x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_obmc_sub_pixel_variance4x8 aom_obmc_sub_pixel_variance4x8_c
-
-unsigned int aom_obmc_sub_pixel_variance64x128_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-#define aom_obmc_sub_pixel_variance64x128 aom_obmc_sub_pixel_variance64x128_c
-
-unsigned int aom_obmc_sub_pixel_variance64x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance64x16 aom_obmc_sub_pixel_variance64x16_c
-
-unsigned int aom_obmc_sub_pixel_variance64x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance64x32 aom_obmc_sub_pixel_variance64x32_c
-
-unsigned int aom_obmc_sub_pixel_variance64x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance64x64 aom_obmc_sub_pixel_variance64x64_c
-
-unsigned int aom_obmc_sub_pixel_variance8x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_obmc_sub_pixel_variance8x16 aom_obmc_sub_pixel_variance8x16_c
-
-unsigned int aom_obmc_sub_pixel_variance8x32_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_obmc_sub_pixel_variance8x32 aom_obmc_sub_pixel_variance8x32_c
-
-unsigned int aom_obmc_sub_pixel_variance8x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_obmc_sub_pixel_variance8x4 aom_obmc_sub_pixel_variance8x4_c
-
-unsigned int aom_obmc_sub_pixel_variance8x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_obmc_sub_pixel_variance8x8 aom_obmc_sub_pixel_variance8x8_c
-
-unsigned int aom_obmc_variance128x128_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask,
-                                        unsigned int* sse);
-#define aom_obmc_variance128x128 aom_obmc_variance128x128_c
-
-unsigned int aom_obmc_variance128x64_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask,
-                                       unsigned int* sse);
-#define aom_obmc_variance128x64 aom_obmc_variance128x64_c
-
-unsigned int aom_obmc_variance16x16_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance16x16 aom_obmc_variance16x16_c
-
-unsigned int aom_obmc_variance16x32_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance16x32 aom_obmc_variance16x32_c
-
-unsigned int aom_obmc_variance16x4_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-#define aom_obmc_variance16x4 aom_obmc_variance16x4_c
-
-unsigned int aom_obmc_variance16x64_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance16x64 aom_obmc_variance16x64_c
-
-unsigned int aom_obmc_variance16x8_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-#define aom_obmc_variance16x8 aom_obmc_variance16x8_c
-
-unsigned int aom_obmc_variance32x16_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance32x16 aom_obmc_variance32x16_c
-
-unsigned int aom_obmc_variance32x32_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance32x32 aom_obmc_variance32x32_c
-
-unsigned int aom_obmc_variance32x64_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance32x64 aom_obmc_variance32x64_c
-
-unsigned int aom_obmc_variance32x8_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-#define aom_obmc_variance32x8 aom_obmc_variance32x8_c
-
-unsigned int aom_obmc_variance4x16_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-#define aom_obmc_variance4x16 aom_obmc_variance4x16_c
-
-unsigned int aom_obmc_variance4x4_c(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask,
-                                    unsigned int* sse);
-#define aom_obmc_variance4x4 aom_obmc_variance4x4_c
-
-unsigned int aom_obmc_variance4x8_c(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask,
-                                    unsigned int* sse);
-#define aom_obmc_variance4x8 aom_obmc_variance4x8_c
-
-unsigned int aom_obmc_variance64x128_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask,
-                                       unsigned int* sse);
-#define aom_obmc_variance64x128 aom_obmc_variance64x128_c
-
-unsigned int aom_obmc_variance64x16_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance64x16 aom_obmc_variance64x16_c
-
-unsigned int aom_obmc_variance64x32_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance64x32 aom_obmc_variance64x32_c
-
-unsigned int aom_obmc_variance64x64_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance64x64 aom_obmc_variance64x64_c
-
-unsigned int aom_obmc_variance8x16_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-#define aom_obmc_variance8x16 aom_obmc_variance8x16_c
-
-unsigned int aom_obmc_variance8x32_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-#define aom_obmc_variance8x32 aom_obmc_variance8x32_c
-
-unsigned int aom_obmc_variance8x4_c(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask,
-                                    unsigned int* sse);
-#define aom_obmc_variance8x4 aom_obmc_variance8x4_c
-
-unsigned int aom_obmc_variance8x8_c(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask,
-                                    unsigned int* sse);
-#define aom_obmc_variance8x8 aom_obmc_variance8x8_c
-
 void aom_paeth_predictor_16x16_c(uint8_t* dst,
                                  ptrdiff_t y_stride,
                                  const uint8_t* above,
diff --git a/third_party/libaom/source/config/linux/arm-neon/config/av1_rtcd.h b/third_party/libaom/source/config/linux/arm-neon/config/av1_rtcd.h
index d612ede3..c8b39bd0 100644
--- a/third_party/libaom/source/config/linux/arm-neon/config/av1_rtcd.h
+++ b/third_party/libaom/source/config/linux/arm-neon/config/av1_rtcd.h
@@ -114,46 +114,6 @@
                                 const int log_scale);
 #define aom_quantize_b_helper aom_quantize_b_helper_neon
 
-void av1_apply_selfguided_restoration_c(const uint8_t* dat,
-                                        int width,
-                                        int height,
-                                        int stride,
-                                        int eps,
-                                        const int* xqd,
-                                        uint8_t* dst,
-                                        int dst_stride,
-                                        int32_t* tmpbuf,
-                                        int bit_depth,
-                                        int highbd);
-void av1_apply_selfguided_restoration_neon(const uint8_t* dat,
-                                           int width,
-                                           int height,
-                                           int stride,
-                                           int eps,
-                                           const int* xqd,
-                                           uint8_t* dst,
-                                           int dst_stride,
-                                           int32_t* tmpbuf,
-                                           int bit_depth,
-                                           int highbd);
-#define av1_apply_selfguided_restoration av1_apply_selfguided_restoration_neon
-
-void av1_apply_temporal_filter_c(const struct yv12_buffer_config* ref_frame,
-                                 const struct macroblockd* mbd,
-                                 const BLOCK_SIZE block_size,
-                                 const int mb_row,
-                                 const int mb_col,
-                                 const int num_planes,
-                                 const double* noise_levels,
-                                 const MV* subblock_mvs,
-                                 const int* subblock_mses,
-                                 const int q_factor,
-                                 const int filter_strength,
-                                 const uint8_t* pred,
-                                 uint32_t* accum,
-                                 uint16_t* count);
-#define av1_apply_temporal_filter av1_apply_temporal_filter_c
-
 int64_t av1_block_error_c(const tran_low_t* coeff,
                           const tran_low_t* dqcoeff,
                           intptr_t block_size,
@@ -217,44 +177,6 @@
 #define av1_build_compound_diffwtd_mask_highbd \
   av1_build_compound_diffwtd_mask_highbd_c
 
-int64_t av1_calc_frame_error_c(const uint8_t* const ref,
-                               int stride,
-                               const uint8_t* const dst,
-                               int p_width,
-                               int p_height,
-                               int p_stride);
-#define av1_calc_frame_error av1_calc_frame_error_c
-
-void av1_calc_proj_params_c(const uint8_t* src8,
-                            int width,
-                            int height,
-                            int src_stride,
-                            const uint8_t* dat8,
-                            int dat_stride,
-                            int32_t* flt0,
-                            int flt0_stride,
-                            int32_t* flt1,
-                            int flt1_stride,
-                            int64_t H[2][2],
-                            int64_t C[2],
-                            const sgr_params_type* params);
-#define av1_calc_proj_params av1_calc_proj_params_c
-
-void av1_calc_proj_params_high_bd_c(const uint8_t* src8,
-                                    int width,
-                                    int height,
-                                    int src_stride,
-                                    const uint8_t* dat8,
-                                    int dat_stride,
-                                    int32_t* flt0,
-                                    int flt0_stride,
-                                    int32_t* flt1,
-                                    int flt1_stride,
-                                    int64_t H[2][2],
-                                    int64_t C[2],
-                                    const sgr_params_type* params);
-#define av1_calc_proj_params_high_bd av1_calc_proj_params_high_bd_c
-
 void av1_cnn_activate_c(float** input,
                         int channels,
                         int width,
@@ -321,33 +243,6 @@
                                        int y2);
 #define av1_compute_cross_correlation av1_compute_cross_correlation_c
 
-void av1_compute_stats_c(int wiener_win,
-                         const uint8_t* dgd8,
-                         const uint8_t* src8,
-                         int h_start,
-                         int h_end,
-                         int v_start,
-                         int v_end,
-                         int dgd_stride,
-                         int src_stride,
-                         int64_t* M,
-                         int64_t* H);
-#define av1_compute_stats av1_compute_stats_c
-
-void av1_compute_stats_highbd_c(int wiener_win,
-                                const uint8_t* dgd8,
-                                const uint8_t* src8,
-                                int h_start,
-                                int h_end,
-                                int v_start,
-                                int v_end,
-                                int dgd_stride,
-                                int src_stride,
-                                int64_t* M,
-                                int64_t* H,
-                                aom_bit_depth_t bit_depth);
-#define av1_compute_stats_highbd av1_compute_stats_highbd_c
-
 void av1_convolve_2d_scale_c(const uint8_t* src,
                              int src_stride,
                              uint8_t* dst,
@@ -863,30 +758,6 @@
                                   int8_t* const coeff_contexts);
 #define av1_get_nz_map_contexts av1_get_nz_map_contexts_neon
 
-void av1_highbd_apply_temporal_filter_c(
-    const struct yv12_buffer_config* ref_frame,
-    const struct macroblockd* mbd,
-    const BLOCK_SIZE block_size,
-    const int mb_row,
-    const int mb_col,
-    const int num_planes,
-    const double* noise_levels,
-    const MV* subblock_mvs,
-    const int* subblock_mses,
-    const int q_factor,
-    const int filter_strength,
-    const uint8_t* pred,
-    uint32_t* accum,
-    uint16_t* count);
-#define av1_highbd_apply_temporal_filter av1_highbd_apply_temporal_filter_c
-
-int64_t av1_highbd_block_error_c(const tran_low_t* coeff,
-                                 const tran_low_t* dqcoeff,
-                                 intptr_t block_size,
-                                 int64_t* ssz,
-                                 int bd);
-#define av1_highbd_block_error av1_highbd_block_error_c
-
 void av1_highbd_convolve8_c(const uint8_t* src,
                             ptrdiff_t src_stride,
                             uint8_t* dst,
@@ -926,36 +797,6 @@
                                  int bps);
 #define av1_highbd_convolve8_vert av1_highbd_convolve8_vert_c
 
-void av1_highbd_convolve_2d_scale_c(const uint16_t* src,
-                                    int src_stride,
-                                    uint16_t* dst,
-                                    int dst_stride,
-                                    int w,
-                                    int h,
-                                    const InterpFilterParams* filter_params_x,
-                                    const InterpFilterParams* filter_params_y,
-                                    const int subpel_x_qn,
-                                    const int x_step_qn,
-                                    const int subpel_y_qn,
-                                    const int y_step_qn,
-                                    ConvolveParams* conv_params,
-                                    int bd);
-#define av1_highbd_convolve_2d_scale av1_highbd_convolve_2d_scale_c
-
-void av1_highbd_convolve_2d_sr_c(const uint16_t* src,
-                                 int src_stride,
-                                 uint16_t* dst,
-                                 int dst_stride,
-                                 int w,
-                                 int h,
-                                 const InterpFilterParams* filter_params_x,
-                                 const InterpFilterParams* filter_params_y,
-                                 const int subpel_x_qn,
-                                 const int subpel_y_qn,
-                                 ConvolveParams* conv_params,
-                                 int bd);
-#define av1_highbd_convolve_2d_sr av1_highbd_convolve_2d_sr_c
-
 void av1_highbd_convolve_avg_c(const uint8_t* src,
                                ptrdiff_t src_stride,
                                uint8_t* dst,
@@ -982,128 +823,6 @@
                                 int bps);
 #define av1_highbd_convolve_copy av1_highbd_convolve_copy_c
 
-void av1_highbd_convolve_horiz_rs_c(const uint16_t* src,
-                                    int src_stride,
-                                    uint16_t* dst,
-                                    int dst_stride,
-                                    int w,
-                                    int h,
-                                    const int16_t* x_filters,
-                                    int x0_qn,
-                                    int x_step_qn,
-                                    int bd);
-#define av1_highbd_convolve_horiz_rs av1_highbd_convolve_horiz_rs_c
-
-void av1_highbd_convolve_x_sr_c(const uint16_t* src,
-                                int src_stride,
-                                uint16_t* dst,
-                                int dst_stride,
-                                int w,
-                                int h,
-                                const InterpFilterParams* filter_params_x,
-                                const int subpel_x_qn,
-                                ConvolveParams* conv_params,
-                                int bd);
-#define av1_highbd_convolve_x_sr av1_highbd_convolve_x_sr_c
-
-void av1_highbd_convolve_y_sr_c(const uint16_t* src,
-                                int src_stride,
-                                uint16_t* dst,
-                                int dst_stride,
-                                int w,
-                                int h,
-                                const InterpFilterParams* filter_params_y,
-                                const int subpel_y_qn,
-                                int bd);
-#define av1_highbd_convolve_y_sr av1_highbd_convolve_y_sr_c
-
-void av1_highbd_dist_wtd_convolve_2d_c(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_x,
-    const InterpFilterParams* filter_params_y,
-    const int subpel_x_qn,
-    const int subpel_y_qn,
-    ConvolveParams* conv_params,
-    int bd);
-#define av1_highbd_dist_wtd_convolve_2d av1_highbd_dist_wtd_convolve_2d_c
-
-void av1_highbd_dist_wtd_convolve_2d_copy_c(const uint16_t* src,
-                                            int src_stride,
-                                            uint16_t* dst,
-                                            int dst_stride,
-                                            int w,
-                                            int h,
-                                            ConvolveParams* conv_params,
-                                            int bd);
-#define av1_highbd_dist_wtd_convolve_2d_copy \
-  av1_highbd_dist_wtd_convolve_2d_copy_c
-
-void av1_highbd_dist_wtd_convolve_x_c(const uint16_t* src,
-                                      int src_stride,
-                                      uint16_t* dst,
-                                      int dst_stride,
-                                      int w,
-                                      int h,
-                                      const InterpFilterParams* filter_params_x,
-                                      const int subpel_x_qn,
-                                      ConvolveParams* conv_params,
-                                      int bd);
-#define av1_highbd_dist_wtd_convolve_x av1_highbd_dist_wtd_convolve_x_c
-
-void av1_highbd_dist_wtd_convolve_y_c(const uint16_t* src,
-                                      int src_stride,
-                                      uint16_t* dst,
-                                      int dst_stride,
-                                      int w,
-                                      int h,
-                                      const InterpFilterParams* filter_params_y,
-                                      const int subpel_y_qn,
-                                      ConvolveParams* conv_params,
-                                      int bd);
-#define av1_highbd_dist_wtd_convolve_y av1_highbd_dist_wtd_convolve_y_c
-
-void av1_highbd_dr_prediction_z1_c(uint16_t* dst,
-                                   ptrdiff_t stride,
-                                   int bw,
-                                   int bh,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int upsample_above,
-                                   int dx,
-                                   int dy,
-                                   int bd);
-#define av1_highbd_dr_prediction_z1 av1_highbd_dr_prediction_z1_c
-
-void av1_highbd_dr_prediction_z2_c(uint16_t* dst,
-                                   ptrdiff_t stride,
-                                   int bw,
-                                   int bh,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int upsample_above,
-                                   int upsample_left,
-                                   int dx,
-                                   int dy,
-                                   int bd);
-#define av1_highbd_dr_prediction_z2 av1_highbd_dr_prediction_z2_c
-
-void av1_highbd_dr_prediction_z3_c(uint16_t* dst,
-                                   ptrdiff_t stride,
-                                   int bw,
-                                   int bh,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int upsample_left,
-                                   int dx,
-                                   int dy,
-                                   int bd);
-#define av1_highbd_dr_prediction_z3 av1_highbd_dr_prediction_z3_c
-
 void av1_highbd_fwht4x4_c(const int16_t* input, tran_low_t* output, int stride);
 void av1_highbd_fwht4x4_neon(const int16_t* input,
                              tran_low_t* output,
@@ -1296,70 +1015,6 @@
                                 int bd);
 #define av1_highbd_iwht4x4_1_add av1_highbd_iwht4x4_1_add_c
 
-int64_t av1_highbd_pixel_proj_error_c(const uint8_t* src8,
-                                      int width,
-                                      int height,
-                                      int src_stride,
-                                      const uint8_t* dat8,
-                                      int dat_stride,
-                                      int32_t* flt0,
-                                      int flt0_stride,
-                                      int32_t* flt1,
-                                      int flt1_stride,
-                                      int xq[2],
-                                      const sgr_params_type* params);
-#define av1_highbd_pixel_proj_error av1_highbd_pixel_proj_error_c
-
-void av1_highbd_quantize_fp_c(const tran_low_t* coeff_ptr,
-                              intptr_t n_coeffs,
-                              const int16_t* zbin_ptr,
-                              const int16_t* round_ptr,
-                              const int16_t* quant_ptr,
-                              const int16_t* quant_shift_ptr,
-                              tran_low_t* qcoeff_ptr,
-                              tran_low_t* dqcoeff_ptr,
-                              const int16_t* dequant_ptr,
-                              uint16_t* eob_ptr,
-                              const int16_t* scan,
-                              const int16_t* iscan,
-                              int log_scale);
-#define av1_highbd_quantize_fp av1_highbd_quantize_fp_c
-
-void av1_highbd_warp_affine_c(const int32_t* mat,
-                              const uint16_t* ref,
-                              int width,
-                              int height,
-                              int stride,
-                              uint16_t* pred,
-                              int p_col,
-                              int p_row,
-                              int p_width,
-                              int p_height,
-                              int p_stride,
-                              int subsampling_x,
-                              int subsampling_y,
-                              int bd,
-                              ConvolveParams* conv_params,
-                              int16_t alpha,
-                              int16_t beta,
-                              int16_t gamma,
-                              int16_t delta);
-#define av1_highbd_warp_affine av1_highbd_warp_affine_c
-
-void av1_highbd_wiener_convolve_add_src_c(const uint8_t* src,
-                                          ptrdiff_t src_stride,
-                                          uint8_t* dst,
-                                          ptrdiff_t dst_stride,
-                                          const int16_t* filter_x,
-                                          int x_step_q4,
-                                          const int16_t* filter_y,
-                                          int y_step_q4,
-                                          int w,
-                                          int h,
-                                          const ConvolveParams* conv_params,
-                                          int bd);
-#define av1_highbd_wiener_convolve_add_src av1_highbd_wiener_convolve_add_src_c
-
 void av1_inv_txfm2d_add_16x16_c(const int32_t* input,
                                 uint16_t* output,
                                 int stride,
@@ -1603,32 +1258,6 @@
                              TxfmParam* txfm_param);
 #define av1_lowbd_fwd_txfm av1_lowbd_fwd_txfm_neon
 
-int64_t av1_lowbd_pixel_proj_error_c(const uint8_t* src8,
-                                     int width,
-                                     int height,
-                                     int src_stride,
-                                     const uint8_t* dat8,
-                                     int dat_stride,
-                                     int32_t* flt0,
-                                     int flt0_stride,
-                                     int32_t* flt1,
-                                     int flt1_stride,
-                                     int xq[2],
-                                     const sgr_params_type* params);
-int64_t av1_lowbd_pixel_proj_error_neon(const uint8_t* src8,
-                                        int width,
-                                        int height,
-                                        int src_stride,
-                                        const uint8_t* dat8,
-                                        int dat_stride,
-                                        int32_t* flt0,
-                                        int flt0_stride,
-                                        int32_t* flt1,
-                                        int flt1_stride,
-                                        int xq[2],
-                                        const sgr_params_type* params);
-#define av1_lowbd_pixel_proj_error av1_lowbd_pixel_proj_error_neon
-
 void av1_nn_predict_c(const float* input_nodes,
                       const NN_CONFIG* const nn_config,
                       int reduce_prec,
@@ -1770,28 +1399,6 @@
 void av1_round_shift_array_neon(int32_t* arr, int size, int bit);
 #define av1_round_shift_array av1_round_shift_array_neon
 
-int av1_selfguided_restoration_c(const uint8_t* dgd8,
-                                 int width,
-                                 int height,
-                                 int dgd_stride,
-                                 int32_t* flt0,
-                                 int32_t* flt1,
-                                 int flt_stride,
-                                 int sgr_params_idx,
-                                 int bit_depth,
-                                 int highbd);
-int av1_selfguided_restoration_neon(const uint8_t* dgd8,
-                                    int width,
-                                    int height,
-                                    int dgd_stride,
-                                    int32_t* flt0,
-                                    int32_t* flt1,
-                                    int flt_stride,
-                                    int sgr_params_idx,
-                                    int bit_depth,
-                                    int highbd);
-#define av1_selfguided_restoration av1_selfguided_restoration_neon
-
 void av1_txb_init_levels_c(const tran_low_t* const coeff,
                            const int width,
                            const int height,
@@ -1808,44 +1415,6 @@
 void av1_upsample_intra_edge_high_c(uint16_t* p, int sz, int bd);
 #define av1_upsample_intra_edge_high av1_upsample_intra_edge_high_c
 
-void av1_warp_affine_c(const int32_t* mat,
-                       const uint8_t* ref,
-                       int width,
-                       int height,
-                       int stride,
-                       uint8_t* pred,
-                       int p_col,
-                       int p_row,
-                       int p_width,
-                       int p_height,
-                       int p_stride,
-                       int subsampling_x,
-                       int subsampling_y,
-                       ConvolveParams* conv_params,
-                       int16_t alpha,
-                       int16_t beta,
-                       int16_t gamma,
-                       int16_t delta);
-void av1_warp_affine_neon(const int32_t* mat,
-                          const uint8_t* ref,
-                          int width,
-                          int height,
-                          int stride,
-                          uint8_t* pred,
-                          int p_col,
-                          int p_row,
-                          int p_width,
-                          int p_height,
-                          int p_stride,
-                          int subsampling_x,
-                          int subsampling_y,
-                          ConvolveParams* conv_params,
-                          int16_t alpha,
-                          int16_t beta,
-                          int16_t gamma,
-                          int16_t delta);
-#define av1_warp_affine av1_warp_affine_neon
-
 void av1_wedge_compute_delta_squares_c(int16_t* d,
                                        const int16_t* a,
                                        const int16_t* b,
@@ -1950,34 +1519,18 @@
                        int coeff_shift);
 #define cdef_find_dir cdef_find_dir_neon
 
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_420_hbd_c(TX_SIZE tx_size);
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_420_hbd_neon(TX_SIZE tx_size);
-#define cfl_get_luma_subsampling_420_hbd cfl_get_luma_subsampling_420_hbd_neon
-
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_420_lbd_c(TX_SIZE tx_size);
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_420_lbd_neon(TX_SIZE tx_size);
 #define cfl_get_luma_subsampling_420_lbd cfl_get_luma_subsampling_420_lbd_neon
 
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_422_hbd_c(TX_SIZE tx_size);
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_422_hbd_neon(TX_SIZE tx_size);
-#define cfl_get_luma_subsampling_422_hbd cfl_get_luma_subsampling_422_hbd_neon
-
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_422_lbd_c(TX_SIZE tx_size);
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_422_lbd_neon(TX_SIZE tx_size);
 #define cfl_get_luma_subsampling_422_lbd cfl_get_luma_subsampling_422_lbd_neon
 
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_444_hbd_c(TX_SIZE tx_size);
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_444_hbd_neon(TX_SIZE tx_size);
-#define cfl_get_luma_subsampling_444_hbd cfl_get_luma_subsampling_444_hbd_neon
-
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_444_lbd_c(TX_SIZE tx_size);
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_444_lbd_neon(TX_SIZE tx_size);
 #define cfl_get_luma_subsampling_444_lbd cfl_get_luma_subsampling_444_lbd_neon
 
-cfl_predict_hbd_fn cfl_get_predict_hbd_fn_c(TX_SIZE tx_size);
-cfl_predict_hbd_fn cfl_get_predict_hbd_fn_neon(TX_SIZE tx_size);
-#define cfl_get_predict_hbd_fn cfl_get_predict_hbd_fn_neon
-
 cfl_predict_lbd_fn cfl_get_predict_lbd_fn_c(TX_SIZE tx_size);
 cfl_predict_lbd_fn cfl_get_predict_lbd_fn_neon(TX_SIZE tx_size);
 #define cfl_get_predict_lbd_fn cfl_get_predict_lbd_fn_neon
diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.asm b/third_party/libaom/source/config/linux/arm/config/aom_config.asm
index 1bc4ed0..27aeefe9 100644
--- a/third_party/libaom/source/config/linux/arm/config/aom_config.asm
+++ b/third_party/libaom/source/config/linux/arm/config/aom_config.asm
@@ -17,7 +17,7 @@
 CONFIG_ANALYZER equ 0
 CONFIG_AV1_DECODER equ 1
 CONFIG_AV1_ENCODER equ 1
-CONFIG_AV1_HIGHBITDEPTH equ 1
+CONFIG_AV1_HIGHBITDEPTH equ 0
 CONFIG_AV1_TEMPORAL_DENOISING equ 0
 CONFIG_BIG_ENDIAN equ 0
 CONFIG_BITSTREAM_DEBUG equ 0
@@ -47,7 +47,7 @@
 CONFIG_OS_SUPPORT equ 1
 CONFIG_PIC equ 0
 CONFIG_RD_DEBUG equ 0
-CONFIG_REALTIME_ONLY equ 0
+CONFIG_REALTIME_ONLY equ 1
 CONFIG_RUNTIME_CPU_DETECT equ 0
 CONFIG_SHARED equ 0
 CONFIG_SHARP_SETTINGS equ 0
diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.c b/third_party/libaom/source/config/linux/arm/config/aom_config.c
index 0e29fc1..128f6fe0 100644
--- a/third_party/libaom/source/config/linux/arm/config/aom_config.c
+++ b/third_party/libaom/source/config/linux/arm/config/aom_config.c
@@ -9,5 +9,5 @@
  * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
  */
 #include "aom/aom_codec.h"
-static const char* const cfg = "cmake ../source/libaom -G \"Unix Makefiles\" -DCMAKE_TOOLCHAIN_FILE=\"../source/libaom/build/cmake/toolchains/armv7-linux-gcc.cmake\" -DCONFIG_AV1_ENCODER=1 -DCONFIG_LIBYUV=0 -DCONFIG_MAX_DECODE_PROFILE=0 -DCONFIG_NORMAL_TILE_MODE=1 -DCONFIG_SIZE_LIMIT=1 -DDECODE_HEIGHT_LIMIT=16384 -DDECODE_WIDTH_LIMIT=16384 -DENABLE_NEON=0";
+static const char* const cfg = "cmake ../source/libaom -G \"Unix Makefiles\" -DCMAKE_TOOLCHAIN_FILE=\"../source/libaom/build/cmake/toolchains/armv7-linux-gcc.cmake\" -DCONFIG_AV1_ENCODER=1 -DCONFIG_LIBYUV=0 -DCONFIG_MAX_DECODE_PROFILE=0 -DCONFIG_NORMAL_TILE_MODE=1 -DCONFIG_SIZE_LIMIT=1 -DDECODE_HEIGHT_LIMIT=16384 -DDECODE_WIDTH_LIMIT=16384 -DCONFIG_REALTIME_ONLY=1 -DCONFIG_AV1_HIGHBITDEPTH=0 -DENABLE_NEON=0";
 const char *aom_codec_build_config(void) {return cfg;}
diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.h b/third_party/libaom/source/config/linux/arm/config/aom_config.h
index 21198fa..95d58ab 100644
--- a/third_party/libaom/source/config/linux/arm/config/aom_config.h
+++ b/third_party/libaom/source/config/linux/arm/config/aom_config.h
@@ -19,7 +19,7 @@
 #define CONFIG_ANALYZER 0
 #define CONFIG_AV1_DECODER 1
 #define CONFIG_AV1_ENCODER 1
-#define CONFIG_AV1_HIGHBITDEPTH 1
+#define CONFIG_AV1_HIGHBITDEPTH 0
 #define CONFIG_AV1_TEMPORAL_DENOISING 0
 #define CONFIG_BIG_ENDIAN 0
 #define CONFIG_BITSTREAM_DEBUG 0
@@ -49,7 +49,7 @@
 #define CONFIG_OS_SUPPORT 1
 #define CONFIG_PIC 0
 #define CONFIG_RD_DEBUG 0
-#define CONFIG_REALTIME_ONLY 0
+#define CONFIG_REALTIME_ONLY 1
 #define CONFIG_RUNTIME_CPU_DETECT 0
 #define CONFIG_SHARED 0
 #define CONFIG_SHARP_SETTINGS 0
diff --git a/third_party/libaom/source/config/linux/arm/config/aom_dsp_rtcd.h b/third_party/libaom/source/config/linux/arm/config/aom_dsp_rtcd.h
index 614004a..6906c87 100644
--- a/third_party/libaom/source/config/linux/arm/config/aom_dsp_rtcd.h
+++ b/third_party/libaom/source/config/linux/arm/config/aom_dsp_rtcd.h
@@ -1337,8195 +1337,6 @@
                            int16_t* coeff);
 #define aom_hadamard_lp_8x8 aom_hadamard_lp_8x8_c
 
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x128 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x64 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x16 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x16_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x32 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x32_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x4 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x4_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x64 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x64_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x8 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x8_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x16 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x16_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x32 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x32_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x64 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x64_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x8 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x8_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x16 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x4 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x4_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x8 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x128 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x16 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x16_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x32 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x32_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x64 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x64_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x16 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x16_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x32 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x32_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x4 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x4_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x8 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x8_c
-
-void aom_highbd_10_get16x16var_c(const uint8_t* src_ptr,
-                                 int source_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride,
-                                 unsigned int* sse,
-                                 int* sum);
-#define aom_highbd_10_get16x16var aom_highbd_10_get16x16var_c
-
-void aom_highbd_10_get8x8var_c(const uint8_t* src_ptr,
-                               int source_stride,
-                               const uint8_t* ref_ptr,
-                               int ref_stride,
-                               unsigned int* sse,
-                               int* sum);
-#define aom_highbd_10_get8x8var aom_highbd_10_get8x8var_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance128x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance128x128 \
-  aom_highbd_10_masked_sub_pixel_variance128x128_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance128x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance128x64 \
-  aom_highbd_10_masked_sub_pixel_variance128x64_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance16x16 \
-  aom_highbd_10_masked_sub_pixel_variance16x16_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance16x32 \
-  aom_highbd_10_masked_sub_pixel_variance16x32_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance16x4 \
-  aom_highbd_10_masked_sub_pixel_variance16x4_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance16x64 \
-  aom_highbd_10_masked_sub_pixel_variance16x64_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance16x8 \
-  aom_highbd_10_masked_sub_pixel_variance16x8_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance32x16 \
-  aom_highbd_10_masked_sub_pixel_variance32x16_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance32x32 \
-  aom_highbd_10_masked_sub_pixel_variance32x32_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance32x64 \
-  aom_highbd_10_masked_sub_pixel_variance32x64_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance32x8 \
-  aom_highbd_10_masked_sub_pixel_variance32x8_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance4x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance4x16 \
-  aom_highbd_10_masked_sub_pixel_variance4x16_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance4x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance4x4 \
-  aom_highbd_10_masked_sub_pixel_variance4x4_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance4x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance4x8 \
-  aom_highbd_10_masked_sub_pixel_variance4x8_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance64x128 \
-  aom_highbd_10_masked_sub_pixel_variance64x128_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance64x16 \
-  aom_highbd_10_masked_sub_pixel_variance64x16_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance64x32 \
-  aom_highbd_10_masked_sub_pixel_variance64x32_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance64x64 \
-  aom_highbd_10_masked_sub_pixel_variance64x64_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance8x16 \
-  aom_highbd_10_masked_sub_pixel_variance8x16_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance8x32 \
-  aom_highbd_10_masked_sub_pixel_variance8x32_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance8x4 \
-  aom_highbd_10_masked_sub_pixel_variance8x4_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance8x8 \
-  aom_highbd_10_masked_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_10_mse16x16_c(const uint8_t* src_ptr,
-                                      int source_stride,
-                                      const uint8_t* ref_ptr,
-                                      int recon_stride,
-                                      unsigned int* sse);
-#define aom_highbd_10_mse16x16 aom_highbd_10_mse16x16_c
-
-unsigned int aom_highbd_10_mse16x8_c(const uint8_t* src_ptr,
-                                     int source_stride,
-                                     const uint8_t* ref_ptr,
-                                     int recon_stride,
-                                     unsigned int* sse);
-#define aom_highbd_10_mse16x8 aom_highbd_10_mse16x8_c
-
-unsigned int aom_highbd_10_mse8x16_c(const uint8_t* src_ptr,
-                                     int source_stride,
-                                     const uint8_t* ref_ptr,
-                                     int recon_stride,
-                                     unsigned int* sse);
-#define aom_highbd_10_mse8x16 aom_highbd_10_mse8x16_c
-
-unsigned int aom_highbd_10_mse8x8_c(const uint8_t* src_ptr,
-                                    int source_stride,
-                                    const uint8_t* ref_ptr,
-                                    int recon_stride,
-                                    unsigned int* sse);
-#define aom_highbd_10_mse8x8 aom_highbd_10_mse8x8_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance128x128_c(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            int xoffset,
-                                                            int yoffset,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance128x128 \
-  aom_highbd_10_obmc_sub_pixel_variance128x128_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance128x64_c(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance128x64 \
-  aom_highbd_10_obmc_sub_pixel_variance128x64_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance16x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance16x16 \
-  aom_highbd_10_obmc_sub_pixel_variance16x16_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance16x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance16x32 \
-  aom_highbd_10_obmc_sub_pixel_variance16x32_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance16x4_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance16x4 \
-  aom_highbd_10_obmc_sub_pixel_variance16x4_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance16x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance16x64 \
-  aom_highbd_10_obmc_sub_pixel_variance16x64_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance16x8_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance16x8 \
-  aom_highbd_10_obmc_sub_pixel_variance16x8_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance32x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance32x16 \
-  aom_highbd_10_obmc_sub_pixel_variance32x16_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance32x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance32x32 \
-  aom_highbd_10_obmc_sub_pixel_variance32x32_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance32x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance32x64 \
-  aom_highbd_10_obmc_sub_pixel_variance32x64_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance32x8_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance32x8 \
-  aom_highbd_10_obmc_sub_pixel_variance32x8_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance4x16_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance4x16 \
-  aom_highbd_10_obmc_sub_pixel_variance4x16_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance4x4_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance4x4 \
-  aom_highbd_10_obmc_sub_pixel_variance4x4_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance4x8_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance4x8 \
-  aom_highbd_10_obmc_sub_pixel_variance4x8_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance64x128_c(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance64x128 \
-  aom_highbd_10_obmc_sub_pixel_variance64x128_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance64x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance64x16 \
-  aom_highbd_10_obmc_sub_pixel_variance64x16_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance64x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance64x32 \
-  aom_highbd_10_obmc_sub_pixel_variance64x32_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance64x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance64x64 \
-  aom_highbd_10_obmc_sub_pixel_variance64x64_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance8x16_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance8x16 \
-  aom_highbd_10_obmc_sub_pixel_variance8x16_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance8x32_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance8x32 \
-  aom_highbd_10_obmc_sub_pixel_variance8x32_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance8x4_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance8x4 \
-  aom_highbd_10_obmc_sub_pixel_variance8x4_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance8x8_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance8x8 \
-  aom_highbd_10_obmc_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_10_obmc_variance128x128_c(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-#define aom_highbd_10_obmc_variance128x128 aom_highbd_10_obmc_variance128x128_c
-
-unsigned int aom_highbd_10_obmc_variance128x64_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-#define aom_highbd_10_obmc_variance128x64 aom_highbd_10_obmc_variance128x64_c
-
-unsigned int aom_highbd_10_obmc_variance16x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance16x16 aom_highbd_10_obmc_variance16x16_c
-
-unsigned int aom_highbd_10_obmc_variance16x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance16x32 aom_highbd_10_obmc_variance16x32_c
-
-unsigned int aom_highbd_10_obmc_variance16x4_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_10_obmc_variance16x4 aom_highbd_10_obmc_variance16x4_c
-
-unsigned int aom_highbd_10_obmc_variance16x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance16x64 aom_highbd_10_obmc_variance16x64_c
-
-unsigned int aom_highbd_10_obmc_variance16x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_10_obmc_variance16x8 aom_highbd_10_obmc_variance16x8_c
-
-unsigned int aom_highbd_10_obmc_variance32x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance32x16 aom_highbd_10_obmc_variance32x16_c
-
-unsigned int aom_highbd_10_obmc_variance32x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance32x32 aom_highbd_10_obmc_variance32x32_c
-
-unsigned int aom_highbd_10_obmc_variance32x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance32x64 aom_highbd_10_obmc_variance32x64_c
-
-unsigned int aom_highbd_10_obmc_variance32x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_10_obmc_variance32x8 aom_highbd_10_obmc_variance32x8_c
-
-unsigned int aom_highbd_10_obmc_variance4x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_10_obmc_variance4x16 aom_highbd_10_obmc_variance4x16_c
-
-unsigned int aom_highbd_10_obmc_variance4x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_10_obmc_variance4x4 aom_highbd_10_obmc_variance4x4_c
-
-unsigned int aom_highbd_10_obmc_variance4x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_10_obmc_variance4x8 aom_highbd_10_obmc_variance4x8_c
-
-unsigned int aom_highbd_10_obmc_variance64x128_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-#define aom_highbd_10_obmc_variance64x128 aom_highbd_10_obmc_variance64x128_c
-
-unsigned int aom_highbd_10_obmc_variance64x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance64x16 aom_highbd_10_obmc_variance64x16_c
-
-unsigned int aom_highbd_10_obmc_variance64x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance64x32 aom_highbd_10_obmc_variance64x32_c
-
-unsigned int aom_highbd_10_obmc_variance64x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance64x64 aom_highbd_10_obmc_variance64x64_c
-
-unsigned int aom_highbd_10_obmc_variance8x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_10_obmc_variance8x16 aom_highbd_10_obmc_variance8x16_c
-
-unsigned int aom_highbd_10_obmc_variance8x32_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_10_obmc_variance8x32 aom_highbd_10_obmc_variance8x32_c
-
-unsigned int aom_highbd_10_obmc_variance8x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_10_obmc_variance8x4 aom_highbd_10_obmc_variance8x4_c
-
-unsigned int aom_highbd_10_obmc_variance8x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_10_obmc_variance8x8 aom_highbd_10_obmc_variance8x8_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance128x128 \
-  aom_highbd_10_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance128x64 \
-  aom_highbd_10_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance16x16 \
-  aom_highbd_10_sub_pixel_avg_variance16x16_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance16x32 \
-  aom_highbd_10_sub_pixel_avg_variance16x32_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x4_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance16x4 \
-  aom_highbd_10_sub_pixel_avg_variance16x4_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance16x64 \
-  aom_highbd_10_sub_pixel_avg_variance16x64_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance16x8 \
-  aom_highbd_10_sub_pixel_avg_variance16x8_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance32x16 \
-  aom_highbd_10_sub_pixel_avg_variance32x16_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance32x32 \
-  aom_highbd_10_sub_pixel_avg_variance32x32_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance32x64 \
-  aom_highbd_10_sub_pixel_avg_variance32x64_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x8_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance32x8 \
-  aom_highbd_10_sub_pixel_avg_variance32x8_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance4x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance4x16 \
-  aom_highbd_10_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance4x4 \
-  aom_highbd_10_sub_pixel_avg_variance4x4_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance4x8 \
-  aom_highbd_10_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance64x128 \
-  aom_highbd_10_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance64x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance64x16 \
-  aom_highbd_10_sub_pixel_avg_variance64x16_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance64x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance64x32 \
-  aom_highbd_10_sub_pixel_avg_variance64x32_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance64x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance64x64 \
-  aom_highbd_10_sub_pixel_avg_variance64x64_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance8x16 \
-  aom_highbd_10_sub_pixel_avg_variance8x16_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x32_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance8x32 \
-  aom_highbd_10_sub_pixel_avg_variance8x32_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance8x4 \
-  aom_highbd_10_sub_pixel_avg_variance8x4_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance8x8 \
-  aom_highbd_10_sub_pixel_avg_variance8x8_c
-
-uint32_t aom_highbd_10_sub_pixel_variance128x128_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance128x128 \
-  aom_highbd_10_sub_pixel_variance128x128_c
-
-uint32_t aom_highbd_10_sub_pixel_variance128x64_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance128x64 \
-  aom_highbd_10_sub_pixel_variance128x64_c
-
-uint32_t aom_highbd_10_sub_pixel_variance16x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance16x16 \
-  aom_highbd_10_sub_pixel_variance16x16_c
-
-uint32_t aom_highbd_10_sub_pixel_variance16x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance16x32 \
-  aom_highbd_10_sub_pixel_variance16x32_c
-
-uint32_t aom_highbd_10_sub_pixel_variance16x4_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance16x4 \
-  aom_highbd_10_sub_pixel_variance16x4_c
-
-uint32_t aom_highbd_10_sub_pixel_variance16x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance16x64 \
-  aom_highbd_10_sub_pixel_variance16x64_c
-
-uint32_t aom_highbd_10_sub_pixel_variance16x8_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance16x8 \
-  aom_highbd_10_sub_pixel_variance16x8_c
-
-uint32_t aom_highbd_10_sub_pixel_variance32x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance32x16 \
-  aom_highbd_10_sub_pixel_variance32x16_c
-
-uint32_t aom_highbd_10_sub_pixel_variance32x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance32x32 \
-  aom_highbd_10_sub_pixel_variance32x32_c
-
-uint32_t aom_highbd_10_sub_pixel_variance32x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance32x64 \
-  aom_highbd_10_sub_pixel_variance32x64_c
-
-uint32_t aom_highbd_10_sub_pixel_variance32x8_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance32x8 \
-  aom_highbd_10_sub_pixel_variance32x8_c
-
-uint32_t aom_highbd_10_sub_pixel_variance4x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance4x16 \
-  aom_highbd_10_sub_pixel_variance4x16_c
-
-uint32_t aom_highbd_10_sub_pixel_variance4x4_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance4x4 \
-  aom_highbd_10_sub_pixel_variance4x4_c
-
-uint32_t aom_highbd_10_sub_pixel_variance4x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance4x8 \
-  aom_highbd_10_sub_pixel_variance4x8_c
-
-uint32_t aom_highbd_10_sub_pixel_variance64x128_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance64x128 \
-  aom_highbd_10_sub_pixel_variance64x128_c
-
-uint32_t aom_highbd_10_sub_pixel_variance64x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance64x16 \
-  aom_highbd_10_sub_pixel_variance64x16_c
-
-uint32_t aom_highbd_10_sub_pixel_variance64x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance64x32 \
-  aom_highbd_10_sub_pixel_variance64x32_c
-
-uint32_t aom_highbd_10_sub_pixel_variance64x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance64x64 \
-  aom_highbd_10_sub_pixel_variance64x64_c
-
-uint32_t aom_highbd_10_sub_pixel_variance8x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance8x16 \
-  aom_highbd_10_sub_pixel_variance8x16_c
-
-uint32_t aom_highbd_10_sub_pixel_variance8x32_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance8x32 \
-  aom_highbd_10_sub_pixel_variance8x32_c
-
-uint32_t aom_highbd_10_sub_pixel_variance8x4_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance8x4 \
-  aom_highbd_10_sub_pixel_variance8x4_c
-
-uint32_t aom_highbd_10_sub_pixel_variance8x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance8x8 \
-  aom_highbd_10_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_10_variance128x128_c(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-#define aom_highbd_10_variance128x128 aom_highbd_10_variance128x128_c
-
-unsigned int aom_highbd_10_variance128x64_c(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-#define aom_highbd_10_variance128x64 aom_highbd_10_variance128x64_c
-
-unsigned int aom_highbd_10_variance16x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_10_variance16x16 aom_highbd_10_variance16x16_c
-
-unsigned int aom_highbd_10_variance16x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_10_variance16x32 aom_highbd_10_variance16x32_c
-
-unsigned int aom_highbd_10_variance16x4_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_10_variance16x4 aom_highbd_10_variance16x4_c
-
-unsigned int aom_highbd_10_variance16x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           uint32_t* sse);
-#define aom_highbd_10_variance16x64 aom_highbd_10_variance16x64_c
-
-unsigned int aom_highbd_10_variance16x8_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_10_variance16x8 aom_highbd_10_variance16x8_c
-
-unsigned int aom_highbd_10_variance2x2_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance2x2 aom_highbd_10_variance2x2_c
-
-unsigned int aom_highbd_10_variance2x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance2x4 aom_highbd_10_variance2x4_c
-
-unsigned int aom_highbd_10_variance32x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_10_variance32x16 aom_highbd_10_variance32x16_c
-
-unsigned int aom_highbd_10_variance32x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_10_variance32x32 aom_highbd_10_variance32x32_c
-
-unsigned int aom_highbd_10_variance32x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_10_variance32x64 aom_highbd_10_variance32x64_c
-
-unsigned int aom_highbd_10_variance32x8_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_10_variance32x8 aom_highbd_10_variance32x8_c
-
-unsigned int aom_highbd_10_variance4x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_10_variance4x16 aom_highbd_10_variance4x16_c
-
-unsigned int aom_highbd_10_variance4x2_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance4x2 aom_highbd_10_variance4x2_c
-
-unsigned int aom_highbd_10_variance4x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance4x4 aom_highbd_10_variance4x4_c
-
-unsigned int aom_highbd_10_variance4x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance4x8 aom_highbd_10_variance4x8_c
-
-unsigned int aom_highbd_10_variance64x128_c(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-#define aom_highbd_10_variance64x128 aom_highbd_10_variance64x128_c
-
-unsigned int aom_highbd_10_variance64x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           uint32_t* sse);
-#define aom_highbd_10_variance64x16 aom_highbd_10_variance64x16_c
-
-unsigned int aom_highbd_10_variance64x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_10_variance64x32 aom_highbd_10_variance64x32_c
-
-unsigned int aom_highbd_10_variance64x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_10_variance64x64 aom_highbd_10_variance64x64_c
-
-unsigned int aom_highbd_10_variance8x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_10_variance8x16 aom_highbd_10_variance8x16_c
-
-unsigned int aom_highbd_10_variance8x32_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_10_variance8x32 aom_highbd_10_variance8x32_c
-
-unsigned int aom_highbd_10_variance8x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance8x4 aom_highbd_10_variance8x4_c
-
-unsigned int aom_highbd_10_variance8x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance8x8 aom_highbd_10_variance8x8_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x128 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x64 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x16 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x16_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x32 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x32_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x4 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x4_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x64 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x64_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x8 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x8_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x16 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x16_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x32 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x32_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x64 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x64_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x8 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x8_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x16 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x4 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x4_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x8 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x128 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x16 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x16_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x32 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x32_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x64 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x64_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x16 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x16_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x32 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x32_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x4 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x4_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x8 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x8_c
-
-void aom_highbd_12_get16x16var_c(const uint8_t* src_ptr,
-                                 int source_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride,
-                                 unsigned int* sse,
-                                 int* sum);
-#define aom_highbd_12_get16x16var aom_highbd_12_get16x16var_c
-
-void aom_highbd_12_get8x8var_c(const uint8_t* src_ptr,
-                               int source_stride,
-                               const uint8_t* ref_ptr,
-                               int ref_stride,
-                               unsigned int* sse,
-                               int* sum);
-#define aom_highbd_12_get8x8var aom_highbd_12_get8x8var_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance128x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance128x128 \
-  aom_highbd_12_masked_sub_pixel_variance128x128_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance128x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance128x64 \
-  aom_highbd_12_masked_sub_pixel_variance128x64_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance16x16 \
-  aom_highbd_12_masked_sub_pixel_variance16x16_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance16x32 \
-  aom_highbd_12_masked_sub_pixel_variance16x32_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance16x4 \
-  aom_highbd_12_masked_sub_pixel_variance16x4_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance16x64 \
-  aom_highbd_12_masked_sub_pixel_variance16x64_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance16x8 \
-  aom_highbd_12_masked_sub_pixel_variance16x8_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance32x16 \
-  aom_highbd_12_masked_sub_pixel_variance32x16_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance32x32 \
-  aom_highbd_12_masked_sub_pixel_variance32x32_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance32x64 \
-  aom_highbd_12_masked_sub_pixel_variance32x64_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance32x8 \
-  aom_highbd_12_masked_sub_pixel_variance32x8_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance4x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance4x16 \
-  aom_highbd_12_masked_sub_pixel_variance4x16_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance4x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance4x4 \
-  aom_highbd_12_masked_sub_pixel_variance4x4_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance4x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance4x8 \
-  aom_highbd_12_masked_sub_pixel_variance4x8_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance64x128 \
-  aom_highbd_12_masked_sub_pixel_variance64x128_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance64x16 \
-  aom_highbd_12_masked_sub_pixel_variance64x16_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance64x32 \
-  aom_highbd_12_masked_sub_pixel_variance64x32_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance64x64 \
-  aom_highbd_12_masked_sub_pixel_variance64x64_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance8x16 \
-  aom_highbd_12_masked_sub_pixel_variance8x16_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance8x32 \
-  aom_highbd_12_masked_sub_pixel_variance8x32_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance8x4 \
-  aom_highbd_12_masked_sub_pixel_variance8x4_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance8x8 \
-  aom_highbd_12_masked_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_12_mse16x16_c(const uint8_t* src_ptr,
-                                      int source_stride,
-                                      const uint8_t* ref_ptr,
-                                      int recon_stride,
-                                      unsigned int* sse);
-#define aom_highbd_12_mse16x16 aom_highbd_12_mse16x16_c
-
-unsigned int aom_highbd_12_mse16x8_c(const uint8_t* src_ptr,
-                                     int source_stride,
-                                     const uint8_t* ref_ptr,
-                                     int recon_stride,
-                                     unsigned int* sse);
-#define aom_highbd_12_mse16x8 aom_highbd_12_mse16x8_c
-
-unsigned int aom_highbd_12_mse8x16_c(const uint8_t* src_ptr,
-                                     int source_stride,
-                                     const uint8_t* ref_ptr,
-                                     int recon_stride,
-                                     unsigned int* sse);
-#define aom_highbd_12_mse8x16 aom_highbd_12_mse8x16_c
-
-unsigned int aom_highbd_12_mse8x8_c(const uint8_t* src_ptr,
-                                    int source_stride,
-                                    const uint8_t* ref_ptr,
-                                    int recon_stride,
-                                    unsigned int* sse);
-#define aom_highbd_12_mse8x8 aom_highbd_12_mse8x8_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance128x128_c(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            int xoffset,
-                                                            int yoffset,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance128x128 \
-  aom_highbd_12_obmc_sub_pixel_variance128x128_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance128x64_c(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance128x64 \
-  aom_highbd_12_obmc_sub_pixel_variance128x64_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance16x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance16x16 \
-  aom_highbd_12_obmc_sub_pixel_variance16x16_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance16x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance16x32 \
-  aom_highbd_12_obmc_sub_pixel_variance16x32_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance16x4_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance16x4 \
-  aom_highbd_12_obmc_sub_pixel_variance16x4_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance16x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance16x64 \
-  aom_highbd_12_obmc_sub_pixel_variance16x64_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance16x8_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance16x8 \
-  aom_highbd_12_obmc_sub_pixel_variance16x8_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance32x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance32x16 \
-  aom_highbd_12_obmc_sub_pixel_variance32x16_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance32x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance32x32 \
-  aom_highbd_12_obmc_sub_pixel_variance32x32_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance32x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance32x64 \
-  aom_highbd_12_obmc_sub_pixel_variance32x64_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance32x8_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance32x8 \
-  aom_highbd_12_obmc_sub_pixel_variance32x8_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance4x16_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance4x16 \
-  aom_highbd_12_obmc_sub_pixel_variance4x16_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance4x4_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance4x4 \
-  aom_highbd_12_obmc_sub_pixel_variance4x4_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance4x8_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance4x8 \
-  aom_highbd_12_obmc_sub_pixel_variance4x8_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance64x128_c(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance64x128 \
-  aom_highbd_12_obmc_sub_pixel_variance64x128_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance64x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance64x16 \
-  aom_highbd_12_obmc_sub_pixel_variance64x16_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance64x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance64x32 \
-  aom_highbd_12_obmc_sub_pixel_variance64x32_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance64x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance64x64 \
-  aom_highbd_12_obmc_sub_pixel_variance64x64_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance8x16_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance8x16 \
-  aom_highbd_12_obmc_sub_pixel_variance8x16_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance8x32_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance8x32 \
-  aom_highbd_12_obmc_sub_pixel_variance8x32_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance8x4_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance8x4 \
-  aom_highbd_12_obmc_sub_pixel_variance8x4_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance8x8_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance8x8 \
-  aom_highbd_12_obmc_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_12_obmc_variance128x128_c(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-#define aom_highbd_12_obmc_variance128x128 aom_highbd_12_obmc_variance128x128_c
-
-unsigned int aom_highbd_12_obmc_variance128x64_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-#define aom_highbd_12_obmc_variance128x64 aom_highbd_12_obmc_variance128x64_c
-
-unsigned int aom_highbd_12_obmc_variance16x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance16x16 aom_highbd_12_obmc_variance16x16_c
-
-unsigned int aom_highbd_12_obmc_variance16x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance16x32 aom_highbd_12_obmc_variance16x32_c
-
-unsigned int aom_highbd_12_obmc_variance16x4_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_12_obmc_variance16x4 aom_highbd_12_obmc_variance16x4_c
-
-unsigned int aom_highbd_12_obmc_variance16x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance16x64 aom_highbd_12_obmc_variance16x64_c
-
-unsigned int aom_highbd_12_obmc_variance16x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_12_obmc_variance16x8 aom_highbd_12_obmc_variance16x8_c
-
-unsigned int aom_highbd_12_obmc_variance32x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance32x16 aom_highbd_12_obmc_variance32x16_c
-
-unsigned int aom_highbd_12_obmc_variance32x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance32x32 aom_highbd_12_obmc_variance32x32_c
-
-unsigned int aom_highbd_12_obmc_variance32x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance32x64 aom_highbd_12_obmc_variance32x64_c
-
-unsigned int aom_highbd_12_obmc_variance32x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_12_obmc_variance32x8 aom_highbd_12_obmc_variance32x8_c
-
-unsigned int aom_highbd_12_obmc_variance4x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_12_obmc_variance4x16 aom_highbd_12_obmc_variance4x16_c
-
-unsigned int aom_highbd_12_obmc_variance4x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_12_obmc_variance4x4 aom_highbd_12_obmc_variance4x4_c
-
-unsigned int aom_highbd_12_obmc_variance4x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_12_obmc_variance4x8 aom_highbd_12_obmc_variance4x8_c
-
-unsigned int aom_highbd_12_obmc_variance64x128_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-#define aom_highbd_12_obmc_variance64x128 aom_highbd_12_obmc_variance64x128_c
-
-unsigned int aom_highbd_12_obmc_variance64x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance64x16 aom_highbd_12_obmc_variance64x16_c
-
-unsigned int aom_highbd_12_obmc_variance64x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance64x32 aom_highbd_12_obmc_variance64x32_c
-
-unsigned int aom_highbd_12_obmc_variance64x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance64x64 aom_highbd_12_obmc_variance64x64_c
-
-unsigned int aom_highbd_12_obmc_variance8x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_12_obmc_variance8x16 aom_highbd_12_obmc_variance8x16_c
-
-unsigned int aom_highbd_12_obmc_variance8x32_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_12_obmc_variance8x32 aom_highbd_12_obmc_variance8x32_c
-
-unsigned int aom_highbd_12_obmc_variance8x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_12_obmc_variance8x4 aom_highbd_12_obmc_variance8x4_c
-
-unsigned int aom_highbd_12_obmc_variance8x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_12_obmc_variance8x8 aom_highbd_12_obmc_variance8x8_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance128x128 \
-  aom_highbd_12_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance128x64 \
-  aom_highbd_12_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance16x16 \
-  aom_highbd_12_sub_pixel_avg_variance16x16_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance16x32 \
-  aom_highbd_12_sub_pixel_avg_variance16x32_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x4_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance16x4 \
-  aom_highbd_12_sub_pixel_avg_variance16x4_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance16x64 \
-  aom_highbd_12_sub_pixel_avg_variance16x64_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance16x8 \
-  aom_highbd_12_sub_pixel_avg_variance16x8_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance32x16 \
-  aom_highbd_12_sub_pixel_avg_variance32x16_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance32x32 \
-  aom_highbd_12_sub_pixel_avg_variance32x32_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance32x64 \
-  aom_highbd_12_sub_pixel_avg_variance32x64_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x8_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance32x8 \
-  aom_highbd_12_sub_pixel_avg_variance32x8_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance4x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance4x16 \
-  aom_highbd_12_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance4x4 \
-  aom_highbd_12_sub_pixel_avg_variance4x4_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance4x8 \
-  aom_highbd_12_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance64x128 \
-  aom_highbd_12_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance64x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance64x16 \
-  aom_highbd_12_sub_pixel_avg_variance64x16_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance64x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance64x32 \
-  aom_highbd_12_sub_pixel_avg_variance64x32_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance64x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance64x64 \
-  aom_highbd_12_sub_pixel_avg_variance64x64_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance8x16 \
-  aom_highbd_12_sub_pixel_avg_variance8x16_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x32_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance8x32 \
-  aom_highbd_12_sub_pixel_avg_variance8x32_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance8x4 \
-  aom_highbd_12_sub_pixel_avg_variance8x4_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance8x8 \
-  aom_highbd_12_sub_pixel_avg_variance8x8_c
-
-uint32_t aom_highbd_12_sub_pixel_variance128x128_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance128x128 \
-  aom_highbd_12_sub_pixel_variance128x128_c
-
-uint32_t aom_highbd_12_sub_pixel_variance128x64_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance128x64 \
-  aom_highbd_12_sub_pixel_variance128x64_c
-
-uint32_t aom_highbd_12_sub_pixel_variance16x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance16x16 \
-  aom_highbd_12_sub_pixel_variance16x16_c
-
-uint32_t aom_highbd_12_sub_pixel_variance16x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance16x32 \
-  aom_highbd_12_sub_pixel_variance16x32_c
-
-uint32_t aom_highbd_12_sub_pixel_variance16x4_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance16x4 \
-  aom_highbd_12_sub_pixel_variance16x4_c
-
-uint32_t aom_highbd_12_sub_pixel_variance16x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance16x64 \
-  aom_highbd_12_sub_pixel_variance16x64_c
-
-uint32_t aom_highbd_12_sub_pixel_variance16x8_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance16x8 \
-  aom_highbd_12_sub_pixel_variance16x8_c
-
-uint32_t aom_highbd_12_sub_pixel_variance32x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance32x16 \
-  aom_highbd_12_sub_pixel_variance32x16_c
-
-uint32_t aom_highbd_12_sub_pixel_variance32x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance32x32 \
-  aom_highbd_12_sub_pixel_variance32x32_c
-
-uint32_t aom_highbd_12_sub_pixel_variance32x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance32x64 \
-  aom_highbd_12_sub_pixel_variance32x64_c
-
-uint32_t aom_highbd_12_sub_pixel_variance32x8_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance32x8 \
-  aom_highbd_12_sub_pixel_variance32x8_c
-
-uint32_t aom_highbd_12_sub_pixel_variance4x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance4x16 \
-  aom_highbd_12_sub_pixel_variance4x16_c
-
-uint32_t aom_highbd_12_sub_pixel_variance4x4_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance4x4 \
-  aom_highbd_12_sub_pixel_variance4x4_c
-
-uint32_t aom_highbd_12_sub_pixel_variance4x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance4x8 \
-  aom_highbd_12_sub_pixel_variance4x8_c
-
-uint32_t aom_highbd_12_sub_pixel_variance64x128_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance64x128 \
-  aom_highbd_12_sub_pixel_variance64x128_c
-
-uint32_t aom_highbd_12_sub_pixel_variance64x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance64x16 \
-  aom_highbd_12_sub_pixel_variance64x16_c
-
-uint32_t aom_highbd_12_sub_pixel_variance64x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance64x32 \
-  aom_highbd_12_sub_pixel_variance64x32_c
-
-uint32_t aom_highbd_12_sub_pixel_variance64x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance64x64 \
-  aom_highbd_12_sub_pixel_variance64x64_c
-
-uint32_t aom_highbd_12_sub_pixel_variance8x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance8x16 \
-  aom_highbd_12_sub_pixel_variance8x16_c
-
-uint32_t aom_highbd_12_sub_pixel_variance8x32_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance8x32 \
-  aom_highbd_12_sub_pixel_variance8x32_c
-
-uint32_t aom_highbd_12_sub_pixel_variance8x4_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance8x4 \
-  aom_highbd_12_sub_pixel_variance8x4_c
-
-uint32_t aom_highbd_12_sub_pixel_variance8x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance8x8 \
-  aom_highbd_12_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_12_variance128x128_c(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-#define aom_highbd_12_variance128x128 aom_highbd_12_variance128x128_c
-
-unsigned int aom_highbd_12_variance128x64_c(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-#define aom_highbd_12_variance128x64 aom_highbd_12_variance128x64_c
-
-unsigned int aom_highbd_12_variance16x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_12_variance16x16 aom_highbd_12_variance16x16_c
-
-unsigned int aom_highbd_12_variance16x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_12_variance16x32 aom_highbd_12_variance16x32_c
-
-unsigned int aom_highbd_12_variance16x4_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_12_variance16x4 aom_highbd_12_variance16x4_c
-
-unsigned int aom_highbd_12_variance16x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           uint32_t* sse);
-#define aom_highbd_12_variance16x64 aom_highbd_12_variance16x64_c
-
-unsigned int aom_highbd_12_variance16x8_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_12_variance16x8 aom_highbd_12_variance16x8_c
-
-unsigned int aom_highbd_12_variance2x2_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance2x2 aom_highbd_12_variance2x2_c
-
-unsigned int aom_highbd_12_variance2x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance2x4 aom_highbd_12_variance2x4_c
-
-unsigned int aom_highbd_12_variance32x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_12_variance32x16 aom_highbd_12_variance32x16_c
-
-unsigned int aom_highbd_12_variance32x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_12_variance32x32 aom_highbd_12_variance32x32_c
-
-unsigned int aom_highbd_12_variance32x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_12_variance32x64 aom_highbd_12_variance32x64_c
-
-unsigned int aom_highbd_12_variance32x8_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_12_variance32x8 aom_highbd_12_variance32x8_c
-
-unsigned int aom_highbd_12_variance4x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_12_variance4x16 aom_highbd_12_variance4x16_c
-
-unsigned int aom_highbd_12_variance4x2_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance4x2 aom_highbd_12_variance4x2_c
-
-unsigned int aom_highbd_12_variance4x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance4x4 aom_highbd_12_variance4x4_c
-
-unsigned int aom_highbd_12_variance4x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance4x8 aom_highbd_12_variance4x8_c
-
-unsigned int aom_highbd_12_variance64x128_c(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-#define aom_highbd_12_variance64x128 aom_highbd_12_variance64x128_c
-
-unsigned int aom_highbd_12_variance64x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           uint32_t* sse);
-#define aom_highbd_12_variance64x16 aom_highbd_12_variance64x16_c
-
-unsigned int aom_highbd_12_variance64x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_12_variance64x32 aom_highbd_12_variance64x32_c
-
-unsigned int aom_highbd_12_variance64x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_12_variance64x64 aom_highbd_12_variance64x64_c
-
-unsigned int aom_highbd_12_variance8x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_12_variance8x16 aom_highbd_12_variance8x16_c
-
-unsigned int aom_highbd_12_variance8x32_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_12_variance8x32 aom_highbd_12_variance8x32_c
-
-unsigned int aom_highbd_12_variance8x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance8x4 aom_highbd_12_variance8x4_c
-
-unsigned int aom_highbd_12_variance8x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance8x8 aom_highbd_12_variance8x8_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x128 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x64 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x16 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x16_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x32 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x32_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x4 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x4_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x64 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x64_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x8 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x8_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x16 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x16_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x32 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x32_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x64 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x64_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x8 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x8_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x16 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x4 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x4_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x8 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x128 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x16 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x16_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x32 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x32_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x64 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x64_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x16 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x16_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x32 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x32_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x4 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x4_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x8 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x8_c
-
-void aom_highbd_8_get16x16var_c(const uint8_t* src_ptr,
-                                int source_stride,
-                                const uint8_t* ref_ptr,
-                                int ref_stride,
-                                unsigned int* sse,
-                                int* sum);
-#define aom_highbd_8_get16x16var aom_highbd_8_get16x16var_c
-
-void aom_highbd_8_get8x8var_c(const uint8_t* src_ptr,
-                              int source_stride,
-                              const uint8_t* ref_ptr,
-                              int ref_stride,
-                              unsigned int* sse,
-                              int* sum);
-#define aom_highbd_8_get8x8var aom_highbd_8_get8x8var_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance128x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance128x128 \
-  aom_highbd_8_masked_sub_pixel_variance128x128_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance128x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance128x64 \
-  aom_highbd_8_masked_sub_pixel_variance128x64_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance16x16 \
-  aom_highbd_8_masked_sub_pixel_variance16x16_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance16x32 \
-  aom_highbd_8_masked_sub_pixel_variance16x32_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance16x4 \
-  aom_highbd_8_masked_sub_pixel_variance16x4_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance16x64 \
-  aom_highbd_8_masked_sub_pixel_variance16x64_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance16x8 \
-  aom_highbd_8_masked_sub_pixel_variance16x8_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance32x16 \
-  aom_highbd_8_masked_sub_pixel_variance32x16_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance32x32 \
-  aom_highbd_8_masked_sub_pixel_variance32x32_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance32x64 \
-  aom_highbd_8_masked_sub_pixel_variance32x64_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance32x8 \
-  aom_highbd_8_masked_sub_pixel_variance32x8_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance4x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance4x16 \
-  aom_highbd_8_masked_sub_pixel_variance4x16_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance4x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance4x4 \
-  aom_highbd_8_masked_sub_pixel_variance4x4_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance4x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance4x8 \
-  aom_highbd_8_masked_sub_pixel_variance4x8_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance64x128 \
-  aom_highbd_8_masked_sub_pixel_variance64x128_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance64x16 \
-  aom_highbd_8_masked_sub_pixel_variance64x16_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance64x32 \
-  aom_highbd_8_masked_sub_pixel_variance64x32_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance64x64 \
-  aom_highbd_8_masked_sub_pixel_variance64x64_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance8x16 \
-  aom_highbd_8_masked_sub_pixel_variance8x16_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance8x32 \
-  aom_highbd_8_masked_sub_pixel_variance8x32_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance8x4 \
-  aom_highbd_8_masked_sub_pixel_variance8x4_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance8x8 \
-  aom_highbd_8_masked_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_8_mse16x16_c(const uint8_t* src_ptr,
-                                     int source_stride,
-                                     const uint8_t* ref_ptr,
-                                     int recon_stride,
-                                     unsigned int* sse);
-#define aom_highbd_8_mse16x16 aom_highbd_8_mse16x16_c
-
-unsigned int aom_highbd_8_mse16x8_c(const uint8_t* src_ptr,
-                                    int source_stride,
-                                    const uint8_t* ref_ptr,
-                                    int recon_stride,
-                                    unsigned int* sse);
-#define aom_highbd_8_mse16x8 aom_highbd_8_mse16x8_c
-
-unsigned int aom_highbd_8_mse8x16_c(const uint8_t* src_ptr,
-                                    int source_stride,
-                                    const uint8_t* ref_ptr,
-                                    int recon_stride,
-                                    unsigned int* sse);
-#define aom_highbd_8_mse8x16 aom_highbd_8_mse8x16_c
-
-unsigned int aom_highbd_8_mse8x8_c(const uint8_t* src_ptr,
-                                   int source_stride,
-                                   const uint8_t* ref_ptr,
-                                   int recon_stride,
-                                   unsigned int* sse);
-#define aom_highbd_8_mse8x8 aom_highbd_8_mse8x8_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance128x128 \
-  aom_highbd_8_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance128x64 \
-  aom_highbd_8_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance16x16 \
-  aom_highbd_8_sub_pixel_avg_variance16x16_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x32_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance16x32 \
-  aom_highbd_8_sub_pixel_avg_variance16x32_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x4_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance16x4 \
-  aom_highbd_8_sub_pixel_avg_variance16x4_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x64_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance16x64 \
-  aom_highbd_8_sub_pixel_avg_variance16x64_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance16x8 \
-  aom_highbd_8_sub_pixel_avg_variance16x8_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance32x16 \
-  aom_highbd_8_sub_pixel_avg_variance32x16_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x32_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance32x32 \
-  aom_highbd_8_sub_pixel_avg_variance32x32_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x64_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance32x64 \
-  aom_highbd_8_sub_pixel_avg_variance32x64_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance32x8 \
-  aom_highbd_8_sub_pixel_avg_variance32x8_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance4x16_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance4x16 \
-  aom_highbd_8_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse,
-                                                  const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance4x4 \
-  aom_highbd_8_sub_pixel_avg_variance4x4_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse,
-                                                  const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance4x8 \
-  aom_highbd_8_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance64x128 \
-  aom_highbd_8_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance64x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance64x16 \
-  aom_highbd_8_sub_pixel_avg_variance64x16_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance64x32_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance64x32 \
-  aom_highbd_8_sub_pixel_avg_variance64x32_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance64x64_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance64x64 \
-  aom_highbd_8_sub_pixel_avg_variance64x64_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance8x16 \
-  aom_highbd_8_sub_pixel_avg_variance8x16_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x32_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance8x32 \
-  aom_highbd_8_sub_pixel_avg_variance8x32_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse,
-                                                  const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance8x4 \
-  aom_highbd_8_sub_pixel_avg_variance8x4_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse,
-                                                  const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance8x8 \
-  aom_highbd_8_sub_pixel_avg_variance8x8_c
-
-uint32_t aom_highbd_8_sub_pixel_variance128x128_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance128x128 \
-  aom_highbd_8_sub_pixel_variance128x128_c
-
-uint32_t aom_highbd_8_sub_pixel_variance128x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance128x64 \
-  aom_highbd_8_sub_pixel_variance128x64_c
-
-uint32_t aom_highbd_8_sub_pixel_variance16x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance16x16 \
-  aom_highbd_8_sub_pixel_variance16x16_c
-
-uint32_t aom_highbd_8_sub_pixel_variance16x32_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance16x32 \
-  aom_highbd_8_sub_pixel_variance16x32_c
-
-uint32_t aom_highbd_8_sub_pixel_variance16x4_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance16x4 \
-  aom_highbd_8_sub_pixel_variance16x4_c
-
-uint32_t aom_highbd_8_sub_pixel_variance16x64_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance16x64 \
-  aom_highbd_8_sub_pixel_variance16x64_c
-
-uint32_t aom_highbd_8_sub_pixel_variance16x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance16x8 \
-  aom_highbd_8_sub_pixel_variance16x8_c
-
-uint32_t aom_highbd_8_sub_pixel_variance32x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance32x16 \
-  aom_highbd_8_sub_pixel_variance32x16_c
-
-uint32_t aom_highbd_8_sub_pixel_variance32x32_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance32x32 \
-  aom_highbd_8_sub_pixel_variance32x32_c
-
-uint32_t aom_highbd_8_sub_pixel_variance32x64_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance32x64 \
-  aom_highbd_8_sub_pixel_variance32x64_c
-
-uint32_t aom_highbd_8_sub_pixel_variance32x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance32x8 \
-  aom_highbd_8_sub_pixel_variance32x8_c
-
-uint32_t aom_highbd_8_sub_pixel_variance4x16_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance4x16 \
-  aom_highbd_8_sub_pixel_variance4x16_c
-
-uint32_t aom_highbd_8_sub_pixel_variance4x4_c(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance4x4 aom_highbd_8_sub_pixel_variance4x4_c
-
-uint32_t aom_highbd_8_sub_pixel_variance4x8_c(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance4x8 aom_highbd_8_sub_pixel_variance4x8_c
-
-uint32_t aom_highbd_8_sub_pixel_variance64x128_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance64x128 \
-  aom_highbd_8_sub_pixel_variance64x128_c
-
-uint32_t aom_highbd_8_sub_pixel_variance64x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance64x16 \
-  aom_highbd_8_sub_pixel_variance64x16_c
-
-uint32_t aom_highbd_8_sub_pixel_variance64x32_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance64x32 \
-  aom_highbd_8_sub_pixel_variance64x32_c
-
-uint32_t aom_highbd_8_sub_pixel_variance64x64_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance64x64 \
-  aom_highbd_8_sub_pixel_variance64x64_c
-
-uint32_t aom_highbd_8_sub_pixel_variance8x16_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance8x16 \
-  aom_highbd_8_sub_pixel_variance8x16_c
-
-uint32_t aom_highbd_8_sub_pixel_variance8x32_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance8x32 \
-  aom_highbd_8_sub_pixel_variance8x32_c
-
-uint32_t aom_highbd_8_sub_pixel_variance8x4_c(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance8x4 aom_highbd_8_sub_pixel_variance8x4_c
-
-uint32_t aom_highbd_8_sub_pixel_variance8x8_c(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance8x8 aom_highbd_8_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_8_variance128x128_c(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-#define aom_highbd_8_variance128x128 aom_highbd_8_variance128x128_c
-
-unsigned int aom_highbd_8_variance128x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_8_variance128x64 aom_highbd_8_variance128x64_c
-
-unsigned int aom_highbd_8_variance16x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_8_variance16x16 aom_highbd_8_variance16x16_c
-
-unsigned int aom_highbd_8_variance16x32_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_8_variance16x32 aom_highbd_8_variance16x32_c
-
-unsigned int aom_highbd_8_variance16x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         uint32_t* sse);
-#define aom_highbd_8_variance16x4 aom_highbd_8_variance16x4_c
-
-unsigned int aom_highbd_8_variance16x64_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_8_variance16x64 aom_highbd_8_variance16x64_c
-
-unsigned int aom_highbd_8_variance16x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_8_variance16x8 aom_highbd_8_variance16x8_c
-
-unsigned int aom_highbd_8_variance2x2_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance2x2 aom_highbd_8_variance2x2_c
-
-unsigned int aom_highbd_8_variance2x4_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance2x4 aom_highbd_8_variance2x4_c
-
-unsigned int aom_highbd_8_variance32x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_8_variance32x16 aom_highbd_8_variance32x16_c
-
-unsigned int aom_highbd_8_variance32x32_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_8_variance32x32 aom_highbd_8_variance32x32_c
-
-unsigned int aom_highbd_8_variance32x64_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_8_variance32x64 aom_highbd_8_variance32x64_c
-
-unsigned int aom_highbd_8_variance32x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         uint32_t* sse);
-#define aom_highbd_8_variance32x8 aom_highbd_8_variance32x8_c
-
-unsigned int aom_highbd_8_variance4x16_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         uint32_t* sse);
-#define aom_highbd_8_variance4x16 aom_highbd_8_variance4x16_c
-
-unsigned int aom_highbd_8_variance4x2_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance4x2 aom_highbd_8_variance4x2_c
-
-unsigned int aom_highbd_8_variance4x4_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance4x4 aom_highbd_8_variance4x4_c
-
-unsigned int aom_highbd_8_variance4x8_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance4x8 aom_highbd_8_variance4x8_c
-
-unsigned int aom_highbd_8_variance64x128_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_8_variance64x128 aom_highbd_8_variance64x128_c
-
-unsigned int aom_highbd_8_variance64x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_8_variance64x16 aom_highbd_8_variance64x16_c
-
-unsigned int aom_highbd_8_variance64x32_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_8_variance64x32 aom_highbd_8_variance64x32_c
-
-unsigned int aom_highbd_8_variance64x64_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_8_variance64x64 aom_highbd_8_variance64x64_c
-
-unsigned int aom_highbd_8_variance8x16_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_8_variance8x16 aom_highbd_8_variance8x16_c
-
-unsigned int aom_highbd_8_variance8x32_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         uint32_t* sse);
-#define aom_highbd_8_variance8x32 aom_highbd_8_variance8x32_c
-
-unsigned int aom_highbd_8_variance8x4_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance8x4 aom_highbd_8_variance8x4_c
-
-unsigned int aom_highbd_8_variance8x8_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance8x8 aom_highbd_8_variance8x8_c
-
-unsigned int aom_highbd_avg_4x4_c(const uint8_t*, int p);
-#define aom_highbd_avg_4x4 aom_highbd_avg_4x4_c
-
-unsigned int aom_highbd_avg_8x8_c(const uint8_t*, int p);
-#define aom_highbd_avg_8x8 aom_highbd_avg_8x8_c
-
-void aom_highbd_blend_a64_d16_mask_c(uint8_t* dst,
-                                     uint32_t dst_stride,
-                                     const CONV_BUF_TYPE* src0,
-                                     uint32_t src0_stride,
-                                     const CONV_BUF_TYPE* src1,
-                                     uint32_t src1_stride,
-                                     const uint8_t* mask,
-                                     uint32_t mask_stride,
-                                     int w,
-                                     int h,
-                                     int subw,
-                                     int subh,
-                                     ConvolveParams* conv_params,
-                                     const int bd);
-#define aom_highbd_blend_a64_d16_mask aom_highbd_blend_a64_d16_mask_c
-
-void aom_highbd_blend_a64_hmask_c(uint8_t* dst,
-                                  uint32_t dst_stride,
-                                  const uint8_t* src0,
-                                  uint32_t src0_stride,
-                                  const uint8_t* src1,
-                                  uint32_t src1_stride,
-                                  const uint8_t* mask,
-                                  int w,
-                                  int h,
-                                  int bd);
-#define aom_highbd_blend_a64_hmask aom_highbd_blend_a64_hmask_c
-
-void aom_highbd_blend_a64_mask_c(uint8_t* dst,
-                                 uint32_t dst_stride,
-                                 const uint8_t* src0,
-                                 uint32_t src0_stride,
-                                 const uint8_t* src1,
-                                 uint32_t src1_stride,
-                                 const uint8_t* mask,
-                                 uint32_t mask_stride,
-                                 int w,
-                                 int h,
-                                 int subw,
-                                 int subh,
-                                 int bd);
-#define aom_highbd_blend_a64_mask aom_highbd_blend_a64_mask_c
-
-void aom_highbd_blend_a64_vmask_c(uint8_t* dst,
-                                  uint32_t dst_stride,
-                                  const uint8_t* src0,
-                                  uint32_t src0_stride,
-                                  const uint8_t* src1,
-                                  uint32_t src1_stride,
-                                  const uint8_t* mask,
-                                  int w,
-                                  int h,
-                                  int bd);
-#define aom_highbd_blend_a64_vmask aom_highbd_blend_a64_vmask_c
-
-void aom_highbd_comp_avg_pred_c(uint8_t* comp_pred8,
-                                const uint8_t* pred8,
-                                int width,
-                                int height,
-                                const uint8_t* ref8,
-                                int ref_stride);
-#define aom_highbd_comp_avg_pred aom_highbd_comp_avg_pred_c
-
-void aom_highbd_comp_avg_upsampled_pred_c(MACROBLOCKD* xd,
-                                          const struct AV1Common* const cm,
-                                          int mi_row,
-                                          int mi_col,
-                                          const MV* const mv,
-                                          uint8_t* comp_pred8,
-                                          const uint8_t* pred8,
-                                          int width,
-                                          int height,
-                                          int subpel_x_q3,
-                                          int subpel_y_q3,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          int bd,
-                                          int subpel_search);
-#define aom_highbd_comp_avg_upsampled_pred aom_highbd_comp_avg_upsampled_pred_c
-
-void aom_highbd_comp_mask_pred_c(uint8_t* comp_pred,
-                                 const uint8_t* pred8,
-                                 int width,
-                                 int height,
-                                 const uint8_t* ref8,
-                                 int ref_stride,
-                                 const uint8_t* mask,
-                                 int mask_stride,
-                                 int invert_mask);
-#define aom_highbd_comp_mask_pred aom_highbd_comp_mask_pred_c
-
-void aom_highbd_convolve8_horiz_c(const uint8_t* src,
-                                  ptrdiff_t src_stride,
-                                  uint8_t* dst,
-                                  ptrdiff_t dst_stride,
-                                  const int16_t* filter_x,
-                                  int x_step_q4,
-                                  const int16_t* filter_y,
-                                  int y_step_q4,
-                                  int w,
-                                  int h,
-                                  int bd);
-#define aom_highbd_convolve8_horiz aom_highbd_convolve8_horiz_c
-
-void aom_highbd_convolve8_vert_c(const uint8_t* src,
-                                 ptrdiff_t src_stride,
-                                 uint8_t* dst,
-                                 ptrdiff_t dst_stride,
-                                 const int16_t* filter_x,
-                                 int x_step_q4,
-                                 const int16_t* filter_y,
-                                 int y_step_q4,
-                                 int w,
-                                 int h,
-                                 int bd);
-#define aom_highbd_convolve8_vert aom_highbd_convolve8_vert_c
-
-void aom_highbd_convolve_copy_c(const uint16_t* src,
-                                ptrdiff_t src_stride,
-                                uint16_t* dst,
-                                ptrdiff_t dst_stride,
-                                int w,
-                                int h);
-#define aom_highbd_convolve_copy aom_highbd_convolve_copy_c
-
-void aom_highbd_dc_128_predictor_16x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_16x16 aom_highbd_dc_128_predictor_16x16_c
-
-void aom_highbd_dc_128_predictor_16x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_16x32 aom_highbd_dc_128_predictor_16x32_c
-
-void aom_highbd_dc_128_predictor_16x4_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_16x4 aom_highbd_dc_128_predictor_16x4_c
-
-void aom_highbd_dc_128_predictor_16x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_16x64 aom_highbd_dc_128_predictor_16x64_c
-
-void aom_highbd_dc_128_predictor_16x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_16x8 aom_highbd_dc_128_predictor_16x8_c
-
-void aom_highbd_dc_128_predictor_2x2_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_128_predictor_2x2 aom_highbd_dc_128_predictor_2x2_c
-
-void aom_highbd_dc_128_predictor_32x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_32x16 aom_highbd_dc_128_predictor_32x16_c
-
-void aom_highbd_dc_128_predictor_32x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_32x32 aom_highbd_dc_128_predictor_32x32_c
-
-void aom_highbd_dc_128_predictor_32x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_32x64 aom_highbd_dc_128_predictor_32x64_c
-
-void aom_highbd_dc_128_predictor_32x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_32x8 aom_highbd_dc_128_predictor_32x8_c
-
-void aom_highbd_dc_128_predictor_4x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_4x16 aom_highbd_dc_128_predictor_4x16_c
-
-void aom_highbd_dc_128_predictor_4x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_128_predictor_4x4 aom_highbd_dc_128_predictor_4x4_c
-
-void aom_highbd_dc_128_predictor_4x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_128_predictor_4x8 aom_highbd_dc_128_predictor_4x8_c
-
-void aom_highbd_dc_128_predictor_64x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_64x16 aom_highbd_dc_128_predictor_64x16_c
-
-void aom_highbd_dc_128_predictor_64x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_64x32 aom_highbd_dc_128_predictor_64x32_c
-
-void aom_highbd_dc_128_predictor_64x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_64x64 aom_highbd_dc_128_predictor_64x64_c
-
-void aom_highbd_dc_128_predictor_8x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_8x16 aom_highbd_dc_128_predictor_8x16_c
-
-void aom_highbd_dc_128_predictor_8x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_8x32 aom_highbd_dc_128_predictor_8x32_c
-
-void aom_highbd_dc_128_predictor_8x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_128_predictor_8x4 aom_highbd_dc_128_predictor_8x4_c
-
-void aom_highbd_dc_128_predictor_8x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_128_predictor_8x8 aom_highbd_dc_128_predictor_8x8_c
-
-void aom_highbd_dc_left_predictor_16x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_16x16 aom_highbd_dc_left_predictor_16x16_c
-
-void aom_highbd_dc_left_predictor_16x32_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_16x32 aom_highbd_dc_left_predictor_16x32_c
-
-void aom_highbd_dc_left_predictor_16x4_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_16x4 aom_highbd_dc_left_predictor_16x4_c
-
-void aom_highbd_dc_left_predictor_16x64_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_16x64 aom_highbd_dc_left_predictor_16x64_c
-
-void aom_highbd_dc_left_predictor_16x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_16x8 aom_highbd_dc_left_predictor_16x8_c
-
-void aom_highbd_dc_left_predictor_2x2_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_left_predictor_2x2 aom_highbd_dc_left_predictor_2x2_c
-
-void aom_highbd_dc_left_predictor_32x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_32x16 aom_highbd_dc_left_predictor_32x16_c
-
-void aom_highbd_dc_left_predictor_32x32_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_32x32 aom_highbd_dc_left_predictor_32x32_c
-
-void aom_highbd_dc_left_predictor_32x64_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_32x64 aom_highbd_dc_left_predictor_32x64_c
-
-void aom_highbd_dc_left_predictor_32x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_32x8 aom_highbd_dc_left_predictor_32x8_c
-
-void aom_highbd_dc_left_predictor_4x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_4x16 aom_highbd_dc_left_predictor_4x16_c
-
-void aom_highbd_dc_left_predictor_4x4_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_left_predictor_4x4 aom_highbd_dc_left_predictor_4x4_c
-
-void aom_highbd_dc_left_predictor_4x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_left_predictor_4x8 aom_highbd_dc_left_predictor_4x8_c
-
-void aom_highbd_dc_left_predictor_64x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_64x16 aom_highbd_dc_left_predictor_64x16_c
-
-void aom_highbd_dc_left_predictor_64x32_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_64x32 aom_highbd_dc_left_predictor_64x32_c
-
-void aom_highbd_dc_left_predictor_64x64_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_64x64 aom_highbd_dc_left_predictor_64x64_c
-
-void aom_highbd_dc_left_predictor_8x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_8x16 aom_highbd_dc_left_predictor_8x16_c
-
-void aom_highbd_dc_left_predictor_8x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_8x32 aom_highbd_dc_left_predictor_8x32_c
-
-void aom_highbd_dc_left_predictor_8x4_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_left_predictor_8x4 aom_highbd_dc_left_predictor_8x4_c
-
-void aom_highbd_dc_left_predictor_8x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_left_predictor_8x8 aom_highbd_dc_left_predictor_8x8_c
-
-void aom_highbd_dc_predictor_16x16_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_16x16 aom_highbd_dc_predictor_16x16_c
-
-void aom_highbd_dc_predictor_16x32_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_16x32 aom_highbd_dc_predictor_16x32_c
-
-void aom_highbd_dc_predictor_16x4_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_16x4 aom_highbd_dc_predictor_16x4_c
-
-void aom_highbd_dc_predictor_16x64_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_16x64 aom_highbd_dc_predictor_16x64_c
-
-void aom_highbd_dc_predictor_16x8_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_16x8 aom_highbd_dc_predictor_16x8_c
-
-void aom_highbd_dc_predictor_2x2_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_dc_predictor_2x2 aom_highbd_dc_predictor_2x2_c
-
-void aom_highbd_dc_predictor_32x16_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_32x16 aom_highbd_dc_predictor_32x16_c
-
-void aom_highbd_dc_predictor_32x32_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_32x32 aom_highbd_dc_predictor_32x32_c
-
-void aom_highbd_dc_predictor_32x64_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_32x64 aom_highbd_dc_predictor_32x64_c
-
-void aom_highbd_dc_predictor_32x8_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_32x8 aom_highbd_dc_predictor_32x8_c
-
-void aom_highbd_dc_predictor_4x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_4x16 aom_highbd_dc_predictor_4x16_c
-
-void aom_highbd_dc_predictor_4x4_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_dc_predictor_4x4 aom_highbd_dc_predictor_4x4_c
-
-void aom_highbd_dc_predictor_4x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_dc_predictor_4x8 aom_highbd_dc_predictor_4x8_c
-
-void aom_highbd_dc_predictor_64x16_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_64x16 aom_highbd_dc_predictor_64x16_c
-
-void aom_highbd_dc_predictor_64x32_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_64x32 aom_highbd_dc_predictor_64x32_c
-
-void aom_highbd_dc_predictor_64x64_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_64x64 aom_highbd_dc_predictor_64x64_c
-
-void aom_highbd_dc_predictor_8x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_8x16 aom_highbd_dc_predictor_8x16_c
-
-void aom_highbd_dc_predictor_8x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_8x32 aom_highbd_dc_predictor_8x32_c
-
-void aom_highbd_dc_predictor_8x4_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_dc_predictor_8x4 aom_highbd_dc_predictor_8x4_c
-
-void aom_highbd_dc_predictor_8x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_dc_predictor_8x8 aom_highbd_dc_predictor_8x8_c
-
-void aom_highbd_dc_top_predictor_16x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_16x16 aom_highbd_dc_top_predictor_16x16_c
-
-void aom_highbd_dc_top_predictor_16x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_16x32 aom_highbd_dc_top_predictor_16x32_c
-
-void aom_highbd_dc_top_predictor_16x4_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_16x4 aom_highbd_dc_top_predictor_16x4_c
-
-void aom_highbd_dc_top_predictor_16x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_16x64 aom_highbd_dc_top_predictor_16x64_c
-
-void aom_highbd_dc_top_predictor_16x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_16x8 aom_highbd_dc_top_predictor_16x8_c
-
-void aom_highbd_dc_top_predictor_2x2_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_top_predictor_2x2 aom_highbd_dc_top_predictor_2x2_c
-
-void aom_highbd_dc_top_predictor_32x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_32x16 aom_highbd_dc_top_predictor_32x16_c
-
-void aom_highbd_dc_top_predictor_32x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_32x32 aom_highbd_dc_top_predictor_32x32_c
-
-void aom_highbd_dc_top_predictor_32x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_32x64 aom_highbd_dc_top_predictor_32x64_c
-
-void aom_highbd_dc_top_predictor_32x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_32x8 aom_highbd_dc_top_predictor_32x8_c
-
-void aom_highbd_dc_top_predictor_4x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_4x16 aom_highbd_dc_top_predictor_4x16_c
-
-void aom_highbd_dc_top_predictor_4x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_top_predictor_4x4 aom_highbd_dc_top_predictor_4x4_c
-
-void aom_highbd_dc_top_predictor_4x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_top_predictor_4x8 aom_highbd_dc_top_predictor_4x8_c
-
-void aom_highbd_dc_top_predictor_64x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_64x16 aom_highbd_dc_top_predictor_64x16_c
-
-void aom_highbd_dc_top_predictor_64x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_64x32 aom_highbd_dc_top_predictor_64x32_c
-
-void aom_highbd_dc_top_predictor_64x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_64x64 aom_highbd_dc_top_predictor_64x64_c
-
-void aom_highbd_dc_top_predictor_8x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_8x16 aom_highbd_dc_top_predictor_8x16_c
-
-void aom_highbd_dc_top_predictor_8x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_8x32 aom_highbd_dc_top_predictor_8x32_c
-
-void aom_highbd_dc_top_predictor_8x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_top_predictor_8x4 aom_highbd_dc_top_predictor_8x4_c
-
-void aom_highbd_dc_top_predictor_8x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_top_predictor_8x8 aom_highbd_dc_top_predictor_8x8_c
-
-void aom_highbd_dist_wtd_comp_avg_pred_c(uint8_t* comp_pred8,
-                                         const uint8_t* pred8,
-                                         int width,
-                                         int height,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_comp_avg_pred aom_highbd_dist_wtd_comp_avg_pred_c
-
-void aom_highbd_dist_wtd_comp_avg_upsampled_pred_c(
-    MACROBLOCKD* xd,
-    const struct AV1Common* const cm,
-    int mi_row,
-    int mi_col,
-    const MV* const mv,
-    uint8_t* comp_pred8,
-    const uint8_t* pred8,
-    int width,
-    int height,
-    int subpel_x_q3,
-    int subpel_y_q3,
-    const uint8_t* ref8,
-    int ref_stride,
-    int bd,
-    const DIST_WTD_COMP_PARAMS* jcp_param,
-    int subpel_search);
-#define aom_highbd_dist_wtd_comp_avg_upsampled_pred \
-  aom_highbd_dist_wtd_comp_avg_upsampled_pred_c
-
-unsigned int aom_highbd_dist_wtd_sad128x128_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad128x128_avg aom_highbd_dist_wtd_sad128x128_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad128x64_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad128x64_avg aom_highbd_dist_wtd_sad128x64_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad16x16_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad16x16_avg aom_highbd_dist_wtd_sad16x16_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad16x32_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad16x32_avg aom_highbd_dist_wtd_sad16x32_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad16x4_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad16x4_avg aom_highbd_dist_wtd_sad16x4_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad16x64_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad16x64_avg aom_highbd_dist_wtd_sad16x64_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad16x8_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad16x8_avg aom_highbd_dist_wtd_sad16x8_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad32x16_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad32x16_avg aom_highbd_dist_wtd_sad32x16_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad32x32_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad32x32_avg aom_highbd_dist_wtd_sad32x32_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad32x64_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad32x64_avg aom_highbd_dist_wtd_sad32x64_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad32x8_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad32x8_avg aom_highbd_dist_wtd_sad32x8_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad4x16_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad4x16_avg aom_highbd_dist_wtd_sad4x16_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad4x4_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad4x4_avg aom_highbd_dist_wtd_sad4x4_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad4x8_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad4x8_avg aom_highbd_dist_wtd_sad4x8_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad64x128_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad64x128_avg aom_highbd_dist_wtd_sad64x128_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad64x16_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad64x16_avg aom_highbd_dist_wtd_sad64x16_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad64x32_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad64x32_avg aom_highbd_dist_wtd_sad64x32_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad64x64_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad64x64_avg aom_highbd_dist_wtd_sad64x64_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad8x16_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad8x16_avg aom_highbd_dist_wtd_sad8x16_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad8x32_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad8x32_avg aom_highbd_dist_wtd_sad8x32_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad8x4_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad8x4_avg aom_highbd_dist_wtd_sad8x4_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad8x8_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad8x8_avg aom_highbd_dist_wtd_sad8x8_avg_c
-
-void aom_highbd_fdct8x8_c(const int16_t* input, tran_low_t* output, int stride);
-#define aom_highbd_fdct8x8 aom_highbd_fdct8x8_c
-
-void aom_highbd_h_predictor_16x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_16x16 aom_highbd_h_predictor_16x16_c
-
-void aom_highbd_h_predictor_16x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_16x32 aom_highbd_h_predictor_16x32_c
-
-void aom_highbd_h_predictor_16x4_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_16x4 aom_highbd_h_predictor_16x4_c
-
-void aom_highbd_h_predictor_16x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_16x64 aom_highbd_h_predictor_16x64_c
-
-void aom_highbd_h_predictor_16x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_16x8 aom_highbd_h_predictor_16x8_c
-
-void aom_highbd_h_predictor_2x2_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_h_predictor_2x2 aom_highbd_h_predictor_2x2_c
-
-void aom_highbd_h_predictor_32x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_32x16 aom_highbd_h_predictor_32x16_c
-
-void aom_highbd_h_predictor_32x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_32x32 aom_highbd_h_predictor_32x32_c
-
-void aom_highbd_h_predictor_32x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_32x64 aom_highbd_h_predictor_32x64_c
-
-void aom_highbd_h_predictor_32x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_32x8 aom_highbd_h_predictor_32x8_c
-
-void aom_highbd_h_predictor_4x16_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_4x16 aom_highbd_h_predictor_4x16_c
-
-void aom_highbd_h_predictor_4x4_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_h_predictor_4x4 aom_highbd_h_predictor_4x4_c
-
-void aom_highbd_h_predictor_4x8_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_h_predictor_4x8 aom_highbd_h_predictor_4x8_c
-
-void aom_highbd_h_predictor_64x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_64x16 aom_highbd_h_predictor_64x16_c
-
-void aom_highbd_h_predictor_64x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_64x32 aom_highbd_h_predictor_64x32_c
-
-void aom_highbd_h_predictor_64x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_64x64 aom_highbd_h_predictor_64x64_c
-
-void aom_highbd_h_predictor_8x16_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_8x16 aom_highbd_h_predictor_8x16_c
-
-void aom_highbd_h_predictor_8x32_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_8x32 aom_highbd_h_predictor_8x32_c
-
-void aom_highbd_h_predictor_8x4_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_h_predictor_8x4 aom_highbd_h_predictor_8x4_c
-
-void aom_highbd_h_predictor_8x8_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_h_predictor_8x8 aom_highbd_h_predictor_8x8_c
-
-void aom_highbd_hadamard_16x16_c(const int16_t* src_diff,
-                                 ptrdiff_t src_stride,
-                                 tran_low_t* coeff);
-#define aom_highbd_hadamard_16x16 aom_highbd_hadamard_16x16_c
-
-void aom_highbd_hadamard_32x32_c(const int16_t* src_diff,
-                                 ptrdiff_t src_stride,
-                                 tran_low_t* coeff);
-#define aom_highbd_hadamard_32x32 aom_highbd_hadamard_32x32_c
-
-void aom_highbd_hadamard_8x8_c(const int16_t* src_diff,
-                               ptrdiff_t src_stride,
-                               tran_low_t* coeff);
-#define aom_highbd_hadamard_8x8 aom_highbd_hadamard_8x8_c
-
-void aom_highbd_lpf_horizontal_14_c(uint16_t* s,
-                                    int pitch,
-                                    const uint8_t* blimit,
-                                    const uint8_t* limit,
-                                    const uint8_t* thresh,
-                                    int bd);
-#define aom_highbd_lpf_horizontal_14 aom_highbd_lpf_horizontal_14_c
-
-void aom_highbd_lpf_horizontal_14_dual_c(uint16_t* s,
-                                         int pitch,
-                                         const uint8_t* blimit0,
-                                         const uint8_t* limit0,
-                                         const uint8_t* thresh0,
-                                         const uint8_t* blimit1,
-                                         const uint8_t* limit1,
-                                         const uint8_t* thresh1,
-                                         int bd);
-#define aom_highbd_lpf_horizontal_14_dual aom_highbd_lpf_horizontal_14_dual_c
-
-void aom_highbd_lpf_horizontal_4_c(uint16_t* s,
-                                   int pitch,
-                                   const uint8_t* blimit,
-                                   const uint8_t* limit,
-                                   const uint8_t* thresh,
-                                   int bd);
-#define aom_highbd_lpf_horizontal_4 aom_highbd_lpf_horizontal_4_c
-
-void aom_highbd_lpf_horizontal_4_dual_c(uint16_t* s,
-                                        int pitch,
-                                        const uint8_t* blimit0,
-                                        const uint8_t* limit0,
-                                        const uint8_t* thresh0,
-                                        const uint8_t* blimit1,
-                                        const uint8_t* limit1,
-                                        const uint8_t* thresh1,
-                                        int bd);
-#define aom_highbd_lpf_horizontal_4_dual aom_highbd_lpf_horizontal_4_dual_c
-
-void aom_highbd_lpf_horizontal_6_c(uint16_t* s,
-                                   int pitch,
-                                   const uint8_t* blimit,
-                                   const uint8_t* limit,
-                                   const uint8_t* thresh,
-                                   int bd);
-#define aom_highbd_lpf_horizontal_6 aom_highbd_lpf_horizontal_6_c
-
-void aom_highbd_lpf_horizontal_6_dual_c(uint16_t* s,
-                                        int pitch,
-                                        const uint8_t* blimit0,
-                                        const uint8_t* limit0,
-                                        const uint8_t* thresh0,
-                                        const uint8_t* blimit1,
-                                        const uint8_t* limit1,
-                                        const uint8_t* thresh1,
-                                        int bd);
-#define aom_highbd_lpf_horizontal_6_dual aom_highbd_lpf_horizontal_6_dual_c
-
-void aom_highbd_lpf_horizontal_8_c(uint16_t* s,
-                                   int pitch,
-                                   const uint8_t* blimit,
-                                   const uint8_t* limit,
-                                   const uint8_t* thresh,
-                                   int bd);
-#define aom_highbd_lpf_horizontal_8 aom_highbd_lpf_horizontal_8_c
-
-void aom_highbd_lpf_horizontal_8_dual_c(uint16_t* s,
-                                        int pitch,
-                                        const uint8_t* blimit0,
-                                        const uint8_t* limit0,
-                                        const uint8_t* thresh0,
-                                        const uint8_t* blimit1,
-                                        const uint8_t* limit1,
-                                        const uint8_t* thresh1,
-                                        int bd);
-#define aom_highbd_lpf_horizontal_8_dual aom_highbd_lpf_horizontal_8_dual_c
-
-void aom_highbd_lpf_vertical_14_c(uint16_t* s,
-                                  int pitch,
-                                  const uint8_t* blimit,
-                                  const uint8_t* limit,
-                                  const uint8_t* thresh,
-                                  int bd);
-#define aom_highbd_lpf_vertical_14 aom_highbd_lpf_vertical_14_c
-
-void aom_highbd_lpf_vertical_14_dual_c(uint16_t* s,
-                                       int pitch,
-                                       const uint8_t* blimit0,
-                                       const uint8_t* limit0,
-                                       const uint8_t* thresh0,
-                                       const uint8_t* blimit1,
-                                       const uint8_t* limit1,
-                                       const uint8_t* thresh1,
-                                       int bd);
-#define aom_highbd_lpf_vertical_14_dual aom_highbd_lpf_vertical_14_dual_c
-
-void aom_highbd_lpf_vertical_4_c(uint16_t* s,
-                                 int pitch,
-                                 const uint8_t* blimit,
-                                 const uint8_t* limit,
-                                 const uint8_t* thresh,
-                                 int bd);
-#define aom_highbd_lpf_vertical_4 aom_highbd_lpf_vertical_4_c
-
-void aom_highbd_lpf_vertical_4_dual_c(uint16_t* s,
-                                      int pitch,
-                                      const uint8_t* blimit0,
-                                      const uint8_t* limit0,
-                                      const uint8_t* thresh0,
-                                      const uint8_t* blimit1,
-                                      const uint8_t* limit1,
-                                      const uint8_t* thresh1,
-                                      int bd);
-#define aom_highbd_lpf_vertical_4_dual aom_highbd_lpf_vertical_4_dual_c
-
-void aom_highbd_lpf_vertical_6_c(uint16_t* s,
-                                 int pitch,
-                                 const uint8_t* blimit,
-                                 const uint8_t* limit,
-                                 const uint8_t* thresh,
-                                 int bd);
-#define aom_highbd_lpf_vertical_6 aom_highbd_lpf_vertical_6_c
-
-void aom_highbd_lpf_vertical_6_dual_c(uint16_t* s,
-                                      int pitch,
-                                      const uint8_t* blimit0,
-                                      const uint8_t* limit0,
-                                      const uint8_t* thresh0,
-                                      const uint8_t* blimit1,
-                                      const uint8_t* limit1,
-                                      const uint8_t* thresh1,
-                                      int bd);
-#define aom_highbd_lpf_vertical_6_dual aom_highbd_lpf_vertical_6_dual_c
-
-void aom_highbd_lpf_vertical_8_c(uint16_t* s,
-                                 int pitch,
-                                 const uint8_t* blimit,
-                                 const uint8_t* limit,
-                                 const uint8_t* thresh,
-                                 int bd);
-#define aom_highbd_lpf_vertical_8 aom_highbd_lpf_vertical_8_c
-
-void aom_highbd_lpf_vertical_8_dual_c(uint16_t* s,
-                                      int pitch,
-                                      const uint8_t* blimit0,
-                                      const uint8_t* limit0,
-                                      const uint8_t* thresh0,
-                                      const uint8_t* blimit1,
-                                      const uint8_t* limit1,
-                                      const uint8_t* thresh1,
-                                      int bd);
-#define aom_highbd_lpf_vertical_8_dual aom_highbd_lpf_vertical_8_dual_c
-
-unsigned int aom_highbd_masked_sad128x128_c(const uint8_t* src8,
-                                            int src_stride,
-                                            const uint8_t* ref8,
-                                            int ref_stride,
-                                            const uint8_t* second_pred8,
-                                            const uint8_t* msk,
-                                            int msk_stride,
-                                            int invert_mask);
-#define aom_highbd_masked_sad128x128 aom_highbd_masked_sad128x128_c
-
-unsigned int aom_highbd_masked_sad128x64_c(const uint8_t* src8,
-                                           int src_stride,
-                                           const uint8_t* ref8,
-                                           int ref_stride,
-                                           const uint8_t* second_pred8,
-                                           const uint8_t* msk,
-                                           int msk_stride,
-                                           int invert_mask);
-#define aom_highbd_masked_sad128x64 aom_highbd_masked_sad128x64_c
-
-unsigned int aom_highbd_masked_sad16x16_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad16x16 aom_highbd_masked_sad16x16_c
-
-unsigned int aom_highbd_masked_sad16x32_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad16x32 aom_highbd_masked_sad16x32_c
-
-unsigned int aom_highbd_masked_sad16x4_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-#define aom_highbd_masked_sad16x4 aom_highbd_masked_sad16x4_c
-
-unsigned int aom_highbd_masked_sad16x64_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad16x64 aom_highbd_masked_sad16x64_c
-
-unsigned int aom_highbd_masked_sad16x8_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-#define aom_highbd_masked_sad16x8 aom_highbd_masked_sad16x8_c
-
-unsigned int aom_highbd_masked_sad32x16_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad32x16 aom_highbd_masked_sad32x16_c
-
-unsigned int aom_highbd_masked_sad32x32_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad32x32 aom_highbd_masked_sad32x32_c
-
-unsigned int aom_highbd_masked_sad32x64_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad32x64 aom_highbd_masked_sad32x64_c
-
-unsigned int aom_highbd_masked_sad32x8_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-#define aom_highbd_masked_sad32x8 aom_highbd_masked_sad32x8_c
-
-unsigned int aom_highbd_masked_sad4x16_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-#define aom_highbd_masked_sad4x16 aom_highbd_masked_sad4x16_c
-
-unsigned int aom_highbd_masked_sad4x4_c(const uint8_t* src8,
-                                        int src_stride,
-                                        const uint8_t* ref8,
-                                        int ref_stride,
-                                        const uint8_t* second_pred8,
-                                        const uint8_t* msk,
-                                        int msk_stride,
-                                        int invert_mask);
-#define aom_highbd_masked_sad4x4 aom_highbd_masked_sad4x4_c
-
-unsigned int aom_highbd_masked_sad4x8_c(const uint8_t* src8,
-                                        int src_stride,
-                                        const uint8_t* ref8,
-                                        int ref_stride,
-                                        const uint8_t* second_pred8,
-                                        const uint8_t* msk,
-                                        int msk_stride,
-                                        int invert_mask);
-#define aom_highbd_masked_sad4x8 aom_highbd_masked_sad4x8_c
-
-unsigned int aom_highbd_masked_sad64x128_c(const uint8_t* src8,
-                                           int src_stride,
-                                           const uint8_t* ref8,
-                                           int ref_stride,
-                                           const uint8_t* second_pred8,
-                                           const uint8_t* msk,
-                                           int msk_stride,
-                                           int invert_mask);
-#define aom_highbd_masked_sad64x128 aom_highbd_masked_sad64x128_c
-
-unsigned int aom_highbd_masked_sad64x16_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad64x16 aom_highbd_masked_sad64x16_c
-
-unsigned int aom_highbd_masked_sad64x32_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad64x32 aom_highbd_masked_sad64x32_c
-
-unsigned int aom_highbd_masked_sad64x64_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad64x64 aom_highbd_masked_sad64x64_c
-
-unsigned int aom_highbd_masked_sad8x16_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-#define aom_highbd_masked_sad8x16 aom_highbd_masked_sad8x16_c
-
-unsigned int aom_highbd_masked_sad8x32_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-#define aom_highbd_masked_sad8x32 aom_highbd_masked_sad8x32_c
-
-unsigned int aom_highbd_masked_sad8x4_c(const uint8_t* src8,
-                                        int src_stride,
-                                        const uint8_t* ref8,
-                                        int ref_stride,
-                                        const uint8_t* second_pred8,
-                                        const uint8_t* msk,
-                                        int msk_stride,
-                                        int invert_mask);
-#define aom_highbd_masked_sad8x4 aom_highbd_masked_sad8x4_c
-
-unsigned int aom_highbd_masked_sad8x8_c(const uint8_t* src8,
-                                        int src_stride,
-                                        const uint8_t* ref8,
-                                        int ref_stride,
-                                        const uint8_t* second_pred8,
-                                        const uint8_t* msk,
-                                        int msk_stride,
-                                        int invert_mask);
-#define aom_highbd_masked_sad8x8 aom_highbd_masked_sad8x8_c
-
-void aom_highbd_minmax_8x8_c(const uint8_t* s,
-                             int p,
-                             const uint8_t* d,
-                             int dp,
-                             int* min,
-                             int* max);
-#define aom_highbd_minmax_8x8 aom_highbd_minmax_8x8_c
-
-unsigned int aom_highbd_obmc_sad128x128_c(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask);
-#define aom_highbd_obmc_sad128x128 aom_highbd_obmc_sad128x128_c
-
-unsigned int aom_highbd_obmc_sad128x64_c(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask);
-#define aom_highbd_obmc_sad128x64 aom_highbd_obmc_sad128x64_c
-
-unsigned int aom_highbd_obmc_sad16x16_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad16x16 aom_highbd_obmc_sad16x16_c
-
-unsigned int aom_highbd_obmc_sad16x32_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad16x32 aom_highbd_obmc_sad16x32_c
-
-unsigned int aom_highbd_obmc_sad16x4_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-#define aom_highbd_obmc_sad16x4 aom_highbd_obmc_sad16x4_c
-
-unsigned int aom_highbd_obmc_sad16x64_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad16x64 aom_highbd_obmc_sad16x64_c
-
-unsigned int aom_highbd_obmc_sad16x8_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-#define aom_highbd_obmc_sad16x8 aom_highbd_obmc_sad16x8_c
-
-unsigned int aom_highbd_obmc_sad32x16_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad32x16 aom_highbd_obmc_sad32x16_c
-
-unsigned int aom_highbd_obmc_sad32x32_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad32x32 aom_highbd_obmc_sad32x32_c
-
-unsigned int aom_highbd_obmc_sad32x64_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad32x64 aom_highbd_obmc_sad32x64_c
-
-unsigned int aom_highbd_obmc_sad32x8_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-#define aom_highbd_obmc_sad32x8 aom_highbd_obmc_sad32x8_c
-
-unsigned int aom_highbd_obmc_sad4x16_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-#define aom_highbd_obmc_sad4x16 aom_highbd_obmc_sad4x16_c
-
-unsigned int aom_highbd_obmc_sad4x4_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-#define aom_highbd_obmc_sad4x4 aom_highbd_obmc_sad4x4_c
-
-unsigned int aom_highbd_obmc_sad4x8_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-#define aom_highbd_obmc_sad4x8 aom_highbd_obmc_sad4x8_c
-
-unsigned int aom_highbd_obmc_sad64x128_c(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask);
-#define aom_highbd_obmc_sad64x128 aom_highbd_obmc_sad64x128_c
-
-unsigned int aom_highbd_obmc_sad64x16_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad64x16 aom_highbd_obmc_sad64x16_c
-
-unsigned int aom_highbd_obmc_sad64x32_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad64x32 aom_highbd_obmc_sad64x32_c
-
-unsigned int aom_highbd_obmc_sad64x64_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad64x64 aom_highbd_obmc_sad64x64_c
-
-unsigned int aom_highbd_obmc_sad8x16_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-#define aom_highbd_obmc_sad8x16 aom_highbd_obmc_sad8x16_c
-
-unsigned int aom_highbd_obmc_sad8x32_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-#define aom_highbd_obmc_sad8x32 aom_highbd_obmc_sad8x32_c
-
-unsigned int aom_highbd_obmc_sad8x4_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-#define aom_highbd_obmc_sad8x4 aom_highbd_obmc_sad8x4_c
-
-unsigned int aom_highbd_obmc_sad8x8_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-#define aom_highbd_obmc_sad8x8 aom_highbd_obmc_sad8x8_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance128x128_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance128x128 \
-  aom_highbd_obmc_sub_pixel_variance128x128_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance128x64_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance128x64 \
-  aom_highbd_obmc_sub_pixel_variance128x64_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance16x16_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance16x16 \
-  aom_highbd_obmc_sub_pixel_variance16x16_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance16x32_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance16x32 \
-  aom_highbd_obmc_sub_pixel_variance16x32_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance16x4_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance16x4 \
-  aom_highbd_obmc_sub_pixel_variance16x4_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance16x64_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance16x64 \
-  aom_highbd_obmc_sub_pixel_variance16x64_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance16x8_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance16x8 \
-  aom_highbd_obmc_sub_pixel_variance16x8_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance32x16_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance32x16 \
-  aom_highbd_obmc_sub_pixel_variance32x16_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance32x32_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance32x32 \
-  aom_highbd_obmc_sub_pixel_variance32x32_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance32x64_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance32x64 \
-  aom_highbd_obmc_sub_pixel_variance32x64_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance32x8_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance32x8 \
-  aom_highbd_obmc_sub_pixel_variance32x8_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance4x16_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance4x16 \
-  aom_highbd_obmc_sub_pixel_variance4x16_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance4x4_c(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance4x4 \
-  aom_highbd_obmc_sub_pixel_variance4x4_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance4x8_c(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance4x8 \
-  aom_highbd_obmc_sub_pixel_variance4x8_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance64x128_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance64x128 \
-  aom_highbd_obmc_sub_pixel_variance64x128_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance64x16_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance64x16 \
-  aom_highbd_obmc_sub_pixel_variance64x16_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance64x32_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance64x32 \
-  aom_highbd_obmc_sub_pixel_variance64x32_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance64x64_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance64x64 \
-  aom_highbd_obmc_sub_pixel_variance64x64_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance8x16_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance8x16 \
-  aom_highbd_obmc_sub_pixel_variance8x16_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance8x32_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance8x32 \
-  aom_highbd_obmc_sub_pixel_variance8x32_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance8x4_c(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance8x4 \
-  aom_highbd_obmc_sub_pixel_variance8x4_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance8x8_c(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance8x8 \
-  aom_highbd_obmc_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_obmc_variance128x128_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_obmc_variance128x128 aom_highbd_obmc_variance128x128_c
-
-unsigned int aom_highbd_obmc_variance128x64_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_obmc_variance128x64 aom_highbd_obmc_variance128x64_c
-
-unsigned int aom_highbd_obmc_variance16x16_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance16x16 aom_highbd_obmc_variance16x16_c
-
-unsigned int aom_highbd_obmc_variance16x32_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance16x32 aom_highbd_obmc_variance16x32_c
-
-unsigned int aom_highbd_obmc_variance16x4_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-#define aom_highbd_obmc_variance16x4 aom_highbd_obmc_variance16x4_c
-
-unsigned int aom_highbd_obmc_variance16x64_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance16x64 aom_highbd_obmc_variance16x64_c
-
-unsigned int aom_highbd_obmc_variance16x8_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-#define aom_highbd_obmc_variance16x8 aom_highbd_obmc_variance16x8_c
-
-unsigned int aom_highbd_obmc_variance32x16_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance32x16 aom_highbd_obmc_variance32x16_c
-
-unsigned int aom_highbd_obmc_variance32x32_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance32x32 aom_highbd_obmc_variance32x32_c
-
-unsigned int aom_highbd_obmc_variance32x64_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance32x64 aom_highbd_obmc_variance32x64_c
-
-unsigned int aom_highbd_obmc_variance32x8_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-#define aom_highbd_obmc_variance32x8 aom_highbd_obmc_variance32x8_c
-
-unsigned int aom_highbd_obmc_variance4x16_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-#define aom_highbd_obmc_variance4x16 aom_highbd_obmc_variance4x16_c
-
-unsigned int aom_highbd_obmc_variance4x4_c(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-#define aom_highbd_obmc_variance4x4 aom_highbd_obmc_variance4x4_c
-
-unsigned int aom_highbd_obmc_variance4x8_c(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-#define aom_highbd_obmc_variance4x8 aom_highbd_obmc_variance4x8_c
-
-unsigned int aom_highbd_obmc_variance64x128_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_obmc_variance64x128 aom_highbd_obmc_variance64x128_c
-
-unsigned int aom_highbd_obmc_variance64x16_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance64x16 aom_highbd_obmc_variance64x16_c
-
-unsigned int aom_highbd_obmc_variance64x32_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance64x32 aom_highbd_obmc_variance64x32_c
-
-unsigned int aom_highbd_obmc_variance64x64_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance64x64 aom_highbd_obmc_variance64x64_c
-
-unsigned int aom_highbd_obmc_variance8x16_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-#define aom_highbd_obmc_variance8x16 aom_highbd_obmc_variance8x16_c
-
-unsigned int aom_highbd_obmc_variance8x32_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-#define aom_highbd_obmc_variance8x32 aom_highbd_obmc_variance8x32_c
-
-unsigned int aom_highbd_obmc_variance8x4_c(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-#define aom_highbd_obmc_variance8x4 aom_highbd_obmc_variance8x4_c
-
-unsigned int aom_highbd_obmc_variance8x8_c(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-#define aom_highbd_obmc_variance8x8 aom_highbd_obmc_variance8x8_c
-
-void aom_highbd_paeth_predictor_16x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_16x16 aom_highbd_paeth_predictor_16x16_c
-
-void aom_highbd_paeth_predictor_16x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_16x32 aom_highbd_paeth_predictor_16x32_c
-
-void aom_highbd_paeth_predictor_16x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_16x4 aom_highbd_paeth_predictor_16x4_c
-
-void aom_highbd_paeth_predictor_16x64_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_16x64 aom_highbd_paeth_predictor_16x64_c
-
-void aom_highbd_paeth_predictor_16x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_16x8 aom_highbd_paeth_predictor_16x8_c
-
-void aom_highbd_paeth_predictor_2x2_c(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_paeth_predictor_2x2 aom_highbd_paeth_predictor_2x2_c
-
-void aom_highbd_paeth_predictor_32x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_32x16 aom_highbd_paeth_predictor_32x16_c
-
-void aom_highbd_paeth_predictor_32x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_32x32 aom_highbd_paeth_predictor_32x32_c
-
-void aom_highbd_paeth_predictor_32x64_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_32x64 aom_highbd_paeth_predictor_32x64_c
-
-void aom_highbd_paeth_predictor_32x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_32x8 aom_highbd_paeth_predictor_32x8_c
-
-void aom_highbd_paeth_predictor_4x16_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_4x16 aom_highbd_paeth_predictor_4x16_c
-
-void aom_highbd_paeth_predictor_4x4_c(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_paeth_predictor_4x4 aom_highbd_paeth_predictor_4x4_c
-
-void aom_highbd_paeth_predictor_4x8_c(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_paeth_predictor_4x8 aom_highbd_paeth_predictor_4x8_c
-
-void aom_highbd_paeth_predictor_64x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_64x16 aom_highbd_paeth_predictor_64x16_c
-
-void aom_highbd_paeth_predictor_64x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_64x32 aom_highbd_paeth_predictor_64x32_c
-
-void aom_highbd_paeth_predictor_64x64_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_64x64 aom_highbd_paeth_predictor_64x64_c
-
-void aom_highbd_paeth_predictor_8x16_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_8x16 aom_highbd_paeth_predictor_8x16_c
-
-void aom_highbd_paeth_predictor_8x32_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_8x32 aom_highbd_paeth_predictor_8x32_c
-
-void aom_highbd_paeth_predictor_8x4_c(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_paeth_predictor_8x4 aom_highbd_paeth_predictor_8x4_c
-
-void aom_highbd_paeth_predictor_8x8_c(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_paeth_predictor_8x8 aom_highbd_paeth_predictor_8x8_c
-
-void aom_highbd_quantize_b_c(const tran_low_t* coeff_ptr,
-                             intptr_t n_coeffs,
-                             const int16_t* zbin_ptr,
-                             const int16_t* round_ptr,
-                             const int16_t* quant_ptr,
-                             const int16_t* quant_shift_ptr,
-                             tran_low_t* qcoeff_ptr,
-                             tran_low_t* dqcoeff_ptr,
-                             const int16_t* dequant_ptr,
-                             uint16_t* eob_ptr,
-                             const int16_t* scan,
-                             const int16_t* iscan);
-#define aom_highbd_quantize_b aom_highbd_quantize_b_c
-
-void aom_highbd_quantize_b_32x32_c(const tran_low_t* coeff_ptr,
-                                   intptr_t n_coeffs,
-                                   const int16_t* zbin_ptr,
-                                   const int16_t* round_ptr,
-                                   const int16_t* quant_ptr,
-                                   const int16_t* quant_shift_ptr,
-                                   tran_low_t* qcoeff_ptr,
-                                   tran_low_t* dqcoeff_ptr,
-                                   const int16_t* dequant_ptr,
-                                   uint16_t* eob_ptr,
-                                   const int16_t* scan,
-                                   const int16_t* iscan);
-#define aom_highbd_quantize_b_32x32 aom_highbd_quantize_b_32x32_c
-
-void aom_highbd_quantize_b_32x32_adaptive_c(const tran_low_t* coeff_ptr,
-                                            intptr_t n_coeffs,
-                                            const int16_t* zbin_ptr,
-                                            const int16_t* round_ptr,
-                                            const int16_t* quant_ptr,
-                                            const int16_t* quant_shift_ptr,
-                                            tran_low_t* qcoeff_ptr,
-                                            tran_low_t* dqcoeff_ptr,
-                                            const int16_t* dequant_ptr,
-                                            uint16_t* eob_ptr,
-                                            const int16_t* scan,
-                                            const int16_t* iscan);
-#define aom_highbd_quantize_b_32x32_adaptive \
-  aom_highbd_quantize_b_32x32_adaptive_c
-
-void aom_highbd_quantize_b_64x64_c(const tran_low_t* coeff_ptr,
-                                   intptr_t n_coeffs,
-                                   const int16_t* zbin_ptr,
-                                   const int16_t* round_ptr,
-                                   const int16_t* quant_ptr,
-                                   const int16_t* quant_shift_ptr,
-                                   tran_low_t* qcoeff_ptr,
-                                   tran_low_t* dqcoeff_ptr,
-                                   const int16_t* dequant_ptr,
-                                   uint16_t* eob_ptr,
-                                   const int16_t* scan,
-                                   const int16_t* iscan);
-#define aom_highbd_quantize_b_64x64 aom_highbd_quantize_b_64x64_c
-
-void aom_highbd_quantize_b_64x64_adaptive_c(const tran_low_t* coeff_ptr,
-                                            intptr_t n_coeffs,
-                                            const int16_t* zbin_ptr,
-                                            const int16_t* round_ptr,
-                                            const int16_t* quant_ptr,
-                                            const int16_t* quant_shift_ptr,
-                                            tran_low_t* qcoeff_ptr,
-                                            tran_low_t* dqcoeff_ptr,
-                                            const int16_t* dequant_ptr,
-                                            uint16_t* eob_ptr,
-                                            const int16_t* scan,
-                                            const int16_t* iscan);
-#define aom_highbd_quantize_b_64x64_adaptive \
-  aom_highbd_quantize_b_64x64_adaptive_c
-
-void aom_highbd_quantize_b_adaptive_c(const tran_low_t* coeff_ptr,
-                                      intptr_t n_coeffs,
-                                      const int16_t* zbin_ptr,
-                                      const int16_t* round_ptr,
-                                      const int16_t* quant_ptr,
-                                      const int16_t* quant_shift_ptr,
-                                      tran_low_t* qcoeff_ptr,
-                                      tran_low_t* dqcoeff_ptr,
-                                      const int16_t* dequant_ptr,
-                                      uint16_t* eob_ptr,
-                                      const int16_t* scan,
-                                      const int16_t* iscan);
-#define aom_highbd_quantize_b_adaptive aom_highbd_quantize_b_adaptive_c
-
-unsigned int aom_highbd_sad128x128_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride);
-#define aom_highbd_sad128x128 aom_highbd_sad128x128_c
-
-unsigned int aom_highbd_sad128x128_avg_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         const uint8_t* second_pred);
-#define aom_highbd_sad128x128_avg aom_highbd_sad128x128_avg_c
-
-void aom_highbd_sad128x128x4d_c(const uint8_t* src_ptr,
-                                int src_stride,
-                                const uint8_t* const ref_ptr[],
-                                int ref_stride,
-                                uint32_t* sad_array);
-#define aom_highbd_sad128x128x4d aom_highbd_sad128x128x4d_c
-
-unsigned int aom_highbd_sad128x64_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* ref_ptr,
-                                    int ref_stride);
-#define aom_highbd_sad128x64 aom_highbd_sad128x64_c
-
-unsigned int aom_highbd_sad128x64_avg_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        const uint8_t* second_pred);
-#define aom_highbd_sad128x64_avg aom_highbd_sad128x64_avg_c
-
-void aom_highbd_sad128x64x4d_c(const uint8_t* src_ptr,
-                               int src_stride,
-                               const uint8_t* const ref_ptr[],
-                               int ref_stride,
-                               uint32_t* sad_array);
-#define aom_highbd_sad128x64x4d aom_highbd_sad128x64x4d_c
-
-unsigned int aom_highbd_sad16x16_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad16x16 aom_highbd_sad16x16_c
-
-unsigned int aom_highbd_sad16x16_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad16x16_avg aom_highbd_sad16x16_avg_c
-
-void aom_highbd_sad16x16x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad16x16x4d aom_highbd_sad16x16x4d_c
-
-unsigned int aom_highbd_sad16x32_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad16x32 aom_highbd_sad16x32_c
-
-unsigned int aom_highbd_sad16x32_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad16x32_avg aom_highbd_sad16x32_avg_c
-
-void aom_highbd_sad16x32x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad16x32x4d aom_highbd_sad16x32x4d_c
-
-unsigned int aom_highbd_sad16x4_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-#define aom_highbd_sad16x4 aom_highbd_sad16x4_c
-
-unsigned int aom_highbd_sad16x4_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-#define aom_highbd_sad16x4_avg aom_highbd_sad16x4_avg_c
-
-void aom_highbd_sad16x4x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-#define aom_highbd_sad16x4x4d aom_highbd_sad16x4x4d_c
-
-unsigned int aom_highbd_sad16x64_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad16x64 aom_highbd_sad16x64_c
-
-unsigned int aom_highbd_sad16x64_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad16x64_avg aom_highbd_sad16x64_avg_c
-
-void aom_highbd_sad16x64x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad16x64x4d aom_highbd_sad16x64x4d_c
-
-unsigned int aom_highbd_sad16x8_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-#define aom_highbd_sad16x8 aom_highbd_sad16x8_c
-
-unsigned int aom_highbd_sad16x8_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-#define aom_highbd_sad16x8_avg aom_highbd_sad16x8_avg_c
-
-void aom_highbd_sad16x8x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-#define aom_highbd_sad16x8x4d aom_highbd_sad16x8x4d_c
-
-unsigned int aom_highbd_sad32x16_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad32x16 aom_highbd_sad32x16_c
-
-unsigned int aom_highbd_sad32x16_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad32x16_avg aom_highbd_sad32x16_avg_c
-
-void aom_highbd_sad32x16x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad32x16x4d aom_highbd_sad32x16x4d_c
-
-unsigned int aom_highbd_sad32x32_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad32x32 aom_highbd_sad32x32_c
-
-unsigned int aom_highbd_sad32x32_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad32x32_avg aom_highbd_sad32x32_avg_c
-
-void aom_highbd_sad32x32x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad32x32x4d aom_highbd_sad32x32x4d_c
-
-unsigned int aom_highbd_sad32x64_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad32x64 aom_highbd_sad32x64_c
-
-unsigned int aom_highbd_sad32x64_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad32x64_avg aom_highbd_sad32x64_avg_c
-
-void aom_highbd_sad32x64x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad32x64x4d aom_highbd_sad32x64x4d_c
-
-unsigned int aom_highbd_sad32x8_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-#define aom_highbd_sad32x8 aom_highbd_sad32x8_c
-
-unsigned int aom_highbd_sad32x8_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-#define aom_highbd_sad32x8_avg aom_highbd_sad32x8_avg_c
-
-void aom_highbd_sad32x8x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-#define aom_highbd_sad32x8x4d aom_highbd_sad32x8x4d_c
-
-unsigned int aom_highbd_sad4x16_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-#define aom_highbd_sad4x16 aom_highbd_sad4x16_c
-
-unsigned int aom_highbd_sad4x16_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-#define aom_highbd_sad4x16_avg aom_highbd_sad4x16_avg_c
-
-void aom_highbd_sad4x16x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-#define aom_highbd_sad4x16x4d aom_highbd_sad4x16x4d_c
-
-unsigned int aom_highbd_sad4x4_c(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride);
-#define aom_highbd_sad4x4 aom_highbd_sad4x4_c
-
-unsigned int aom_highbd_sad4x4_avg_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride,
-                                     const uint8_t* second_pred);
-#define aom_highbd_sad4x4_avg aom_highbd_sad4x4_avg_c
-
-void aom_highbd_sad4x4x4d_c(const uint8_t* src_ptr,
-                            int src_stride,
-                            const uint8_t* const ref_ptr[],
-                            int ref_stride,
-                            uint32_t* sad_array);
-#define aom_highbd_sad4x4x4d aom_highbd_sad4x4x4d_c
-
-unsigned int aom_highbd_sad4x8_c(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride);
-#define aom_highbd_sad4x8 aom_highbd_sad4x8_c
-
-unsigned int aom_highbd_sad4x8_avg_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride,
-                                     const uint8_t* second_pred);
-#define aom_highbd_sad4x8_avg aom_highbd_sad4x8_avg_c
-
-void aom_highbd_sad4x8x4d_c(const uint8_t* src_ptr,
-                            int src_stride,
-                            const uint8_t* const ref_ptr[],
-                            int ref_stride,
-                            uint32_t* sad_array);
-#define aom_highbd_sad4x8x4d aom_highbd_sad4x8x4d_c
-
-unsigned int aom_highbd_sad64x128_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* ref_ptr,
-                                    int ref_stride);
-#define aom_highbd_sad64x128 aom_highbd_sad64x128_c
-
-unsigned int aom_highbd_sad64x128_avg_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        const uint8_t* second_pred);
-#define aom_highbd_sad64x128_avg aom_highbd_sad64x128_avg_c
-
-void aom_highbd_sad64x128x4d_c(const uint8_t* src_ptr,
-                               int src_stride,
-                               const uint8_t* const ref_ptr[],
-                               int ref_stride,
-                               uint32_t* sad_array);
-#define aom_highbd_sad64x128x4d aom_highbd_sad64x128x4d_c
-
-unsigned int aom_highbd_sad64x16_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad64x16 aom_highbd_sad64x16_c
-
-unsigned int aom_highbd_sad64x16_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad64x16_avg aom_highbd_sad64x16_avg_c
-
-void aom_highbd_sad64x16x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad64x16x4d aom_highbd_sad64x16x4d_c
-
-unsigned int aom_highbd_sad64x32_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad64x32 aom_highbd_sad64x32_c
-
-unsigned int aom_highbd_sad64x32_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad64x32_avg aom_highbd_sad64x32_avg_c
-
-void aom_highbd_sad64x32x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad64x32x4d aom_highbd_sad64x32x4d_c
-
-unsigned int aom_highbd_sad64x64_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad64x64 aom_highbd_sad64x64_c
-
-unsigned int aom_highbd_sad64x64_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad64x64_avg aom_highbd_sad64x64_avg_c
-
-void aom_highbd_sad64x64x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad64x64x4d aom_highbd_sad64x64x4d_c
-
-unsigned int aom_highbd_sad8x16_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-#define aom_highbd_sad8x16 aom_highbd_sad8x16_c
-
-unsigned int aom_highbd_sad8x16_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-#define aom_highbd_sad8x16_avg aom_highbd_sad8x16_avg_c
-
-void aom_highbd_sad8x16x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-#define aom_highbd_sad8x16x4d aom_highbd_sad8x16x4d_c
-
-unsigned int aom_highbd_sad8x32_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-#define aom_highbd_sad8x32 aom_highbd_sad8x32_c
-
-unsigned int aom_highbd_sad8x32_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-#define aom_highbd_sad8x32_avg aom_highbd_sad8x32_avg_c
-
-void aom_highbd_sad8x32x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-#define aom_highbd_sad8x32x4d aom_highbd_sad8x32x4d_c
-
-unsigned int aom_highbd_sad8x4_c(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride);
-#define aom_highbd_sad8x4 aom_highbd_sad8x4_c
-
-unsigned int aom_highbd_sad8x4_avg_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride,
-                                     const uint8_t* second_pred);
-#define aom_highbd_sad8x4_avg aom_highbd_sad8x4_avg_c
-
-void aom_highbd_sad8x4x4d_c(const uint8_t* src_ptr,
-                            int src_stride,
-                            const uint8_t* const ref_ptr[],
-                            int ref_stride,
-                            uint32_t* sad_array);
-#define aom_highbd_sad8x4x4d aom_highbd_sad8x4x4d_c
-
-unsigned int aom_highbd_sad8x8_c(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride);
-#define aom_highbd_sad8x8 aom_highbd_sad8x8_c
-
-unsigned int aom_highbd_sad8x8_avg_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride,
-                                     const uint8_t* second_pred);
-#define aom_highbd_sad8x8_avg aom_highbd_sad8x8_avg_c
-
-void aom_highbd_sad8x8x4d_c(const uint8_t* src_ptr,
-                            int src_stride,
-                            const uint8_t* const ref_ptr[],
-                            int ref_stride,
-                            uint32_t* sad_array);
-#define aom_highbd_sad8x8x4d aom_highbd_sad8x8x4d_c
-
-unsigned int aom_highbd_sad_skip_128x128_c(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride);
-#define aom_highbd_sad_skip_128x128 aom_highbd_sad_skip_128x128_c
-
-void aom_highbd_sad_skip_128x128x4d_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* const ref_ptr[],
-                                      int ref_stride,
-                                      uint32_t* sad_array);
-#define aom_highbd_sad_skip_128x128x4d aom_highbd_sad_skip_128x128x4d_c
-
-unsigned int aom_highbd_sad_skip_128x64_c(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride);
-#define aom_highbd_sad_skip_128x64 aom_highbd_sad_skip_128x64_c
-
-void aom_highbd_sad_skip_128x64x4d_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* const ref_ptr[],
-                                     int ref_stride,
-                                     uint32_t* sad_array);
-#define aom_highbd_sad_skip_128x64x4d aom_highbd_sad_skip_128x64x4d_c
-
-unsigned int aom_highbd_sad_skip_16x16_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_16x16 aom_highbd_sad_skip_16x16_c
-
-void aom_highbd_sad_skip_16x16x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_16x16x4d aom_highbd_sad_skip_16x16x4d_c
-
-unsigned int aom_highbd_sad_skip_16x32_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_16x32 aom_highbd_sad_skip_16x32_c
-
-void aom_highbd_sad_skip_16x32x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_16x32x4d aom_highbd_sad_skip_16x32x4d_c
-
-unsigned int aom_highbd_sad_skip_16x4_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-#define aom_highbd_sad_skip_16x4 aom_highbd_sad_skip_16x4_c
-
-void aom_highbd_sad_skip_16x4x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-#define aom_highbd_sad_skip_16x4x4d aom_highbd_sad_skip_16x4x4d_c
-
-unsigned int aom_highbd_sad_skip_16x64_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_16x64 aom_highbd_sad_skip_16x64_c
-
-void aom_highbd_sad_skip_16x64x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_16x64x4d aom_highbd_sad_skip_16x64x4d_c
-
-unsigned int aom_highbd_sad_skip_16x8_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-#define aom_highbd_sad_skip_16x8 aom_highbd_sad_skip_16x8_c
-
-void aom_highbd_sad_skip_16x8x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-#define aom_highbd_sad_skip_16x8x4d aom_highbd_sad_skip_16x8x4d_c
-
-unsigned int aom_highbd_sad_skip_32x16_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_32x16 aom_highbd_sad_skip_32x16_c
-
-void aom_highbd_sad_skip_32x16x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_32x16x4d aom_highbd_sad_skip_32x16x4d_c
-
-unsigned int aom_highbd_sad_skip_32x32_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_32x32 aom_highbd_sad_skip_32x32_c
-
-void aom_highbd_sad_skip_32x32x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_32x32x4d aom_highbd_sad_skip_32x32x4d_c
-
-unsigned int aom_highbd_sad_skip_32x64_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_32x64 aom_highbd_sad_skip_32x64_c
-
-void aom_highbd_sad_skip_32x64x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_32x64x4d aom_highbd_sad_skip_32x64x4d_c
-
-unsigned int aom_highbd_sad_skip_32x8_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-#define aom_highbd_sad_skip_32x8 aom_highbd_sad_skip_32x8_c
-
-void aom_highbd_sad_skip_32x8x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-#define aom_highbd_sad_skip_32x8x4d aom_highbd_sad_skip_32x8x4d_c
-
-unsigned int aom_highbd_sad_skip_4x16_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-#define aom_highbd_sad_skip_4x16 aom_highbd_sad_skip_4x16_c
-
-void aom_highbd_sad_skip_4x16x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-#define aom_highbd_sad_skip_4x16x4d aom_highbd_sad_skip_4x16x4d_c
-
-unsigned int aom_highbd_sad_skip_4x4_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride);
-#define aom_highbd_sad_skip_4x4 aom_highbd_sad_skip_4x4_c
-
-void aom_highbd_sad_skip_4x4x4d_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* const ref_ptr[],
-                                  int ref_stride,
-                                  uint32_t* sad_array);
-#define aom_highbd_sad_skip_4x4x4d aom_highbd_sad_skip_4x4x4d_c
-
-unsigned int aom_highbd_sad_skip_4x8_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride);
-#define aom_highbd_sad_skip_4x8 aom_highbd_sad_skip_4x8_c
-
-void aom_highbd_sad_skip_4x8x4d_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* const ref_ptr[],
-                                  int ref_stride,
-                                  uint32_t* sad_array);
-#define aom_highbd_sad_skip_4x8x4d aom_highbd_sad_skip_4x8x4d_c
-
-unsigned int aom_highbd_sad_skip_64x128_c(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride);
-#define aom_highbd_sad_skip_64x128 aom_highbd_sad_skip_64x128_c
-
-void aom_highbd_sad_skip_64x128x4d_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* const ref_ptr[],
-                                     int ref_stride,
-                                     uint32_t* sad_array);
-#define aom_highbd_sad_skip_64x128x4d aom_highbd_sad_skip_64x128x4d_c
-
-unsigned int aom_highbd_sad_skip_64x16_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_64x16 aom_highbd_sad_skip_64x16_c
-
-void aom_highbd_sad_skip_64x16x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_64x16x4d aom_highbd_sad_skip_64x16x4d_c
-
-unsigned int aom_highbd_sad_skip_64x32_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_64x32 aom_highbd_sad_skip_64x32_c
-
-void aom_highbd_sad_skip_64x32x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_64x32x4d aom_highbd_sad_skip_64x32x4d_c
-
-unsigned int aom_highbd_sad_skip_64x64_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_64x64 aom_highbd_sad_skip_64x64_c
-
-void aom_highbd_sad_skip_64x64x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_64x64x4d aom_highbd_sad_skip_64x64x4d_c
-
-unsigned int aom_highbd_sad_skip_8x16_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-#define aom_highbd_sad_skip_8x16 aom_highbd_sad_skip_8x16_c
-
-void aom_highbd_sad_skip_8x16x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-#define aom_highbd_sad_skip_8x16x4d aom_highbd_sad_skip_8x16x4d_c
-
-unsigned int aom_highbd_sad_skip_8x32_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-#define aom_highbd_sad_skip_8x32 aom_highbd_sad_skip_8x32_c
-
-void aom_highbd_sad_skip_8x32x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-#define aom_highbd_sad_skip_8x32x4d aom_highbd_sad_skip_8x32x4d_c
-
-unsigned int aom_highbd_sad_skip_8x4_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride);
-#define aom_highbd_sad_skip_8x4 aom_highbd_sad_skip_8x4_c
-
-void aom_highbd_sad_skip_8x4x4d_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* const ref_ptr[],
-                                  int ref_stride,
-                                  uint32_t* sad_array);
-#define aom_highbd_sad_skip_8x4x4d aom_highbd_sad_skip_8x4x4d_c
-
-unsigned int aom_highbd_sad_skip_8x8_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride);
-#define aom_highbd_sad_skip_8x8 aom_highbd_sad_skip_8x8_c
-
-void aom_highbd_sad_skip_8x8x4d_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* const ref_ptr[],
-                                  int ref_stride,
-                                  uint32_t* sad_array);
-#define aom_highbd_sad_skip_8x8x4d aom_highbd_sad_skip_8x8x4d_c
-
-void aom_highbd_smooth_h_predictor_16x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_16x16 \
-  aom_highbd_smooth_h_predictor_16x16_c
-
-void aom_highbd_smooth_h_predictor_16x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_16x32 \
-  aom_highbd_smooth_h_predictor_16x32_c
-
-void aom_highbd_smooth_h_predictor_16x4_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_16x4 aom_highbd_smooth_h_predictor_16x4_c
-
-void aom_highbd_smooth_h_predictor_16x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_16x64 \
-  aom_highbd_smooth_h_predictor_16x64_c
-
-void aom_highbd_smooth_h_predictor_16x8_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_16x8 aom_highbd_smooth_h_predictor_16x8_c
-
-void aom_highbd_smooth_h_predictor_2x2_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_h_predictor_2x2 aom_highbd_smooth_h_predictor_2x2_c
-
-void aom_highbd_smooth_h_predictor_32x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_32x16 \
-  aom_highbd_smooth_h_predictor_32x16_c
-
-void aom_highbd_smooth_h_predictor_32x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_32x32 \
-  aom_highbd_smooth_h_predictor_32x32_c
-
-void aom_highbd_smooth_h_predictor_32x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_32x64 \
-  aom_highbd_smooth_h_predictor_32x64_c
-
-void aom_highbd_smooth_h_predictor_32x8_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_32x8 aom_highbd_smooth_h_predictor_32x8_c
-
-void aom_highbd_smooth_h_predictor_4x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_4x16 aom_highbd_smooth_h_predictor_4x16_c
-
-void aom_highbd_smooth_h_predictor_4x4_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_h_predictor_4x4 aom_highbd_smooth_h_predictor_4x4_c
-
-void aom_highbd_smooth_h_predictor_4x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_h_predictor_4x8 aom_highbd_smooth_h_predictor_4x8_c
-
-void aom_highbd_smooth_h_predictor_64x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_64x16 \
-  aom_highbd_smooth_h_predictor_64x16_c
-
-void aom_highbd_smooth_h_predictor_64x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_64x32 \
-  aom_highbd_smooth_h_predictor_64x32_c
-
-void aom_highbd_smooth_h_predictor_64x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_64x64 \
-  aom_highbd_smooth_h_predictor_64x64_c
-
-void aom_highbd_smooth_h_predictor_8x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_8x16 aom_highbd_smooth_h_predictor_8x16_c
-
-void aom_highbd_smooth_h_predictor_8x32_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_8x32 aom_highbd_smooth_h_predictor_8x32_c
-
-void aom_highbd_smooth_h_predictor_8x4_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_h_predictor_8x4 aom_highbd_smooth_h_predictor_8x4_c
-
-void aom_highbd_smooth_h_predictor_8x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_h_predictor_8x8 aom_highbd_smooth_h_predictor_8x8_c
-
-void aom_highbd_smooth_predictor_16x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_16x16 aom_highbd_smooth_predictor_16x16_c
-
-void aom_highbd_smooth_predictor_16x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_16x32 aom_highbd_smooth_predictor_16x32_c
-
-void aom_highbd_smooth_predictor_16x4_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_16x4 aom_highbd_smooth_predictor_16x4_c
-
-void aom_highbd_smooth_predictor_16x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_16x64 aom_highbd_smooth_predictor_16x64_c
-
-void aom_highbd_smooth_predictor_16x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_16x8 aom_highbd_smooth_predictor_16x8_c
-
-void aom_highbd_smooth_predictor_2x2_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_smooth_predictor_2x2 aom_highbd_smooth_predictor_2x2_c
-
-void aom_highbd_smooth_predictor_32x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_32x16 aom_highbd_smooth_predictor_32x16_c
-
-void aom_highbd_smooth_predictor_32x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_32x32 aom_highbd_smooth_predictor_32x32_c
-
-void aom_highbd_smooth_predictor_32x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_32x64 aom_highbd_smooth_predictor_32x64_c
-
-void aom_highbd_smooth_predictor_32x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_32x8 aom_highbd_smooth_predictor_32x8_c
-
-void aom_highbd_smooth_predictor_4x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_4x16 aom_highbd_smooth_predictor_4x16_c
-
-void aom_highbd_smooth_predictor_4x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_smooth_predictor_4x4 aom_highbd_smooth_predictor_4x4_c
-
-void aom_highbd_smooth_predictor_4x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_smooth_predictor_4x8 aom_highbd_smooth_predictor_4x8_c
-
-void aom_highbd_smooth_predictor_64x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_64x16 aom_highbd_smooth_predictor_64x16_c
-
-void aom_highbd_smooth_predictor_64x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_64x32 aom_highbd_smooth_predictor_64x32_c
-
-void aom_highbd_smooth_predictor_64x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_64x64 aom_highbd_smooth_predictor_64x64_c
-
-void aom_highbd_smooth_predictor_8x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_8x16 aom_highbd_smooth_predictor_8x16_c
-
-void aom_highbd_smooth_predictor_8x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_8x32 aom_highbd_smooth_predictor_8x32_c
-
-void aom_highbd_smooth_predictor_8x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_smooth_predictor_8x4 aom_highbd_smooth_predictor_8x4_c
-
-void aom_highbd_smooth_predictor_8x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_smooth_predictor_8x8 aom_highbd_smooth_predictor_8x8_c
-
-void aom_highbd_smooth_v_predictor_16x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_16x16 \
-  aom_highbd_smooth_v_predictor_16x16_c
-
-void aom_highbd_smooth_v_predictor_16x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_16x32 \
-  aom_highbd_smooth_v_predictor_16x32_c
-
-void aom_highbd_smooth_v_predictor_16x4_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_16x4 aom_highbd_smooth_v_predictor_16x4_c
-
-void aom_highbd_smooth_v_predictor_16x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_16x64 \
-  aom_highbd_smooth_v_predictor_16x64_c
-
-void aom_highbd_smooth_v_predictor_16x8_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_16x8 aom_highbd_smooth_v_predictor_16x8_c
-
-void aom_highbd_smooth_v_predictor_2x2_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_v_predictor_2x2 aom_highbd_smooth_v_predictor_2x2_c
-
-void aom_highbd_smooth_v_predictor_32x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_32x16 \
-  aom_highbd_smooth_v_predictor_32x16_c
-
-void aom_highbd_smooth_v_predictor_32x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_32x32 \
-  aom_highbd_smooth_v_predictor_32x32_c
-
-void aom_highbd_smooth_v_predictor_32x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_32x64 \
-  aom_highbd_smooth_v_predictor_32x64_c
-
-void aom_highbd_smooth_v_predictor_32x8_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_32x8 aom_highbd_smooth_v_predictor_32x8_c
-
-void aom_highbd_smooth_v_predictor_4x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_4x16 aom_highbd_smooth_v_predictor_4x16_c
-
-void aom_highbd_smooth_v_predictor_4x4_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_v_predictor_4x4 aom_highbd_smooth_v_predictor_4x4_c
-
-void aom_highbd_smooth_v_predictor_4x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_v_predictor_4x8 aom_highbd_smooth_v_predictor_4x8_c
-
-void aom_highbd_smooth_v_predictor_64x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_64x16 \
-  aom_highbd_smooth_v_predictor_64x16_c
-
-void aom_highbd_smooth_v_predictor_64x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_64x32 \
-  aom_highbd_smooth_v_predictor_64x32_c
-
-void aom_highbd_smooth_v_predictor_64x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_64x64 \
-  aom_highbd_smooth_v_predictor_64x64_c
-
-void aom_highbd_smooth_v_predictor_8x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_8x16 aom_highbd_smooth_v_predictor_8x16_c
-
-void aom_highbd_smooth_v_predictor_8x32_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_8x32 aom_highbd_smooth_v_predictor_8x32_c
-
-void aom_highbd_smooth_v_predictor_8x4_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_v_predictor_8x4 aom_highbd_smooth_v_predictor_8x4_c
-
-void aom_highbd_smooth_v_predictor_8x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_v_predictor_8x8 aom_highbd_smooth_v_predictor_8x8_c
-
-int64_t aom_highbd_sse_c(const uint8_t* a8,
-                         int a_stride,
-                         const uint8_t* b8,
-                         int b_stride,
-                         int width,
-                         int height);
-#define aom_highbd_sse aom_highbd_sse_c
-
-void aom_highbd_subtract_block_c(int rows,
-                                 int cols,
-                                 int16_t* diff_ptr,
-                                 ptrdiff_t diff_stride,
-                                 const uint8_t* src_ptr,
-                                 ptrdiff_t src_stride,
-                                 const uint8_t* pred_ptr,
-                                 ptrdiff_t pred_stride,
-                                 int bd);
-#define aom_highbd_subtract_block aom_highbd_subtract_block_c
-
-void aom_highbd_upsampled_pred_c(MACROBLOCKD* xd,
-                                 const struct AV1Common* const cm,
-                                 int mi_row,
-                                 int mi_col,
-                                 const MV* const mv,
-                                 uint8_t* comp_pred8,
-                                 int width,
-                                 int height,
-                                 int subpel_x_q3,
-                                 int subpel_y_q3,
-                                 const uint8_t* ref8,
-                                 int ref_stride,
-                                 int bd,
-                                 int subpel_search);
-#define aom_highbd_upsampled_pred aom_highbd_upsampled_pred_c
-
-void aom_highbd_v_predictor_16x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_16x16 aom_highbd_v_predictor_16x16_c
-
-void aom_highbd_v_predictor_16x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_16x32 aom_highbd_v_predictor_16x32_c
-
-void aom_highbd_v_predictor_16x4_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_16x4 aom_highbd_v_predictor_16x4_c
-
-void aom_highbd_v_predictor_16x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_16x64 aom_highbd_v_predictor_16x64_c
-
-void aom_highbd_v_predictor_16x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_16x8 aom_highbd_v_predictor_16x8_c
-
-void aom_highbd_v_predictor_2x2_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_v_predictor_2x2 aom_highbd_v_predictor_2x2_c
-
-void aom_highbd_v_predictor_32x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_32x16 aom_highbd_v_predictor_32x16_c
-
-void aom_highbd_v_predictor_32x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_32x32 aom_highbd_v_predictor_32x32_c
-
-void aom_highbd_v_predictor_32x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_32x64 aom_highbd_v_predictor_32x64_c
-
-void aom_highbd_v_predictor_32x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_32x8 aom_highbd_v_predictor_32x8_c
-
-void aom_highbd_v_predictor_4x16_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_4x16 aom_highbd_v_predictor_4x16_c
-
-void aom_highbd_v_predictor_4x4_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_v_predictor_4x4 aom_highbd_v_predictor_4x4_c
-
-void aom_highbd_v_predictor_4x8_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_v_predictor_4x8 aom_highbd_v_predictor_4x8_c
-
-void aom_highbd_v_predictor_64x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_64x16 aom_highbd_v_predictor_64x16_c
-
-void aom_highbd_v_predictor_64x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_64x32 aom_highbd_v_predictor_64x32_c
-
-void aom_highbd_v_predictor_64x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_64x64 aom_highbd_v_predictor_64x64_c
-
-void aom_highbd_v_predictor_8x16_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_8x16 aom_highbd_v_predictor_8x16_c
-
-void aom_highbd_v_predictor_8x32_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_8x32 aom_highbd_v_predictor_8x32_c
-
-void aom_highbd_v_predictor_8x4_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_v_predictor_8x4 aom_highbd_v_predictor_8x4_c
-
-void aom_highbd_v_predictor_8x8_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_v_predictor_8x8 aom_highbd_v_predictor_8x8_c
-
 void aom_ifft16x16_float_c(const float* input, float* temp, float* output);
 #define aom_ifft16x16_float aom_ifft16x16_float_c
 
@@ -10496,498 +2307,6 @@
                              int h);
 #define aom_mse_wxh_16bit aom_mse_wxh_16bit_c
 
-uint64_t aom_mse_wxh_16bit_highbd_c(uint16_t* dst,
-                                    int dstride,
-                                    uint16_t* src,
-                                    int sstride,
-                                    int w,
-                                    int h);
-#define aom_mse_wxh_16bit_highbd aom_mse_wxh_16bit_highbd_c
-
-unsigned int aom_obmc_sad128x128_c(const uint8_t* pre,
-                                   int pre_stride,
-                                   const int32_t* wsrc,
-                                   const int32_t* mask);
-#define aom_obmc_sad128x128 aom_obmc_sad128x128_c
-
-unsigned int aom_obmc_sad128x64_c(const uint8_t* pre,
-                                  int pre_stride,
-                                  const int32_t* wsrc,
-                                  const int32_t* mask);
-#define aom_obmc_sad128x64 aom_obmc_sad128x64_c
-
-unsigned int aom_obmc_sad16x16_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad16x16 aom_obmc_sad16x16_c
-
-unsigned int aom_obmc_sad16x32_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad16x32 aom_obmc_sad16x32_c
-
-unsigned int aom_obmc_sad16x4_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-#define aom_obmc_sad16x4 aom_obmc_sad16x4_c
-
-unsigned int aom_obmc_sad16x64_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad16x64 aom_obmc_sad16x64_c
-
-unsigned int aom_obmc_sad16x8_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-#define aom_obmc_sad16x8 aom_obmc_sad16x8_c
-
-unsigned int aom_obmc_sad32x16_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad32x16 aom_obmc_sad32x16_c
-
-unsigned int aom_obmc_sad32x32_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad32x32 aom_obmc_sad32x32_c
-
-unsigned int aom_obmc_sad32x64_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad32x64 aom_obmc_sad32x64_c
-
-unsigned int aom_obmc_sad32x8_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-#define aom_obmc_sad32x8 aom_obmc_sad32x8_c
-
-unsigned int aom_obmc_sad4x16_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-#define aom_obmc_sad4x16 aom_obmc_sad4x16_c
-
-unsigned int aom_obmc_sad4x4_c(const uint8_t* pre,
-                               int pre_stride,
-                               const int32_t* wsrc,
-                               const int32_t* mask);
-#define aom_obmc_sad4x4 aom_obmc_sad4x4_c
-
-unsigned int aom_obmc_sad4x8_c(const uint8_t* pre,
-                               int pre_stride,
-                               const int32_t* wsrc,
-                               const int32_t* mask);
-#define aom_obmc_sad4x8 aom_obmc_sad4x8_c
-
-unsigned int aom_obmc_sad64x128_c(const uint8_t* pre,
-                                  int pre_stride,
-                                  const int32_t* wsrc,
-                                  const int32_t* mask);
-#define aom_obmc_sad64x128 aom_obmc_sad64x128_c
-
-unsigned int aom_obmc_sad64x16_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad64x16 aom_obmc_sad64x16_c
-
-unsigned int aom_obmc_sad64x32_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad64x32 aom_obmc_sad64x32_c
-
-unsigned int aom_obmc_sad64x64_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad64x64 aom_obmc_sad64x64_c
-
-unsigned int aom_obmc_sad8x16_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-#define aom_obmc_sad8x16 aom_obmc_sad8x16_c
-
-unsigned int aom_obmc_sad8x32_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-#define aom_obmc_sad8x32 aom_obmc_sad8x32_c
-
-unsigned int aom_obmc_sad8x4_c(const uint8_t* pre,
-                               int pre_stride,
-                               const int32_t* wsrc,
-                               const int32_t* mask);
-#define aom_obmc_sad8x4 aom_obmc_sad8x4_c
-
-unsigned int aom_obmc_sad8x8_c(const uint8_t* pre,
-                               int pre_stride,
-                               const int32_t* wsrc,
-                               const int32_t* mask);
-#define aom_obmc_sad8x8 aom_obmc_sad8x8_c
-
-unsigned int aom_obmc_sub_pixel_variance128x128_c(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-#define aom_obmc_sub_pixel_variance128x128 aom_obmc_sub_pixel_variance128x128_c
-
-unsigned int aom_obmc_sub_pixel_variance128x64_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-#define aom_obmc_sub_pixel_variance128x64 aom_obmc_sub_pixel_variance128x64_c
-
-unsigned int aom_obmc_sub_pixel_variance16x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance16x16 aom_obmc_sub_pixel_variance16x16_c
-
-unsigned int aom_obmc_sub_pixel_variance16x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance16x32 aom_obmc_sub_pixel_variance16x32_c
-
-unsigned int aom_obmc_sub_pixel_variance16x4_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_obmc_sub_pixel_variance16x4 aom_obmc_sub_pixel_variance16x4_c
-
-unsigned int aom_obmc_sub_pixel_variance16x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance16x64 aom_obmc_sub_pixel_variance16x64_c
-
-unsigned int aom_obmc_sub_pixel_variance16x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_obmc_sub_pixel_variance16x8 aom_obmc_sub_pixel_variance16x8_c
-
-unsigned int aom_obmc_sub_pixel_variance32x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance32x16 aom_obmc_sub_pixel_variance32x16_c
-
-unsigned int aom_obmc_sub_pixel_variance32x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance32x32 aom_obmc_sub_pixel_variance32x32_c
-
-unsigned int aom_obmc_sub_pixel_variance32x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance32x64 aom_obmc_sub_pixel_variance32x64_c
-
-unsigned int aom_obmc_sub_pixel_variance32x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_obmc_sub_pixel_variance32x8 aom_obmc_sub_pixel_variance32x8_c
-
-unsigned int aom_obmc_sub_pixel_variance4x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_obmc_sub_pixel_variance4x16 aom_obmc_sub_pixel_variance4x16_c
-
-unsigned int aom_obmc_sub_pixel_variance4x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_obmc_sub_pixel_variance4x4 aom_obmc_sub_pixel_variance4x4_c
-
-unsigned int aom_obmc_sub_pixel_variance4x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_obmc_sub_pixel_variance4x8 aom_obmc_sub_pixel_variance4x8_c
-
-unsigned int aom_obmc_sub_pixel_variance64x128_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-#define aom_obmc_sub_pixel_variance64x128 aom_obmc_sub_pixel_variance64x128_c
-
-unsigned int aom_obmc_sub_pixel_variance64x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance64x16 aom_obmc_sub_pixel_variance64x16_c
-
-unsigned int aom_obmc_sub_pixel_variance64x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance64x32 aom_obmc_sub_pixel_variance64x32_c
-
-unsigned int aom_obmc_sub_pixel_variance64x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance64x64 aom_obmc_sub_pixel_variance64x64_c
-
-unsigned int aom_obmc_sub_pixel_variance8x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_obmc_sub_pixel_variance8x16 aom_obmc_sub_pixel_variance8x16_c
-
-unsigned int aom_obmc_sub_pixel_variance8x32_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_obmc_sub_pixel_variance8x32 aom_obmc_sub_pixel_variance8x32_c
-
-unsigned int aom_obmc_sub_pixel_variance8x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_obmc_sub_pixel_variance8x4 aom_obmc_sub_pixel_variance8x4_c
-
-unsigned int aom_obmc_sub_pixel_variance8x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_obmc_sub_pixel_variance8x8 aom_obmc_sub_pixel_variance8x8_c
-
-unsigned int aom_obmc_variance128x128_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask,
-                                        unsigned int* sse);
-#define aom_obmc_variance128x128 aom_obmc_variance128x128_c
-
-unsigned int aom_obmc_variance128x64_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask,
-                                       unsigned int* sse);
-#define aom_obmc_variance128x64 aom_obmc_variance128x64_c
-
-unsigned int aom_obmc_variance16x16_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance16x16 aom_obmc_variance16x16_c
-
-unsigned int aom_obmc_variance16x32_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance16x32 aom_obmc_variance16x32_c
-
-unsigned int aom_obmc_variance16x4_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-#define aom_obmc_variance16x4 aom_obmc_variance16x4_c
-
-unsigned int aom_obmc_variance16x64_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance16x64 aom_obmc_variance16x64_c
-
-unsigned int aom_obmc_variance16x8_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-#define aom_obmc_variance16x8 aom_obmc_variance16x8_c
-
-unsigned int aom_obmc_variance32x16_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance32x16 aom_obmc_variance32x16_c
-
-unsigned int aom_obmc_variance32x32_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance32x32 aom_obmc_variance32x32_c
-
-unsigned int aom_obmc_variance32x64_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance32x64 aom_obmc_variance32x64_c
-
-unsigned int aom_obmc_variance32x8_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-#define aom_obmc_variance32x8 aom_obmc_variance32x8_c
-
-unsigned int aom_obmc_variance4x16_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-#define aom_obmc_variance4x16 aom_obmc_variance4x16_c
-
-unsigned int aom_obmc_variance4x4_c(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask,
-                                    unsigned int* sse);
-#define aom_obmc_variance4x4 aom_obmc_variance4x4_c
-
-unsigned int aom_obmc_variance4x8_c(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask,
-                                    unsigned int* sse);
-#define aom_obmc_variance4x8 aom_obmc_variance4x8_c
-
-unsigned int aom_obmc_variance64x128_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask,
-                                       unsigned int* sse);
-#define aom_obmc_variance64x128 aom_obmc_variance64x128_c
-
-unsigned int aom_obmc_variance64x16_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance64x16 aom_obmc_variance64x16_c
-
-unsigned int aom_obmc_variance64x32_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance64x32 aom_obmc_variance64x32_c
-
-unsigned int aom_obmc_variance64x64_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance64x64 aom_obmc_variance64x64_c
-
-unsigned int aom_obmc_variance8x16_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-#define aom_obmc_variance8x16 aom_obmc_variance8x16_c
-
-unsigned int aom_obmc_variance8x32_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-#define aom_obmc_variance8x32 aom_obmc_variance8x32_c
-
-unsigned int aom_obmc_variance8x4_c(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask,
-                                    unsigned int* sse);
-#define aom_obmc_variance8x4 aom_obmc_variance8x4_c
-
-unsigned int aom_obmc_variance8x8_c(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask,
-                                    unsigned int* sse);
-#define aom_obmc_variance8x8 aom_obmc_variance8x8_c
-
 void aom_paeth_predictor_16x16_c(uint8_t* dst,
                                  ptrdiff_t y_stride,
                                  const uint8_t* above,
diff --git a/third_party/libaom/source/config/linux/arm/config/av1_rtcd.h b/third_party/libaom/source/config/linux/arm/config/av1_rtcd.h
index 1e52bf76..5dce280 100644
--- a/third_party/libaom/source/config/linux/arm/config/av1_rtcd.h
+++ b/third_party/libaom/source/config/linux/arm/config/av1_rtcd.h
@@ -99,35 +99,6 @@
                              const int log_scale);
 #define aom_quantize_b_helper aom_quantize_b_helper_c
 
-void av1_apply_selfguided_restoration_c(const uint8_t* dat,
-                                        int width,
-                                        int height,
-                                        int stride,
-                                        int eps,
-                                        const int* xqd,
-                                        uint8_t* dst,
-                                        int dst_stride,
-                                        int32_t* tmpbuf,
-                                        int bit_depth,
-                                        int highbd);
-#define av1_apply_selfguided_restoration av1_apply_selfguided_restoration_c
-
-void av1_apply_temporal_filter_c(const struct yv12_buffer_config* ref_frame,
-                                 const struct macroblockd* mbd,
-                                 const BLOCK_SIZE block_size,
-                                 const int mb_row,
-                                 const int mb_col,
-                                 const int num_planes,
-                                 const double* noise_levels,
-                                 const MV* subblock_mvs,
-                                 const int* subblock_mses,
-                                 const int q_factor,
-                                 const int filter_strength,
-                                 const uint8_t* pred,
-                                 uint32_t* accum,
-                                 uint16_t* count);
-#define av1_apply_temporal_filter av1_apply_temporal_filter_c
-
 int64_t av1_block_error_c(const tran_low_t* coeff,
                           const tran_low_t* dqcoeff,
                           intptr_t block_size,
@@ -174,44 +145,6 @@
 #define av1_build_compound_diffwtd_mask_highbd \
   av1_build_compound_diffwtd_mask_highbd_c
 
-int64_t av1_calc_frame_error_c(const uint8_t* const ref,
-                               int stride,
-                               const uint8_t* const dst,
-                               int p_width,
-                               int p_height,
-                               int p_stride);
-#define av1_calc_frame_error av1_calc_frame_error_c
-
-void av1_calc_proj_params_c(const uint8_t* src8,
-                            int width,
-                            int height,
-                            int src_stride,
-                            const uint8_t* dat8,
-                            int dat_stride,
-                            int32_t* flt0,
-                            int flt0_stride,
-                            int32_t* flt1,
-                            int flt1_stride,
-                            int64_t H[2][2],
-                            int64_t C[2],
-                            const sgr_params_type* params);
-#define av1_calc_proj_params av1_calc_proj_params_c
-
-void av1_calc_proj_params_high_bd_c(const uint8_t* src8,
-                                    int width,
-                                    int height,
-                                    int src_stride,
-                                    const uint8_t* dat8,
-                                    int dat_stride,
-                                    int32_t* flt0,
-                                    int flt0_stride,
-                                    int32_t* flt1,
-                                    int flt1_stride,
-                                    int64_t H[2][2],
-                                    int64_t C[2],
-                                    const sgr_params_type* params);
-#define av1_calc_proj_params_high_bd av1_calc_proj_params_high_bd_c
-
 void av1_cnn_activate_c(float** input,
                         int channels,
                         int width,
@@ -278,33 +211,6 @@
                                        int y2);
 #define av1_compute_cross_correlation av1_compute_cross_correlation_c
 
-void av1_compute_stats_c(int wiener_win,
-                         const uint8_t* dgd8,
-                         const uint8_t* src8,
-                         int h_start,
-                         int h_end,
-                         int v_start,
-                         int v_end,
-                         int dgd_stride,
-                         int src_stride,
-                         int64_t* M,
-                         int64_t* H);
-#define av1_compute_stats av1_compute_stats_c
-
-void av1_compute_stats_highbd_c(int wiener_win,
-                                const uint8_t* dgd8,
-                                const uint8_t* src8,
-                                int h_start,
-                                int h_end,
-                                int v_start,
-                                int v_end,
-                                int dgd_stride,
-                                int src_stride,
-                                int64_t* M,
-                                int64_t* H,
-                                aom_bit_depth_t bit_depth);
-#define av1_compute_stats_highbd av1_compute_stats_highbd_c
-
 void av1_convolve_2d_scale_c(const uint8_t* src,
                              int src_stride,
                              uint8_t* dst,
@@ -614,30 +520,6 @@
                                int8_t* const coeff_contexts);
 #define av1_get_nz_map_contexts av1_get_nz_map_contexts_c
 
-void av1_highbd_apply_temporal_filter_c(
-    const struct yv12_buffer_config* ref_frame,
-    const struct macroblockd* mbd,
-    const BLOCK_SIZE block_size,
-    const int mb_row,
-    const int mb_col,
-    const int num_planes,
-    const double* noise_levels,
-    const MV* subblock_mvs,
-    const int* subblock_mses,
-    const int q_factor,
-    const int filter_strength,
-    const uint8_t* pred,
-    uint32_t* accum,
-    uint16_t* count);
-#define av1_highbd_apply_temporal_filter av1_highbd_apply_temporal_filter_c
-
-int64_t av1_highbd_block_error_c(const tran_low_t* coeff,
-                                 const tran_low_t* dqcoeff,
-                                 intptr_t block_size,
-                                 int64_t* ssz,
-                                 int bd);
-#define av1_highbd_block_error av1_highbd_block_error_c
-
 void av1_highbd_convolve8_c(const uint8_t* src,
                             ptrdiff_t src_stride,
                             uint8_t* dst,
@@ -677,36 +559,6 @@
                                  int bps);
 #define av1_highbd_convolve8_vert av1_highbd_convolve8_vert_c
 
-void av1_highbd_convolve_2d_scale_c(const uint16_t* src,
-                                    int src_stride,
-                                    uint16_t* dst,
-                                    int dst_stride,
-                                    int w,
-                                    int h,
-                                    const InterpFilterParams* filter_params_x,
-                                    const InterpFilterParams* filter_params_y,
-                                    const int subpel_x_qn,
-                                    const int x_step_qn,
-                                    const int subpel_y_qn,
-                                    const int y_step_qn,
-                                    ConvolveParams* conv_params,
-                                    int bd);
-#define av1_highbd_convolve_2d_scale av1_highbd_convolve_2d_scale_c
-
-void av1_highbd_convolve_2d_sr_c(const uint16_t* src,
-                                 int src_stride,
-                                 uint16_t* dst,
-                                 int dst_stride,
-                                 int w,
-                                 int h,
-                                 const InterpFilterParams* filter_params_x,
-                                 const InterpFilterParams* filter_params_y,
-                                 const int subpel_x_qn,
-                                 const int subpel_y_qn,
-                                 ConvolveParams* conv_params,
-                                 int bd);
-#define av1_highbd_convolve_2d_sr av1_highbd_convolve_2d_sr_c
-
 void av1_highbd_convolve_avg_c(const uint8_t* src,
                                ptrdiff_t src_stride,
                                uint8_t* dst,
@@ -733,128 +585,6 @@
                                 int bps);
 #define av1_highbd_convolve_copy av1_highbd_convolve_copy_c
 
-void av1_highbd_convolve_horiz_rs_c(const uint16_t* src,
-                                    int src_stride,
-                                    uint16_t* dst,
-                                    int dst_stride,
-                                    int w,
-                                    int h,
-                                    const int16_t* x_filters,
-                                    int x0_qn,
-                                    int x_step_qn,
-                                    int bd);
-#define av1_highbd_convolve_horiz_rs av1_highbd_convolve_horiz_rs_c
-
-void av1_highbd_convolve_x_sr_c(const uint16_t* src,
-                                int src_stride,
-                                uint16_t* dst,
-                                int dst_stride,
-                                int w,
-                                int h,
-                                const InterpFilterParams* filter_params_x,
-                                const int subpel_x_qn,
-                                ConvolveParams* conv_params,
-                                int bd);
-#define av1_highbd_convolve_x_sr av1_highbd_convolve_x_sr_c
-
-void av1_highbd_convolve_y_sr_c(const uint16_t* src,
-                                int src_stride,
-                                uint16_t* dst,
-                                int dst_stride,
-                                int w,
-                                int h,
-                                const InterpFilterParams* filter_params_y,
-                                const int subpel_y_qn,
-                                int bd);
-#define av1_highbd_convolve_y_sr av1_highbd_convolve_y_sr_c
-
-void av1_highbd_dist_wtd_convolve_2d_c(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_x,
-    const InterpFilterParams* filter_params_y,
-    const int subpel_x_qn,
-    const int subpel_y_qn,
-    ConvolveParams* conv_params,
-    int bd);
-#define av1_highbd_dist_wtd_convolve_2d av1_highbd_dist_wtd_convolve_2d_c
-
-void av1_highbd_dist_wtd_convolve_2d_copy_c(const uint16_t* src,
-                                            int src_stride,
-                                            uint16_t* dst,
-                                            int dst_stride,
-                                            int w,
-                                            int h,
-                                            ConvolveParams* conv_params,
-                                            int bd);
-#define av1_highbd_dist_wtd_convolve_2d_copy \
-  av1_highbd_dist_wtd_convolve_2d_copy_c
-
-void av1_highbd_dist_wtd_convolve_x_c(const uint16_t* src,
-                                      int src_stride,
-                                      uint16_t* dst,
-                                      int dst_stride,
-                                      int w,
-                                      int h,
-                                      const InterpFilterParams* filter_params_x,
-                                      const int subpel_x_qn,
-                                      ConvolveParams* conv_params,
-                                      int bd);
-#define av1_highbd_dist_wtd_convolve_x av1_highbd_dist_wtd_convolve_x_c
-
-void av1_highbd_dist_wtd_convolve_y_c(const uint16_t* src,
-                                      int src_stride,
-                                      uint16_t* dst,
-                                      int dst_stride,
-                                      int w,
-                                      int h,
-                                      const InterpFilterParams* filter_params_y,
-                                      const int subpel_y_qn,
-                                      ConvolveParams* conv_params,
-                                      int bd);
-#define av1_highbd_dist_wtd_convolve_y av1_highbd_dist_wtd_convolve_y_c
-
-void av1_highbd_dr_prediction_z1_c(uint16_t* dst,
-                                   ptrdiff_t stride,
-                                   int bw,
-                                   int bh,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int upsample_above,
-                                   int dx,
-                                   int dy,
-                                   int bd);
-#define av1_highbd_dr_prediction_z1 av1_highbd_dr_prediction_z1_c
-
-void av1_highbd_dr_prediction_z2_c(uint16_t* dst,
-                                   ptrdiff_t stride,
-                                   int bw,
-                                   int bh,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int upsample_above,
-                                   int upsample_left,
-                                   int dx,
-                                   int dy,
-                                   int bd);
-#define av1_highbd_dr_prediction_z2 av1_highbd_dr_prediction_z2_c
-
-void av1_highbd_dr_prediction_z3_c(uint16_t* dst,
-                                   ptrdiff_t stride,
-                                   int bw,
-                                   int bh,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int upsample_left,
-                                   int dx,
-                                   int dy,
-                                   int bd);
-#define av1_highbd_dr_prediction_z3 av1_highbd_dr_prediction_z3_c
-
 void av1_highbd_fwht4x4_c(const int16_t* input, tran_low_t* output, int stride);
 #define av1_highbd_fwht4x4 av1_highbd_fwht4x4_c
 
@@ -984,70 +714,6 @@
                                 int bd);
 #define av1_highbd_iwht4x4_1_add av1_highbd_iwht4x4_1_add_c
 
-int64_t av1_highbd_pixel_proj_error_c(const uint8_t* src8,
-                                      int width,
-                                      int height,
-                                      int src_stride,
-                                      const uint8_t* dat8,
-                                      int dat_stride,
-                                      int32_t* flt0,
-                                      int flt0_stride,
-                                      int32_t* flt1,
-                                      int flt1_stride,
-                                      int xq[2],
-                                      const sgr_params_type* params);
-#define av1_highbd_pixel_proj_error av1_highbd_pixel_proj_error_c
-
-void av1_highbd_quantize_fp_c(const tran_low_t* coeff_ptr,
-                              intptr_t n_coeffs,
-                              const int16_t* zbin_ptr,
-                              const int16_t* round_ptr,
-                              const int16_t* quant_ptr,
-                              const int16_t* quant_shift_ptr,
-                              tran_low_t* qcoeff_ptr,
-                              tran_low_t* dqcoeff_ptr,
-                              const int16_t* dequant_ptr,
-                              uint16_t* eob_ptr,
-                              const int16_t* scan,
-                              const int16_t* iscan,
-                              int log_scale);
-#define av1_highbd_quantize_fp av1_highbd_quantize_fp_c
-
-void av1_highbd_warp_affine_c(const int32_t* mat,
-                              const uint16_t* ref,
-                              int width,
-                              int height,
-                              int stride,
-                              uint16_t* pred,
-                              int p_col,
-                              int p_row,
-                              int p_width,
-                              int p_height,
-                              int p_stride,
-                              int subsampling_x,
-                              int subsampling_y,
-                              int bd,
-                              ConvolveParams* conv_params,
-                              int16_t alpha,
-                              int16_t beta,
-                              int16_t gamma,
-                              int16_t delta);
-#define av1_highbd_warp_affine av1_highbd_warp_affine_c
-
-void av1_highbd_wiener_convolve_add_src_c(const uint8_t* src,
-                                          ptrdiff_t src_stride,
-                                          uint8_t* dst,
-                                          ptrdiff_t dst_stride,
-                                          const int16_t* filter_x,
-                                          int x_step_q4,
-                                          const int16_t* filter_y,
-                                          int y_step_q4,
-                                          int w,
-                                          int h,
-                                          const ConvolveParams* conv_params,
-                                          int bd);
-#define av1_highbd_wiener_convolve_add_src av1_highbd_wiener_convolve_add_src_c
-
 void av1_inv_txfm2d_add_16x16_c(const int32_t* input,
                                 uint16_t* output,
                                 int stride,
@@ -1193,20 +859,6 @@
                           TxfmParam* txfm_param);
 #define av1_lowbd_fwd_txfm av1_lowbd_fwd_txfm_c
 
-int64_t av1_lowbd_pixel_proj_error_c(const uint8_t* src8,
-                                     int width,
-                                     int height,
-                                     int src_stride,
-                                     const uint8_t* dat8,
-                                     int dat_stride,
-                                     int32_t* flt0,
-                                     int flt0_stride,
-                                     int32_t* flt1,
-                                     int flt1_stride,
-                                     int xq[2],
-                                     const sgr_params_type* params);
-#define av1_lowbd_pixel_proj_error av1_lowbd_pixel_proj_error_c
-
 void av1_nn_predict_c(const float* input_nodes,
                       const NN_CONFIG* const nn_config,
                       int reduce_prec,
@@ -1293,18 +945,6 @@
 void av1_round_shift_array_c(int32_t* arr, int size, int bit);
 #define av1_round_shift_array av1_round_shift_array_c
 
-int av1_selfguided_restoration_c(const uint8_t* dgd8,
-                                 int width,
-                                 int height,
-                                 int dgd_stride,
-                                 int32_t* flt0,
-                                 int32_t* flt1,
-                                 int flt_stride,
-                                 int sgr_params_idx,
-                                 int bit_depth,
-                                 int highbd);
-#define av1_selfguided_restoration av1_selfguided_restoration_c
-
 void av1_txb_init_levels_c(const tran_low_t* const coeff,
                            const int width,
                            const int height,
@@ -1317,26 +957,6 @@
 void av1_upsample_intra_edge_high_c(uint16_t* p, int sz, int bd);
 #define av1_upsample_intra_edge_high av1_upsample_intra_edge_high_c
 
-void av1_warp_affine_c(const int32_t* mat,
-                       const uint8_t* ref,
-                       int width,
-                       int height,
-                       int stride,
-                       uint8_t* pred,
-                       int p_col,
-                       int p_row,
-                       int p_width,
-                       int p_height,
-                       int p_stride,
-                       int subsampling_x,
-                       int subsampling_y,
-                       ConvolveParams* conv_params,
-                       int16_t alpha,
-                       int16_t beta,
-                       int16_t gamma,
-                       int16_t delta);
-#define av1_warp_affine av1_warp_affine_c
-
 void av1_wedge_compute_delta_squares_c(int16_t* d,
                                        const int16_t* a,
                                        const int16_t* b,
@@ -1403,27 +1023,15 @@
                     int coeff_shift);
 #define cdef_find_dir cdef_find_dir_c
 
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_420_hbd_c(TX_SIZE tx_size);
-#define cfl_get_luma_subsampling_420_hbd cfl_get_luma_subsampling_420_hbd_c
-
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_420_lbd_c(TX_SIZE tx_size);
 #define cfl_get_luma_subsampling_420_lbd cfl_get_luma_subsampling_420_lbd_c
 
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_422_hbd_c(TX_SIZE tx_size);
-#define cfl_get_luma_subsampling_422_hbd cfl_get_luma_subsampling_422_hbd_c
-
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_422_lbd_c(TX_SIZE tx_size);
 #define cfl_get_luma_subsampling_422_lbd cfl_get_luma_subsampling_422_lbd_c
 
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_444_hbd_c(TX_SIZE tx_size);
-#define cfl_get_luma_subsampling_444_hbd cfl_get_luma_subsampling_444_hbd_c
-
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_444_lbd_c(TX_SIZE tx_size);
 #define cfl_get_luma_subsampling_444_lbd cfl_get_luma_subsampling_444_lbd_c
 
-cfl_predict_hbd_fn cfl_get_predict_hbd_fn_c(TX_SIZE tx_size);
-#define cfl_get_predict_hbd_fn cfl_get_predict_hbd_fn_c
-
 cfl_predict_lbd_fn cfl_get_predict_lbd_fn_c(TX_SIZE tx_size);
 #define cfl_get_predict_lbd_fn cfl_get_predict_lbd_fn_c
 
diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.asm b/third_party/libaom/source/config/linux/arm64/config/aom_config.asm
index c803d9fe..8fbd732d 100644
--- a/third_party/libaom/source/config/linux/arm64/config/aom_config.asm
+++ b/third_party/libaom/source/config/linux/arm64/config/aom_config.asm
@@ -17,7 +17,7 @@
 CONFIG_ANALYZER equ 0
 CONFIG_AV1_DECODER equ 1
 CONFIG_AV1_ENCODER equ 1
-CONFIG_AV1_HIGHBITDEPTH equ 1
+CONFIG_AV1_HIGHBITDEPTH equ 0
 CONFIG_AV1_TEMPORAL_DENOISING equ 0
 CONFIG_BIG_ENDIAN equ 0
 CONFIG_BITSTREAM_DEBUG equ 0
@@ -47,7 +47,7 @@
 CONFIG_OS_SUPPORT equ 1
 CONFIG_PIC equ 0
 CONFIG_RD_DEBUG equ 0
-CONFIG_REALTIME_ONLY equ 0
+CONFIG_REALTIME_ONLY equ 1
 CONFIG_RUNTIME_CPU_DETECT equ 0
 CONFIG_SHARED equ 0
 CONFIG_SHARP_SETTINGS equ 0
diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.c b/third_party/libaom/source/config/linux/arm64/config/aom_config.c
index 86d097e..dfaa428 100644
--- a/third_party/libaom/source/config/linux/arm64/config/aom_config.c
+++ b/third_party/libaom/source/config/linux/arm64/config/aom_config.c
@@ -9,5 +9,5 @@
  * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
  */
 #include "aom/aom_codec.h"
-static const char* const cfg = "cmake ../source/libaom -G \"Unix Makefiles\" -DCMAKE_TOOLCHAIN_FILE=\"../source/libaom/build/cmake/toolchains/arm64-linux-gcc.cmake\" -DCONFIG_AV1_ENCODER=1 -DCONFIG_LIBYUV=0 -DCONFIG_MAX_DECODE_PROFILE=0 -DCONFIG_NORMAL_TILE_MODE=1 -DCONFIG_SIZE_LIMIT=1 -DDECODE_HEIGHT_LIMIT=16384 -DDECODE_WIDTH_LIMIT=16384";
+static const char* const cfg = "cmake ../source/libaom -G \"Unix Makefiles\" -DCMAKE_TOOLCHAIN_FILE=\"../source/libaom/build/cmake/toolchains/arm64-linux-gcc.cmake\" -DCONFIG_AV1_ENCODER=1 -DCONFIG_LIBYUV=0 -DCONFIG_MAX_DECODE_PROFILE=0 -DCONFIG_NORMAL_TILE_MODE=1 -DCONFIG_SIZE_LIMIT=1 -DDECODE_HEIGHT_LIMIT=16384 -DDECODE_WIDTH_LIMIT=16384 -DCONFIG_REALTIME_ONLY=1 -DCONFIG_AV1_HIGHBITDEPTH=0";
 const char *aom_codec_build_config(void) {return cfg;}
diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.h b/third_party/libaom/source/config/linux/arm64/config/aom_config.h
index 71185c9f..fa9522d 100644
--- a/third_party/libaom/source/config/linux/arm64/config/aom_config.h
+++ b/third_party/libaom/source/config/linux/arm64/config/aom_config.h
@@ -19,7 +19,7 @@
 #define CONFIG_ANALYZER 0
 #define CONFIG_AV1_DECODER 1
 #define CONFIG_AV1_ENCODER 1
-#define CONFIG_AV1_HIGHBITDEPTH 1
+#define CONFIG_AV1_HIGHBITDEPTH 0
 #define CONFIG_AV1_TEMPORAL_DENOISING 0
 #define CONFIG_BIG_ENDIAN 0
 #define CONFIG_BITSTREAM_DEBUG 0
@@ -49,7 +49,7 @@
 #define CONFIG_OS_SUPPORT 1
 #define CONFIG_PIC 0
 #define CONFIG_RD_DEBUG 0
-#define CONFIG_REALTIME_ONLY 0
+#define CONFIG_REALTIME_ONLY 1
 #define CONFIG_RUNTIME_CPU_DETECT 0
 #define CONFIG_SHARED 0
 #define CONFIG_SHARP_SETTINGS 0
diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_dsp_rtcd.h b/third_party/libaom/source/config/linux/arm64/config/aom_dsp_rtcd.h
index 5bf7631..5bc4d69e 100644
--- a/third_party/libaom/source/config/linux/arm64/config/aom_dsp_rtcd.h
+++ b/third_party/libaom/source/config/linux/arm64/config/aom_dsp_rtcd.h
@@ -1474,8226 +1474,6 @@
                               int16_t* coeff);
 #define aom_hadamard_lp_8x8 aom_hadamard_lp_8x8_neon
 
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x128 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x64 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x16 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x16_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x32 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x32_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x4 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x4_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x64 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x64_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x8 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x8_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x16 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x16_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x32 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x32_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x64 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x64_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x8 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x8_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x16 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x4 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x4_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x8 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x128 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x16 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x16_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x32 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x32_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x64 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x64_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x16 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x16_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x32 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x32_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x4 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x4_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x8 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x8_c
-
-void aom_highbd_10_get16x16var_c(const uint8_t* src_ptr,
-                                 int source_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride,
-                                 unsigned int* sse,
-                                 int* sum);
-#define aom_highbd_10_get16x16var aom_highbd_10_get16x16var_c
-
-void aom_highbd_10_get8x8var_c(const uint8_t* src_ptr,
-                               int source_stride,
-                               const uint8_t* ref_ptr,
-                               int ref_stride,
-                               unsigned int* sse,
-                               int* sum);
-#define aom_highbd_10_get8x8var aom_highbd_10_get8x8var_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance128x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance128x128 \
-  aom_highbd_10_masked_sub_pixel_variance128x128_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance128x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance128x64 \
-  aom_highbd_10_masked_sub_pixel_variance128x64_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance16x16 \
-  aom_highbd_10_masked_sub_pixel_variance16x16_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance16x32 \
-  aom_highbd_10_masked_sub_pixel_variance16x32_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance16x4 \
-  aom_highbd_10_masked_sub_pixel_variance16x4_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance16x64 \
-  aom_highbd_10_masked_sub_pixel_variance16x64_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance16x8 \
-  aom_highbd_10_masked_sub_pixel_variance16x8_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance32x16 \
-  aom_highbd_10_masked_sub_pixel_variance32x16_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance32x32 \
-  aom_highbd_10_masked_sub_pixel_variance32x32_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance32x64 \
-  aom_highbd_10_masked_sub_pixel_variance32x64_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance32x8 \
-  aom_highbd_10_masked_sub_pixel_variance32x8_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance4x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance4x16 \
-  aom_highbd_10_masked_sub_pixel_variance4x16_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance4x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance4x4 \
-  aom_highbd_10_masked_sub_pixel_variance4x4_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance4x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance4x8 \
-  aom_highbd_10_masked_sub_pixel_variance4x8_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance64x128 \
-  aom_highbd_10_masked_sub_pixel_variance64x128_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance64x16 \
-  aom_highbd_10_masked_sub_pixel_variance64x16_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance64x32 \
-  aom_highbd_10_masked_sub_pixel_variance64x32_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance64x64 \
-  aom_highbd_10_masked_sub_pixel_variance64x64_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance8x16 \
-  aom_highbd_10_masked_sub_pixel_variance8x16_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance8x32 \
-  aom_highbd_10_masked_sub_pixel_variance8x32_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance8x4 \
-  aom_highbd_10_masked_sub_pixel_variance8x4_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance8x8 \
-  aom_highbd_10_masked_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_10_mse16x16_c(const uint8_t* src_ptr,
-                                      int source_stride,
-                                      const uint8_t* ref_ptr,
-                                      int recon_stride,
-                                      unsigned int* sse);
-#define aom_highbd_10_mse16x16 aom_highbd_10_mse16x16_c
-
-unsigned int aom_highbd_10_mse16x8_c(const uint8_t* src_ptr,
-                                     int source_stride,
-                                     const uint8_t* ref_ptr,
-                                     int recon_stride,
-                                     unsigned int* sse);
-#define aom_highbd_10_mse16x8 aom_highbd_10_mse16x8_c
-
-unsigned int aom_highbd_10_mse8x16_c(const uint8_t* src_ptr,
-                                     int source_stride,
-                                     const uint8_t* ref_ptr,
-                                     int recon_stride,
-                                     unsigned int* sse);
-#define aom_highbd_10_mse8x16 aom_highbd_10_mse8x16_c
-
-unsigned int aom_highbd_10_mse8x8_c(const uint8_t* src_ptr,
-                                    int source_stride,
-                                    const uint8_t* ref_ptr,
-                                    int recon_stride,
-                                    unsigned int* sse);
-#define aom_highbd_10_mse8x8 aom_highbd_10_mse8x8_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance128x128_c(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            int xoffset,
-                                                            int yoffset,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance128x128 \
-  aom_highbd_10_obmc_sub_pixel_variance128x128_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance128x64_c(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance128x64 \
-  aom_highbd_10_obmc_sub_pixel_variance128x64_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance16x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance16x16 \
-  aom_highbd_10_obmc_sub_pixel_variance16x16_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance16x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance16x32 \
-  aom_highbd_10_obmc_sub_pixel_variance16x32_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance16x4_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance16x4 \
-  aom_highbd_10_obmc_sub_pixel_variance16x4_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance16x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance16x64 \
-  aom_highbd_10_obmc_sub_pixel_variance16x64_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance16x8_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance16x8 \
-  aom_highbd_10_obmc_sub_pixel_variance16x8_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance32x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance32x16 \
-  aom_highbd_10_obmc_sub_pixel_variance32x16_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance32x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance32x32 \
-  aom_highbd_10_obmc_sub_pixel_variance32x32_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance32x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance32x64 \
-  aom_highbd_10_obmc_sub_pixel_variance32x64_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance32x8_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance32x8 \
-  aom_highbd_10_obmc_sub_pixel_variance32x8_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance4x16_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance4x16 \
-  aom_highbd_10_obmc_sub_pixel_variance4x16_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance4x4_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance4x4 \
-  aom_highbd_10_obmc_sub_pixel_variance4x4_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance4x8_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance4x8 \
-  aom_highbd_10_obmc_sub_pixel_variance4x8_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance64x128_c(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance64x128 \
-  aom_highbd_10_obmc_sub_pixel_variance64x128_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance64x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance64x16 \
-  aom_highbd_10_obmc_sub_pixel_variance64x16_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance64x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance64x32 \
-  aom_highbd_10_obmc_sub_pixel_variance64x32_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance64x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance64x64 \
-  aom_highbd_10_obmc_sub_pixel_variance64x64_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance8x16_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance8x16 \
-  aom_highbd_10_obmc_sub_pixel_variance8x16_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance8x32_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance8x32 \
-  aom_highbd_10_obmc_sub_pixel_variance8x32_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance8x4_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance8x4 \
-  aom_highbd_10_obmc_sub_pixel_variance8x4_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance8x8_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance8x8 \
-  aom_highbd_10_obmc_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_10_obmc_variance128x128_c(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-#define aom_highbd_10_obmc_variance128x128 aom_highbd_10_obmc_variance128x128_c
-
-unsigned int aom_highbd_10_obmc_variance128x64_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-#define aom_highbd_10_obmc_variance128x64 aom_highbd_10_obmc_variance128x64_c
-
-unsigned int aom_highbd_10_obmc_variance16x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance16x16 aom_highbd_10_obmc_variance16x16_c
-
-unsigned int aom_highbd_10_obmc_variance16x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance16x32 aom_highbd_10_obmc_variance16x32_c
-
-unsigned int aom_highbd_10_obmc_variance16x4_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_10_obmc_variance16x4 aom_highbd_10_obmc_variance16x4_c
-
-unsigned int aom_highbd_10_obmc_variance16x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance16x64 aom_highbd_10_obmc_variance16x64_c
-
-unsigned int aom_highbd_10_obmc_variance16x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_10_obmc_variance16x8 aom_highbd_10_obmc_variance16x8_c
-
-unsigned int aom_highbd_10_obmc_variance32x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance32x16 aom_highbd_10_obmc_variance32x16_c
-
-unsigned int aom_highbd_10_obmc_variance32x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance32x32 aom_highbd_10_obmc_variance32x32_c
-
-unsigned int aom_highbd_10_obmc_variance32x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance32x64 aom_highbd_10_obmc_variance32x64_c
-
-unsigned int aom_highbd_10_obmc_variance32x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_10_obmc_variance32x8 aom_highbd_10_obmc_variance32x8_c
-
-unsigned int aom_highbd_10_obmc_variance4x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_10_obmc_variance4x16 aom_highbd_10_obmc_variance4x16_c
-
-unsigned int aom_highbd_10_obmc_variance4x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_10_obmc_variance4x4 aom_highbd_10_obmc_variance4x4_c
-
-unsigned int aom_highbd_10_obmc_variance4x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_10_obmc_variance4x8 aom_highbd_10_obmc_variance4x8_c
-
-unsigned int aom_highbd_10_obmc_variance64x128_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-#define aom_highbd_10_obmc_variance64x128 aom_highbd_10_obmc_variance64x128_c
-
-unsigned int aom_highbd_10_obmc_variance64x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance64x16 aom_highbd_10_obmc_variance64x16_c
-
-unsigned int aom_highbd_10_obmc_variance64x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance64x32 aom_highbd_10_obmc_variance64x32_c
-
-unsigned int aom_highbd_10_obmc_variance64x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance64x64 aom_highbd_10_obmc_variance64x64_c
-
-unsigned int aom_highbd_10_obmc_variance8x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_10_obmc_variance8x16 aom_highbd_10_obmc_variance8x16_c
-
-unsigned int aom_highbd_10_obmc_variance8x32_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_10_obmc_variance8x32 aom_highbd_10_obmc_variance8x32_c
-
-unsigned int aom_highbd_10_obmc_variance8x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_10_obmc_variance8x4 aom_highbd_10_obmc_variance8x4_c
-
-unsigned int aom_highbd_10_obmc_variance8x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_10_obmc_variance8x8 aom_highbd_10_obmc_variance8x8_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance128x128 \
-  aom_highbd_10_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance128x64 \
-  aom_highbd_10_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance16x16 \
-  aom_highbd_10_sub_pixel_avg_variance16x16_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance16x32 \
-  aom_highbd_10_sub_pixel_avg_variance16x32_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x4_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance16x4 \
-  aom_highbd_10_sub_pixel_avg_variance16x4_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance16x64 \
-  aom_highbd_10_sub_pixel_avg_variance16x64_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance16x8 \
-  aom_highbd_10_sub_pixel_avg_variance16x8_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance32x16 \
-  aom_highbd_10_sub_pixel_avg_variance32x16_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance32x32 \
-  aom_highbd_10_sub_pixel_avg_variance32x32_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance32x64 \
-  aom_highbd_10_sub_pixel_avg_variance32x64_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x8_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance32x8 \
-  aom_highbd_10_sub_pixel_avg_variance32x8_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance4x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance4x16 \
-  aom_highbd_10_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance4x4 \
-  aom_highbd_10_sub_pixel_avg_variance4x4_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance4x8 \
-  aom_highbd_10_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance64x128 \
-  aom_highbd_10_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance64x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance64x16 \
-  aom_highbd_10_sub_pixel_avg_variance64x16_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance64x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance64x32 \
-  aom_highbd_10_sub_pixel_avg_variance64x32_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance64x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance64x64 \
-  aom_highbd_10_sub_pixel_avg_variance64x64_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance8x16 \
-  aom_highbd_10_sub_pixel_avg_variance8x16_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x32_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance8x32 \
-  aom_highbd_10_sub_pixel_avg_variance8x32_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance8x4 \
-  aom_highbd_10_sub_pixel_avg_variance8x4_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance8x8 \
-  aom_highbd_10_sub_pixel_avg_variance8x8_c
-
-uint32_t aom_highbd_10_sub_pixel_variance128x128_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance128x128 \
-  aom_highbd_10_sub_pixel_variance128x128_c
-
-uint32_t aom_highbd_10_sub_pixel_variance128x64_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance128x64 \
-  aom_highbd_10_sub_pixel_variance128x64_c
-
-uint32_t aom_highbd_10_sub_pixel_variance16x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance16x16 \
-  aom_highbd_10_sub_pixel_variance16x16_c
-
-uint32_t aom_highbd_10_sub_pixel_variance16x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance16x32 \
-  aom_highbd_10_sub_pixel_variance16x32_c
-
-uint32_t aom_highbd_10_sub_pixel_variance16x4_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance16x4 \
-  aom_highbd_10_sub_pixel_variance16x4_c
-
-uint32_t aom_highbd_10_sub_pixel_variance16x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance16x64 \
-  aom_highbd_10_sub_pixel_variance16x64_c
-
-uint32_t aom_highbd_10_sub_pixel_variance16x8_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance16x8 \
-  aom_highbd_10_sub_pixel_variance16x8_c
-
-uint32_t aom_highbd_10_sub_pixel_variance32x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance32x16 \
-  aom_highbd_10_sub_pixel_variance32x16_c
-
-uint32_t aom_highbd_10_sub_pixel_variance32x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance32x32 \
-  aom_highbd_10_sub_pixel_variance32x32_c
-
-uint32_t aom_highbd_10_sub_pixel_variance32x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance32x64 \
-  aom_highbd_10_sub_pixel_variance32x64_c
-
-uint32_t aom_highbd_10_sub_pixel_variance32x8_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance32x8 \
-  aom_highbd_10_sub_pixel_variance32x8_c
-
-uint32_t aom_highbd_10_sub_pixel_variance4x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance4x16 \
-  aom_highbd_10_sub_pixel_variance4x16_c
-
-uint32_t aom_highbd_10_sub_pixel_variance4x4_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance4x4 \
-  aom_highbd_10_sub_pixel_variance4x4_c
-
-uint32_t aom_highbd_10_sub_pixel_variance4x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance4x8 \
-  aom_highbd_10_sub_pixel_variance4x8_c
-
-uint32_t aom_highbd_10_sub_pixel_variance64x128_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance64x128 \
-  aom_highbd_10_sub_pixel_variance64x128_c
-
-uint32_t aom_highbd_10_sub_pixel_variance64x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance64x16 \
-  aom_highbd_10_sub_pixel_variance64x16_c
-
-uint32_t aom_highbd_10_sub_pixel_variance64x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance64x32 \
-  aom_highbd_10_sub_pixel_variance64x32_c
-
-uint32_t aom_highbd_10_sub_pixel_variance64x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance64x64 \
-  aom_highbd_10_sub_pixel_variance64x64_c
-
-uint32_t aom_highbd_10_sub_pixel_variance8x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance8x16 \
-  aom_highbd_10_sub_pixel_variance8x16_c
-
-uint32_t aom_highbd_10_sub_pixel_variance8x32_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance8x32 \
-  aom_highbd_10_sub_pixel_variance8x32_c
-
-uint32_t aom_highbd_10_sub_pixel_variance8x4_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance8x4 \
-  aom_highbd_10_sub_pixel_variance8x4_c
-
-uint32_t aom_highbd_10_sub_pixel_variance8x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance8x8 \
-  aom_highbd_10_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_10_variance128x128_c(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-#define aom_highbd_10_variance128x128 aom_highbd_10_variance128x128_c
-
-unsigned int aom_highbd_10_variance128x64_c(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-#define aom_highbd_10_variance128x64 aom_highbd_10_variance128x64_c
-
-unsigned int aom_highbd_10_variance16x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_10_variance16x16 aom_highbd_10_variance16x16_c
-
-unsigned int aom_highbd_10_variance16x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_10_variance16x32 aom_highbd_10_variance16x32_c
-
-unsigned int aom_highbd_10_variance16x4_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_10_variance16x4 aom_highbd_10_variance16x4_c
-
-unsigned int aom_highbd_10_variance16x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           uint32_t* sse);
-#define aom_highbd_10_variance16x64 aom_highbd_10_variance16x64_c
-
-unsigned int aom_highbd_10_variance16x8_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_10_variance16x8 aom_highbd_10_variance16x8_c
-
-unsigned int aom_highbd_10_variance2x2_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance2x2 aom_highbd_10_variance2x2_c
-
-unsigned int aom_highbd_10_variance2x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance2x4 aom_highbd_10_variance2x4_c
-
-unsigned int aom_highbd_10_variance32x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_10_variance32x16 aom_highbd_10_variance32x16_c
-
-unsigned int aom_highbd_10_variance32x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_10_variance32x32 aom_highbd_10_variance32x32_c
-
-unsigned int aom_highbd_10_variance32x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_10_variance32x64 aom_highbd_10_variance32x64_c
-
-unsigned int aom_highbd_10_variance32x8_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_10_variance32x8 aom_highbd_10_variance32x8_c
-
-unsigned int aom_highbd_10_variance4x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_10_variance4x16 aom_highbd_10_variance4x16_c
-
-unsigned int aom_highbd_10_variance4x2_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance4x2 aom_highbd_10_variance4x2_c
-
-unsigned int aom_highbd_10_variance4x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance4x4 aom_highbd_10_variance4x4_c
-
-unsigned int aom_highbd_10_variance4x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance4x8 aom_highbd_10_variance4x8_c
-
-unsigned int aom_highbd_10_variance64x128_c(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-#define aom_highbd_10_variance64x128 aom_highbd_10_variance64x128_c
-
-unsigned int aom_highbd_10_variance64x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           uint32_t* sse);
-#define aom_highbd_10_variance64x16 aom_highbd_10_variance64x16_c
-
-unsigned int aom_highbd_10_variance64x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_10_variance64x32 aom_highbd_10_variance64x32_c
-
-unsigned int aom_highbd_10_variance64x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_10_variance64x64 aom_highbd_10_variance64x64_c
-
-unsigned int aom_highbd_10_variance8x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_10_variance8x16 aom_highbd_10_variance8x16_c
-
-unsigned int aom_highbd_10_variance8x32_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_10_variance8x32 aom_highbd_10_variance8x32_c
-
-unsigned int aom_highbd_10_variance8x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance8x4 aom_highbd_10_variance8x4_c
-
-unsigned int aom_highbd_10_variance8x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance8x8 aom_highbd_10_variance8x8_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x128 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x64 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x16 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x16_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x32 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x32_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x4 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x4_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x64 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x64_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x8 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x8_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x16 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x16_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x32 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x32_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x64 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x64_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x8 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x8_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x16 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x4 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x4_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x8 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x128 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x16 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x16_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x32 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x32_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x64 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x64_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x16 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x16_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x32 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x32_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x4 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x4_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x8 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x8_c
-
-void aom_highbd_12_get16x16var_c(const uint8_t* src_ptr,
-                                 int source_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride,
-                                 unsigned int* sse,
-                                 int* sum);
-#define aom_highbd_12_get16x16var aom_highbd_12_get16x16var_c
-
-void aom_highbd_12_get8x8var_c(const uint8_t* src_ptr,
-                               int source_stride,
-                               const uint8_t* ref_ptr,
-                               int ref_stride,
-                               unsigned int* sse,
-                               int* sum);
-#define aom_highbd_12_get8x8var aom_highbd_12_get8x8var_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance128x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance128x128 \
-  aom_highbd_12_masked_sub_pixel_variance128x128_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance128x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance128x64 \
-  aom_highbd_12_masked_sub_pixel_variance128x64_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance16x16 \
-  aom_highbd_12_masked_sub_pixel_variance16x16_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance16x32 \
-  aom_highbd_12_masked_sub_pixel_variance16x32_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance16x4 \
-  aom_highbd_12_masked_sub_pixel_variance16x4_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance16x64 \
-  aom_highbd_12_masked_sub_pixel_variance16x64_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance16x8 \
-  aom_highbd_12_masked_sub_pixel_variance16x8_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance32x16 \
-  aom_highbd_12_masked_sub_pixel_variance32x16_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance32x32 \
-  aom_highbd_12_masked_sub_pixel_variance32x32_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance32x64 \
-  aom_highbd_12_masked_sub_pixel_variance32x64_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance32x8 \
-  aom_highbd_12_masked_sub_pixel_variance32x8_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance4x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance4x16 \
-  aom_highbd_12_masked_sub_pixel_variance4x16_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance4x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance4x4 \
-  aom_highbd_12_masked_sub_pixel_variance4x4_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance4x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance4x8 \
-  aom_highbd_12_masked_sub_pixel_variance4x8_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance64x128 \
-  aom_highbd_12_masked_sub_pixel_variance64x128_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance64x16 \
-  aom_highbd_12_masked_sub_pixel_variance64x16_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance64x32 \
-  aom_highbd_12_masked_sub_pixel_variance64x32_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance64x64 \
-  aom_highbd_12_masked_sub_pixel_variance64x64_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance8x16 \
-  aom_highbd_12_masked_sub_pixel_variance8x16_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance8x32 \
-  aom_highbd_12_masked_sub_pixel_variance8x32_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance8x4 \
-  aom_highbd_12_masked_sub_pixel_variance8x4_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance8x8 \
-  aom_highbd_12_masked_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_12_mse16x16_c(const uint8_t* src_ptr,
-                                      int source_stride,
-                                      const uint8_t* ref_ptr,
-                                      int recon_stride,
-                                      unsigned int* sse);
-#define aom_highbd_12_mse16x16 aom_highbd_12_mse16x16_c
-
-unsigned int aom_highbd_12_mse16x8_c(const uint8_t* src_ptr,
-                                     int source_stride,
-                                     const uint8_t* ref_ptr,
-                                     int recon_stride,
-                                     unsigned int* sse);
-#define aom_highbd_12_mse16x8 aom_highbd_12_mse16x8_c
-
-unsigned int aom_highbd_12_mse8x16_c(const uint8_t* src_ptr,
-                                     int source_stride,
-                                     const uint8_t* ref_ptr,
-                                     int recon_stride,
-                                     unsigned int* sse);
-#define aom_highbd_12_mse8x16 aom_highbd_12_mse8x16_c
-
-unsigned int aom_highbd_12_mse8x8_c(const uint8_t* src_ptr,
-                                    int source_stride,
-                                    const uint8_t* ref_ptr,
-                                    int recon_stride,
-                                    unsigned int* sse);
-#define aom_highbd_12_mse8x8 aom_highbd_12_mse8x8_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance128x128_c(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            int xoffset,
-                                                            int yoffset,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance128x128 \
-  aom_highbd_12_obmc_sub_pixel_variance128x128_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance128x64_c(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance128x64 \
-  aom_highbd_12_obmc_sub_pixel_variance128x64_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance16x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance16x16 \
-  aom_highbd_12_obmc_sub_pixel_variance16x16_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance16x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance16x32 \
-  aom_highbd_12_obmc_sub_pixel_variance16x32_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance16x4_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance16x4 \
-  aom_highbd_12_obmc_sub_pixel_variance16x4_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance16x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance16x64 \
-  aom_highbd_12_obmc_sub_pixel_variance16x64_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance16x8_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance16x8 \
-  aom_highbd_12_obmc_sub_pixel_variance16x8_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance32x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance32x16 \
-  aom_highbd_12_obmc_sub_pixel_variance32x16_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance32x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance32x32 \
-  aom_highbd_12_obmc_sub_pixel_variance32x32_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance32x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance32x64 \
-  aom_highbd_12_obmc_sub_pixel_variance32x64_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance32x8_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance32x8 \
-  aom_highbd_12_obmc_sub_pixel_variance32x8_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance4x16_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance4x16 \
-  aom_highbd_12_obmc_sub_pixel_variance4x16_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance4x4_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance4x4 \
-  aom_highbd_12_obmc_sub_pixel_variance4x4_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance4x8_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance4x8 \
-  aom_highbd_12_obmc_sub_pixel_variance4x8_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance64x128_c(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance64x128 \
-  aom_highbd_12_obmc_sub_pixel_variance64x128_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance64x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance64x16 \
-  aom_highbd_12_obmc_sub_pixel_variance64x16_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance64x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance64x32 \
-  aom_highbd_12_obmc_sub_pixel_variance64x32_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance64x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance64x64 \
-  aom_highbd_12_obmc_sub_pixel_variance64x64_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance8x16_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance8x16 \
-  aom_highbd_12_obmc_sub_pixel_variance8x16_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance8x32_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance8x32 \
-  aom_highbd_12_obmc_sub_pixel_variance8x32_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance8x4_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance8x4 \
-  aom_highbd_12_obmc_sub_pixel_variance8x4_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance8x8_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance8x8 \
-  aom_highbd_12_obmc_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_12_obmc_variance128x128_c(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-#define aom_highbd_12_obmc_variance128x128 aom_highbd_12_obmc_variance128x128_c
-
-unsigned int aom_highbd_12_obmc_variance128x64_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-#define aom_highbd_12_obmc_variance128x64 aom_highbd_12_obmc_variance128x64_c
-
-unsigned int aom_highbd_12_obmc_variance16x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance16x16 aom_highbd_12_obmc_variance16x16_c
-
-unsigned int aom_highbd_12_obmc_variance16x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance16x32 aom_highbd_12_obmc_variance16x32_c
-
-unsigned int aom_highbd_12_obmc_variance16x4_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_12_obmc_variance16x4 aom_highbd_12_obmc_variance16x4_c
-
-unsigned int aom_highbd_12_obmc_variance16x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance16x64 aom_highbd_12_obmc_variance16x64_c
-
-unsigned int aom_highbd_12_obmc_variance16x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_12_obmc_variance16x8 aom_highbd_12_obmc_variance16x8_c
-
-unsigned int aom_highbd_12_obmc_variance32x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance32x16 aom_highbd_12_obmc_variance32x16_c
-
-unsigned int aom_highbd_12_obmc_variance32x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance32x32 aom_highbd_12_obmc_variance32x32_c
-
-unsigned int aom_highbd_12_obmc_variance32x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance32x64 aom_highbd_12_obmc_variance32x64_c
-
-unsigned int aom_highbd_12_obmc_variance32x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_12_obmc_variance32x8 aom_highbd_12_obmc_variance32x8_c
-
-unsigned int aom_highbd_12_obmc_variance4x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_12_obmc_variance4x16 aom_highbd_12_obmc_variance4x16_c
-
-unsigned int aom_highbd_12_obmc_variance4x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_12_obmc_variance4x4 aom_highbd_12_obmc_variance4x4_c
-
-unsigned int aom_highbd_12_obmc_variance4x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_12_obmc_variance4x8 aom_highbd_12_obmc_variance4x8_c
-
-unsigned int aom_highbd_12_obmc_variance64x128_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-#define aom_highbd_12_obmc_variance64x128 aom_highbd_12_obmc_variance64x128_c
-
-unsigned int aom_highbd_12_obmc_variance64x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance64x16 aom_highbd_12_obmc_variance64x16_c
-
-unsigned int aom_highbd_12_obmc_variance64x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance64x32 aom_highbd_12_obmc_variance64x32_c
-
-unsigned int aom_highbd_12_obmc_variance64x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance64x64 aom_highbd_12_obmc_variance64x64_c
-
-unsigned int aom_highbd_12_obmc_variance8x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_12_obmc_variance8x16 aom_highbd_12_obmc_variance8x16_c
-
-unsigned int aom_highbd_12_obmc_variance8x32_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_12_obmc_variance8x32 aom_highbd_12_obmc_variance8x32_c
-
-unsigned int aom_highbd_12_obmc_variance8x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_12_obmc_variance8x4 aom_highbd_12_obmc_variance8x4_c
-
-unsigned int aom_highbd_12_obmc_variance8x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_12_obmc_variance8x8 aom_highbd_12_obmc_variance8x8_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance128x128 \
-  aom_highbd_12_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance128x64 \
-  aom_highbd_12_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance16x16 \
-  aom_highbd_12_sub_pixel_avg_variance16x16_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance16x32 \
-  aom_highbd_12_sub_pixel_avg_variance16x32_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x4_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance16x4 \
-  aom_highbd_12_sub_pixel_avg_variance16x4_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance16x64 \
-  aom_highbd_12_sub_pixel_avg_variance16x64_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance16x8 \
-  aom_highbd_12_sub_pixel_avg_variance16x8_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance32x16 \
-  aom_highbd_12_sub_pixel_avg_variance32x16_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance32x32 \
-  aom_highbd_12_sub_pixel_avg_variance32x32_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance32x64 \
-  aom_highbd_12_sub_pixel_avg_variance32x64_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x8_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance32x8 \
-  aom_highbd_12_sub_pixel_avg_variance32x8_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance4x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance4x16 \
-  aom_highbd_12_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance4x4 \
-  aom_highbd_12_sub_pixel_avg_variance4x4_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance4x8 \
-  aom_highbd_12_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance64x128 \
-  aom_highbd_12_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance64x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance64x16 \
-  aom_highbd_12_sub_pixel_avg_variance64x16_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance64x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance64x32 \
-  aom_highbd_12_sub_pixel_avg_variance64x32_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance64x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance64x64 \
-  aom_highbd_12_sub_pixel_avg_variance64x64_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance8x16 \
-  aom_highbd_12_sub_pixel_avg_variance8x16_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x32_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance8x32 \
-  aom_highbd_12_sub_pixel_avg_variance8x32_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance8x4 \
-  aom_highbd_12_sub_pixel_avg_variance8x4_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance8x8 \
-  aom_highbd_12_sub_pixel_avg_variance8x8_c
-
-uint32_t aom_highbd_12_sub_pixel_variance128x128_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance128x128 \
-  aom_highbd_12_sub_pixel_variance128x128_c
-
-uint32_t aom_highbd_12_sub_pixel_variance128x64_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance128x64 \
-  aom_highbd_12_sub_pixel_variance128x64_c
-
-uint32_t aom_highbd_12_sub_pixel_variance16x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance16x16 \
-  aom_highbd_12_sub_pixel_variance16x16_c
-
-uint32_t aom_highbd_12_sub_pixel_variance16x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance16x32 \
-  aom_highbd_12_sub_pixel_variance16x32_c
-
-uint32_t aom_highbd_12_sub_pixel_variance16x4_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance16x4 \
-  aom_highbd_12_sub_pixel_variance16x4_c
-
-uint32_t aom_highbd_12_sub_pixel_variance16x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance16x64 \
-  aom_highbd_12_sub_pixel_variance16x64_c
-
-uint32_t aom_highbd_12_sub_pixel_variance16x8_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance16x8 \
-  aom_highbd_12_sub_pixel_variance16x8_c
-
-uint32_t aom_highbd_12_sub_pixel_variance32x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance32x16 \
-  aom_highbd_12_sub_pixel_variance32x16_c
-
-uint32_t aom_highbd_12_sub_pixel_variance32x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance32x32 \
-  aom_highbd_12_sub_pixel_variance32x32_c
-
-uint32_t aom_highbd_12_sub_pixel_variance32x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance32x64 \
-  aom_highbd_12_sub_pixel_variance32x64_c
-
-uint32_t aom_highbd_12_sub_pixel_variance32x8_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance32x8 \
-  aom_highbd_12_sub_pixel_variance32x8_c
-
-uint32_t aom_highbd_12_sub_pixel_variance4x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance4x16 \
-  aom_highbd_12_sub_pixel_variance4x16_c
-
-uint32_t aom_highbd_12_sub_pixel_variance4x4_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance4x4 \
-  aom_highbd_12_sub_pixel_variance4x4_c
-
-uint32_t aom_highbd_12_sub_pixel_variance4x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance4x8 \
-  aom_highbd_12_sub_pixel_variance4x8_c
-
-uint32_t aom_highbd_12_sub_pixel_variance64x128_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance64x128 \
-  aom_highbd_12_sub_pixel_variance64x128_c
-
-uint32_t aom_highbd_12_sub_pixel_variance64x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance64x16 \
-  aom_highbd_12_sub_pixel_variance64x16_c
-
-uint32_t aom_highbd_12_sub_pixel_variance64x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance64x32 \
-  aom_highbd_12_sub_pixel_variance64x32_c
-
-uint32_t aom_highbd_12_sub_pixel_variance64x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance64x64 \
-  aom_highbd_12_sub_pixel_variance64x64_c
-
-uint32_t aom_highbd_12_sub_pixel_variance8x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance8x16 \
-  aom_highbd_12_sub_pixel_variance8x16_c
-
-uint32_t aom_highbd_12_sub_pixel_variance8x32_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance8x32 \
-  aom_highbd_12_sub_pixel_variance8x32_c
-
-uint32_t aom_highbd_12_sub_pixel_variance8x4_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance8x4 \
-  aom_highbd_12_sub_pixel_variance8x4_c
-
-uint32_t aom_highbd_12_sub_pixel_variance8x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance8x8 \
-  aom_highbd_12_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_12_variance128x128_c(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-#define aom_highbd_12_variance128x128 aom_highbd_12_variance128x128_c
-
-unsigned int aom_highbd_12_variance128x64_c(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-#define aom_highbd_12_variance128x64 aom_highbd_12_variance128x64_c
-
-unsigned int aom_highbd_12_variance16x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_12_variance16x16 aom_highbd_12_variance16x16_c
-
-unsigned int aom_highbd_12_variance16x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_12_variance16x32 aom_highbd_12_variance16x32_c
-
-unsigned int aom_highbd_12_variance16x4_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_12_variance16x4 aom_highbd_12_variance16x4_c
-
-unsigned int aom_highbd_12_variance16x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           uint32_t* sse);
-#define aom_highbd_12_variance16x64 aom_highbd_12_variance16x64_c
-
-unsigned int aom_highbd_12_variance16x8_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_12_variance16x8 aom_highbd_12_variance16x8_c
-
-unsigned int aom_highbd_12_variance2x2_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance2x2 aom_highbd_12_variance2x2_c
-
-unsigned int aom_highbd_12_variance2x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance2x4 aom_highbd_12_variance2x4_c
-
-unsigned int aom_highbd_12_variance32x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_12_variance32x16 aom_highbd_12_variance32x16_c
-
-unsigned int aom_highbd_12_variance32x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_12_variance32x32 aom_highbd_12_variance32x32_c
-
-unsigned int aom_highbd_12_variance32x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_12_variance32x64 aom_highbd_12_variance32x64_c
-
-unsigned int aom_highbd_12_variance32x8_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_12_variance32x8 aom_highbd_12_variance32x8_c
-
-unsigned int aom_highbd_12_variance4x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_12_variance4x16 aom_highbd_12_variance4x16_c
-
-unsigned int aom_highbd_12_variance4x2_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance4x2 aom_highbd_12_variance4x2_c
-
-unsigned int aom_highbd_12_variance4x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance4x4 aom_highbd_12_variance4x4_c
-
-unsigned int aom_highbd_12_variance4x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance4x8 aom_highbd_12_variance4x8_c
-
-unsigned int aom_highbd_12_variance64x128_c(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-#define aom_highbd_12_variance64x128 aom_highbd_12_variance64x128_c
-
-unsigned int aom_highbd_12_variance64x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           uint32_t* sse);
-#define aom_highbd_12_variance64x16 aom_highbd_12_variance64x16_c
-
-unsigned int aom_highbd_12_variance64x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_12_variance64x32 aom_highbd_12_variance64x32_c
-
-unsigned int aom_highbd_12_variance64x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_12_variance64x64 aom_highbd_12_variance64x64_c
-
-unsigned int aom_highbd_12_variance8x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_12_variance8x16 aom_highbd_12_variance8x16_c
-
-unsigned int aom_highbd_12_variance8x32_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_12_variance8x32 aom_highbd_12_variance8x32_c
-
-unsigned int aom_highbd_12_variance8x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance8x4 aom_highbd_12_variance8x4_c
-
-unsigned int aom_highbd_12_variance8x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance8x8 aom_highbd_12_variance8x8_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x128 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x64 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x16 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x16_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x32 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x32_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x4 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x4_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x64 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x64_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x8 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x8_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x16 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x16_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x32 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x32_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x64 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x64_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x8 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x8_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x16 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x4 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x4_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x8 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x128 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x16 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x16_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x32 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x32_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x64 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x64_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x16 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x16_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x32 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x32_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x4 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x4_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x8 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x8_c
-
-void aom_highbd_8_get16x16var_c(const uint8_t* src_ptr,
-                                int source_stride,
-                                const uint8_t* ref_ptr,
-                                int ref_stride,
-                                unsigned int* sse,
-                                int* sum);
-#define aom_highbd_8_get16x16var aom_highbd_8_get16x16var_c
-
-void aom_highbd_8_get8x8var_c(const uint8_t* src_ptr,
-                              int source_stride,
-                              const uint8_t* ref_ptr,
-                              int ref_stride,
-                              unsigned int* sse,
-                              int* sum);
-#define aom_highbd_8_get8x8var aom_highbd_8_get8x8var_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance128x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance128x128 \
-  aom_highbd_8_masked_sub_pixel_variance128x128_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance128x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance128x64 \
-  aom_highbd_8_masked_sub_pixel_variance128x64_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance16x16 \
-  aom_highbd_8_masked_sub_pixel_variance16x16_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance16x32 \
-  aom_highbd_8_masked_sub_pixel_variance16x32_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance16x4 \
-  aom_highbd_8_masked_sub_pixel_variance16x4_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance16x64 \
-  aom_highbd_8_masked_sub_pixel_variance16x64_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance16x8 \
-  aom_highbd_8_masked_sub_pixel_variance16x8_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance32x16 \
-  aom_highbd_8_masked_sub_pixel_variance32x16_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance32x32 \
-  aom_highbd_8_masked_sub_pixel_variance32x32_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance32x64 \
-  aom_highbd_8_masked_sub_pixel_variance32x64_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance32x8 \
-  aom_highbd_8_masked_sub_pixel_variance32x8_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance4x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance4x16 \
-  aom_highbd_8_masked_sub_pixel_variance4x16_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance4x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance4x4 \
-  aom_highbd_8_masked_sub_pixel_variance4x4_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance4x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance4x8 \
-  aom_highbd_8_masked_sub_pixel_variance4x8_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance64x128 \
-  aom_highbd_8_masked_sub_pixel_variance64x128_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance64x16 \
-  aom_highbd_8_masked_sub_pixel_variance64x16_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance64x32 \
-  aom_highbd_8_masked_sub_pixel_variance64x32_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance64x64 \
-  aom_highbd_8_masked_sub_pixel_variance64x64_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance8x16 \
-  aom_highbd_8_masked_sub_pixel_variance8x16_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance8x32 \
-  aom_highbd_8_masked_sub_pixel_variance8x32_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance8x4 \
-  aom_highbd_8_masked_sub_pixel_variance8x4_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance8x8 \
-  aom_highbd_8_masked_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_8_mse16x16_c(const uint8_t* src_ptr,
-                                     int source_stride,
-                                     const uint8_t* ref_ptr,
-                                     int recon_stride,
-                                     unsigned int* sse);
-#define aom_highbd_8_mse16x16 aom_highbd_8_mse16x16_c
-
-unsigned int aom_highbd_8_mse16x8_c(const uint8_t* src_ptr,
-                                    int source_stride,
-                                    const uint8_t* ref_ptr,
-                                    int recon_stride,
-                                    unsigned int* sse);
-#define aom_highbd_8_mse16x8 aom_highbd_8_mse16x8_c
-
-unsigned int aom_highbd_8_mse8x16_c(const uint8_t* src_ptr,
-                                    int source_stride,
-                                    const uint8_t* ref_ptr,
-                                    int recon_stride,
-                                    unsigned int* sse);
-#define aom_highbd_8_mse8x16 aom_highbd_8_mse8x16_c
-
-unsigned int aom_highbd_8_mse8x8_c(const uint8_t* src_ptr,
-                                   int source_stride,
-                                   const uint8_t* ref_ptr,
-                                   int recon_stride,
-                                   unsigned int* sse);
-#define aom_highbd_8_mse8x8 aom_highbd_8_mse8x8_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance128x128 \
-  aom_highbd_8_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance128x64 \
-  aom_highbd_8_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance16x16 \
-  aom_highbd_8_sub_pixel_avg_variance16x16_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x32_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance16x32 \
-  aom_highbd_8_sub_pixel_avg_variance16x32_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x4_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance16x4 \
-  aom_highbd_8_sub_pixel_avg_variance16x4_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x64_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance16x64 \
-  aom_highbd_8_sub_pixel_avg_variance16x64_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance16x8 \
-  aom_highbd_8_sub_pixel_avg_variance16x8_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance32x16 \
-  aom_highbd_8_sub_pixel_avg_variance32x16_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x32_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance32x32 \
-  aom_highbd_8_sub_pixel_avg_variance32x32_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x64_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance32x64 \
-  aom_highbd_8_sub_pixel_avg_variance32x64_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance32x8 \
-  aom_highbd_8_sub_pixel_avg_variance32x8_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance4x16_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance4x16 \
-  aom_highbd_8_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse,
-                                                  const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance4x4 \
-  aom_highbd_8_sub_pixel_avg_variance4x4_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse,
-                                                  const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance4x8 \
-  aom_highbd_8_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance64x128 \
-  aom_highbd_8_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance64x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance64x16 \
-  aom_highbd_8_sub_pixel_avg_variance64x16_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance64x32_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance64x32 \
-  aom_highbd_8_sub_pixel_avg_variance64x32_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance64x64_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance64x64 \
-  aom_highbd_8_sub_pixel_avg_variance64x64_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance8x16 \
-  aom_highbd_8_sub_pixel_avg_variance8x16_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x32_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance8x32 \
-  aom_highbd_8_sub_pixel_avg_variance8x32_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse,
-                                                  const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance8x4 \
-  aom_highbd_8_sub_pixel_avg_variance8x4_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse,
-                                                  const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance8x8 \
-  aom_highbd_8_sub_pixel_avg_variance8x8_c
-
-uint32_t aom_highbd_8_sub_pixel_variance128x128_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance128x128 \
-  aom_highbd_8_sub_pixel_variance128x128_c
-
-uint32_t aom_highbd_8_sub_pixel_variance128x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance128x64 \
-  aom_highbd_8_sub_pixel_variance128x64_c
-
-uint32_t aom_highbd_8_sub_pixel_variance16x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance16x16 \
-  aom_highbd_8_sub_pixel_variance16x16_c
-
-uint32_t aom_highbd_8_sub_pixel_variance16x32_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance16x32 \
-  aom_highbd_8_sub_pixel_variance16x32_c
-
-uint32_t aom_highbd_8_sub_pixel_variance16x4_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance16x4 \
-  aom_highbd_8_sub_pixel_variance16x4_c
-
-uint32_t aom_highbd_8_sub_pixel_variance16x64_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance16x64 \
-  aom_highbd_8_sub_pixel_variance16x64_c
-
-uint32_t aom_highbd_8_sub_pixel_variance16x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance16x8 \
-  aom_highbd_8_sub_pixel_variance16x8_c
-
-uint32_t aom_highbd_8_sub_pixel_variance32x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance32x16 \
-  aom_highbd_8_sub_pixel_variance32x16_c
-
-uint32_t aom_highbd_8_sub_pixel_variance32x32_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance32x32 \
-  aom_highbd_8_sub_pixel_variance32x32_c
-
-uint32_t aom_highbd_8_sub_pixel_variance32x64_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance32x64 \
-  aom_highbd_8_sub_pixel_variance32x64_c
-
-uint32_t aom_highbd_8_sub_pixel_variance32x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance32x8 \
-  aom_highbd_8_sub_pixel_variance32x8_c
-
-uint32_t aom_highbd_8_sub_pixel_variance4x16_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance4x16 \
-  aom_highbd_8_sub_pixel_variance4x16_c
-
-uint32_t aom_highbd_8_sub_pixel_variance4x4_c(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance4x4 aom_highbd_8_sub_pixel_variance4x4_c
-
-uint32_t aom_highbd_8_sub_pixel_variance4x8_c(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance4x8 aom_highbd_8_sub_pixel_variance4x8_c
-
-uint32_t aom_highbd_8_sub_pixel_variance64x128_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance64x128 \
-  aom_highbd_8_sub_pixel_variance64x128_c
-
-uint32_t aom_highbd_8_sub_pixel_variance64x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance64x16 \
-  aom_highbd_8_sub_pixel_variance64x16_c
-
-uint32_t aom_highbd_8_sub_pixel_variance64x32_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance64x32 \
-  aom_highbd_8_sub_pixel_variance64x32_c
-
-uint32_t aom_highbd_8_sub_pixel_variance64x64_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance64x64 \
-  aom_highbd_8_sub_pixel_variance64x64_c
-
-uint32_t aom_highbd_8_sub_pixel_variance8x16_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance8x16 \
-  aom_highbd_8_sub_pixel_variance8x16_c
-
-uint32_t aom_highbd_8_sub_pixel_variance8x32_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance8x32 \
-  aom_highbd_8_sub_pixel_variance8x32_c
-
-uint32_t aom_highbd_8_sub_pixel_variance8x4_c(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance8x4 aom_highbd_8_sub_pixel_variance8x4_c
-
-uint32_t aom_highbd_8_sub_pixel_variance8x8_c(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance8x8 aom_highbd_8_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_8_variance128x128_c(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-#define aom_highbd_8_variance128x128 aom_highbd_8_variance128x128_c
-
-unsigned int aom_highbd_8_variance128x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_8_variance128x64 aom_highbd_8_variance128x64_c
-
-unsigned int aom_highbd_8_variance16x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_8_variance16x16 aom_highbd_8_variance16x16_c
-
-unsigned int aom_highbd_8_variance16x32_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_8_variance16x32 aom_highbd_8_variance16x32_c
-
-unsigned int aom_highbd_8_variance16x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         uint32_t* sse);
-#define aom_highbd_8_variance16x4 aom_highbd_8_variance16x4_c
-
-unsigned int aom_highbd_8_variance16x64_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_8_variance16x64 aom_highbd_8_variance16x64_c
-
-unsigned int aom_highbd_8_variance16x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_8_variance16x8 aom_highbd_8_variance16x8_c
-
-unsigned int aom_highbd_8_variance2x2_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance2x2 aom_highbd_8_variance2x2_c
-
-unsigned int aom_highbd_8_variance2x4_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance2x4 aom_highbd_8_variance2x4_c
-
-unsigned int aom_highbd_8_variance32x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_8_variance32x16 aom_highbd_8_variance32x16_c
-
-unsigned int aom_highbd_8_variance32x32_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_8_variance32x32 aom_highbd_8_variance32x32_c
-
-unsigned int aom_highbd_8_variance32x64_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_8_variance32x64 aom_highbd_8_variance32x64_c
-
-unsigned int aom_highbd_8_variance32x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         uint32_t* sse);
-#define aom_highbd_8_variance32x8 aom_highbd_8_variance32x8_c
-
-unsigned int aom_highbd_8_variance4x16_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         uint32_t* sse);
-#define aom_highbd_8_variance4x16 aom_highbd_8_variance4x16_c
-
-unsigned int aom_highbd_8_variance4x2_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance4x2 aom_highbd_8_variance4x2_c
-
-unsigned int aom_highbd_8_variance4x4_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance4x4 aom_highbd_8_variance4x4_c
-
-unsigned int aom_highbd_8_variance4x8_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance4x8 aom_highbd_8_variance4x8_c
-
-unsigned int aom_highbd_8_variance64x128_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_8_variance64x128 aom_highbd_8_variance64x128_c
-
-unsigned int aom_highbd_8_variance64x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_8_variance64x16 aom_highbd_8_variance64x16_c
-
-unsigned int aom_highbd_8_variance64x32_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_8_variance64x32 aom_highbd_8_variance64x32_c
-
-unsigned int aom_highbd_8_variance64x64_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_8_variance64x64 aom_highbd_8_variance64x64_c
-
-unsigned int aom_highbd_8_variance8x16_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_8_variance8x16 aom_highbd_8_variance8x16_c
-
-unsigned int aom_highbd_8_variance8x32_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         uint32_t* sse);
-#define aom_highbd_8_variance8x32 aom_highbd_8_variance8x32_c
-
-unsigned int aom_highbd_8_variance8x4_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance8x4 aom_highbd_8_variance8x4_c
-
-unsigned int aom_highbd_8_variance8x8_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance8x8 aom_highbd_8_variance8x8_c
-
-unsigned int aom_highbd_avg_4x4_c(const uint8_t*, int p);
-#define aom_highbd_avg_4x4 aom_highbd_avg_4x4_c
-
-unsigned int aom_highbd_avg_8x8_c(const uint8_t*, int p);
-#define aom_highbd_avg_8x8 aom_highbd_avg_8x8_c
-
-void aom_highbd_blend_a64_d16_mask_c(uint8_t* dst,
-                                     uint32_t dst_stride,
-                                     const CONV_BUF_TYPE* src0,
-                                     uint32_t src0_stride,
-                                     const CONV_BUF_TYPE* src1,
-                                     uint32_t src1_stride,
-                                     const uint8_t* mask,
-                                     uint32_t mask_stride,
-                                     int w,
-                                     int h,
-                                     int subw,
-                                     int subh,
-                                     ConvolveParams* conv_params,
-                                     const int bd);
-#define aom_highbd_blend_a64_d16_mask aom_highbd_blend_a64_d16_mask_c
-
-void aom_highbd_blend_a64_hmask_c(uint8_t* dst,
-                                  uint32_t dst_stride,
-                                  const uint8_t* src0,
-                                  uint32_t src0_stride,
-                                  const uint8_t* src1,
-                                  uint32_t src1_stride,
-                                  const uint8_t* mask,
-                                  int w,
-                                  int h,
-                                  int bd);
-#define aom_highbd_blend_a64_hmask aom_highbd_blend_a64_hmask_c
-
-void aom_highbd_blend_a64_mask_c(uint8_t* dst,
-                                 uint32_t dst_stride,
-                                 const uint8_t* src0,
-                                 uint32_t src0_stride,
-                                 const uint8_t* src1,
-                                 uint32_t src1_stride,
-                                 const uint8_t* mask,
-                                 uint32_t mask_stride,
-                                 int w,
-                                 int h,
-                                 int subw,
-                                 int subh,
-                                 int bd);
-#define aom_highbd_blend_a64_mask aom_highbd_blend_a64_mask_c
-
-void aom_highbd_blend_a64_vmask_c(uint8_t* dst,
-                                  uint32_t dst_stride,
-                                  const uint8_t* src0,
-                                  uint32_t src0_stride,
-                                  const uint8_t* src1,
-                                  uint32_t src1_stride,
-                                  const uint8_t* mask,
-                                  int w,
-                                  int h,
-                                  int bd);
-#define aom_highbd_blend_a64_vmask aom_highbd_blend_a64_vmask_c
-
-void aom_highbd_comp_avg_pred_c(uint8_t* comp_pred8,
-                                const uint8_t* pred8,
-                                int width,
-                                int height,
-                                const uint8_t* ref8,
-                                int ref_stride);
-#define aom_highbd_comp_avg_pred aom_highbd_comp_avg_pred_c
-
-void aom_highbd_comp_avg_upsampled_pred_c(MACROBLOCKD* xd,
-                                          const struct AV1Common* const cm,
-                                          int mi_row,
-                                          int mi_col,
-                                          const MV* const mv,
-                                          uint8_t* comp_pred8,
-                                          const uint8_t* pred8,
-                                          int width,
-                                          int height,
-                                          int subpel_x_q3,
-                                          int subpel_y_q3,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          int bd,
-                                          int subpel_search);
-#define aom_highbd_comp_avg_upsampled_pred aom_highbd_comp_avg_upsampled_pred_c
-
-void aom_highbd_comp_mask_pred_c(uint8_t* comp_pred,
-                                 const uint8_t* pred8,
-                                 int width,
-                                 int height,
-                                 const uint8_t* ref8,
-                                 int ref_stride,
-                                 const uint8_t* mask,
-                                 int mask_stride,
-                                 int invert_mask);
-#define aom_highbd_comp_mask_pred aom_highbd_comp_mask_pred_c
-
-void aom_highbd_convolve8_horiz_c(const uint8_t* src,
-                                  ptrdiff_t src_stride,
-                                  uint8_t* dst,
-                                  ptrdiff_t dst_stride,
-                                  const int16_t* filter_x,
-                                  int x_step_q4,
-                                  const int16_t* filter_y,
-                                  int y_step_q4,
-                                  int w,
-                                  int h,
-                                  int bd);
-#define aom_highbd_convolve8_horiz aom_highbd_convolve8_horiz_c
-
-void aom_highbd_convolve8_vert_c(const uint8_t* src,
-                                 ptrdiff_t src_stride,
-                                 uint8_t* dst,
-                                 ptrdiff_t dst_stride,
-                                 const int16_t* filter_x,
-                                 int x_step_q4,
-                                 const int16_t* filter_y,
-                                 int y_step_q4,
-                                 int w,
-                                 int h,
-                                 int bd);
-#define aom_highbd_convolve8_vert aom_highbd_convolve8_vert_c
-
-void aom_highbd_convolve_copy_c(const uint16_t* src,
-                                ptrdiff_t src_stride,
-                                uint16_t* dst,
-                                ptrdiff_t dst_stride,
-                                int w,
-                                int h);
-#define aom_highbd_convolve_copy aom_highbd_convolve_copy_c
-
-void aom_highbd_dc_128_predictor_16x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_16x16 aom_highbd_dc_128_predictor_16x16_c
-
-void aom_highbd_dc_128_predictor_16x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_16x32 aom_highbd_dc_128_predictor_16x32_c
-
-void aom_highbd_dc_128_predictor_16x4_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_16x4 aom_highbd_dc_128_predictor_16x4_c
-
-void aom_highbd_dc_128_predictor_16x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_16x64 aom_highbd_dc_128_predictor_16x64_c
-
-void aom_highbd_dc_128_predictor_16x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_16x8 aom_highbd_dc_128_predictor_16x8_c
-
-void aom_highbd_dc_128_predictor_2x2_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_128_predictor_2x2 aom_highbd_dc_128_predictor_2x2_c
-
-void aom_highbd_dc_128_predictor_32x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_32x16 aom_highbd_dc_128_predictor_32x16_c
-
-void aom_highbd_dc_128_predictor_32x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_32x32 aom_highbd_dc_128_predictor_32x32_c
-
-void aom_highbd_dc_128_predictor_32x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_32x64 aom_highbd_dc_128_predictor_32x64_c
-
-void aom_highbd_dc_128_predictor_32x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_32x8 aom_highbd_dc_128_predictor_32x8_c
-
-void aom_highbd_dc_128_predictor_4x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_4x16 aom_highbd_dc_128_predictor_4x16_c
-
-void aom_highbd_dc_128_predictor_4x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_128_predictor_4x4 aom_highbd_dc_128_predictor_4x4_c
-
-void aom_highbd_dc_128_predictor_4x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_128_predictor_4x8 aom_highbd_dc_128_predictor_4x8_c
-
-void aom_highbd_dc_128_predictor_64x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_64x16 aom_highbd_dc_128_predictor_64x16_c
-
-void aom_highbd_dc_128_predictor_64x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_64x32 aom_highbd_dc_128_predictor_64x32_c
-
-void aom_highbd_dc_128_predictor_64x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_64x64 aom_highbd_dc_128_predictor_64x64_c
-
-void aom_highbd_dc_128_predictor_8x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_8x16 aom_highbd_dc_128_predictor_8x16_c
-
-void aom_highbd_dc_128_predictor_8x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_8x32 aom_highbd_dc_128_predictor_8x32_c
-
-void aom_highbd_dc_128_predictor_8x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_128_predictor_8x4 aom_highbd_dc_128_predictor_8x4_c
-
-void aom_highbd_dc_128_predictor_8x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_128_predictor_8x8 aom_highbd_dc_128_predictor_8x8_c
-
-void aom_highbd_dc_left_predictor_16x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_16x16 aom_highbd_dc_left_predictor_16x16_c
-
-void aom_highbd_dc_left_predictor_16x32_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_16x32 aom_highbd_dc_left_predictor_16x32_c
-
-void aom_highbd_dc_left_predictor_16x4_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_16x4 aom_highbd_dc_left_predictor_16x4_c
-
-void aom_highbd_dc_left_predictor_16x64_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_16x64 aom_highbd_dc_left_predictor_16x64_c
-
-void aom_highbd_dc_left_predictor_16x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_16x8 aom_highbd_dc_left_predictor_16x8_c
-
-void aom_highbd_dc_left_predictor_2x2_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_left_predictor_2x2 aom_highbd_dc_left_predictor_2x2_c
-
-void aom_highbd_dc_left_predictor_32x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_32x16 aom_highbd_dc_left_predictor_32x16_c
-
-void aom_highbd_dc_left_predictor_32x32_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_32x32 aom_highbd_dc_left_predictor_32x32_c
-
-void aom_highbd_dc_left_predictor_32x64_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_32x64 aom_highbd_dc_left_predictor_32x64_c
-
-void aom_highbd_dc_left_predictor_32x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_32x8 aom_highbd_dc_left_predictor_32x8_c
-
-void aom_highbd_dc_left_predictor_4x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_4x16 aom_highbd_dc_left_predictor_4x16_c
-
-void aom_highbd_dc_left_predictor_4x4_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_left_predictor_4x4 aom_highbd_dc_left_predictor_4x4_c
-
-void aom_highbd_dc_left_predictor_4x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_left_predictor_4x8 aom_highbd_dc_left_predictor_4x8_c
-
-void aom_highbd_dc_left_predictor_64x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_64x16 aom_highbd_dc_left_predictor_64x16_c
-
-void aom_highbd_dc_left_predictor_64x32_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_64x32 aom_highbd_dc_left_predictor_64x32_c
-
-void aom_highbd_dc_left_predictor_64x64_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_64x64 aom_highbd_dc_left_predictor_64x64_c
-
-void aom_highbd_dc_left_predictor_8x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_8x16 aom_highbd_dc_left_predictor_8x16_c
-
-void aom_highbd_dc_left_predictor_8x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_8x32 aom_highbd_dc_left_predictor_8x32_c
-
-void aom_highbd_dc_left_predictor_8x4_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_left_predictor_8x4 aom_highbd_dc_left_predictor_8x4_c
-
-void aom_highbd_dc_left_predictor_8x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_left_predictor_8x8 aom_highbd_dc_left_predictor_8x8_c
-
-void aom_highbd_dc_predictor_16x16_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-void aom_highbd_dc_predictor_16x16_neon(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_predictor_16x16 aom_highbd_dc_predictor_16x16_neon
-
-void aom_highbd_dc_predictor_16x32_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_16x32 aom_highbd_dc_predictor_16x32_c
-
-void aom_highbd_dc_predictor_16x4_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_16x4 aom_highbd_dc_predictor_16x4_c
-
-void aom_highbd_dc_predictor_16x64_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_16x64 aom_highbd_dc_predictor_16x64_c
-
-void aom_highbd_dc_predictor_16x8_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_16x8 aom_highbd_dc_predictor_16x8_c
-
-void aom_highbd_dc_predictor_2x2_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_dc_predictor_2x2 aom_highbd_dc_predictor_2x2_c
-
-void aom_highbd_dc_predictor_32x16_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_32x16 aom_highbd_dc_predictor_32x16_c
-
-void aom_highbd_dc_predictor_32x32_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-void aom_highbd_dc_predictor_32x32_neon(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_predictor_32x32 aom_highbd_dc_predictor_32x32_neon
-
-void aom_highbd_dc_predictor_32x64_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_32x64 aom_highbd_dc_predictor_32x64_c
-
-void aom_highbd_dc_predictor_32x8_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_32x8 aom_highbd_dc_predictor_32x8_c
-
-void aom_highbd_dc_predictor_4x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_4x16 aom_highbd_dc_predictor_4x16_c
-
-void aom_highbd_dc_predictor_4x4_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-void aom_highbd_dc_predictor_4x4_neon(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_dc_predictor_4x4 aom_highbd_dc_predictor_4x4_neon
-
-void aom_highbd_dc_predictor_4x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_dc_predictor_4x8 aom_highbd_dc_predictor_4x8_c
-
-void aom_highbd_dc_predictor_64x16_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_64x16 aom_highbd_dc_predictor_64x16_c
-
-void aom_highbd_dc_predictor_64x32_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_64x32 aom_highbd_dc_predictor_64x32_c
-
-void aom_highbd_dc_predictor_64x64_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-void aom_highbd_dc_predictor_64x64_neon(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_predictor_64x64 aom_highbd_dc_predictor_64x64_neon
-
-void aom_highbd_dc_predictor_8x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_8x16 aom_highbd_dc_predictor_8x16_c
-
-void aom_highbd_dc_predictor_8x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_8x32 aom_highbd_dc_predictor_8x32_c
-
-void aom_highbd_dc_predictor_8x4_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_dc_predictor_8x4 aom_highbd_dc_predictor_8x4_c
-
-void aom_highbd_dc_predictor_8x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-void aom_highbd_dc_predictor_8x8_neon(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_dc_predictor_8x8 aom_highbd_dc_predictor_8x8_neon
-
-void aom_highbd_dc_top_predictor_16x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_16x16 aom_highbd_dc_top_predictor_16x16_c
-
-void aom_highbd_dc_top_predictor_16x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_16x32 aom_highbd_dc_top_predictor_16x32_c
-
-void aom_highbd_dc_top_predictor_16x4_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_16x4 aom_highbd_dc_top_predictor_16x4_c
-
-void aom_highbd_dc_top_predictor_16x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_16x64 aom_highbd_dc_top_predictor_16x64_c
-
-void aom_highbd_dc_top_predictor_16x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_16x8 aom_highbd_dc_top_predictor_16x8_c
-
-void aom_highbd_dc_top_predictor_2x2_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_top_predictor_2x2 aom_highbd_dc_top_predictor_2x2_c
-
-void aom_highbd_dc_top_predictor_32x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_32x16 aom_highbd_dc_top_predictor_32x16_c
-
-void aom_highbd_dc_top_predictor_32x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_32x32 aom_highbd_dc_top_predictor_32x32_c
-
-void aom_highbd_dc_top_predictor_32x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_32x64 aom_highbd_dc_top_predictor_32x64_c
-
-void aom_highbd_dc_top_predictor_32x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_32x8 aom_highbd_dc_top_predictor_32x8_c
-
-void aom_highbd_dc_top_predictor_4x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_4x16 aom_highbd_dc_top_predictor_4x16_c
-
-void aom_highbd_dc_top_predictor_4x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_top_predictor_4x4 aom_highbd_dc_top_predictor_4x4_c
-
-void aom_highbd_dc_top_predictor_4x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_top_predictor_4x8 aom_highbd_dc_top_predictor_4x8_c
-
-void aom_highbd_dc_top_predictor_64x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_64x16 aom_highbd_dc_top_predictor_64x16_c
-
-void aom_highbd_dc_top_predictor_64x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_64x32 aom_highbd_dc_top_predictor_64x32_c
-
-void aom_highbd_dc_top_predictor_64x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_64x64 aom_highbd_dc_top_predictor_64x64_c
-
-void aom_highbd_dc_top_predictor_8x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_8x16 aom_highbd_dc_top_predictor_8x16_c
-
-void aom_highbd_dc_top_predictor_8x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_8x32 aom_highbd_dc_top_predictor_8x32_c
-
-void aom_highbd_dc_top_predictor_8x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_top_predictor_8x4 aom_highbd_dc_top_predictor_8x4_c
-
-void aom_highbd_dc_top_predictor_8x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_top_predictor_8x8 aom_highbd_dc_top_predictor_8x8_c
-
-void aom_highbd_dist_wtd_comp_avg_pred_c(uint8_t* comp_pred8,
-                                         const uint8_t* pred8,
-                                         int width,
-                                         int height,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_comp_avg_pred aom_highbd_dist_wtd_comp_avg_pred_c
-
-void aom_highbd_dist_wtd_comp_avg_upsampled_pred_c(
-    MACROBLOCKD* xd,
-    const struct AV1Common* const cm,
-    int mi_row,
-    int mi_col,
-    const MV* const mv,
-    uint8_t* comp_pred8,
-    const uint8_t* pred8,
-    int width,
-    int height,
-    int subpel_x_q3,
-    int subpel_y_q3,
-    const uint8_t* ref8,
-    int ref_stride,
-    int bd,
-    const DIST_WTD_COMP_PARAMS* jcp_param,
-    int subpel_search);
-#define aom_highbd_dist_wtd_comp_avg_upsampled_pred \
-  aom_highbd_dist_wtd_comp_avg_upsampled_pred_c
-
-unsigned int aom_highbd_dist_wtd_sad128x128_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad128x128_avg aom_highbd_dist_wtd_sad128x128_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad128x64_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad128x64_avg aom_highbd_dist_wtd_sad128x64_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad16x16_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad16x16_avg aom_highbd_dist_wtd_sad16x16_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad16x32_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad16x32_avg aom_highbd_dist_wtd_sad16x32_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad16x4_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad16x4_avg aom_highbd_dist_wtd_sad16x4_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad16x64_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad16x64_avg aom_highbd_dist_wtd_sad16x64_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad16x8_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad16x8_avg aom_highbd_dist_wtd_sad16x8_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad32x16_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad32x16_avg aom_highbd_dist_wtd_sad32x16_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad32x32_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad32x32_avg aom_highbd_dist_wtd_sad32x32_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad32x64_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad32x64_avg aom_highbd_dist_wtd_sad32x64_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad32x8_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad32x8_avg aom_highbd_dist_wtd_sad32x8_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad4x16_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad4x16_avg aom_highbd_dist_wtd_sad4x16_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad4x4_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad4x4_avg aom_highbd_dist_wtd_sad4x4_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad4x8_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad4x8_avg aom_highbd_dist_wtd_sad4x8_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad64x128_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad64x128_avg aom_highbd_dist_wtd_sad64x128_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad64x16_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad64x16_avg aom_highbd_dist_wtd_sad64x16_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad64x32_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad64x32_avg aom_highbd_dist_wtd_sad64x32_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad64x64_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad64x64_avg aom_highbd_dist_wtd_sad64x64_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad8x16_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad8x16_avg aom_highbd_dist_wtd_sad8x16_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad8x32_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad8x32_avg aom_highbd_dist_wtd_sad8x32_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad8x4_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad8x4_avg aom_highbd_dist_wtd_sad8x4_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad8x8_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad8x8_avg aom_highbd_dist_wtd_sad8x8_avg_c
-
-void aom_highbd_fdct8x8_c(const int16_t* input, tran_low_t* output, int stride);
-#define aom_highbd_fdct8x8 aom_highbd_fdct8x8_c
-
-void aom_highbd_h_predictor_16x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_16x16 aom_highbd_h_predictor_16x16_c
-
-void aom_highbd_h_predictor_16x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_16x32 aom_highbd_h_predictor_16x32_c
-
-void aom_highbd_h_predictor_16x4_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_16x4 aom_highbd_h_predictor_16x4_c
-
-void aom_highbd_h_predictor_16x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_16x64 aom_highbd_h_predictor_16x64_c
-
-void aom_highbd_h_predictor_16x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_16x8 aom_highbd_h_predictor_16x8_c
-
-void aom_highbd_h_predictor_2x2_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_h_predictor_2x2 aom_highbd_h_predictor_2x2_c
-
-void aom_highbd_h_predictor_32x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_32x16 aom_highbd_h_predictor_32x16_c
-
-void aom_highbd_h_predictor_32x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_32x32 aom_highbd_h_predictor_32x32_c
-
-void aom_highbd_h_predictor_32x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_32x64 aom_highbd_h_predictor_32x64_c
-
-void aom_highbd_h_predictor_32x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_32x8 aom_highbd_h_predictor_32x8_c
-
-void aom_highbd_h_predictor_4x16_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_4x16 aom_highbd_h_predictor_4x16_c
-
-void aom_highbd_h_predictor_4x4_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_h_predictor_4x4 aom_highbd_h_predictor_4x4_c
-
-void aom_highbd_h_predictor_4x8_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_h_predictor_4x8 aom_highbd_h_predictor_4x8_c
-
-void aom_highbd_h_predictor_64x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_64x16 aom_highbd_h_predictor_64x16_c
-
-void aom_highbd_h_predictor_64x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_64x32 aom_highbd_h_predictor_64x32_c
-
-void aom_highbd_h_predictor_64x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_64x64 aom_highbd_h_predictor_64x64_c
-
-void aom_highbd_h_predictor_8x16_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_8x16 aom_highbd_h_predictor_8x16_c
-
-void aom_highbd_h_predictor_8x32_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_8x32 aom_highbd_h_predictor_8x32_c
-
-void aom_highbd_h_predictor_8x4_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_h_predictor_8x4 aom_highbd_h_predictor_8x4_c
-
-void aom_highbd_h_predictor_8x8_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_h_predictor_8x8 aom_highbd_h_predictor_8x8_c
-
-void aom_highbd_hadamard_16x16_c(const int16_t* src_diff,
-                                 ptrdiff_t src_stride,
-                                 tran_low_t* coeff);
-#define aom_highbd_hadamard_16x16 aom_highbd_hadamard_16x16_c
-
-void aom_highbd_hadamard_32x32_c(const int16_t* src_diff,
-                                 ptrdiff_t src_stride,
-                                 tran_low_t* coeff);
-#define aom_highbd_hadamard_32x32 aom_highbd_hadamard_32x32_c
-
-void aom_highbd_hadamard_8x8_c(const int16_t* src_diff,
-                               ptrdiff_t src_stride,
-                               tran_low_t* coeff);
-#define aom_highbd_hadamard_8x8 aom_highbd_hadamard_8x8_c
-
-void aom_highbd_lpf_horizontal_14_c(uint16_t* s,
-                                    int pitch,
-                                    const uint8_t* blimit,
-                                    const uint8_t* limit,
-                                    const uint8_t* thresh,
-                                    int bd);
-#define aom_highbd_lpf_horizontal_14 aom_highbd_lpf_horizontal_14_c
-
-void aom_highbd_lpf_horizontal_14_dual_c(uint16_t* s,
-                                         int pitch,
-                                         const uint8_t* blimit0,
-                                         const uint8_t* limit0,
-                                         const uint8_t* thresh0,
-                                         const uint8_t* blimit1,
-                                         const uint8_t* limit1,
-                                         const uint8_t* thresh1,
-                                         int bd);
-#define aom_highbd_lpf_horizontal_14_dual aom_highbd_lpf_horizontal_14_dual_c
-
-void aom_highbd_lpf_horizontal_4_c(uint16_t* s,
-                                   int pitch,
-                                   const uint8_t* blimit,
-                                   const uint8_t* limit,
-                                   const uint8_t* thresh,
-                                   int bd);
-#define aom_highbd_lpf_horizontal_4 aom_highbd_lpf_horizontal_4_c
-
-void aom_highbd_lpf_horizontal_4_dual_c(uint16_t* s,
-                                        int pitch,
-                                        const uint8_t* blimit0,
-                                        const uint8_t* limit0,
-                                        const uint8_t* thresh0,
-                                        const uint8_t* blimit1,
-                                        const uint8_t* limit1,
-                                        const uint8_t* thresh1,
-                                        int bd);
-#define aom_highbd_lpf_horizontal_4_dual aom_highbd_lpf_horizontal_4_dual_c
-
-void aom_highbd_lpf_horizontal_6_c(uint16_t* s,
-                                   int pitch,
-                                   const uint8_t* blimit,
-                                   const uint8_t* limit,
-                                   const uint8_t* thresh,
-                                   int bd);
-#define aom_highbd_lpf_horizontal_6 aom_highbd_lpf_horizontal_6_c
-
-void aom_highbd_lpf_horizontal_6_dual_c(uint16_t* s,
-                                        int pitch,
-                                        const uint8_t* blimit0,
-                                        const uint8_t* limit0,
-                                        const uint8_t* thresh0,
-                                        const uint8_t* blimit1,
-                                        const uint8_t* limit1,
-                                        const uint8_t* thresh1,
-                                        int bd);
-#define aom_highbd_lpf_horizontal_6_dual aom_highbd_lpf_horizontal_6_dual_c
-
-void aom_highbd_lpf_horizontal_8_c(uint16_t* s,
-                                   int pitch,
-                                   const uint8_t* blimit,
-                                   const uint8_t* limit,
-                                   const uint8_t* thresh,
-                                   int bd);
-#define aom_highbd_lpf_horizontal_8 aom_highbd_lpf_horizontal_8_c
-
-void aom_highbd_lpf_horizontal_8_dual_c(uint16_t* s,
-                                        int pitch,
-                                        const uint8_t* blimit0,
-                                        const uint8_t* limit0,
-                                        const uint8_t* thresh0,
-                                        const uint8_t* blimit1,
-                                        const uint8_t* limit1,
-                                        const uint8_t* thresh1,
-                                        int bd);
-#define aom_highbd_lpf_horizontal_8_dual aom_highbd_lpf_horizontal_8_dual_c
-
-void aom_highbd_lpf_vertical_14_c(uint16_t* s,
-                                  int pitch,
-                                  const uint8_t* blimit,
-                                  const uint8_t* limit,
-                                  const uint8_t* thresh,
-                                  int bd);
-#define aom_highbd_lpf_vertical_14 aom_highbd_lpf_vertical_14_c
-
-void aom_highbd_lpf_vertical_14_dual_c(uint16_t* s,
-                                       int pitch,
-                                       const uint8_t* blimit0,
-                                       const uint8_t* limit0,
-                                       const uint8_t* thresh0,
-                                       const uint8_t* blimit1,
-                                       const uint8_t* limit1,
-                                       const uint8_t* thresh1,
-                                       int bd);
-#define aom_highbd_lpf_vertical_14_dual aom_highbd_lpf_vertical_14_dual_c
-
-void aom_highbd_lpf_vertical_4_c(uint16_t* s,
-                                 int pitch,
-                                 const uint8_t* blimit,
-                                 const uint8_t* limit,
-                                 const uint8_t* thresh,
-                                 int bd);
-#define aom_highbd_lpf_vertical_4 aom_highbd_lpf_vertical_4_c
-
-void aom_highbd_lpf_vertical_4_dual_c(uint16_t* s,
-                                      int pitch,
-                                      const uint8_t* blimit0,
-                                      const uint8_t* limit0,
-                                      const uint8_t* thresh0,
-                                      const uint8_t* blimit1,
-                                      const uint8_t* limit1,
-                                      const uint8_t* thresh1,
-                                      int bd);
-#define aom_highbd_lpf_vertical_4_dual aom_highbd_lpf_vertical_4_dual_c
-
-void aom_highbd_lpf_vertical_6_c(uint16_t* s,
-                                 int pitch,
-                                 const uint8_t* blimit,
-                                 const uint8_t* limit,
-                                 const uint8_t* thresh,
-                                 int bd);
-#define aom_highbd_lpf_vertical_6 aom_highbd_lpf_vertical_6_c
-
-void aom_highbd_lpf_vertical_6_dual_c(uint16_t* s,
-                                      int pitch,
-                                      const uint8_t* blimit0,
-                                      const uint8_t* limit0,
-                                      const uint8_t* thresh0,
-                                      const uint8_t* blimit1,
-                                      const uint8_t* limit1,
-                                      const uint8_t* thresh1,
-                                      int bd);
-#define aom_highbd_lpf_vertical_6_dual aom_highbd_lpf_vertical_6_dual_c
-
-void aom_highbd_lpf_vertical_8_c(uint16_t* s,
-                                 int pitch,
-                                 const uint8_t* blimit,
-                                 const uint8_t* limit,
-                                 const uint8_t* thresh,
-                                 int bd);
-#define aom_highbd_lpf_vertical_8 aom_highbd_lpf_vertical_8_c
-
-void aom_highbd_lpf_vertical_8_dual_c(uint16_t* s,
-                                      int pitch,
-                                      const uint8_t* blimit0,
-                                      const uint8_t* limit0,
-                                      const uint8_t* thresh0,
-                                      const uint8_t* blimit1,
-                                      const uint8_t* limit1,
-                                      const uint8_t* thresh1,
-                                      int bd);
-#define aom_highbd_lpf_vertical_8_dual aom_highbd_lpf_vertical_8_dual_c
-
-unsigned int aom_highbd_masked_sad128x128_c(const uint8_t* src8,
-                                            int src_stride,
-                                            const uint8_t* ref8,
-                                            int ref_stride,
-                                            const uint8_t* second_pred8,
-                                            const uint8_t* msk,
-                                            int msk_stride,
-                                            int invert_mask);
-#define aom_highbd_masked_sad128x128 aom_highbd_masked_sad128x128_c
-
-unsigned int aom_highbd_masked_sad128x64_c(const uint8_t* src8,
-                                           int src_stride,
-                                           const uint8_t* ref8,
-                                           int ref_stride,
-                                           const uint8_t* second_pred8,
-                                           const uint8_t* msk,
-                                           int msk_stride,
-                                           int invert_mask);
-#define aom_highbd_masked_sad128x64 aom_highbd_masked_sad128x64_c
-
-unsigned int aom_highbd_masked_sad16x16_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad16x16 aom_highbd_masked_sad16x16_c
-
-unsigned int aom_highbd_masked_sad16x32_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad16x32 aom_highbd_masked_sad16x32_c
-
-unsigned int aom_highbd_masked_sad16x4_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-#define aom_highbd_masked_sad16x4 aom_highbd_masked_sad16x4_c
-
-unsigned int aom_highbd_masked_sad16x64_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad16x64 aom_highbd_masked_sad16x64_c
-
-unsigned int aom_highbd_masked_sad16x8_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-#define aom_highbd_masked_sad16x8 aom_highbd_masked_sad16x8_c
-
-unsigned int aom_highbd_masked_sad32x16_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad32x16 aom_highbd_masked_sad32x16_c
-
-unsigned int aom_highbd_masked_sad32x32_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad32x32 aom_highbd_masked_sad32x32_c
-
-unsigned int aom_highbd_masked_sad32x64_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad32x64 aom_highbd_masked_sad32x64_c
-
-unsigned int aom_highbd_masked_sad32x8_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-#define aom_highbd_masked_sad32x8 aom_highbd_masked_sad32x8_c
-
-unsigned int aom_highbd_masked_sad4x16_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-#define aom_highbd_masked_sad4x16 aom_highbd_masked_sad4x16_c
-
-unsigned int aom_highbd_masked_sad4x4_c(const uint8_t* src8,
-                                        int src_stride,
-                                        const uint8_t* ref8,
-                                        int ref_stride,
-                                        const uint8_t* second_pred8,
-                                        const uint8_t* msk,
-                                        int msk_stride,
-                                        int invert_mask);
-#define aom_highbd_masked_sad4x4 aom_highbd_masked_sad4x4_c
-
-unsigned int aom_highbd_masked_sad4x8_c(const uint8_t* src8,
-                                        int src_stride,
-                                        const uint8_t* ref8,
-                                        int ref_stride,
-                                        const uint8_t* second_pred8,
-                                        const uint8_t* msk,
-                                        int msk_stride,
-                                        int invert_mask);
-#define aom_highbd_masked_sad4x8 aom_highbd_masked_sad4x8_c
-
-unsigned int aom_highbd_masked_sad64x128_c(const uint8_t* src8,
-                                           int src_stride,
-                                           const uint8_t* ref8,
-                                           int ref_stride,
-                                           const uint8_t* second_pred8,
-                                           const uint8_t* msk,
-                                           int msk_stride,
-                                           int invert_mask);
-#define aom_highbd_masked_sad64x128 aom_highbd_masked_sad64x128_c
-
-unsigned int aom_highbd_masked_sad64x16_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad64x16 aom_highbd_masked_sad64x16_c
-
-unsigned int aom_highbd_masked_sad64x32_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad64x32 aom_highbd_masked_sad64x32_c
-
-unsigned int aom_highbd_masked_sad64x64_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad64x64 aom_highbd_masked_sad64x64_c
-
-unsigned int aom_highbd_masked_sad8x16_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-#define aom_highbd_masked_sad8x16 aom_highbd_masked_sad8x16_c
-
-unsigned int aom_highbd_masked_sad8x32_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-#define aom_highbd_masked_sad8x32 aom_highbd_masked_sad8x32_c
-
-unsigned int aom_highbd_masked_sad8x4_c(const uint8_t* src8,
-                                        int src_stride,
-                                        const uint8_t* ref8,
-                                        int ref_stride,
-                                        const uint8_t* second_pred8,
-                                        const uint8_t* msk,
-                                        int msk_stride,
-                                        int invert_mask);
-#define aom_highbd_masked_sad8x4 aom_highbd_masked_sad8x4_c
-
-unsigned int aom_highbd_masked_sad8x8_c(const uint8_t* src8,
-                                        int src_stride,
-                                        const uint8_t* ref8,
-                                        int ref_stride,
-                                        const uint8_t* second_pred8,
-                                        const uint8_t* msk,
-                                        int msk_stride,
-                                        int invert_mask);
-#define aom_highbd_masked_sad8x8 aom_highbd_masked_sad8x8_c
-
-void aom_highbd_minmax_8x8_c(const uint8_t* s,
-                             int p,
-                             const uint8_t* d,
-                             int dp,
-                             int* min,
-                             int* max);
-#define aom_highbd_minmax_8x8 aom_highbd_minmax_8x8_c
-
-unsigned int aom_highbd_obmc_sad128x128_c(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask);
-#define aom_highbd_obmc_sad128x128 aom_highbd_obmc_sad128x128_c
-
-unsigned int aom_highbd_obmc_sad128x64_c(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask);
-#define aom_highbd_obmc_sad128x64 aom_highbd_obmc_sad128x64_c
-
-unsigned int aom_highbd_obmc_sad16x16_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad16x16 aom_highbd_obmc_sad16x16_c
-
-unsigned int aom_highbd_obmc_sad16x32_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad16x32 aom_highbd_obmc_sad16x32_c
-
-unsigned int aom_highbd_obmc_sad16x4_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-#define aom_highbd_obmc_sad16x4 aom_highbd_obmc_sad16x4_c
-
-unsigned int aom_highbd_obmc_sad16x64_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad16x64 aom_highbd_obmc_sad16x64_c
-
-unsigned int aom_highbd_obmc_sad16x8_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-#define aom_highbd_obmc_sad16x8 aom_highbd_obmc_sad16x8_c
-
-unsigned int aom_highbd_obmc_sad32x16_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad32x16 aom_highbd_obmc_sad32x16_c
-
-unsigned int aom_highbd_obmc_sad32x32_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad32x32 aom_highbd_obmc_sad32x32_c
-
-unsigned int aom_highbd_obmc_sad32x64_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad32x64 aom_highbd_obmc_sad32x64_c
-
-unsigned int aom_highbd_obmc_sad32x8_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-#define aom_highbd_obmc_sad32x8 aom_highbd_obmc_sad32x8_c
-
-unsigned int aom_highbd_obmc_sad4x16_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-#define aom_highbd_obmc_sad4x16 aom_highbd_obmc_sad4x16_c
-
-unsigned int aom_highbd_obmc_sad4x4_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-#define aom_highbd_obmc_sad4x4 aom_highbd_obmc_sad4x4_c
-
-unsigned int aom_highbd_obmc_sad4x8_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-#define aom_highbd_obmc_sad4x8 aom_highbd_obmc_sad4x8_c
-
-unsigned int aom_highbd_obmc_sad64x128_c(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask);
-#define aom_highbd_obmc_sad64x128 aom_highbd_obmc_sad64x128_c
-
-unsigned int aom_highbd_obmc_sad64x16_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad64x16 aom_highbd_obmc_sad64x16_c
-
-unsigned int aom_highbd_obmc_sad64x32_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad64x32 aom_highbd_obmc_sad64x32_c
-
-unsigned int aom_highbd_obmc_sad64x64_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad64x64 aom_highbd_obmc_sad64x64_c
-
-unsigned int aom_highbd_obmc_sad8x16_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-#define aom_highbd_obmc_sad8x16 aom_highbd_obmc_sad8x16_c
-
-unsigned int aom_highbd_obmc_sad8x32_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-#define aom_highbd_obmc_sad8x32 aom_highbd_obmc_sad8x32_c
-
-unsigned int aom_highbd_obmc_sad8x4_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-#define aom_highbd_obmc_sad8x4 aom_highbd_obmc_sad8x4_c
-
-unsigned int aom_highbd_obmc_sad8x8_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-#define aom_highbd_obmc_sad8x8 aom_highbd_obmc_sad8x8_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance128x128_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance128x128 \
-  aom_highbd_obmc_sub_pixel_variance128x128_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance128x64_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance128x64 \
-  aom_highbd_obmc_sub_pixel_variance128x64_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance16x16_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance16x16 \
-  aom_highbd_obmc_sub_pixel_variance16x16_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance16x32_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance16x32 \
-  aom_highbd_obmc_sub_pixel_variance16x32_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance16x4_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance16x4 \
-  aom_highbd_obmc_sub_pixel_variance16x4_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance16x64_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance16x64 \
-  aom_highbd_obmc_sub_pixel_variance16x64_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance16x8_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance16x8 \
-  aom_highbd_obmc_sub_pixel_variance16x8_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance32x16_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance32x16 \
-  aom_highbd_obmc_sub_pixel_variance32x16_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance32x32_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance32x32 \
-  aom_highbd_obmc_sub_pixel_variance32x32_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance32x64_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance32x64 \
-  aom_highbd_obmc_sub_pixel_variance32x64_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance32x8_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance32x8 \
-  aom_highbd_obmc_sub_pixel_variance32x8_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance4x16_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance4x16 \
-  aom_highbd_obmc_sub_pixel_variance4x16_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance4x4_c(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance4x4 \
-  aom_highbd_obmc_sub_pixel_variance4x4_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance4x8_c(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance4x8 \
-  aom_highbd_obmc_sub_pixel_variance4x8_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance64x128_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance64x128 \
-  aom_highbd_obmc_sub_pixel_variance64x128_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance64x16_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance64x16 \
-  aom_highbd_obmc_sub_pixel_variance64x16_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance64x32_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance64x32 \
-  aom_highbd_obmc_sub_pixel_variance64x32_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance64x64_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance64x64 \
-  aom_highbd_obmc_sub_pixel_variance64x64_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance8x16_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance8x16 \
-  aom_highbd_obmc_sub_pixel_variance8x16_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance8x32_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance8x32 \
-  aom_highbd_obmc_sub_pixel_variance8x32_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance8x4_c(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance8x4 \
-  aom_highbd_obmc_sub_pixel_variance8x4_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance8x8_c(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance8x8 \
-  aom_highbd_obmc_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_obmc_variance128x128_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_obmc_variance128x128 aom_highbd_obmc_variance128x128_c
-
-unsigned int aom_highbd_obmc_variance128x64_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_obmc_variance128x64 aom_highbd_obmc_variance128x64_c
-
-unsigned int aom_highbd_obmc_variance16x16_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance16x16 aom_highbd_obmc_variance16x16_c
-
-unsigned int aom_highbd_obmc_variance16x32_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance16x32 aom_highbd_obmc_variance16x32_c
-
-unsigned int aom_highbd_obmc_variance16x4_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-#define aom_highbd_obmc_variance16x4 aom_highbd_obmc_variance16x4_c
-
-unsigned int aom_highbd_obmc_variance16x64_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance16x64 aom_highbd_obmc_variance16x64_c
-
-unsigned int aom_highbd_obmc_variance16x8_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-#define aom_highbd_obmc_variance16x8 aom_highbd_obmc_variance16x8_c
-
-unsigned int aom_highbd_obmc_variance32x16_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance32x16 aom_highbd_obmc_variance32x16_c
-
-unsigned int aom_highbd_obmc_variance32x32_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance32x32 aom_highbd_obmc_variance32x32_c
-
-unsigned int aom_highbd_obmc_variance32x64_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance32x64 aom_highbd_obmc_variance32x64_c
-
-unsigned int aom_highbd_obmc_variance32x8_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-#define aom_highbd_obmc_variance32x8 aom_highbd_obmc_variance32x8_c
-
-unsigned int aom_highbd_obmc_variance4x16_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-#define aom_highbd_obmc_variance4x16 aom_highbd_obmc_variance4x16_c
-
-unsigned int aom_highbd_obmc_variance4x4_c(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-#define aom_highbd_obmc_variance4x4 aom_highbd_obmc_variance4x4_c
-
-unsigned int aom_highbd_obmc_variance4x8_c(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-#define aom_highbd_obmc_variance4x8 aom_highbd_obmc_variance4x8_c
-
-unsigned int aom_highbd_obmc_variance64x128_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_obmc_variance64x128 aom_highbd_obmc_variance64x128_c
-
-unsigned int aom_highbd_obmc_variance64x16_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance64x16 aom_highbd_obmc_variance64x16_c
-
-unsigned int aom_highbd_obmc_variance64x32_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance64x32 aom_highbd_obmc_variance64x32_c
-
-unsigned int aom_highbd_obmc_variance64x64_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance64x64 aom_highbd_obmc_variance64x64_c
-
-unsigned int aom_highbd_obmc_variance8x16_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-#define aom_highbd_obmc_variance8x16 aom_highbd_obmc_variance8x16_c
-
-unsigned int aom_highbd_obmc_variance8x32_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-#define aom_highbd_obmc_variance8x32 aom_highbd_obmc_variance8x32_c
-
-unsigned int aom_highbd_obmc_variance8x4_c(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-#define aom_highbd_obmc_variance8x4 aom_highbd_obmc_variance8x4_c
-
-unsigned int aom_highbd_obmc_variance8x8_c(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-#define aom_highbd_obmc_variance8x8 aom_highbd_obmc_variance8x8_c
-
-void aom_highbd_paeth_predictor_16x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_16x16 aom_highbd_paeth_predictor_16x16_c
-
-void aom_highbd_paeth_predictor_16x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_16x32 aom_highbd_paeth_predictor_16x32_c
-
-void aom_highbd_paeth_predictor_16x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_16x4 aom_highbd_paeth_predictor_16x4_c
-
-void aom_highbd_paeth_predictor_16x64_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_16x64 aom_highbd_paeth_predictor_16x64_c
-
-void aom_highbd_paeth_predictor_16x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_16x8 aom_highbd_paeth_predictor_16x8_c
-
-void aom_highbd_paeth_predictor_2x2_c(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_paeth_predictor_2x2 aom_highbd_paeth_predictor_2x2_c
-
-void aom_highbd_paeth_predictor_32x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_32x16 aom_highbd_paeth_predictor_32x16_c
-
-void aom_highbd_paeth_predictor_32x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_32x32 aom_highbd_paeth_predictor_32x32_c
-
-void aom_highbd_paeth_predictor_32x64_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_32x64 aom_highbd_paeth_predictor_32x64_c
-
-void aom_highbd_paeth_predictor_32x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_32x8 aom_highbd_paeth_predictor_32x8_c
-
-void aom_highbd_paeth_predictor_4x16_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_4x16 aom_highbd_paeth_predictor_4x16_c
-
-void aom_highbd_paeth_predictor_4x4_c(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_paeth_predictor_4x4 aom_highbd_paeth_predictor_4x4_c
-
-void aom_highbd_paeth_predictor_4x8_c(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_paeth_predictor_4x8 aom_highbd_paeth_predictor_4x8_c
-
-void aom_highbd_paeth_predictor_64x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_64x16 aom_highbd_paeth_predictor_64x16_c
-
-void aom_highbd_paeth_predictor_64x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_64x32 aom_highbd_paeth_predictor_64x32_c
-
-void aom_highbd_paeth_predictor_64x64_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_64x64 aom_highbd_paeth_predictor_64x64_c
-
-void aom_highbd_paeth_predictor_8x16_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_8x16 aom_highbd_paeth_predictor_8x16_c
-
-void aom_highbd_paeth_predictor_8x32_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_8x32 aom_highbd_paeth_predictor_8x32_c
-
-void aom_highbd_paeth_predictor_8x4_c(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_paeth_predictor_8x4 aom_highbd_paeth_predictor_8x4_c
-
-void aom_highbd_paeth_predictor_8x8_c(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_paeth_predictor_8x8 aom_highbd_paeth_predictor_8x8_c
-
-void aom_highbd_quantize_b_c(const tran_low_t* coeff_ptr,
-                             intptr_t n_coeffs,
-                             const int16_t* zbin_ptr,
-                             const int16_t* round_ptr,
-                             const int16_t* quant_ptr,
-                             const int16_t* quant_shift_ptr,
-                             tran_low_t* qcoeff_ptr,
-                             tran_low_t* dqcoeff_ptr,
-                             const int16_t* dequant_ptr,
-                             uint16_t* eob_ptr,
-                             const int16_t* scan,
-                             const int16_t* iscan);
-#define aom_highbd_quantize_b aom_highbd_quantize_b_c
-
-void aom_highbd_quantize_b_32x32_c(const tran_low_t* coeff_ptr,
-                                   intptr_t n_coeffs,
-                                   const int16_t* zbin_ptr,
-                                   const int16_t* round_ptr,
-                                   const int16_t* quant_ptr,
-                                   const int16_t* quant_shift_ptr,
-                                   tran_low_t* qcoeff_ptr,
-                                   tran_low_t* dqcoeff_ptr,
-                                   const int16_t* dequant_ptr,
-                                   uint16_t* eob_ptr,
-                                   const int16_t* scan,
-                                   const int16_t* iscan);
-#define aom_highbd_quantize_b_32x32 aom_highbd_quantize_b_32x32_c
-
-void aom_highbd_quantize_b_32x32_adaptive_c(const tran_low_t* coeff_ptr,
-                                            intptr_t n_coeffs,
-                                            const int16_t* zbin_ptr,
-                                            const int16_t* round_ptr,
-                                            const int16_t* quant_ptr,
-                                            const int16_t* quant_shift_ptr,
-                                            tran_low_t* qcoeff_ptr,
-                                            tran_low_t* dqcoeff_ptr,
-                                            const int16_t* dequant_ptr,
-                                            uint16_t* eob_ptr,
-                                            const int16_t* scan,
-                                            const int16_t* iscan);
-#define aom_highbd_quantize_b_32x32_adaptive \
-  aom_highbd_quantize_b_32x32_adaptive_c
-
-void aom_highbd_quantize_b_64x64_c(const tran_low_t* coeff_ptr,
-                                   intptr_t n_coeffs,
-                                   const int16_t* zbin_ptr,
-                                   const int16_t* round_ptr,
-                                   const int16_t* quant_ptr,
-                                   const int16_t* quant_shift_ptr,
-                                   tran_low_t* qcoeff_ptr,
-                                   tran_low_t* dqcoeff_ptr,
-                                   const int16_t* dequant_ptr,
-                                   uint16_t* eob_ptr,
-                                   const int16_t* scan,
-                                   const int16_t* iscan);
-#define aom_highbd_quantize_b_64x64 aom_highbd_quantize_b_64x64_c
-
-void aom_highbd_quantize_b_64x64_adaptive_c(const tran_low_t* coeff_ptr,
-                                            intptr_t n_coeffs,
-                                            const int16_t* zbin_ptr,
-                                            const int16_t* round_ptr,
-                                            const int16_t* quant_ptr,
-                                            const int16_t* quant_shift_ptr,
-                                            tran_low_t* qcoeff_ptr,
-                                            tran_low_t* dqcoeff_ptr,
-                                            const int16_t* dequant_ptr,
-                                            uint16_t* eob_ptr,
-                                            const int16_t* scan,
-                                            const int16_t* iscan);
-#define aom_highbd_quantize_b_64x64_adaptive \
-  aom_highbd_quantize_b_64x64_adaptive_c
-
-void aom_highbd_quantize_b_adaptive_c(const tran_low_t* coeff_ptr,
-                                      intptr_t n_coeffs,
-                                      const int16_t* zbin_ptr,
-                                      const int16_t* round_ptr,
-                                      const int16_t* quant_ptr,
-                                      const int16_t* quant_shift_ptr,
-                                      tran_low_t* qcoeff_ptr,
-                                      tran_low_t* dqcoeff_ptr,
-                                      const int16_t* dequant_ptr,
-                                      uint16_t* eob_ptr,
-                                      const int16_t* scan,
-                                      const int16_t* iscan);
-#define aom_highbd_quantize_b_adaptive aom_highbd_quantize_b_adaptive_c
-
-unsigned int aom_highbd_sad128x128_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride);
-#define aom_highbd_sad128x128 aom_highbd_sad128x128_c
-
-unsigned int aom_highbd_sad128x128_avg_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         const uint8_t* second_pred);
-#define aom_highbd_sad128x128_avg aom_highbd_sad128x128_avg_c
-
-void aom_highbd_sad128x128x4d_c(const uint8_t* src_ptr,
-                                int src_stride,
-                                const uint8_t* const ref_ptr[],
-                                int ref_stride,
-                                uint32_t* sad_array);
-#define aom_highbd_sad128x128x4d aom_highbd_sad128x128x4d_c
-
-unsigned int aom_highbd_sad128x64_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* ref_ptr,
-                                    int ref_stride);
-#define aom_highbd_sad128x64 aom_highbd_sad128x64_c
-
-unsigned int aom_highbd_sad128x64_avg_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        const uint8_t* second_pred);
-#define aom_highbd_sad128x64_avg aom_highbd_sad128x64_avg_c
-
-void aom_highbd_sad128x64x4d_c(const uint8_t* src_ptr,
-                               int src_stride,
-                               const uint8_t* const ref_ptr[],
-                               int ref_stride,
-                               uint32_t* sad_array);
-#define aom_highbd_sad128x64x4d aom_highbd_sad128x64x4d_c
-
-unsigned int aom_highbd_sad16x16_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad16x16 aom_highbd_sad16x16_c
-
-unsigned int aom_highbd_sad16x16_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad16x16_avg aom_highbd_sad16x16_avg_c
-
-void aom_highbd_sad16x16x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad16x16x4d aom_highbd_sad16x16x4d_c
-
-unsigned int aom_highbd_sad16x32_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad16x32 aom_highbd_sad16x32_c
-
-unsigned int aom_highbd_sad16x32_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad16x32_avg aom_highbd_sad16x32_avg_c
-
-void aom_highbd_sad16x32x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad16x32x4d aom_highbd_sad16x32x4d_c
-
-unsigned int aom_highbd_sad16x4_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-#define aom_highbd_sad16x4 aom_highbd_sad16x4_c
-
-unsigned int aom_highbd_sad16x4_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-#define aom_highbd_sad16x4_avg aom_highbd_sad16x4_avg_c
-
-void aom_highbd_sad16x4x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-#define aom_highbd_sad16x4x4d aom_highbd_sad16x4x4d_c
-
-unsigned int aom_highbd_sad16x64_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad16x64 aom_highbd_sad16x64_c
-
-unsigned int aom_highbd_sad16x64_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad16x64_avg aom_highbd_sad16x64_avg_c
-
-void aom_highbd_sad16x64x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad16x64x4d aom_highbd_sad16x64x4d_c
-
-unsigned int aom_highbd_sad16x8_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-#define aom_highbd_sad16x8 aom_highbd_sad16x8_c
-
-unsigned int aom_highbd_sad16x8_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-#define aom_highbd_sad16x8_avg aom_highbd_sad16x8_avg_c
-
-void aom_highbd_sad16x8x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-#define aom_highbd_sad16x8x4d aom_highbd_sad16x8x4d_c
-
-unsigned int aom_highbd_sad32x16_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad32x16 aom_highbd_sad32x16_c
-
-unsigned int aom_highbd_sad32x16_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad32x16_avg aom_highbd_sad32x16_avg_c
-
-void aom_highbd_sad32x16x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad32x16x4d aom_highbd_sad32x16x4d_c
-
-unsigned int aom_highbd_sad32x32_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad32x32 aom_highbd_sad32x32_c
-
-unsigned int aom_highbd_sad32x32_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad32x32_avg aom_highbd_sad32x32_avg_c
-
-void aom_highbd_sad32x32x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad32x32x4d aom_highbd_sad32x32x4d_c
-
-unsigned int aom_highbd_sad32x64_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad32x64 aom_highbd_sad32x64_c
-
-unsigned int aom_highbd_sad32x64_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad32x64_avg aom_highbd_sad32x64_avg_c
-
-void aom_highbd_sad32x64x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad32x64x4d aom_highbd_sad32x64x4d_c
-
-unsigned int aom_highbd_sad32x8_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-#define aom_highbd_sad32x8 aom_highbd_sad32x8_c
-
-unsigned int aom_highbd_sad32x8_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-#define aom_highbd_sad32x8_avg aom_highbd_sad32x8_avg_c
-
-void aom_highbd_sad32x8x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-#define aom_highbd_sad32x8x4d aom_highbd_sad32x8x4d_c
-
-unsigned int aom_highbd_sad4x16_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-#define aom_highbd_sad4x16 aom_highbd_sad4x16_c
-
-unsigned int aom_highbd_sad4x16_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-#define aom_highbd_sad4x16_avg aom_highbd_sad4x16_avg_c
-
-void aom_highbd_sad4x16x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-#define aom_highbd_sad4x16x4d aom_highbd_sad4x16x4d_c
-
-unsigned int aom_highbd_sad4x4_c(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride);
-#define aom_highbd_sad4x4 aom_highbd_sad4x4_c
-
-unsigned int aom_highbd_sad4x4_avg_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride,
-                                     const uint8_t* second_pred);
-#define aom_highbd_sad4x4_avg aom_highbd_sad4x4_avg_c
-
-void aom_highbd_sad4x4x4d_c(const uint8_t* src_ptr,
-                            int src_stride,
-                            const uint8_t* const ref_ptr[],
-                            int ref_stride,
-                            uint32_t* sad_array);
-#define aom_highbd_sad4x4x4d aom_highbd_sad4x4x4d_c
-
-unsigned int aom_highbd_sad4x8_c(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride);
-#define aom_highbd_sad4x8 aom_highbd_sad4x8_c
-
-unsigned int aom_highbd_sad4x8_avg_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride,
-                                     const uint8_t* second_pred);
-#define aom_highbd_sad4x8_avg aom_highbd_sad4x8_avg_c
-
-void aom_highbd_sad4x8x4d_c(const uint8_t* src_ptr,
-                            int src_stride,
-                            const uint8_t* const ref_ptr[],
-                            int ref_stride,
-                            uint32_t* sad_array);
-#define aom_highbd_sad4x8x4d aom_highbd_sad4x8x4d_c
-
-unsigned int aom_highbd_sad64x128_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* ref_ptr,
-                                    int ref_stride);
-#define aom_highbd_sad64x128 aom_highbd_sad64x128_c
-
-unsigned int aom_highbd_sad64x128_avg_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        const uint8_t* second_pred);
-#define aom_highbd_sad64x128_avg aom_highbd_sad64x128_avg_c
-
-void aom_highbd_sad64x128x4d_c(const uint8_t* src_ptr,
-                               int src_stride,
-                               const uint8_t* const ref_ptr[],
-                               int ref_stride,
-                               uint32_t* sad_array);
-#define aom_highbd_sad64x128x4d aom_highbd_sad64x128x4d_c
-
-unsigned int aom_highbd_sad64x16_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad64x16 aom_highbd_sad64x16_c
-
-unsigned int aom_highbd_sad64x16_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad64x16_avg aom_highbd_sad64x16_avg_c
-
-void aom_highbd_sad64x16x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad64x16x4d aom_highbd_sad64x16x4d_c
-
-unsigned int aom_highbd_sad64x32_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad64x32 aom_highbd_sad64x32_c
-
-unsigned int aom_highbd_sad64x32_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad64x32_avg aom_highbd_sad64x32_avg_c
-
-void aom_highbd_sad64x32x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad64x32x4d aom_highbd_sad64x32x4d_c
-
-unsigned int aom_highbd_sad64x64_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad64x64 aom_highbd_sad64x64_c
-
-unsigned int aom_highbd_sad64x64_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad64x64_avg aom_highbd_sad64x64_avg_c
-
-void aom_highbd_sad64x64x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad64x64x4d aom_highbd_sad64x64x4d_c
-
-unsigned int aom_highbd_sad8x16_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-#define aom_highbd_sad8x16 aom_highbd_sad8x16_c
-
-unsigned int aom_highbd_sad8x16_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-#define aom_highbd_sad8x16_avg aom_highbd_sad8x16_avg_c
-
-void aom_highbd_sad8x16x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-#define aom_highbd_sad8x16x4d aom_highbd_sad8x16x4d_c
-
-unsigned int aom_highbd_sad8x32_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-#define aom_highbd_sad8x32 aom_highbd_sad8x32_c
-
-unsigned int aom_highbd_sad8x32_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-#define aom_highbd_sad8x32_avg aom_highbd_sad8x32_avg_c
-
-void aom_highbd_sad8x32x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-#define aom_highbd_sad8x32x4d aom_highbd_sad8x32x4d_c
-
-unsigned int aom_highbd_sad8x4_c(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride);
-#define aom_highbd_sad8x4 aom_highbd_sad8x4_c
-
-unsigned int aom_highbd_sad8x4_avg_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride,
-                                     const uint8_t* second_pred);
-#define aom_highbd_sad8x4_avg aom_highbd_sad8x4_avg_c
-
-void aom_highbd_sad8x4x4d_c(const uint8_t* src_ptr,
-                            int src_stride,
-                            const uint8_t* const ref_ptr[],
-                            int ref_stride,
-                            uint32_t* sad_array);
-#define aom_highbd_sad8x4x4d aom_highbd_sad8x4x4d_c
-
-unsigned int aom_highbd_sad8x8_c(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride);
-#define aom_highbd_sad8x8 aom_highbd_sad8x8_c
-
-unsigned int aom_highbd_sad8x8_avg_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride,
-                                     const uint8_t* second_pred);
-#define aom_highbd_sad8x8_avg aom_highbd_sad8x8_avg_c
-
-void aom_highbd_sad8x8x4d_c(const uint8_t* src_ptr,
-                            int src_stride,
-                            const uint8_t* const ref_ptr[],
-                            int ref_stride,
-                            uint32_t* sad_array);
-#define aom_highbd_sad8x8x4d aom_highbd_sad8x8x4d_c
-
-unsigned int aom_highbd_sad_skip_128x128_c(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride);
-#define aom_highbd_sad_skip_128x128 aom_highbd_sad_skip_128x128_c
-
-void aom_highbd_sad_skip_128x128x4d_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* const ref_ptr[],
-                                      int ref_stride,
-                                      uint32_t* sad_array);
-#define aom_highbd_sad_skip_128x128x4d aom_highbd_sad_skip_128x128x4d_c
-
-unsigned int aom_highbd_sad_skip_128x64_c(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride);
-#define aom_highbd_sad_skip_128x64 aom_highbd_sad_skip_128x64_c
-
-void aom_highbd_sad_skip_128x64x4d_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* const ref_ptr[],
-                                     int ref_stride,
-                                     uint32_t* sad_array);
-#define aom_highbd_sad_skip_128x64x4d aom_highbd_sad_skip_128x64x4d_c
-
-unsigned int aom_highbd_sad_skip_16x16_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_16x16 aom_highbd_sad_skip_16x16_c
-
-void aom_highbd_sad_skip_16x16x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_16x16x4d aom_highbd_sad_skip_16x16x4d_c
-
-unsigned int aom_highbd_sad_skip_16x32_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_16x32 aom_highbd_sad_skip_16x32_c
-
-void aom_highbd_sad_skip_16x32x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_16x32x4d aom_highbd_sad_skip_16x32x4d_c
-
-unsigned int aom_highbd_sad_skip_16x4_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-#define aom_highbd_sad_skip_16x4 aom_highbd_sad_skip_16x4_c
-
-void aom_highbd_sad_skip_16x4x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-#define aom_highbd_sad_skip_16x4x4d aom_highbd_sad_skip_16x4x4d_c
-
-unsigned int aom_highbd_sad_skip_16x64_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_16x64 aom_highbd_sad_skip_16x64_c
-
-void aom_highbd_sad_skip_16x64x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_16x64x4d aom_highbd_sad_skip_16x64x4d_c
-
-unsigned int aom_highbd_sad_skip_16x8_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-#define aom_highbd_sad_skip_16x8 aom_highbd_sad_skip_16x8_c
-
-void aom_highbd_sad_skip_16x8x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-#define aom_highbd_sad_skip_16x8x4d aom_highbd_sad_skip_16x8x4d_c
-
-unsigned int aom_highbd_sad_skip_32x16_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_32x16 aom_highbd_sad_skip_32x16_c
-
-void aom_highbd_sad_skip_32x16x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_32x16x4d aom_highbd_sad_skip_32x16x4d_c
-
-unsigned int aom_highbd_sad_skip_32x32_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_32x32 aom_highbd_sad_skip_32x32_c
-
-void aom_highbd_sad_skip_32x32x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_32x32x4d aom_highbd_sad_skip_32x32x4d_c
-
-unsigned int aom_highbd_sad_skip_32x64_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_32x64 aom_highbd_sad_skip_32x64_c
-
-void aom_highbd_sad_skip_32x64x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_32x64x4d aom_highbd_sad_skip_32x64x4d_c
-
-unsigned int aom_highbd_sad_skip_32x8_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-#define aom_highbd_sad_skip_32x8 aom_highbd_sad_skip_32x8_c
-
-void aom_highbd_sad_skip_32x8x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-#define aom_highbd_sad_skip_32x8x4d aom_highbd_sad_skip_32x8x4d_c
-
-unsigned int aom_highbd_sad_skip_4x16_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-#define aom_highbd_sad_skip_4x16 aom_highbd_sad_skip_4x16_c
-
-void aom_highbd_sad_skip_4x16x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-#define aom_highbd_sad_skip_4x16x4d aom_highbd_sad_skip_4x16x4d_c
-
-unsigned int aom_highbd_sad_skip_4x4_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride);
-#define aom_highbd_sad_skip_4x4 aom_highbd_sad_skip_4x4_c
-
-void aom_highbd_sad_skip_4x4x4d_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* const ref_ptr[],
-                                  int ref_stride,
-                                  uint32_t* sad_array);
-#define aom_highbd_sad_skip_4x4x4d aom_highbd_sad_skip_4x4x4d_c
-
-unsigned int aom_highbd_sad_skip_4x8_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride);
-#define aom_highbd_sad_skip_4x8 aom_highbd_sad_skip_4x8_c
-
-void aom_highbd_sad_skip_4x8x4d_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* const ref_ptr[],
-                                  int ref_stride,
-                                  uint32_t* sad_array);
-#define aom_highbd_sad_skip_4x8x4d aom_highbd_sad_skip_4x8x4d_c
-
-unsigned int aom_highbd_sad_skip_64x128_c(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride);
-#define aom_highbd_sad_skip_64x128 aom_highbd_sad_skip_64x128_c
-
-void aom_highbd_sad_skip_64x128x4d_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* const ref_ptr[],
-                                     int ref_stride,
-                                     uint32_t* sad_array);
-#define aom_highbd_sad_skip_64x128x4d aom_highbd_sad_skip_64x128x4d_c
-
-unsigned int aom_highbd_sad_skip_64x16_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_64x16 aom_highbd_sad_skip_64x16_c
-
-void aom_highbd_sad_skip_64x16x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_64x16x4d aom_highbd_sad_skip_64x16x4d_c
-
-unsigned int aom_highbd_sad_skip_64x32_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_64x32 aom_highbd_sad_skip_64x32_c
-
-void aom_highbd_sad_skip_64x32x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_64x32x4d aom_highbd_sad_skip_64x32x4d_c
-
-unsigned int aom_highbd_sad_skip_64x64_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_64x64 aom_highbd_sad_skip_64x64_c
-
-void aom_highbd_sad_skip_64x64x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_64x64x4d aom_highbd_sad_skip_64x64x4d_c
-
-unsigned int aom_highbd_sad_skip_8x16_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-#define aom_highbd_sad_skip_8x16 aom_highbd_sad_skip_8x16_c
-
-void aom_highbd_sad_skip_8x16x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-#define aom_highbd_sad_skip_8x16x4d aom_highbd_sad_skip_8x16x4d_c
-
-unsigned int aom_highbd_sad_skip_8x32_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-#define aom_highbd_sad_skip_8x32 aom_highbd_sad_skip_8x32_c
-
-void aom_highbd_sad_skip_8x32x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-#define aom_highbd_sad_skip_8x32x4d aom_highbd_sad_skip_8x32x4d_c
-
-unsigned int aom_highbd_sad_skip_8x4_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride);
-#define aom_highbd_sad_skip_8x4 aom_highbd_sad_skip_8x4_c
-
-void aom_highbd_sad_skip_8x4x4d_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* const ref_ptr[],
-                                  int ref_stride,
-                                  uint32_t* sad_array);
-#define aom_highbd_sad_skip_8x4x4d aom_highbd_sad_skip_8x4x4d_c
-
-unsigned int aom_highbd_sad_skip_8x8_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride);
-#define aom_highbd_sad_skip_8x8 aom_highbd_sad_skip_8x8_c
-
-void aom_highbd_sad_skip_8x8x4d_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* const ref_ptr[],
-                                  int ref_stride,
-                                  uint32_t* sad_array);
-#define aom_highbd_sad_skip_8x8x4d aom_highbd_sad_skip_8x8x4d_c
-
-void aom_highbd_smooth_h_predictor_16x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_16x16 \
-  aom_highbd_smooth_h_predictor_16x16_c
-
-void aom_highbd_smooth_h_predictor_16x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_16x32 \
-  aom_highbd_smooth_h_predictor_16x32_c
-
-void aom_highbd_smooth_h_predictor_16x4_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_16x4 aom_highbd_smooth_h_predictor_16x4_c
-
-void aom_highbd_smooth_h_predictor_16x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_16x64 \
-  aom_highbd_smooth_h_predictor_16x64_c
-
-void aom_highbd_smooth_h_predictor_16x8_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_16x8 aom_highbd_smooth_h_predictor_16x8_c
-
-void aom_highbd_smooth_h_predictor_2x2_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_h_predictor_2x2 aom_highbd_smooth_h_predictor_2x2_c
-
-void aom_highbd_smooth_h_predictor_32x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_32x16 \
-  aom_highbd_smooth_h_predictor_32x16_c
-
-void aom_highbd_smooth_h_predictor_32x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_32x32 \
-  aom_highbd_smooth_h_predictor_32x32_c
-
-void aom_highbd_smooth_h_predictor_32x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_32x64 \
-  aom_highbd_smooth_h_predictor_32x64_c
-
-void aom_highbd_smooth_h_predictor_32x8_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_32x8 aom_highbd_smooth_h_predictor_32x8_c
-
-void aom_highbd_smooth_h_predictor_4x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_4x16 aom_highbd_smooth_h_predictor_4x16_c
-
-void aom_highbd_smooth_h_predictor_4x4_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_h_predictor_4x4 aom_highbd_smooth_h_predictor_4x4_c
-
-void aom_highbd_smooth_h_predictor_4x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_h_predictor_4x8 aom_highbd_smooth_h_predictor_4x8_c
-
-void aom_highbd_smooth_h_predictor_64x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_64x16 \
-  aom_highbd_smooth_h_predictor_64x16_c
-
-void aom_highbd_smooth_h_predictor_64x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_64x32 \
-  aom_highbd_smooth_h_predictor_64x32_c
-
-void aom_highbd_smooth_h_predictor_64x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_64x64 \
-  aom_highbd_smooth_h_predictor_64x64_c
-
-void aom_highbd_smooth_h_predictor_8x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_8x16 aom_highbd_smooth_h_predictor_8x16_c
-
-void aom_highbd_smooth_h_predictor_8x32_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_8x32 aom_highbd_smooth_h_predictor_8x32_c
-
-void aom_highbd_smooth_h_predictor_8x4_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_h_predictor_8x4 aom_highbd_smooth_h_predictor_8x4_c
-
-void aom_highbd_smooth_h_predictor_8x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_h_predictor_8x8 aom_highbd_smooth_h_predictor_8x8_c
-
-void aom_highbd_smooth_predictor_16x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_16x16 aom_highbd_smooth_predictor_16x16_c
-
-void aom_highbd_smooth_predictor_16x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_16x32 aom_highbd_smooth_predictor_16x32_c
-
-void aom_highbd_smooth_predictor_16x4_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_16x4 aom_highbd_smooth_predictor_16x4_c
-
-void aom_highbd_smooth_predictor_16x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_16x64 aom_highbd_smooth_predictor_16x64_c
-
-void aom_highbd_smooth_predictor_16x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_16x8 aom_highbd_smooth_predictor_16x8_c
-
-void aom_highbd_smooth_predictor_2x2_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_smooth_predictor_2x2 aom_highbd_smooth_predictor_2x2_c
-
-void aom_highbd_smooth_predictor_32x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_32x16 aom_highbd_smooth_predictor_32x16_c
-
-void aom_highbd_smooth_predictor_32x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_32x32 aom_highbd_smooth_predictor_32x32_c
-
-void aom_highbd_smooth_predictor_32x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_32x64 aom_highbd_smooth_predictor_32x64_c
-
-void aom_highbd_smooth_predictor_32x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_32x8 aom_highbd_smooth_predictor_32x8_c
-
-void aom_highbd_smooth_predictor_4x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_4x16 aom_highbd_smooth_predictor_4x16_c
-
-void aom_highbd_smooth_predictor_4x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_smooth_predictor_4x4 aom_highbd_smooth_predictor_4x4_c
-
-void aom_highbd_smooth_predictor_4x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_smooth_predictor_4x8 aom_highbd_smooth_predictor_4x8_c
-
-void aom_highbd_smooth_predictor_64x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_64x16 aom_highbd_smooth_predictor_64x16_c
-
-void aom_highbd_smooth_predictor_64x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_64x32 aom_highbd_smooth_predictor_64x32_c
-
-void aom_highbd_smooth_predictor_64x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_64x64 aom_highbd_smooth_predictor_64x64_c
-
-void aom_highbd_smooth_predictor_8x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_8x16 aom_highbd_smooth_predictor_8x16_c
-
-void aom_highbd_smooth_predictor_8x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_8x32 aom_highbd_smooth_predictor_8x32_c
-
-void aom_highbd_smooth_predictor_8x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_smooth_predictor_8x4 aom_highbd_smooth_predictor_8x4_c
-
-void aom_highbd_smooth_predictor_8x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_smooth_predictor_8x8 aom_highbd_smooth_predictor_8x8_c
-
-void aom_highbd_smooth_v_predictor_16x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_16x16 \
-  aom_highbd_smooth_v_predictor_16x16_c
-
-void aom_highbd_smooth_v_predictor_16x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_16x32 \
-  aom_highbd_smooth_v_predictor_16x32_c
-
-void aom_highbd_smooth_v_predictor_16x4_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_16x4 aom_highbd_smooth_v_predictor_16x4_c
-
-void aom_highbd_smooth_v_predictor_16x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_16x64 \
-  aom_highbd_smooth_v_predictor_16x64_c
-
-void aom_highbd_smooth_v_predictor_16x8_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_16x8 aom_highbd_smooth_v_predictor_16x8_c
-
-void aom_highbd_smooth_v_predictor_2x2_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_v_predictor_2x2 aom_highbd_smooth_v_predictor_2x2_c
-
-void aom_highbd_smooth_v_predictor_32x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_32x16 \
-  aom_highbd_smooth_v_predictor_32x16_c
-
-void aom_highbd_smooth_v_predictor_32x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_32x32 \
-  aom_highbd_smooth_v_predictor_32x32_c
-
-void aom_highbd_smooth_v_predictor_32x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_32x64 \
-  aom_highbd_smooth_v_predictor_32x64_c
-
-void aom_highbd_smooth_v_predictor_32x8_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_32x8 aom_highbd_smooth_v_predictor_32x8_c
-
-void aom_highbd_smooth_v_predictor_4x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_4x16 aom_highbd_smooth_v_predictor_4x16_c
-
-void aom_highbd_smooth_v_predictor_4x4_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_v_predictor_4x4 aom_highbd_smooth_v_predictor_4x4_c
-
-void aom_highbd_smooth_v_predictor_4x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_v_predictor_4x8 aom_highbd_smooth_v_predictor_4x8_c
-
-void aom_highbd_smooth_v_predictor_64x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_64x16 \
-  aom_highbd_smooth_v_predictor_64x16_c
-
-void aom_highbd_smooth_v_predictor_64x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_64x32 \
-  aom_highbd_smooth_v_predictor_64x32_c
-
-void aom_highbd_smooth_v_predictor_64x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_64x64 \
-  aom_highbd_smooth_v_predictor_64x64_c
-
-void aom_highbd_smooth_v_predictor_8x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_8x16 aom_highbd_smooth_v_predictor_8x16_c
-
-void aom_highbd_smooth_v_predictor_8x32_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_8x32 aom_highbd_smooth_v_predictor_8x32_c
-
-void aom_highbd_smooth_v_predictor_8x4_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_v_predictor_8x4 aom_highbd_smooth_v_predictor_8x4_c
-
-void aom_highbd_smooth_v_predictor_8x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_v_predictor_8x8 aom_highbd_smooth_v_predictor_8x8_c
-
-int64_t aom_highbd_sse_c(const uint8_t* a8,
-                         int a_stride,
-                         const uint8_t* b8,
-                         int b_stride,
-                         int width,
-                         int height);
-int64_t aom_highbd_sse_neon(const uint8_t* a8,
-                            int a_stride,
-                            const uint8_t* b8,
-                            int b_stride,
-                            int width,
-                            int height);
-#define aom_highbd_sse aom_highbd_sse_neon
-
-void aom_highbd_subtract_block_c(int rows,
-                                 int cols,
-                                 int16_t* diff_ptr,
-                                 ptrdiff_t diff_stride,
-                                 const uint8_t* src_ptr,
-                                 ptrdiff_t src_stride,
-                                 const uint8_t* pred_ptr,
-                                 ptrdiff_t pred_stride,
-                                 int bd);
-#define aom_highbd_subtract_block aom_highbd_subtract_block_c
-
-void aom_highbd_upsampled_pred_c(MACROBLOCKD* xd,
-                                 const struct AV1Common* const cm,
-                                 int mi_row,
-                                 int mi_col,
-                                 const MV* const mv,
-                                 uint8_t* comp_pred8,
-                                 int width,
-                                 int height,
-                                 int subpel_x_q3,
-                                 int subpel_y_q3,
-                                 const uint8_t* ref8,
-                                 int ref_stride,
-                                 int bd,
-                                 int subpel_search);
-#define aom_highbd_upsampled_pred aom_highbd_upsampled_pred_c
-
-void aom_highbd_v_predictor_16x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_16x16 aom_highbd_v_predictor_16x16_c
-
-void aom_highbd_v_predictor_16x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_16x32 aom_highbd_v_predictor_16x32_c
-
-void aom_highbd_v_predictor_16x4_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_16x4 aom_highbd_v_predictor_16x4_c
-
-void aom_highbd_v_predictor_16x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_16x64 aom_highbd_v_predictor_16x64_c
-
-void aom_highbd_v_predictor_16x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_16x8 aom_highbd_v_predictor_16x8_c
-
-void aom_highbd_v_predictor_2x2_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_v_predictor_2x2 aom_highbd_v_predictor_2x2_c
-
-void aom_highbd_v_predictor_32x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_32x16 aom_highbd_v_predictor_32x16_c
-
-void aom_highbd_v_predictor_32x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_32x32 aom_highbd_v_predictor_32x32_c
-
-void aom_highbd_v_predictor_32x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_32x64 aom_highbd_v_predictor_32x64_c
-
-void aom_highbd_v_predictor_32x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_32x8 aom_highbd_v_predictor_32x8_c
-
-void aom_highbd_v_predictor_4x16_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_4x16 aom_highbd_v_predictor_4x16_c
-
-void aom_highbd_v_predictor_4x4_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_v_predictor_4x4 aom_highbd_v_predictor_4x4_c
-
-void aom_highbd_v_predictor_4x8_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_v_predictor_4x8 aom_highbd_v_predictor_4x8_c
-
-void aom_highbd_v_predictor_64x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_64x16 aom_highbd_v_predictor_64x16_c
-
-void aom_highbd_v_predictor_64x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_64x32 aom_highbd_v_predictor_64x32_c
-
-void aom_highbd_v_predictor_64x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_64x64 aom_highbd_v_predictor_64x64_c
-
-void aom_highbd_v_predictor_8x16_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_8x16 aom_highbd_v_predictor_8x16_c
-
-void aom_highbd_v_predictor_8x32_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_8x32 aom_highbd_v_predictor_8x32_c
-
-void aom_highbd_v_predictor_8x4_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_v_predictor_8x4 aom_highbd_v_predictor_8x4_c
-
-void aom_highbd_v_predictor_8x8_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_v_predictor_8x8 aom_highbd_v_predictor_8x8_c
-
 void aom_ifft16x16_float_c(const float* input, float* temp, float* output);
 #define aom_ifft16x16_float aom_ifft16x16_float_c
 
@@ -10727,498 +2507,6 @@
                              int h);
 #define aom_mse_wxh_16bit aom_mse_wxh_16bit_c
 
-uint64_t aom_mse_wxh_16bit_highbd_c(uint16_t* dst,
-                                    int dstride,
-                                    uint16_t* src,
-                                    int sstride,
-                                    int w,
-                                    int h);
-#define aom_mse_wxh_16bit_highbd aom_mse_wxh_16bit_highbd_c
-
-unsigned int aom_obmc_sad128x128_c(const uint8_t* pre,
-                                   int pre_stride,
-                                   const int32_t* wsrc,
-                                   const int32_t* mask);
-#define aom_obmc_sad128x128 aom_obmc_sad128x128_c
-
-unsigned int aom_obmc_sad128x64_c(const uint8_t* pre,
-                                  int pre_stride,
-                                  const int32_t* wsrc,
-                                  const int32_t* mask);
-#define aom_obmc_sad128x64 aom_obmc_sad128x64_c
-
-unsigned int aom_obmc_sad16x16_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad16x16 aom_obmc_sad16x16_c
-
-unsigned int aom_obmc_sad16x32_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad16x32 aom_obmc_sad16x32_c
-
-unsigned int aom_obmc_sad16x4_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-#define aom_obmc_sad16x4 aom_obmc_sad16x4_c
-
-unsigned int aom_obmc_sad16x64_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad16x64 aom_obmc_sad16x64_c
-
-unsigned int aom_obmc_sad16x8_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-#define aom_obmc_sad16x8 aom_obmc_sad16x8_c
-
-unsigned int aom_obmc_sad32x16_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad32x16 aom_obmc_sad32x16_c
-
-unsigned int aom_obmc_sad32x32_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad32x32 aom_obmc_sad32x32_c
-
-unsigned int aom_obmc_sad32x64_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad32x64 aom_obmc_sad32x64_c
-
-unsigned int aom_obmc_sad32x8_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-#define aom_obmc_sad32x8 aom_obmc_sad32x8_c
-
-unsigned int aom_obmc_sad4x16_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-#define aom_obmc_sad4x16 aom_obmc_sad4x16_c
-
-unsigned int aom_obmc_sad4x4_c(const uint8_t* pre,
-                               int pre_stride,
-                               const int32_t* wsrc,
-                               const int32_t* mask);
-#define aom_obmc_sad4x4 aom_obmc_sad4x4_c
-
-unsigned int aom_obmc_sad4x8_c(const uint8_t* pre,
-                               int pre_stride,
-                               const int32_t* wsrc,
-                               const int32_t* mask);
-#define aom_obmc_sad4x8 aom_obmc_sad4x8_c
-
-unsigned int aom_obmc_sad64x128_c(const uint8_t* pre,
-                                  int pre_stride,
-                                  const int32_t* wsrc,
-                                  const int32_t* mask);
-#define aom_obmc_sad64x128 aom_obmc_sad64x128_c
-
-unsigned int aom_obmc_sad64x16_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad64x16 aom_obmc_sad64x16_c
-
-unsigned int aom_obmc_sad64x32_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad64x32 aom_obmc_sad64x32_c
-
-unsigned int aom_obmc_sad64x64_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad64x64 aom_obmc_sad64x64_c
-
-unsigned int aom_obmc_sad8x16_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-#define aom_obmc_sad8x16 aom_obmc_sad8x16_c
-
-unsigned int aom_obmc_sad8x32_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-#define aom_obmc_sad8x32 aom_obmc_sad8x32_c
-
-unsigned int aom_obmc_sad8x4_c(const uint8_t* pre,
-                               int pre_stride,
-                               const int32_t* wsrc,
-                               const int32_t* mask);
-#define aom_obmc_sad8x4 aom_obmc_sad8x4_c
-
-unsigned int aom_obmc_sad8x8_c(const uint8_t* pre,
-                               int pre_stride,
-                               const int32_t* wsrc,
-                               const int32_t* mask);
-#define aom_obmc_sad8x8 aom_obmc_sad8x8_c
-
-unsigned int aom_obmc_sub_pixel_variance128x128_c(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-#define aom_obmc_sub_pixel_variance128x128 aom_obmc_sub_pixel_variance128x128_c
-
-unsigned int aom_obmc_sub_pixel_variance128x64_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-#define aom_obmc_sub_pixel_variance128x64 aom_obmc_sub_pixel_variance128x64_c
-
-unsigned int aom_obmc_sub_pixel_variance16x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance16x16 aom_obmc_sub_pixel_variance16x16_c
-
-unsigned int aom_obmc_sub_pixel_variance16x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance16x32 aom_obmc_sub_pixel_variance16x32_c
-
-unsigned int aom_obmc_sub_pixel_variance16x4_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_obmc_sub_pixel_variance16x4 aom_obmc_sub_pixel_variance16x4_c
-
-unsigned int aom_obmc_sub_pixel_variance16x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance16x64 aom_obmc_sub_pixel_variance16x64_c
-
-unsigned int aom_obmc_sub_pixel_variance16x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_obmc_sub_pixel_variance16x8 aom_obmc_sub_pixel_variance16x8_c
-
-unsigned int aom_obmc_sub_pixel_variance32x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance32x16 aom_obmc_sub_pixel_variance32x16_c
-
-unsigned int aom_obmc_sub_pixel_variance32x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance32x32 aom_obmc_sub_pixel_variance32x32_c
-
-unsigned int aom_obmc_sub_pixel_variance32x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance32x64 aom_obmc_sub_pixel_variance32x64_c
-
-unsigned int aom_obmc_sub_pixel_variance32x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_obmc_sub_pixel_variance32x8 aom_obmc_sub_pixel_variance32x8_c
-
-unsigned int aom_obmc_sub_pixel_variance4x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_obmc_sub_pixel_variance4x16 aom_obmc_sub_pixel_variance4x16_c
-
-unsigned int aom_obmc_sub_pixel_variance4x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_obmc_sub_pixel_variance4x4 aom_obmc_sub_pixel_variance4x4_c
-
-unsigned int aom_obmc_sub_pixel_variance4x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_obmc_sub_pixel_variance4x8 aom_obmc_sub_pixel_variance4x8_c
-
-unsigned int aom_obmc_sub_pixel_variance64x128_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-#define aom_obmc_sub_pixel_variance64x128 aom_obmc_sub_pixel_variance64x128_c
-
-unsigned int aom_obmc_sub_pixel_variance64x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance64x16 aom_obmc_sub_pixel_variance64x16_c
-
-unsigned int aom_obmc_sub_pixel_variance64x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance64x32 aom_obmc_sub_pixel_variance64x32_c
-
-unsigned int aom_obmc_sub_pixel_variance64x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance64x64 aom_obmc_sub_pixel_variance64x64_c
-
-unsigned int aom_obmc_sub_pixel_variance8x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_obmc_sub_pixel_variance8x16 aom_obmc_sub_pixel_variance8x16_c
-
-unsigned int aom_obmc_sub_pixel_variance8x32_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_obmc_sub_pixel_variance8x32 aom_obmc_sub_pixel_variance8x32_c
-
-unsigned int aom_obmc_sub_pixel_variance8x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_obmc_sub_pixel_variance8x4 aom_obmc_sub_pixel_variance8x4_c
-
-unsigned int aom_obmc_sub_pixel_variance8x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_obmc_sub_pixel_variance8x8 aom_obmc_sub_pixel_variance8x8_c
-
-unsigned int aom_obmc_variance128x128_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask,
-                                        unsigned int* sse);
-#define aom_obmc_variance128x128 aom_obmc_variance128x128_c
-
-unsigned int aom_obmc_variance128x64_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask,
-                                       unsigned int* sse);
-#define aom_obmc_variance128x64 aom_obmc_variance128x64_c
-
-unsigned int aom_obmc_variance16x16_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance16x16 aom_obmc_variance16x16_c
-
-unsigned int aom_obmc_variance16x32_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance16x32 aom_obmc_variance16x32_c
-
-unsigned int aom_obmc_variance16x4_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-#define aom_obmc_variance16x4 aom_obmc_variance16x4_c
-
-unsigned int aom_obmc_variance16x64_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance16x64 aom_obmc_variance16x64_c
-
-unsigned int aom_obmc_variance16x8_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-#define aom_obmc_variance16x8 aom_obmc_variance16x8_c
-
-unsigned int aom_obmc_variance32x16_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance32x16 aom_obmc_variance32x16_c
-
-unsigned int aom_obmc_variance32x32_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance32x32 aom_obmc_variance32x32_c
-
-unsigned int aom_obmc_variance32x64_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance32x64 aom_obmc_variance32x64_c
-
-unsigned int aom_obmc_variance32x8_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-#define aom_obmc_variance32x8 aom_obmc_variance32x8_c
-
-unsigned int aom_obmc_variance4x16_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-#define aom_obmc_variance4x16 aom_obmc_variance4x16_c
-
-unsigned int aom_obmc_variance4x4_c(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask,
-                                    unsigned int* sse);
-#define aom_obmc_variance4x4 aom_obmc_variance4x4_c
-
-unsigned int aom_obmc_variance4x8_c(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask,
-                                    unsigned int* sse);
-#define aom_obmc_variance4x8 aom_obmc_variance4x8_c
-
-unsigned int aom_obmc_variance64x128_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask,
-                                       unsigned int* sse);
-#define aom_obmc_variance64x128 aom_obmc_variance64x128_c
-
-unsigned int aom_obmc_variance64x16_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance64x16 aom_obmc_variance64x16_c
-
-unsigned int aom_obmc_variance64x32_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance64x32 aom_obmc_variance64x32_c
-
-unsigned int aom_obmc_variance64x64_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance64x64 aom_obmc_variance64x64_c
-
-unsigned int aom_obmc_variance8x16_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-#define aom_obmc_variance8x16 aom_obmc_variance8x16_c
-
-unsigned int aom_obmc_variance8x32_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-#define aom_obmc_variance8x32 aom_obmc_variance8x32_c
-
-unsigned int aom_obmc_variance8x4_c(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask,
-                                    unsigned int* sse);
-#define aom_obmc_variance8x4 aom_obmc_variance8x4_c
-
-unsigned int aom_obmc_variance8x8_c(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask,
-                                    unsigned int* sse);
-#define aom_obmc_variance8x8 aom_obmc_variance8x8_c
-
 void aom_paeth_predictor_16x16_c(uint8_t* dst,
                                  ptrdiff_t y_stride,
                                  const uint8_t* above,
diff --git a/third_party/libaom/source/config/linux/arm64/config/av1_rtcd.h b/third_party/libaom/source/config/linux/arm64/config/av1_rtcd.h
index d612ede3..c8b39bd0 100644
--- a/third_party/libaom/source/config/linux/arm64/config/av1_rtcd.h
+++ b/third_party/libaom/source/config/linux/arm64/config/av1_rtcd.h
@@ -114,46 +114,6 @@
                                 const int log_scale);
 #define aom_quantize_b_helper aom_quantize_b_helper_neon
 
-void av1_apply_selfguided_restoration_c(const uint8_t* dat,
-                                        int width,
-                                        int height,
-                                        int stride,
-                                        int eps,
-                                        const int* xqd,
-                                        uint8_t* dst,
-                                        int dst_stride,
-                                        int32_t* tmpbuf,
-                                        int bit_depth,
-                                        int highbd);
-void av1_apply_selfguided_restoration_neon(const uint8_t* dat,
-                                           int width,
-                                           int height,
-                                           int stride,
-                                           int eps,
-                                           const int* xqd,
-                                           uint8_t* dst,
-                                           int dst_stride,
-                                           int32_t* tmpbuf,
-                                           int bit_depth,
-                                           int highbd);
-#define av1_apply_selfguided_restoration av1_apply_selfguided_restoration_neon
-
-void av1_apply_temporal_filter_c(const struct yv12_buffer_config* ref_frame,
-                                 const struct macroblockd* mbd,
-                                 const BLOCK_SIZE block_size,
-                                 const int mb_row,
-                                 const int mb_col,
-                                 const int num_planes,
-                                 const double* noise_levels,
-                                 const MV* subblock_mvs,
-                                 const int* subblock_mses,
-                                 const int q_factor,
-                                 const int filter_strength,
-                                 const uint8_t* pred,
-                                 uint32_t* accum,
-                                 uint16_t* count);
-#define av1_apply_temporal_filter av1_apply_temporal_filter_c
-
 int64_t av1_block_error_c(const tran_low_t* coeff,
                           const tran_low_t* dqcoeff,
                           intptr_t block_size,
@@ -217,44 +177,6 @@
 #define av1_build_compound_diffwtd_mask_highbd \
   av1_build_compound_diffwtd_mask_highbd_c
 
-int64_t av1_calc_frame_error_c(const uint8_t* const ref,
-                               int stride,
-                               const uint8_t* const dst,
-                               int p_width,
-                               int p_height,
-                               int p_stride);
-#define av1_calc_frame_error av1_calc_frame_error_c
-
-void av1_calc_proj_params_c(const uint8_t* src8,
-                            int width,
-                            int height,
-                            int src_stride,
-                            const uint8_t* dat8,
-                            int dat_stride,
-                            int32_t* flt0,
-                            int flt0_stride,
-                            int32_t* flt1,
-                            int flt1_stride,
-                            int64_t H[2][2],
-                            int64_t C[2],
-                            const sgr_params_type* params);
-#define av1_calc_proj_params av1_calc_proj_params_c
-
-void av1_calc_proj_params_high_bd_c(const uint8_t* src8,
-                                    int width,
-                                    int height,
-                                    int src_stride,
-                                    const uint8_t* dat8,
-                                    int dat_stride,
-                                    int32_t* flt0,
-                                    int flt0_stride,
-                                    int32_t* flt1,
-                                    int flt1_stride,
-                                    int64_t H[2][2],
-                                    int64_t C[2],
-                                    const sgr_params_type* params);
-#define av1_calc_proj_params_high_bd av1_calc_proj_params_high_bd_c
-
 void av1_cnn_activate_c(float** input,
                         int channels,
                         int width,
@@ -321,33 +243,6 @@
                                        int y2);
 #define av1_compute_cross_correlation av1_compute_cross_correlation_c
 
-void av1_compute_stats_c(int wiener_win,
-                         const uint8_t* dgd8,
-                         const uint8_t* src8,
-                         int h_start,
-                         int h_end,
-                         int v_start,
-                         int v_end,
-                         int dgd_stride,
-                         int src_stride,
-                         int64_t* M,
-                         int64_t* H);
-#define av1_compute_stats av1_compute_stats_c
-
-void av1_compute_stats_highbd_c(int wiener_win,
-                                const uint8_t* dgd8,
-                                const uint8_t* src8,
-                                int h_start,
-                                int h_end,
-                                int v_start,
-                                int v_end,
-                                int dgd_stride,
-                                int src_stride,
-                                int64_t* M,
-                                int64_t* H,
-                                aom_bit_depth_t bit_depth);
-#define av1_compute_stats_highbd av1_compute_stats_highbd_c
-
 void av1_convolve_2d_scale_c(const uint8_t* src,
                              int src_stride,
                              uint8_t* dst,
@@ -863,30 +758,6 @@
                                   int8_t* const coeff_contexts);
 #define av1_get_nz_map_contexts av1_get_nz_map_contexts_neon
 
-void av1_highbd_apply_temporal_filter_c(
-    const struct yv12_buffer_config* ref_frame,
-    const struct macroblockd* mbd,
-    const BLOCK_SIZE block_size,
-    const int mb_row,
-    const int mb_col,
-    const int num_planes,
-    const double* noise_levels,
-    const MV* subblock_mvs,
-    const int* subblock_mses,
-    const int q_factor,
-    const int filter_strength,
-    const uint8_t* pred,
-    uint32_t* accum,
-    uint16_t* count);
-#define av1_highbd_apply_temporal_filter av1_highbd_apply_temporal_filter_c
-
-int64_t av1_highbd_block_error_c(const tran_low_t* coeff,
-                                 const tran_low_t* dqcoeff,
-                                 intptr_t block_size,
-                                 int64_t* ssz,
-                                 int bd);
-#define av1_highbd_block_error av1_highbd_block_error_c
-
 void av1_highbd_convolve8_c(const uint8_t* src,
                             ptrdiff_t src_stride,
                             uint8_t* dst,
@@ -926,36 +797,6 @@
                                  int bps);
 #define av1_highbd_convolve8_vert av1_highbd_convolve8_vert_c
 
-void av1_highbd_convolve_2d_scale_c(const uint16_t* src,
-                                    int src_stride,
-                                    uint16_t* dst,
-                                    int dst_stride,
-                                    int w,
-                                    int h,
-                                    const InterpFilterParams* filter_params_x,
-                                    const InterpFilterParams* filter_params_y,
-                                    const int subpel_x_qn,
-                                    const int x_step_qn,
-                                    const int subpel_y_qn,
-                                    const int y_step_qn,
-                                    ConvolveParams* conv_params,
-                                    int bd);
-#define av1_highbd_convolve_2d_scale av1_highbd_convolve_2d_scale_c
-
-void av1_highbd_convolve_2d_sr_c(const uint16_t* src,
-                                 int src_stride,
-                                 uint16_t* dst,
-                                 int dst_stride,
-                                 int w,
-                                 int h,
-                                 const InterpFilterParams* filter_params_x,
-                                 const InterpFilterParams* filter_params_y,
-                                 const int subpel_x_qn,
-                                 const int subpel_y_qn,
-                                 ConvolveParams* conv_params,
-                                 int bd);
-#define av1_highbd_convolve_2d_sr av1_highbd_convolve_2d_sr_c
-
 void av1_highbd_convolve_avg_c(const uint8_t* src,
                                ptrdiff_t src_stride,
                                uint8_t* dst,
@@ -982,128 +823,6 @@
                                 int bps);
 #define av1_highbd_convolve_copy av1_highbd_convolve_copy_c
 
-void av1_highbd_convolve_horiz_rs_c(const uint16_t* src,
-                                    int src_stride,
-                                    uint16_t* dst,
-                                    int dst_stride,
-                                    int w,
-                                    int h,
-                                    const int16_t* x_filters,
-                                    int x0_qn,
-                                    int x_step_qn,
-                                    int bd);
-#define av1_highbd_convolve_horiz_rs av1_highbd_convolve_horiz_rs_c
-
-void av1_highbd_convolve_x_sr_c(const uint16_t* src,
-                                int src_stride,
-                                uint16_t* dst,
-                                int dst_stride,
-                                int w,
-                                int h,
-                                const InterpFilterParams* filter_params_x,
-                                const int subpel_x_qn,
-                                ConvolveParams* conv_params,
-                                int bd);
-#define av1_highbd_convolve_x_sr av1_highbd_convolve_x_sr_c
-
-void av1_highbd_convolve_y_sr_c(const uint16_t* src,
-                                int src_stride,
-                                uint16_t* dst,
-                                int dst_stride,
-                                int w,
-                                int h,
-                                const InterpFilterParams* filter_params_y,
-                                const int subpel_y_qn,
-                                int bd);
-#define av1_highbd_convolve_y_sr av1_highbd_convolve_y_sr_c
-
-void av1_highbd_dist_wtd_convolve_2d_c(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_x,
-    const InterpFilterParams* filter_params_y,
-    const int subpel_x_qn,
-    const int subpel_y_qn,
-    ConvolveParams* conv_params,
-    int bd);
-#define av1_highbd_dist_wtd_convolve_2d av1_highbd_dist_wtd_convolve_2d_c
-
-void av1_highbd_dist_wtd_convolve_2d_copy_c(const uint16_t* src,
-                                            int src_stride,
-                                            uint16_t* dst,
-                                            int dst_stride,
-                                            int w,
-                                            int h,
-                                            ConvolveParams* conv_params,
-                                            int bd);
-#define av1_highbd_dist_wtd_convolve_2d_copy \
-  av1_highbd_dist_wtd_convolve_2d_copy_c
-
-void av1_highbd_dist_wtd_convolve_x_c(const uint16_t* src,
-                                      int src_stride,
-                                      uint16_t* dst,
-                                      int dst_stride,
-                                      int w,
-                                      int h,
-                                      const InterpFilterParams* filter_params_x,
-                                      const int subpel_x_qn,
-                                      ConvolveParams* conv_params,
-                                      int bd);
-#define av1_highbd_dist_wtd_convolve_x av1_highbd_dist_wtd_convolve_x_c
-
-void av1_highbd_dist_wtd_convolve_y_c(const uint16_t* src,
-                                      int src_stride,
-                                      uint16_t* dst,
-                                      int dst_stride,
-                                      int w,
-                                      int h,
-                                      const InterpFilterParams* filter_params_y,
-                                      const int subpel_y_qn,
-                                      ConvolveParams* conv_params,
-                                      int bd);
-#define av1_highbd_dist_wtd_convolve_y av1_highbd_dist_wtd_convolve_y_c
-
-void av1_highbd_dr_prediction_z1_c(uint16_t* dst,
-                                   ptrdiff_t stride,
-                                   int bw,
-                                   int bh,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int upsample_above,
-                                   int dx,
-                                   int dy,
-                                   int bd);
-#define av1_highbd_dr_prediction_z1 av1_highbd_dr_prediction_z1_c
-
-void av1_highbd_dr_prediction_z2_c(uint16_t* dst,
-                                   ptrdiff_t stride,
-                                   int bw,
-                                   int bh,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int upsample_above,
-                                   int upsample_left,
-                                   int dx,
-                                   int dy,
-                                   int bd);
-#define av1_highbd_dr_prediction_z2 av1_highbd_dr_prediction_z2_c
-
-void av1_highbd_dr_prediction_z3_c(uint16_t* dst,
-                                   ptrdiff_t stride,
-                                   int bw,
-                                   int bh,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int upsample_left,
-                                   int dx,
-                                   int dy,
-                                   int bd);
-#define av1_highbd_dr_prediction_z3 av1_highbd_dr_prediction_z3_c
-
 void av1_highbd_fwht4x4_c(const int16_t* input, tran_low_t* output, int stride);
 void av1_highbd_fwht4x4_neon(const int16_t* input,
                              tran_low_t* output,
@@ -1296,70 +1015,6 @@
                                 int bd);
 #define av1_highbd_iwht4x4_1_add av1_highbd_iwht4x4_1_add_c
 
-int64_t av1_highbd_pixel_proj_error_c(const uint8_t* src8,
-                                      int width,
-                                      int height,
-                                      int src_stride,
-                                      const uint8_t* dat8,
-                                      int dat_stride,
-                                      int32_t* flt0,
-                                      int flt0_stride,
-                                      int32_t* flt1,
-                                      int flt1_stride,
-                                      int xq[2],
-                                      const sgr_params_type* params);
-#define av1_highbd_pixel_proj_error av1_highbd_pixel_proj_error_c
-
-void av1_highbd_quantize_fp_c(const tran_low_t* coeff_ptr,
-                              intptr_t n_coeffs,
-                              const int16_t* zbin_ptr,
-                              const int16_t* round_ptr,
-                              const int16_t* quant_ptr,
-                              const int16_t* quant_shift_ptr,
-                              tran_low_t* qcoeff_ptr,
-                              tran_low_t* dqcoeff_ptr,
-                              const int16_t* dequant_ptr,
-                              uint16_t* eob_ptr,
-                              const int16_t* scan,
-                              const int16_t* iscan,
-                              int log_scale);
-#define av1_highbd_quantize_fp av1_highbd_quantize_fp_c
-
-void av1_highbd_warp_affine_c(const int32_t* mat,
-                              const uint16_t* ref,
-                              int width,
-                              int height,
-                              int stride,
-                              uint16_t* pred,
-                              int p_col,
-                              int p_row,
-                              int p_width,
-                              int p_height,
-                              int p_stride,
-                              int subsampling_x,
-                              int subsampling_y,
-                              int bd,
-                              ConvolveParams* conv_params,
-                              int16_t alpha,
-                              int16_t beta,
-                              int16_t gamma,
-                              int16_t delta);
-#define av1_highbd_warp_affine av1_highbd_warp_affine_c
-
-void av1_highbd_wiener_convolve_add_src_c(const uint8_t* src,
-                                          ptrdiff_t src_stride,
-                                          uint8_t* dst,
-                                          ptrdiff_t dst_stride,
-                                          const int16_t* filter_x,
-                                          int x_step_q4,
-                                          const int16_t* filter_y,
-                                          int y_step_q4,
-                                          int w,
-                                          int h,
-                                          const ConvolveParams* conv_params,
-                                          int bd);
-#define av1_highbd_wiener_convolve_add_src av1_highbd_wiener_convolve_add_src_c
-
 void av1_inv_txfm2d_add_16x16_c(const int32_t* input,
                                 uint16_t* output,
                                 int stride,
@@ -1603,32 +1258,6 @@
                              TxfmParam* txfm_param);
 #define av1_lowbd_fwd_txfm av1_lowbd_fwd_txfm_neon
 
-int64_t av1_lowbd_pixel_proj_error_c(const uint8_t* src8,
-                                     int width,
-                                     int height,
-                                     int src_stride,
-                                     const uint8_t* dat8,
-                                     int dat_stride,
-                                     int32_t* flt0,
-                                     int flt0_stride,
-                                     int32_t* flt1,
-                                     int flt1_stride,
-                                     int xq[2],
-                                     const sgr_params_type* params);
-int64_t av1_lowbd_pixel_proj_error_neon(const uint8_t* src8,
-                                        int width,
-                                        int height,
-                                        int src_stride,
-                                        const uint8_t* dat8,
-                                        int dat_stride,
-                                        int32_t* flt0,
-                                        int flt0_stride,
-                                        int32_t* flt1,
-                                        int flt1_stride,
-                                        int xq[2],
-                                        const sgr_params_type* params);
-#define av1_lowbd_pixel_proj_error av1_lowbd_pixel_proj_error_neon
-
 void av1_nn_predict_c(const float* input_nodes,
                       const NN_CONFIG* const nn_config,
                       int reduce_prec,
@@ -1770,28 +1399,6 @@
 void av1_round_shift_array_neon(int32_t* arr, int size, int bit);
 #define av1_round_shift_array av1_round_shift_array_neon
 
-int av1_selfguided_restoration_c(const uint8_t* dgd8,
-                                 int width,
-                                 int height,
-                                 int dgd_stride,
-                                 int32_t* flt0,
-                                 int32_t* flt1,
-                                 int flt_stride,
-                                 int sgr_params_idx,
-                                 int bit_depth,
-                                 int highbd);
-int av1_selfguided_restoration_neon(const uint8_t* dgd8,
-                                    int width,
-                                    int height,
-                                    int dgd_stride,
-                                    int32_t* flt0,
-                                    int32_t* flt1,
-                                    int flt_stride,
-                                    int sgr_params_idx,
-                                    int bit_depth,
-                                    int highbd);
-#define av1_selfguided_restoration av1_selfguided_restoration_neon
-
 void av1_txb_init_levels_c(const tran_low_t* const coeff,
                            const int width,
                            const int height,
@@ -1808,44 +1415,6 @@
 void av1_upsample_intra_edge_high_c(uint16_t* p, int sz, int bd);
 #define av1_upsample_intra_edge_high av1_upsample_intra_edge_high_c
 
-void av1_warp_affine_c(const int32_t* mat,
-                       const uint8_t* ref,
-                       int width,
-                       int height,
-                       int stride,
-                       uint8_t* pred,
-                       int p_col,
-                       int p_row,
-                       int p_width,
-                       int p_height,
-                       int p_stride,
-                       int subsampling_x,
-                       int subsampling_y,
-                       ConvolveParams* conv_params,
-                       int16_t alpha,
-                       int16_t beta,
-                       int16_t gamma,
-                       int16_t delta);
-void av1_warp_affine_neon(const int32_t* mat,
-                          const uint8_t* ref,
-                          int width,
-                          int height,
-                          int stride,
-                          uint8_t* pred,
-                          int p_col,
-                          int p_row,
-                          int p_width,
-                          int p_height,
-                          int p_stride,
-                          int subsampling_x,
-                          int subsampling_y,
-                          ConvolveParams* conv_params,
-                          int16_t alpha,
-                          int16_t beta,
-                          int16_t gamma,
-                          int16_t delta);
-#define av1_warp_affine av1_warp_affine_neon
-
 void av1_wedge_compute_delta_squares_c(int16_t* d,
                                        const int16_t* a,
                                        const int16_t* b,
@@ -1950,34 +1519,18 @@
                        int coeff_shift);
 #define cdef_find_dir cdef_find_dir_neon
 
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_420_hbd_c(TX_SIZE tx_size);
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_420_hbd_neon(TX_SIZE tx_size);
-#define cfl_get_luma_subsampling_420_hbd cfl_get_luma_subsampling_420_hbd_neon
-
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_420_lbd_c(TX_SIZE tx_size);
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_420_lbd_neon(TX_SIZE tx_size);
 #define cfl_get_luma_subsampling_420_lbd cfl_get_luma_subsampling_420_lbd_neon
 
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_422_hbd_c(TX_SIZE tx_size);
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_422_hbd_neon(TX_SIZE tx_size);
-#define cfl_get_luma_subsampling_422_hbd cfl_get_luma_subsampling_422_hbd_neon
-
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_422_lbd_c(TX_SIZE tx_size);
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_422_lbd_neon(TX_SIZE tx_size);
 #define cfl_get_luma_subsampling_422_lbd cfl_get_luma_subsampling_422_lbd_neon
 
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_444_hbd_c(TX_SIZE tx_size);
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_444_hbd_neon(TX_SIZE tx_size);
-#define cfl_get_luma_subsampling_444_hbd cfl_get_luma_subsampling_444_hbd_neon
-
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_444_lbd_c(TX_SIZE tx_size);
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_444_lbd_neon(TX_SIZE tx_size);
 #define cfl_get_luma_subsampling_444_lbd cfl_get_luma_subsampling_444_lbd_neon
 
-cfl_predict_hbd_fn cfl_get_predict_hbd_fn_c(TX_SIZE tx_size);
-cfl_predict_hbd_fn cfl_get_predict_hbd_fn_neon(TX_SIZE tx_size);
-#define cfl_get_predict_hbd_fn cfl_get_predict_hbd_fn_neon
-
 cfl_predict_lbd_fn cfl_get_predict_lbd_fn_c(TX_SIZE tx_size);
 cfl_predict_lbd_fn cfl_get_predict_lbd_fn_neon(TX_SIZE tx_size);
 #define cfl_get_predict_lbd_fn cfl_get_predict_lbd_fn_neon
diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.asm b/third_party/libaom/source/config/linux/generic/config/aom_config.asm
index cf79a32..a7bc0cb 100644
--- a/third_party/libaom/source/config/linux/generic/config/aom_config.asm
+++ b/third_party/libaom/source/config/linux/generic/config/aom_config.asm
@@ -17,7 +17,7 @@
 CONFIG_ANALYZER equ 0
 CONFIG_AV1_DECODER equ 1
 CONFIG_AV1_ENCODER equ 1
-CONFIG_AV1_HIGHBITDEPTH equ 1
+CONFIG_AV1_HIGHBITDEPTH equ 0
 CONFIG_AV1_TEMPORAL_DENOISING equ 0
 CONFIG_BIG_ENDIAN equ 0
 CONFIG_BITSTREAM_DEBUG equ 0
@@ -47,7 +47,7 @@
 CONFIG_OS_SUPPORT equ 1
 CONFIG_PIC equ 0
 CONFIG_RD_DEBUG equ 0
-CONFIG_REALTIME_ONLY equ 0
+CONFIG_REALTIME_ONLY equ 1
 CONFIG_RUNTIME_CPU_DETECT equ 1
 CONFIG_SHARED equ 0
 CONFIG_SHARP_SETTINGS equ 0
diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.c b/third_party/libaom/source/config/linux/generic/config/aom_config.c
index 963b5533..3291086 100644
--- a/third_party/libaom/source/config/linux/generic/config/aom_config.c
+++ b/third_party/libaom/source/config/linux/generic/config/aom_config.c
@@ -9,5 +9,5 @@
  * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
  */
 #include "aom/aom_codec.h"
-static const char* const cfg = "cmake ../source/libaom -G \"Unix Makefiles\" -DAOM_TARGET_CPU=generic -DCONFIG_AV1_ENCODER=1 -DCONFIG_LIBYUV=0 -DCONFIG_MAX_DECODE_PROFILE=0 -DCONFIG_NORMAL_TILE_MODE=1 -DCONFIG_SIZE_LIMIT=1 -DDECODE_HEIGHT_LIMIT=16384 -DDECODE_WIDTH_LIMIT=16384";
+static const char* const cfg = "cmake ../source/libaom -G \"Unix Makefiles\" -DAOM_TARGET_CPU=generic -DCONFIG_AV1_ENCODER=1 -DCONFIG_LIBYUV=0 -DCONFIG_MAX_DECODE_PROFILE=0 -DCONFIG_NORMAL_TILE_MODE=1 -DCONFIG_SIZE_LIMIT=1 -DDECODE_HEIGHT_LIMIT=16384 -DDECODE_WIDTH_LIMIT=16384 -DCONFIG_REALTIME_ONLY=1 -DCONFIG_AV1_HIGHBITDEPTH=0";
 const char *aom_codec_build_config(void) {return cfg;}
diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.h b/third_party/libaom/source/config/linux/generic/config/aom_config.h
index ef8e2ed..fe497f6 100644
--- a/third_party/libaom/source/config/linux/generic/config/aom_config.h
+++ b/third_party/libaom/source/config/linux/generic/config/aom_config.h
@@ -19,7 +19,7 @@
 #define CONFIG_ANALYZER 0
 #define CONFIG_AV1_DECODER 1
 #define CONFIG_AV1_ENCODER 1
-#define CONFIG_AV1_HIGHBITDEPTH 1
+#define CONFIG_AV1_HIGHBITDEPTH 0
 #define CONFIG_AV1_TEMPORAL_DENOISING 0
 #define CONFIG_BIG_ENDIAN 0
 #define CONFIG_BITSTREAM_DEBUG 0
@@ -49,7 +49,7 @@
 #define CONFIG_OS_SUPPORT 1
 #define CONFIG_PIC 0
 #define CONFIG_RD_DEBUG 0
-#define CONFIG_REALTIME_ONLY 0
+#define CONFIG_REALTIME_ONLY 1
 #define CONFIG_RUNTIME_CPU_DETECT 1
 #define CONFIG_SHARED 0
 #define CONFIG_SHARP_SETTINGS 0
diff --git a/third_party/libaom/source/config/linux/generic/config/aom_dsp_rtcd.h b/third_party/libaom/source/config/linux/generic/config/aom_dsp_rtcd.h
index 6ba36e3..df7a4c2 100644
--- a/third_party/libaom/source/config/linux/generic/config/aom_dsp_rtcd.h
+++ b/third_party/libaom/source/config/linux/generic/config/aom_dsp_rtcd.h
@@ -1337,8195 +1337,6 @@
                            int16_t* coeff);
 #define aom_hadamard_lp_8x8 aom_hadamard_lp_8x8_c
 
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x128 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x64 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x16 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x16_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x32 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x32_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x4 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x4_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x64 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x64_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x8 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x8_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x16 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x16_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x32 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x32_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x64 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x64_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x8 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x8_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x16 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x4 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x4_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x8 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x128 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x16 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x16_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x32 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x32_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x64 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x64_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x16 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x16_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x32 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x32_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x4 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x4_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x8 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x8_c
-
-void aom_highbd_10_get16x16var_c(const uint8_t* src_ptr,
-                                 int source_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride,
-                                 unsigned int* sse,
-                                 int* sum);
-#define aom_highbd_10_get16x16var aom_highbd_10_get16x16var_c
-
-void aom_highbd_10_get8x8var_c(const uint8_t* src_ptr,
-                               int source_stride,
-                               const uint8_t* ref_ptr,
-                               int ref_stride,
-                               unsigned int* sse,
-                               int* sum);
-#define aom_highbd_10_get8x8var aom_highbd_10_get8x8var_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance128x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance128x128 \
-  aom_highbd_10_masked_sub_pixel_variance128x128_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance128x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance128x64 \
-  aom_highbd_10_masked_sub_pixel_variance128x64_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance16x16 \
-  aom_highbd_10_masked_sub_pixel_variance16x16_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance16x32 \
-  aom_highbd_10_masked_sub_pixel_variance16x32_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance16x4 \
-  aom_highbd_10_masked_sub_pixel_variance16x4_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance16x64 \
-  aom_highbd_10_masked_sub_pixel_variance16x64_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance16x8 \
-  aom_highbd_10_masked_sub_pixel_variance16x8_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance32x16 \
-  aom_highbd_10_masked_sub_pixel_variance32x16_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance32x32 \
-  aom_highbd_10_masked_sub_pixel_variance32x32_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance32x64 \
-  aom_highbd_10_masked_sub_pixel_variance32x64_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance32x8 \
-  aom_highbd_10_masked_sub_pixel_variance32x8_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance4x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance4x16 \
-  aom_highbd_10_masked_sub_pixel_variance4x16_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance4x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance4x4 \
-  aom_highbd_10_masked_sub_pixel_variance4x4_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance4x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance4x8 \
-  aom_highbd_10_masked_sub_pixel_variance4x8_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance64x128 \
-  aom_highbd_10_masked_sub_pixel_variance64x128_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance64x16 \
-  aom_highbd_10_masked_sub_pixel_variance64x16_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance64x32 \
-  aom_highbd_10_masked_sub_pixel_variance64x32_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance64x64 \
-  aom_highbd_10_masked_sub_pixel_variance64x64_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance8x16 \
-  aom_highbd_10_masked_sub_pixel_variance8x16_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance8x32 \
-  aom_highbd_10_masked_sub_pixel_variance8x32_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance8x4 \
-  aom_highbd_10_masked_sub_pixel_variance8x4_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance8x8 \
-  aom_highbd_10_masked_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_10_mse16x16_c(const uint8_t* src_ptr,
-                                      int source_stride,
-                                      const uint8_t* ref_ptr,
-                                      int recon_stride,
-                                      unsigned int* sse);
-#define aom_highbd_10_mse16x16 aom_highbd_10_mse16x16_c
-
-unsigned int aom_highbd_10_mse16x8_c(const uint8_t* src_ptr,
-                                     int source_stride,
-                                     const uint8_t* ref_ptr,
-                                     int recon_stride,
-                                     unsigned int* sse);
-#define aom_highbd_10_mse16x8 aom_highbd_10_mse16x8_c
-
-unsigned int aom_highbd_10_mse8x16_c(const uint8_t* src_ptr,
-                                     int source_stride,
-                                     const uint8_t* ref_ptr,
-                                     int recon_stride,
-                                     unsigned int* sse);
-#define aom_highbd_10_mse8x16 aom_highbd_10_mse8x16_c
-
-unsigned int aom_highbd_10_mse8x8_c(const uint8_t* src_ptr,
-                                    int source_stride,
-                                    const uint8_t* ref_ptr,
-                                    int recon_stride,
-                                    unsigned int* sse);
-#define aom_highbd_10_mse8x8 aom_highbd_10_mse8x8_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance128x128_c(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            int xoffset,
-                                                            int yoffset,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance128x128 \
-  aom_highbd_10_obmc_sub_pixel_variance128x128_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance128x64_c(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance128x64 \
-  aom_highbd_10_obmc_sub_pixel_variance128x64_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance16x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance16x16 \
-  aom_highbd_10_obmc_sub_pixel_variance16x16_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance16x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance16x32 \
-  aom_highbd_10_obmc_sub_pixel_variance16x32_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance16x4_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance16x4 \
-  aom_highbd_10_obmc_sub_pixel_variance16x4_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance16x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance16x64 \
-  aom_highbd_10_obmc_sub_pixel_variance16x64_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance16x8_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance16x8 \
-  aom_highbd_10_obmc_sub_pixel_variance16x8_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance32x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance32x16 \
-  aom_highbd_10_obmc_sub_pixel_variance32x16_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance32x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance32x32 \
-  aom_highbd_10_obmc_sub_pixel_variance32x32_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance32x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance32x64 \
-  aom_highbd_10_obmc_sub_pixel_variance32x64_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance32x8_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance32x8 \
-  aom_highbd_10_obmc_sub_pixel_variance32x8_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance4x16_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance4x16 \
-  aom_highbd_10_obmc_sub_pixel_variance4x16_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance4x4_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance4x4 \
-  aom_highbd_10_obmc_sub_pixel_variance4x4_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance4x8_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance4x8 \
-  aom_highbd_10_obmc_sub_pixel_variance4x8_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance64x128_c(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance64x128 \
-  aom_highbd_10_obmc_sub_pixel_variance64x128_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance64x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance64x16 \
-  aom_highbd_10_obmc_sub_pixel_variance64x16_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance64x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance64x32 \
-  aom_highbd_10_obmc_sub_pixel_variance64x32_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance64x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance64x64 \
-  aom_highbd_10_obmc_sub_pixel_variance64x64_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance8x16_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance8x16 \
-  aom_highbd_10_obmc_sub_pixel_variance8x16_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance8x32_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance8x32 \
-  aom_highbd_10_obmc_sub_pixel_variance8x32_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance8x4_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance8x4 \
-  aom_highbd_10_obmc_sub_pixel_variance8x4_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance8x8_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance8x8 \
-  aom_highbd_10_obmc_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_10_obmc_variance128x128_c(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-#define aom_highbd_10_obmc_variance128x128 aom_highbd_10_obmc_variance128x128_c
-
-unsigned int aom_highbd_10_obmc_variance128x64_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-#define aom_highbd_10_obmc_variance128x64 aom_highbd_10_obmc_variance128x64_c
-
-unsigned int aom_highbd_10_obmc_variance16x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance16x16 aom_highbd_10_obmc_variance16x16_c
-
-unsigned int aom_highbd_10_obmc_variance16x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance16x32 aom_highbd_10_obmc_variance16x32_c
-
-unsigned int aom_highbd_10_obmc_variance16x4_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_10_obmc_variance16x4 aom_highbd_10_obmc_variance16x4_c
-
-unsigned int aom_highbd_10_obmc_variance16x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance16x64 aom_highbd_10_obmc_variance16x64_c
-
-unsigned int aom_highbd_10_obmc_variance16x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_10_obmc_variance16x8 aom_highbd_10_obmc_variance16x8_c
-
-unsigned int aom_highbd_10_obmc_variance32x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance32x16 aom_highbd_10_obmc_variance32x16_c
-
-unsigned int aom_highbd_10_obmc_variance32x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance32x32 aom_highbd_10_obmc_variance32x32_c
-
-unsigned int aom_highbd_10_obmc_variance32x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance32x64 aom_highbd_10_obmc_variance32x64_c
-
-unsigned int aom_highbd_10_obmc_variance32x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_10_obmc_variance32x8 aom_highbd_10_obmc_variance32x8_c
-
-unsigned int aom_highbd_10_obmc_variance4x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_10_obmc_variance4x16 aom_highbd_10_obmc_variance4x16_c
-
-unsigned int aom_highbd_10_obmc_variance4x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_10_obmc_variance4x4 aom_highbd_10_obmc_variance4x4_c
-
-unsigned int aom_highbd_10_obmc_variance4x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_10_obmc_variance4x8 aom_highbd_10_obmc_variance4x8_c
-
-unsigned int aom_highbd_10_obmc_variance64x128_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-#define aom_highbd_10_obmc_variance64x128 aom_highbd_10_obmc_variance64x128_c
-
-unsigned int aom_highbd_10_obmc_variance64x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance64x16 aom_highbd_10_obmc_variance64x16_c
-
-unsigned int aom_highbd_10_obmc_variance64x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance64x32 aom_highbd_10_obmc_variance64x32_c
-
-unsigned int aom_highbd_10_obmc_variance64x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance64x64 aom_highbd_10_obmc_variance64x64_c
-
-unsigned int aom_highbd_10_obmc_variance8x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_10_obmc_variance8x16 aom_highbd_10_obmc_variance8x16_c
-
-unsigned int aom_highbd_10_obmc_variance8x32_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_10_obmc_variance8x32 aom_highbd_10_obmc_variance8x32_c
-
-unsigned int aom_highbd_10_obmc_variance8x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_10_obmc_variance8x4 aom_highbd_10_obmc_variance8x4_c
-
-unsigned int aom_highbd_10_obmc_variance8x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_10_obmc_variance8x8 aom_highbd_10_obmc_variance8x8_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance128x128 \
-  aom_highbd_10_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance128x64 \
-  aom_highbd_10_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance16x16 \
-  aom_highbd_10_sub_pixel_avg_variance16x16_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance16x32 \
-  aom_highbd_10_sub_pixel_avg_variance16x32_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x4_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance16x4 \
-  aom_highbd_10_sub_pixel_avg_variance16x4_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance16x64 \
-  aom_highbd_10_sub_pixel_avg_variance16x64_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance16x8 \
-  aom_highbd_10_sub_pixel_avg_variance16x8_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance32x16 \
-  aom_highbd_10_sub_pixel_avg_variance32x16_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance32x32 \
-  aom_highbd_10_sub_pixel_avg_variance32x32_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance32x64 \
-  aom_highbd_10_sub_pixel_avg_variance32x64_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x8_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance32x8 \
-  aom_highbd_10_sub_pixel_avg_variance32x8_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance4x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance4x16 \
-  aom_highbd_10_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance4x4 \
-  aom_highbd_10_sub_pixel_avg_variance4x4_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance4x8 \
-  aom_highbd_10_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance64x128 \
-  aom_highbd_10_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance64x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance64x16 \
-  aom_highbd_10_sub_pixel_avg_variance64x16_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance64x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance64x32 \
-  aom_highbd_10_sub_pixel_avg_variance64x32_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance64x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance64x64 \
-  aom_highbd_10_sub_pixel_avg_variance64x64_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance8x16 \
-  aom_highbd_10_sub_pixel_avg_variance8x16_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x32_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance8x32 \
-  aom_highbd_10_sub_pixel_avg_variance8x32_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance8x4 \
-  aom_highbd_10_sub_pixel_avg_variance8x4_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance8x8 \
-  aom_highbd_10_sub_pixel_avg_variance8x8_c
-
-uint32_t aom_highbd_10_sub_pixel_variance128x128_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance128x128 \
-  aom_highbd_10_sub_pixel_variance128x128_c
-
-uint32_t aom_highbd_10_sub_pixel_variance128x64_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance128x64 \
-  aom_highbd_10_sub_pixel_variance128x64_c
-
-uint32_t aom_highbd_10_sub_pixel_variance16x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance16x16 \
-  aom_highbd_10_sub_pixel_variance16x16_c
-
-uint32_t aom_highbd_10_sub_pixel_variance16x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance16x32 \
-  aom_highbd_10_sub_pixel_variance16x32_c
-
-uint32_t aom_highbd_10_sub_pixel_variance16x4_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance16x4 \
-  aom_highbd_10_sub_pixel_variance16x4_c
-
-uint32_t aom_highbd_10_sub_pixel_variance16x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance16x64 \
-  aom_highbd_10_sub_pixel_variance16x64_c
-
-uint32_t aom_highbd_10_sub_pixel_variance16x8_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance16x8 \
-  aom_highbd_10_sub_pixel_variance16x8_c
-
-uint32_t aom_highbd_10_sub_pixel_variance32x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance32x16 \
-  aom_highbd_10_sub_pixel_variance32x16_c
-
-uint32_t aom_highbd_10_sub_pixel_variance32x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance32x32 \
-  aom_highbd_10_sub_pixel_variance32x32_c
-
-uint32_t aom_highbd_10_sub_pixel_variance32x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance32x64 \
-  aom_highbd_10_sub_pixel_variance32x64_c
-
-uint32_t aom_highbd_10_sub_pixel_variance32x8_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance32x8 \
-  aom_highbd_10_sub_pixel_variance32x8_c
-
-uint32_t aom_highbd_10_sub_pixel_variance4x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance4x16 \
-  aom_highbd_10_sub_pixel_variance4x16_c
-
-uint32_t aom_highbd_10_sub_pixel_variance4x4_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance4x4 \
-  aom_highbd_10_sub_pixel_variance4x4_c
-
-uint32_t aom_highbd_10_sub_pixel_variance4x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance4x8 \
-  aom_highbd_10_sub_pixel_variance4x8_c
-
-uint32_t aom_highbd_10_sub_pixel_variance64x128_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance64x128 \
-  aom_highbd_10_sub_pixel_variance64x128_c
-
-uint32_t aom_highbd_10_sub_pixel_variance64x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance64x16 \
-  aom_highbd_10_sub_pixel_variance64x16_c
-
-uint32_t aom_highbd_10_sub_pixel_variance64x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance64x32 \
-  aom_highbd_10_sub_pixel_variance64x32_c
-
-uint32_t aom_highbd_10_sub_pixel_variance64x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance64x64 \
-  aom_highbd_10_sub_pixel_variance64x64_c
-
-uint32_t aom_highbd_10_sub_pixel_variance8x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance8x16 \
-  aom_highbd_10_sub_pixel_variance8x16_c
-
-uint32_t aom_highbd_10_sub_pixel_variance8x32_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance8x32 \
-  aom_highbd_10_sub_pixel_variance8x32_c
-
-uint32_t aom_highbd_10_sub_pixel_variance8x4_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance8x4 \
-  aom_highbd_10_sub_pixel_variance8x4_c
-
-uint32_t aom_highbd_10_sub_pixel_variance8x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance8x8 \
-  aom_highbd_10_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_10_variance128x128_c(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-#define aom_highbd_10_variance128x128 aom_highbd_10_variance128x128_c
-
-unsigned int aom_highbd_10_variance128x64_c(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-#define aom_highbd_10_variance128x64 aom_highbd_10_variance128x64_c
-
-unsigned int aom_highbd_10_variance16x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_10_variance16x16 aom_highbd_10_variance16x16_c
-
-unsigned int aom_highbd_10_variance16x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_10_variance16x32 aom_highbd_10_variance16x32_c
-
-unsigned int aom_highbd_10_variance16x4_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_10_variance16x4 aom_highbd_10_variance16x4_c
-
-unsigned int aom_highbd_10_variance16x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           uint32_t* sse);
-#define aom_highbd_10_variance16x64 aom_highbd_10_variance16x64_c
-
-unsigned int aom_highbd_10_variance16x8_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_10_variance16x8 aom_highbd_10_variance16x8_c
-
-unsigned int aom_highbd_10_variance2x2_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance2x2 aom_highbd_10_variance2x2_c
-
-unsigned int aom_highbd_10_variance2x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance2x4 aom_highbd_10_variance2x4_c
-
-unsigned int aom_highbd_10_variance32x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_10_variance32x16 aom_highbd_10_variance32x16_c
-
-unsigned int aom_highbd_10_variance32x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_10_variance32x32 aom_highbd_10_variance32x32_c
-
-unsigned int aom_highbd_10_variance32x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_10_variance32x64 aom_highbd_10_variance32x64_c
-
-unsigned int aom_highbd_10_variance32x8_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_10_variance32x8 aom_highbd_10_variance32x8_c
-
-unsigned int aom_highbd_10_variance4x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_10_variance4x16 aom_highbd_10_variance4x16_c
-
-unsigned int aom_highbd_10_variance4x2_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance4x2 aom_highbd_10_variance4x2_c
-
-unsigned int aom_highbd_10_variance4x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance4x4 aom_highbd_10_variance4x4_c
-
-unsigned int aom_highbd_10_variance4x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance4x8 aom_highbd_10_variance4x8_c
-
-unsigned int aom_highbd_10_variance64x128_c(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-#define aom_highbd_10_variance64x128 aom_highbd_10_variance64x128_c
-
-unsigned int aom_highbd_10_variance64x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           uint32_t* sse);
-#define aom_highbd_10_variance64x16 aom_highbd_10_variance64x16_c
-
-unsigned int aom_highbd_10_variance64x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_10_variance64x32 aom_highbd_10_variance64x32_c
-
-unsigned int aom_highbd_10_variance64x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_10_variance64x64 aom_highbd_10_variance64x64_c
-
-unsigned int aom_highbd_10_variance8x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_10_variance8x16 aom_highbd_10_variance8x16_c
-
-unsigned int aom_highbd_10_variance8x32_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_10_variance8x32 aom_highbd_10_variance8x32_c
-
-unsigned int aom_highbd_10_variance8x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance8x4 aom_highbd_10_variance8x4_c
-
-unsigned int aom_highbd_10_variance8x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance8x8 aom_highbd_10_variance8x8_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x128 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x64 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x16 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x16_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x32 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x32_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x4 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x4_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x64 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x64_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x8 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x8_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x16 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x16_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x32 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x32_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x64 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x64_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x8 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x8_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x16 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x4 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x4_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x8 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x128 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x16 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x16_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x32 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x32_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x64 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x64_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x16 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x16_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x32 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x32_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x4 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x4_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x8 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x8_c
-
-void aom_highbd_12_get16x16var_c(const uint8_t* src_ptr,
-                                 int source_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride,
-                                 unsigned int* sse,
-                                 int* sum);
-#define aom_highbd_12_get16x16var aom_highbd_12_get16x16var_c
-
-void aom_highbd_12_get8x8var_c(const uint8_t* src_ptr,
-                               int source_stride,
-                               const uint8_t* ref_ptr,
-                               int ref_stride,
-                               unsigned int* sse,
-                               int* sum);
-#define aom_highbd_12_get8x8var aom_highbd_12_get8x8var_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance128x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance128x128 \
-  aom_highbd_12_masked_sub_pixel_variance128x128_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance128x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance128x64 \
-  aom_highbd_12_masked_sub_pixel_variance128x64_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance16x16 \
-  aom_highbd_12_masked_sub_pixel_variance16x16_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance16x32 \
-  aom_highbd_12_masked_sub_pixel_variance16x32_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance16x4 \
-  aom_highbd_12_masked_sub_pixel_variance16x4_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance16x64 \
-  aom_highbd_12_masked_sub_pixel_variance16x64_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance16x8 \
-  aom_highbd_12_masked_sub_pixel_variance16x8_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance32x16 \
-  aom_highbd_12_masked_sub_pixel_variance32x16_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance32x32 \
-  aom_highbd_12_masked_sub_pixel_variance32x32_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance32x64 \
-  aom_highbd_12_masked_sub_pixel_variance32x64_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance32x8 \
-  aom_highbd_12_masked_sub_pixel_variance32x8_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance4x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance4x16 \
-  aom_highbd_12_masked_sub_pixel_variance4x16_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance4x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance4x4 \
-  aom_highbd_12_masked_sub_pixel_variance4x4_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance4x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance4x8 \
-  aom_highbd_12_masked_sub_pixel_variance4x8_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance64x128 \
-  aom_highbd_12_masked_sub_pixel_variance64x128_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance64x16 \
-  aom_highbd_12_masked_sub_pixel_variance64x16_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance64x32 \
-  aom_highbd_12_masked_sub_pixel_variance64x32_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance64x64 \
-  aom_highbd_12_masked_sub_pixel_variance64x64_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance8x16 \
-  aom_highbd_12_masked_sub_pixel_variance8x16_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance8x32 \
-  aom_highbd_12_masked_sub_pixel_variance8x32_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance8x4 \
-  aom_highbd_12_masked_sub_pixel_variance8x4_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance8x8 \
-  aom_highbd_12_masked_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_12_mse16x16_c(const uint8_t* src_ptr,
-                                      int source_stride,
-                                      const uint8_t* ref_ptr,
-                                      int recon_stride,
-                                      unsigned int* sse);
-#define aom_highbd_12_mse16x16 aom_highbd_12_mse16x16_c
-
-unsigned int aom_highbd_12_mse16x8_c(const uint8_t* src_ptr,
-                                     int source_stride,
-                                     const uint8_t* ref_ptr,
-                                     int recon_stride,
-                                     unsigned int* sse);
-#define aom_highbd_12_mse16x8 aom_highbd_12_mse16x8_c
-
-unsigned int aom_highbd_12_mse8x16_c(const uint8_t* src_ptr,
-                                     int source_stride,
-                                     const uint8_t* ref_ptr,
-                                     int recon_stride,
-                                     unsigned int* sse);
-#define aom_highbd_12_mse8x16 aom_highbd_12_mse8x16_c
-
-unsigned int aom_highbd_12_mse8x8_c(const uint8_t* src_ptr,
-                                    int source_stride,
-                                    const uint8_t* ref_ptr,
-                                    int recon_stride,
-                                    unsigned int* sse);
-#define aom_highbd_12_mse8x8 aom_highbd_12_mse8x8_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance128x128_c(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            int xoffset,
-                                                            int yoffset,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance128x128 \
-  aom_highbd_12_obmc_sub_pixel_variance128x128_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance128x64_c(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance128x64 \
-  aom_highbd_12_obmc_sub_pixel_variance128x64_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance16x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance16x16 \
-  aom_highbd_12_obmc_sub_pixel_variance16x16_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance16x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance16x32 \
-  aom_highbd_12_obmc_sub_pixel_variance16x32_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance16x4_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance16x4 \
-  aom_highbd_12_obmc_sub_pixel_variance16x4_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance16x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance16x64 \
-  aom_highbd_12_obmc_sub_pixel_variance16x64_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance16x8_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance16x8 \
-  aom_highbd_12_obmc_sub_pixel_variance16x8_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance32x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance32x16 \
-  aom_highbd_12_obmc_sub_pixel_variance32x16_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance32x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance32x32 \
-  aom_highbd_12_obmc_sub_pixel_variance32x32_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance32x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance32x64 \
-  aom_highbd_12_obmc_sub_pixel_variance32x64_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance32x8_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance32x8 \
-  aom_highbd_12_obmc_sub_pixel_variance32x8_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance4x16_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance4x16 \
-  aom_highbd_12_obmc_sub_pixel_variance4x16_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance4x4_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance4x4 \
-  aom_highbd_12_obmc_sub_pixel_variance4x4_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance4x8_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance4x8 \
-  aom_highbd_12_obmc_sub_pixel_variance4x8_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance64x128_c(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance64x128 \
-  aom_highbd_12_obmc_sub_pixel_variance64x128_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance64x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance64x16 \
-  aom_highbd_12_obmc_sub_pixel_variance64x16_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance64x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance64x32 \
-  aom_highbd_12_obmc_sub_pixel_variance64x32_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance64x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance64x64 \
-  aom_highbd_12_obmc_sub_pixel_variance64x64_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance8x16_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance8x16 \
-  aom_highbd_12_obmc_sub_pixel_variance8x16_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance8x32_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance8x32 \
-  aom_highbd_12_obmc_sub_pixel_variance8x32_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance8x4_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance8x4 \
-  aom_highbd_12_obmc_sub_pixel_variance8x4_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance8x8_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance8x8 \
-  aom_highbd_12_obmc_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_12_obmc_variance128x128_c(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-#define aom_highbd_12_obmc_variance128x128 aom_highbd_12_obmc_variance128x128_c
-
-unsigned int aom_highbd_12_obmc_variance128x64_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-#define aom_highbd_12_obmc_variance128x64 aom_highbd_12_obmc_variance128x64_c
-
-unsigned int aom_highbd_12_obmc_variance16x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance16x16 aom_highbd_12_obmc_variance16x16_c
-
-unsigned int aom_highbd_12_obmc_variance16x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance16x32 aom_highbd_12_obmc_variance16x32_c
-
-unsigned int aom_highbd_12_obmc_variance16x4_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_12_obmc_variance16x4 aom_highbd_12_obmc_variance16x4_c
-
-unsigned int aom_highbd_12_obmc_variance16x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance16x64 aom_highbd_12_obmc_variance16x64_c
-
-unsigned int aom_highbd_12_obmc_variance16x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_12_obmc_variance16x8 aom_highbd_12_obmc_variance16x8_c
-
-unsigned int aom_highbd_12_obmc_variance32x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance32x16 aom_highbd_12_obmc_variance32x16_c
-
-unsigned int aom_highbd_12_obmc_variance32x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance32x32 aom_highbd_12_obmc_variance32x32_c
-
-unsigned int aom_highbd_12_obmc_variance32x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance32x64 aom_highbd_12_obmc_variance32x64_c
-
-unsigned int aom_highbd_12_obmc_variance32x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_12_obmc_variance32x8 aom_highbd_12_obmc_variance32x8_c
-
-unsigned int aom_highbd_12_obmc_variance4x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_12_obmc_variance4x16 aom_highbd_12_obmc_variance4x16_c
-
-unsigned int aom_highbd_12_obmc_variance4x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_12_obmc_variance4x4 aom_highbd_12_obmc_variance4x4_c
-
-unsigned int aom_highbd_12_obmc_variance4x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_12_obmc_variance4x8 aom_highbd_12_obmc_variance4x8_c
-
-unsigned int aom_highbd_12_obmc_variance64x128_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-#define aom_highbd_12_obmc_variance64x128 aom_highbd_12_obmc_variance64x128_c
-
-unsigned int aom_highbd_12_obmc_variance64x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance64x16 aom_highbd_12_obmc_variance64x16_c
-
-unsigned int aom_highbd_12_obmc_variance64x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance64x32 aom_highbd_12_obmc_variance64x32_c
-
-unsigned int aom_highbd_12_obmc_variance64x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance64x64 aom_highbd_12_obmc_variance64x64_c
-
-unsigned int aom_highbd_12_obmc_variance8x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_12_obmc_variance8x16 aom_highbd_12_obmc_variance8x16_c
-
-unsigned int aom_highbd_12_obmc_variance8x32_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_12_obmc_variance8x32 aom_highbd_12_obmc_variance8x32_c
-
-unsigned int aom_highbd_12_obmc_variance8x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_12_obmc_variance8x4 aom_highbd_12_obmc_variance8x4_c
-
-unsigned int aom_highbd_12_obmc_variance8x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_12_obmc_variance8x8 aom_highbd_12_obmc_variance8x8_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance128x128 \
-  aom_highbd_12_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance128x64 \
-  aom_highbd_12_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance16x16 \
-  aom_highbd_12_sub_pixel_avg_variance16x16_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance16x32 \
-  aom_highbd_12_sub_pixel_avg_variance16x32_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x4_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance16x4 \
-  aom_highbd_12_sub_pixel_avg_variance16x4_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance16x64 \
-  aom_highbd_12_sub_pixel_avg_variance16x64_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance16x8 \
-  aom_highbd_12_sub_pixel_avg_variance16x8_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance32x16 \
-  aom_highbd_12_sub_pixel_avg_variance32x16_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance32x32 \
-  aom_highbd_12_sub_pixel_avg_variance32x32_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance32x64 \
-  aom_highbd_12_sub_pixel_avg_variance32x64_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x8_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance32x8 \
-  aom_highbd_12_sub_pixel_avg_variance32x8_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance4x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance4x16 \
-  aom_highbd_12_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance4x4 \
-  aom_highbd_12_sub_pixel_avg_variance4x4_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance4x8 \
-  aom_highbd_12_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance64x128 \
-  aom_highbd_12_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance64x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance64x16 \
-  aom_highbd_12_sub_pixel_avg_variance64x16_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance64x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance64x32 \
-  aom_highbd_12_sub_pixel_avg_variance64x32_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance64x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance64x64 \
-  aom_highbd_12_sub_pixel_avg_variance64x64_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance8x16 \
-  aom_highbd_12_sub_pixel_avg_variance8x16_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x32_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance8x32 \
-  aom_highbd_12_sub_pixel_avg_variance8x32_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance8x4 \
-  aom_highbd_12_sub_pixel_avg_variance8x4_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance8x8 \
-  aom_highbd_12_sub_pixel_avg_variance8x8_c
-
-uint32_t aom_highbd_12_sub_pixel_variance128x128_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance128x128 \
-  aom_highbd_12_sub_pixel_variance128x128_c
-
-uint32_t aom_highbd_12_sub_pixel_variance128x64_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance128x64 \
-  aom_highbd_12_sub_pixel_variance128x64_c
-
-uint32_t aom_highbd_12_sub_pixel_variance16x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance16x16 \
-  aom_highbd_12_sub_pixel_variance16x16_c
-
-uint32_t aom_highbd_12_sub_pixel_variance16x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance16x32 \
-  aom_highbd_12_sub_pixel_variance16x32_c
-
-uint32_t aom_highbd_12_sub_pixel_variance16x4_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance16x4 \
-  aom_highbd_12_sub_pixel_variance16x4_c
-
-uint32_t aom_highbd_12_sub_pixel_variance16x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance16x64 \
-  aom_highbd_12_sub_pixel_variance16x64_c
-
-uint32_t aom_highbd_12_sub_pixel_variance16x8_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance16x8 \
-  aom_highbd_12_sub_pixel_variance16x8_c
-
-uint32_t aom_highbd_12_sub_pixel_variance32x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance32x16 \
-  aom_highbd_12_sub_pixel_variance32x16_c
-
-uint32_t aom_highbd_12_sub_pixel_variance32x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance32x32 \
-  aom_highbd_12_sub_pixel_variance32x32_c
-
-uint32_t aom_highbd_12_sub_pixel_variance32x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance32x64 \
-  aom_highbd_12_sub_pixel_variance32x64_c
-
-uint32_t aom_highbd_12_sub_pixel_variance32x8_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance32x8 \
-  aom_highbd_12_sub_pixel_variance32x8_c
-
-uint32_t aom_highbd_12_sub_pixel_variance4x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance4x16 \
-  aom_highbd_12_sub_pixel_variance4x16_c
-
-uint32_t aom_highbd_12_sub_pixel_variance4x4_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance4x4 \
-  aom_highbd_12_sub_pixel_variance4x4_c
-
-uint32_t aom_highbd_12_sub_pixel_variance4x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance4x8 \
-  aom_highbd_12_sub_pixel_variance4x8_c
-
-uint32_t aom_highbd_12_sub_pixel_variance64x128_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance64x128 \
-  aom_highbd_12_sub_pixel_variance64x128_c
-
-uint32_t aom_highbd_12_sub_pixel_variance64x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance64x16 \
-  aom_highbd_12_sub_pixel_variance64x16_c
-
-uint32_t aom_highbd_12_sub_pixel_variance64x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance64x32 \
-  aom_highbd_12_sub_pixel_variance64x32_c
-
-uint32_t aom_highbd_12_sub_pixel_variance64x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance64x64 \
-  aom_highbd_12_sub_pixel_variance64x64_c
-
-uint32_t aom_highbd_12_sub_pixel_variance8x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance8x16 \
-  aom_highbd_12_sub_pixel_variance8x16_c
-
-uint32_t aom_highbd_12_sub_pixel_variance8x32_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance8x32 \
-  aom_highbd_12_sub_pixel_variance8x32_c
-
-uint32_t aom_highbd_12_sub_pixel_variance8x4_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance8x4 \
-  aom_highbd_12_sub_pixel_variance8x4_c
-
-uint32_t aom_highbd_12_sub_pixel_variance8x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance8x8 \
-  aom_highbd_12_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_12_variance128x128_c(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-#define aom_highbd_12_variance128x128 aom_highbd_12_variance128x128_c
-
-unsigned int aom_highbd_12_variance128x64_c(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-#define aom_highbd_12_variance128x64 aom_highbd_12_variance128x64_c
-
-unsigned int aom_highbd_12_variance16x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_12_variance16x16 aom_highbd_12_variance16x16_c
-
-unsigned int aom_highbd_12_variance16x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_12_variance16x32 aom_highbd_12_variance16x32_c
-
-unsigned int aom_highbd_12_variance16x4_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_12_variance16x4 aom_highbd_12_variance16x4_c
-
-unsigned int aom_highbd_12_variance16x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           uint32_t* sse);
-#define aom_highbd_12_variance16x64 aom_highbd_12_variance16x64_c
-
-unsigned int aom_highbd_12_variance16x8_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_12_variance16x8 aom_highbd_12_variance16x8_c
-
-unsigned int aom_highbd_12_variance2x2_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance2x2 aom_highbd_12_variance2x2_c
-
-unsigned int aom_highbd_12_variance2x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance2x4 aom_highbd_12_variance2x4_c
-
-unsigned int aom_highbd_12_variance32x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_12_variance32x16 aom_highbd_12_variance32x16_c
-
-unsigned int aom_highbd_12_variance32x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_12_variance32x32 aom_highbd_12_variance32x32_c
-
-unsigned int aom_highbd_12_variance32x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_12_variance32x64 aom_highbd_12_variance32x64_c
-
-unsigned int aom_highbd_12_variance32x8_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_12_variance32x8 aom_highbd_12_variance32x8_c
-
-unsigned int aom_highbd_12_variance4x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_12_variance4x16 aom_highbd_12_variance4x16_c
-
-unsigned int aom_highbd_12_variance4x2_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance4x2 aom_highbd_12_variance4x2_c
-
-unsigned int aom_highbd_12_variance4x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance4x4 aom_highbd_12_variance4x4_c
-
-unsigned int aom_highbd_12_variance4x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance4x8 aom_highbd_12_variance4x8_c
-
-unsigned int aom_highbd_12_variance64x128_c(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-#define aom_highbd_12_variance64x128 aom_highbd_12_variance64x128_c
-
-unsigned int aom_highbd_12_variance64x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           uint32_t* sse);
-#define aom_highbd_12_variance64x16 aom_highbd_12_variance64x16_c
-
-unsigned int aom_highbd_12_variance64x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_12_variance64x32 aom_highbd_12_variance64x32_c
-
-unsigned int aom_highbd_12_variance64x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_12_variance64x64 aom_highbd_12_variance64x64_c
-
-unsigned int aom_highbd_12_variance8x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_12_variance8x16 aom_highbd_12_variance8x16_c
-
-unsigned int aom_highbd_12_variance8x32_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_12_variance8x32 aom_highbd_12_variance8x32_c
-
-unsigned int aom_highbd_12_variance8x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance8x4 aom_highbd_12_variance8x4_c
-
-unsigned int aom_highbd_12_variance8x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance8x8 aom_highbd_12_variance8x8_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x128 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x64 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x16 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x16_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x32 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x32_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x4 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x4_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x64 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x64_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x8 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x8_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x16 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x16_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x32 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x32_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x64 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x64_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x8 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x8_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x16 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x4 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x4_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x8 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x128 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x16 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x16_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x32 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x32_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x64 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x64_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x16 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x16_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x32 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x32_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x4 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x4_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x8 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x8_c
-
-void aom_highbd_8_get16x16var_c(const uint8_t* src_ptr,
-                                int source_stride,
-                                const uint8_t* ref_ptr,
-                                int ref_stride,
-                                unsigned int* sse,
-                                int* sum);
-#define aom_highbd_8_get16x16var aom_highbd_8_get16x16var_c
-
-void aom_highbd_8_get8x8var_c(const uint8_t* src_ptr,
-                              int source_stride,
-                              const uint8_t* ref_ptr,
-                              int ref_stride,
-                              unsigned int* sse,
-                              int* sum);
-#define aom_highbd_8_get8x8var aom_highbd_8_get8x8var_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance128x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance128x128 \
-  aom_highbd_8_masked_sub_pixel_variance128x128_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance128x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance128x64 \
-  aom_highbd_8_masked_sub_pixel_variance128x64_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance16x16 \
-  aom_highbd_8_masked_sub_pixel_variance16x16_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance16x32 \
-  aom_highbd_8_masked_sub_pixel_variance16x32_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance16x4 \
-  aom_highbd_8_masked_sub_pixel_variance16x4_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance16x64 \
-  aom_highbd_8_masked_sub_pixel_variance16x64_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance16x8 \
-  aom_highbd_8_masked_sub_pixel_variance16x8_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance32x16 \
-  aom_highbd_8_masked_sub_pixel_variance32x16_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance32x32 \
-  aom_highbd_8_masked_sub_pixel_variance32x32_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance32x64 \
-  aom_highbd_8_masked_sub_pixel_variance32x64_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance32x8 \
-  aom_highbd_8_masked_sub_pixel_variance32x8_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance4x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance4x16 \
-  aom_highbd_8_masked_sub_pixel_variance4x16_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance4x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance4x4 \
-  aom_highbd_8_masked_sub_pixel_variance4x4_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance4x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance4x8 \
-  aom_highbd_8_masked_sub_pixel_variance4x8_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance64x128 \
-  aom_highbd_8_masked_sub_pixel_variance64x128_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance64x16 \
-  aom_highbd_8_masked_sub_pixel_variance64x16_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance64x32 \
-  aom_highbd_8_masked_sub_pixel_variance64x32_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance64x64 \
-  aom_highbd_8_masked_sub_pixel_variance64x64_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance8x16 \
-  aom_highbd_8_masked_sub_pixel_variance8x16_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance8x32 \
-  aom_highbd_8_masked_sub_pixel_variance8x32_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance8x4 \
-  aom_highbd_8_masked_sub_pixel_variance8x4_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance8x8 \
-  aom_highbd_8_masked_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_8_mse16x16_c(const uint8_t* src_ptr,
-                                     int source_stride,
-                                     const uint8_t* ref_ptr,
-                                     int recon_stride,
-                                     unsigned int* sse);
-#define aom_highbd_8_mse16x16 aom_highbd_8_mse16x16_c
-
-unsigned int aom_highbd_8_mse16x8_c(const uint8_t* src_ptr,
-                                    int source_stride,
-                                    const uint8_t* ref_ptr,
-                                    int recon_stride,
-                                    unsigned int* sse);
-#define aom_highbd_8_mse16x8 aom_highbd_8_mse16x8_c
-
-unsigned int aom_highbd_8_mse8x16_c(const uint8_t* src_ptr,
-                                    int source_stride,
-                                    const uint8_t* ref_ptr,
-                                    int recon_stride,
-                                    unsigned int* sse);
-#define aom_highbd_8_mse8x16 aom_highbd_8_mse8x16_c
-
-unsigned int aom_highbd_8_mse8x8_c(const uint8_t* src_ptr,
-                                   int source_stride,
-                                   const uint8_t* ref_ptr,
-                                   int recon_stride,
-                                   unsigned int* sse);
-#define aom_highbd_8_mse8x8 aom_highbd_8_mse8x8_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance128x128 \
-  aom_highbd_8_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance128x64 \
-  aom_highbd_8_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance16x16 \
-  aom_highbd_8_sub_pixel_avg_variance16x16_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x32_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance16x32 \
-  aom_highbd_8_sub_pixel_avg_variance16x32_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x4_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance16x4 \
-  aom_highbd_8_sub_pixel_avg_variance16x4_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x64_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance16x64 \
-  aom_highbd_8_sub_pixel_avg_variance16x64_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance16x8 \
-  aom_highbd_8_sub_pixel_avg_variance16x8_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance32x16 \
-  aom_highbd_8_sub_pixel_avg_variance32x16_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x32_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance32x32 \
-  aom_highbd_8_sub_pixel_avg_variance32x32_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x64_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance32x64 \
-  aom_highbd_8_sub_pixel_avg_variance32x64_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance32x8 \
-  aom_highbd_8_sub_pixel_avg_variance32x8_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance4x16_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance4x16 \
-  aom_highbd_8_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse,
-                                                  const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance4x4 \
-  aom_highbd_8_sub_pixel_avg_variance4x4_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse,
-                                                  const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance4x8 \
-  aom_highbd_8_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance64x128 \
-  aom_highbd_8_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance64x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance64x16 \
-  aom_highbd_8_sub_pixel_avg_variance64x16_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance64x32_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance64x32 \
-  aom_highbd_8_sub_pixel_avg_variance64x32_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance64x64_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance64x64 \
-  aom_highbd_8_sub_pixel_avg_variance64x64_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance8x16 \
-  aom_highbd_8_sub_pixel_avg_variance8x16_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x32_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance8x32 \
-  aom_highbd_8_sub_pixel_avg_variance8x32_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse,
-                                                  const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance8x4 \
-  aom_highbd_8_sub_pixel_avg_variance8x4_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse,
-                                                  const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance8x8 \
-  aom_highbd_8_sub_pixel_avg_variance8x8_c
-
-uint32_t aom_highbd_8_sub_pixel_variance128x128_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance128x128 \
-  aom_highbd_8_sub_pixel_variance128x128_c
-
-uint32_t aom_highbd_8_sub_pixel_variance128x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance128x64 \
-  aom_highbd_8_sub_pixel_variance128x64_c
-
-uint32_t aom_highbd_8_sub_pixel_variance16x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance16x16 \
-  aom_highbd_8_sub_pixel_variance16x16_c
-
-uint32_t aom_highbd_8_sub_pixel_variance16x32_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance16x32 \
-  aom_highbd_8_sub_pixel_variance16x32_c
-
-uint32_t aom_highbd_8_sub_pixel_variance16x4_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance16x4 \
-  aom_highbd_8_sub_pixel_variance16x4_c
-
-uint32_t aom_highbd_8_sub_pixel_variance16x64_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance16x64 \
-  aom_highbd_8_sub_pixel_variance16x64_c
-
-uint32_t aom_highbd_8_sub_pixel_variance16x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance16x8 \
-  aom_highbd_8_sub_pixel_variance16x8_c
-
-uint32_t aom_highbd_8_sub_pixel_variance32x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance32x16 \
-  aom_highbd_8_sub_pixel_variance32x16_c
-
-uint32_t aom_highbd_8_sub_pixel_variance32x32_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance32x32 \
-  aom_highbd_8_sub_pixel_variance32x32_c
-
-uint32_t aom_highbd_8_sub_pixel_variance32x64_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance32x64 \
-  aom_highbd_8_sub_pixel_variance32x64_c
-
-uint32_t aom_highbd_8_sub_pixel_variance32x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance32x8 \
-  aom_highbd_8_sub_pixel_variance32x8_c
-
-uint32_t aom_highbd_8_sub_pixel_variance4x16_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance4x16 \
-  aom_highbd_8_sub_pixel_variance4x16_c
-
-uint32_t aom_highbd_8_sub_pixel_variance4x4_c(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance4x4 aom_highbd_8_sub_pixel_variance4x4_c
-
-uint32_t aom_highbd_8_sub_pixel_variance4x8_c(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance4x8 aom_highbd_8_sub_pixel_variance4x8_c
-
-uint32_t aom_highbd_8_sub_pixel_variance64x128_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance64x128 \
-  aom_highbd_8_sub_pixel_variance64x128_c
-
-uint32_t aom_highbd_8_sub_pixel_variance64x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance64x16 \
-  aom_highbd_8_sub_pixel_variance64x16_c
-
-uint32_t aom_highbd_8_sub_pixel_variance64x32_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance64x32 \
-  aom_highbd_8_sub_pixel_variance64x32_c
-
-uint32_t aom_highbd_8_sub_pixel_variance64x64_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance64x64 \
-  aom_highbd_8_sub_pixel_variance64x64_c
-
-uint32_t aom_highbd_8_sub_pixel_variance8x16_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance8x16 \
-  aom_highbd_8_sub_pixel_variance8x16_c
-
-uint32_t aom_highbd_8_sub_pixel_variance8x32_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance8x32 \
-  aom_highbd_8_sub_pixel_variance8x32_c
-
-uint32_t aom_highbd_8_sub_pixel_variance8x4_c(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance8x4 aom_highbd_8_sub_pixel_variance8x4_c
-
-uint32_t aom_highbd_8_sub_pixel_variance8x8_c(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance8x8 aom_highbd_8_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_8_variance128x128_c(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-#define aom_highbd_8_variance128x128 aom_highbd_8_variance128x128_c
-
-unsigned int aom_highbd_8_variance128x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_8_variance128x64 aom_highbd_8_variance128x64_c
-
-unsigned int aom_highbd_8_variance16x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_8_variance16x16 aom_highbd_8_variance16x16_c
-
-unsigned int aom_highbd_8_variance16x32_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_8_variance16x32 aom_highbd_8_variance16x32_c
-
-unsigned int aom_highbd_8_variance16x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         uint32_t* sse);
-#define aom_highbd_8_variance16x4 aom_highbd_8_variance16x4_c
-
-unsigned int aom_highbd_8_variance16x64_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_8_variance16x64 aom_highbd_8_variance16x64_c
-
-unsigned int aom_highbd_8_variance16x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_8_variance16x8 aom_highbd_8_variance16x8_c
-
-unsigned int aom_highbd_8_variance2x2_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance2x2 aom_highbd_8_variance2x2_c
-
-unsigned int aom_highbd_8_variance2x4_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance2x4 aom_highbd_8_variance2x4_c
-
-unsigned int aom_highbd_8_variance32x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_8_variance32x16 aom_highbd_8_variance32x16_c
-
-unsigned int aom_highbd_8_variance32x32_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_8_variance32x32 aom_highbd_8_variance32x32_c
-
-unsigned int aom_highbd_8_variance32x64_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_8_variance32x64 aom_highbd_8_variance32x64_c
-
-unsigned int aom_highbd_8_variance32x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         uint32_t* sse);
-#define aom_highbd_8_variance32x8 aom_highbd_8_variance32x8_c
-
-unsigned int aom_highbd_8_variance4x16_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         uint32_t* sse);
-#define aom_highbd_8_variance4x16 aom_highbd_8_variance4x16_c
-
-unsigned int aom_highbd_8_variance4x2_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance4x2 aom_highbd_8_variance4x2_c
-
-unsigned int aom_highbd_8_variance4x4_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance4x4 aom_highbd_8_variance4x4_c
-
-unsigned int aom_highbd_8_variance4x8_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance4x8 aom_highbd_8_variance4x8_c
-
-unsigned int aom_highbd_8_variance64x128_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_8_variance64x128 aom_highbd_8_variance64x128_c
-
-unsigned int aom_highbd_8_variance64x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_8_variance64x16 aom_highbd_8_variance64x16_c
-
-unsigned int aom_highbd_8_variance64x32_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_8_variance64x32 aom_highbd_8_variance64x32_c
-
-unsigned int aom_highbd_8_variance64x64_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_8_variance64x64 aom_highbd_8_variance64x64_c
-
-unsigned int aom_highbd_8_variance8x16_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_8_variance8x16 aom_highbd_8_variance8x16_c
-
-unsigned int aom_highbd_8_variance8x32_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         uint32_t* sse);
-#define aom_highbd_8_variance8x32 aom_highbd_8_variance8x32_c
-
-unsigned int aom_highbd_8_variance8x4_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance8x4 aom_highbd_8_variance8x4_c
-
-unsigned int aom_highbd_8_variance8x8_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance8x8 aom_highbd_8_variance8x8_c
-
-unsigned int aom_highbd_avg_4x4_c(const uint8_t*, int p);
-#define aom_highbd_avg_4x4 aom_highbd_avg_4x4_c
-
-unsigned int aom_highbd_avg_8x8_c(const uint8_t*, int p);
-#define aom_highbd_avg_8x8 aom_highbd_avg_8x8_c
-
-void aom_highbd_blend_a64_d16_mask_c(uint8_t* dst,
-                                     uint32_t dst_stride,
-                                     const CONV_BUF_TYPE* src0,
-                                     uint32_t src0_stride,
-                                     const CONV_BUF_TYPE* src1,
-                                     uint32_t src1_stride,
-                                     const uint8_t* mask,
-                                     uint32_t mask_stride,
-                                     int w,
-                                     int h,
-                                     int subw,
-                                     int subh,
-                                     ConvolveParams* conv_params,
-                                     const int bd);
-#define aom_highbd_blend_a64_d16_mask aom_highbd_blend_a64_d16_mask_c
-
-void aom_highbd_blend_a64_hmask_c(uint8_t* dst,
-                                  uint32_t dst_stride,
-                                  const uint8_t* src0,
-                                  uint32_t src0_stride,
-                                  const uint8_t* src1,
-                                  uint32_t src1_stride,
-                                  const uint8_t* mask,
-                                  int w,
-                                  int h,
-                                  int bd);
-#define aom_highbd_blend_a64_hmask aom_highbd_blend_a64_hmask_c
-
-void aom_highbd_blend_a64_mask_c(uint8_t* dst,
-                                 uint32_t dst_stride,
-                                 const uint8_t* src0,
-                                 uint32_t src0_stride,
-                                 const uint8_t* src1,
-                                 uint32_t src1_stride,
-                                 const uint8_t* mask,
-                                 uint32_t mask_stride,
-                                 int w,
-                                 int h,
-                                 int subw,
-                                 int subh,
-                                 int bd);
-#define aom_highbd_blend_a64_mask aom_highbd_blend_a64_mask_c
-
-void aom_highbd_blend_a64_vmask_c(uint8_t* dst,
-                                  uint32_t dst_stride,
-                                  const uint8_t* src0,
-                                  uint32_t src0_stride,
-                                  const uint8_t* src1,
-                                  uint32_t src1_stride,
-                                  const uint8_t* mask,
-                                  int w,
-                                  int h,
-                                  int bd);
-#define aom_highbd_blend_a64_vmask aom_highbd_blend_a64_vmask_c
-
-void aom_highbd_comp_avg_pred_c(uint8_t* comp_pred8,
-                                const uint8_t* pred8,
-                                int width,
-                                int height,
-                                const uint8_t* ref8,
-                                int ref_stride);
-#define aom_highbd_comp_avg_pred aom_highbd_comp_avg_pred_c
-
-void aom_highbd_comp_avg_upsampled_pred_c(MACROBLOCKD* xd,
-                                          const struct AV1Common* const cm,
-                                          int mi_row,
-                                          int mi_col,
-                                          const MV* const mv,
-                                          uint8_t* comp_pred8,
-                                          const uint8_t* pred8,
-                                          int width,
-                                          int height,
-                                          int subpel_x_q3,
-                                          int subpel_y_q3,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          int bd,
-                                          int subpel_search);
-#define aom_highbd_comp_avg_upsampled_pred aom_highbd_comp_avg_upsampled_pred_c
-
-void aom_highbd_comp_mask_pred_c(uint8_t* comp_pred,
-                                 const uint8_t* pred8,
-                                 int width,
-                                 int height,
-                                 const uint8_t* ref8,
-                                 int ref_stride,
-                                 const uint8_t* mask,
-                                 int mask_stride,
-                                 int invert_mask);
-#define aom_highbd_comp_mask_pred aom_highbd_comp_mask_pred_c
-
-void aom_highbd_convolve8_horiz_c(const uint8_t* src,
-                                  ptrdiff_t src_stride,
-                                  uint8_t* dst,
-                                  ptrdiff_t dst_stride,
-                                  const int16_t* filter_x,
-                                  int x_step_q4,
-                                  const int16_t* filter_y,
-                                  int y_step_q4,
-                                  int w,
-                                  int h,
-                                  int bd);
-#define aom_highbd_convolve8_horiz aom_highbd_convolve8_horiz_c
-
-void aom_highbd_convolve8_vert_c(const uint8_t* src,
-                                 ptrdiff_t src_stride,
-                                 uint8_t* dst,
-                                 ptrdiff_t dst_stride,
-                                 const int16_t* filter_x,
-                                 int x_step_q4,
-                                 const int16_t* filter_y,
-                                 int y_step_q4,
-                                 int w,
-                                 int h,
-                                 int bd);
-#define aom_highbd_convolve8_vert aom_highbd_convolve8_vert_c
-
-void aom_highbd_convolve_copy_c(const uint16_t* src,
-                                ptrdiff_t src_stride,
-                                uint16_t* dst,
-                                ptrdiff_t dst_stride,
-                                int w,
-                                int h);
-#define aom_highbd_convolve_copy aom_highbd_convolve_copy_c
-
-void aom_highbd_dc_128_predictor_16x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_16x16 aom_highbd_dc_128_predictor_16x16_c
-
-void aom_highbd_dc_128_predictor_16x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_16x32 aom_highbd_dc_128_predictor_16x32_c
-
-void aom_highbd_dc_128_predictor_16x4_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_16x4 aom_highbd_dc_128_predictor_16x4_c
-
-void aom_highbd_dc_128_predictor_16x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_16x64 aom_highbd_dc_128_predictor_16x64_c
-
-void aom_highbd_dc_128_predictor_16x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_16x8 aom_highbd_dc_128_predictor_16x8_c
-
-void aom_highbd_dc_128_predictor_2x2_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_128_predictor_2x2 aom_highbd_dc_128_predictor_2x2_c
-
-void aom_highbd_dc_128_predictor_32x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_32x16 aom_highbd_dc_128_predictor_32x16_c
-
-void aom_highbd_dc_128_predictor_32x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_32x32 aom_highbd_dc_128_predictor_32x32_c
-
-void aom_highbd_dc_128_predictor_32x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_32x64 aom_highbd_dc_128_predictor_32x64_c
-
-void aom_highbd_dc_128_predictor_32x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_32x8 aom_highbd_dc_128_predictor_32x8_c
-
-void aom_highbd_dc_128_predictor_4x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_4x16 aom_highbd_dc_128_predictor_4x16_c
-
-void aom_highbd_dc_128_predictor_4x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_128_predictor_4x4 aom_highbd_dc_128_predictor_4x4_c
-
-void aom_highbd_dc_128_predictor_4x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_128_predictor_4x8 aom_highbd_dc_128_predictor_4x8_c
-
-void aom_highbd_dc_128_predictor_64x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_64x16 aom_highbd_dc_128_predictor_64x16_c
-
-void aom_highbd_dc_128_predictor_64x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_64x32 aom_highbd_dc_128_predictor_64x32_c
-
-void aom_highbd_dc_128_predictor_64x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_64x64 aom_highbd_dc_128_predictor_64x64_c
-
-void aom_highbd_dc_128_predictor_8x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_8x16 aom_highbd_dc_128_predictor_8x16_c
-
-void aom_highbd_dc_128_predictor_8x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_8x32 aom_highbd_dc_128_predictor_8x32_c
-
-void aom_highbd_dc_128_predictor_8x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_128_predictor_8x4 aom_highbd_dc_128_predictor_8x4_c
-
-void aom_highbd_dc_128_predictor_8x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_128_predictor_8x8 aom_highbd_dc_128_predictor_8x8_c
-
-void aom_highbd_dc_left_predictor_16x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_16x16 aom_highbd_dc_left_predictor_16x16_c
-
-void aom_highbd_dc_left_predictor_16x32_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_16x32 aom_highbd_dc_left_predictor_16x32_c
-
-void aom_highbd_dc_left_predictor_16x4_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_16x4 aom_highbd_dc_left_predictor_16x4_c
-
-void aom_highbd_dc_left_predictor_16x64_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_16x64 aom_highbd_dc_left_predictor_16x64_c
-
-void aom_highbd_dc_left_predictor_16x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_16x8 aom_highbd_dc_left_predictor_16x8_c
-
-void aom_highbd_dc_left_predictor_2x2_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_left_predictor_2x2 aom_highbd_dc_left_predictor_2x2_c
-
-void aom_highbd_dc_left_predictor_32x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_32x16 aom_highbd_dc_left_predictor_32x16_c
-
-void aom_highbd_dc_left_predictor_32x32_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_32x32 aom_highbd_dc_left_predictor_32x32_c
-
-void aom_highbd_dc_left_predictor_32x64_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_32x64 aom_highbd_dc_left_predictor_32x64_c
-
-void aom_highbd_dc_left_predictor_32x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_32x8 aom_highbd_dc_left_predictor_32x8_c
-
-void aom_highbd_dc_left_predictor_4x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_4x16 aom_highbd_dc_left_predictor_4x16_c
-
-void aom_highbd_dc_left_predictor_4x4_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_left_predictor_4x4 aom_highbd_dc_left_predictor_4x4_c
-
-void aom_highbd_dc_left_predictor_4x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_left_predictor_4x8 aom_highbd_dc_left_predictor_4x8_c
-
-void aom_highbd_dc_left_predictor_64x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_64x16 aom_highbd_dc_left_predictor_64x16_c
-
-void aom_highbd_dc_left_predictor_64x32_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_64x32 aom_highbd_dc_left_predictor_64x32_c
-
-void aom_highbd_dc_left_predictor_64x64_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_64x64 aom_highbd_dc_left_predictor_64x64_c
-
-void aom_highbd_dc_left_predictor_8x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_8x16 aom_highbd_dc_left_predictor_8x16_c
-
-void aom_highbd_dc_left_predictor_8x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_8x32 aom_highbd_dc_left_predictor_8x32_c
-
-void aom_highbd_dc_left_predictor_8x4_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_left_predictor_8x4 aom_highbd_dc_left_predictor_8x4_c
-
-void aom_highbd_dc_left_predictor_8x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_left_predictor_8x8 aom_highbd_dc_left_predictor_8x8_c
-
-void aom_highbd_dc_predictor_16x16_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_16x16 aom_highbd_dc_predictor_16x16_c
-
-void aom_highbd_dc_predictor_16x32_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_16x32 aom_highbd_dc_predictor_16x32_c
-
-void aom_highbd_dc_predictor_16x4_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_16x4 aom_highbd_dc_predictor_16x4_c
-
-void aom_highbd_dc_predictor_16x64_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_16x64 aom_highbd_dc_predictor_16x64_c
-
-void aom_highbd_dc_predictor_16x8_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_16x8 aom_highbd_dc_predictor_16x8_c
-
-void aom_highbd_dc_predictor_2x2_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_dc_predictor_2x2 aom_highbd_dc_predictor_2x2_c
-
-void aom_highbd_dc_predictor_32x16_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_32x16 aom_highbd_dc_predictor_32x16_c
-
-void aom_highbd_dc_predictor_32x32_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_32x32 aom_highbd_dc_predictor_32x32_c
-
-void aom_highbd_dc_predictor_32x64_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_32x64 aom_highbd_dc_predictor_32x64_c
-
-void aom_highbd_dc_predictor_32x8_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_32x8 aom_highbd_dc_predictor_32x8_c
-
-void aom_highbd_dc_predictor_4x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_4x16 aom_highbd_dc_predictor_4x16_c
-
-void aom_highbd_dc_predictor_4x4_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_dc_predictor_4x4 aom_highbd_dc_predictor_4x4_c
-
-void aom_highbd_dc_predictor_4x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_dc_predictor_4x8 aom_highbd_dc_predictor_4x8_c
-
-void aom_highbd_dc_predictor_64x16_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_64x16 aom_highbd_dc_predictor_64x16_c
-
-void aom_highbd_dc_predictor_64x32_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_64x32 aom_highbd_dc_predictor_64x32_c
-
-void aom_highbd_dc_predictor_64x64_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_64x64 aom_highbd_dc_predictor_64x64_c
-
-void aom_highbd_dc_predictor_8x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_8x16 aom_highbd_dc_predictor_8x16_c
-
-void aom_highbd_dc_predictor_8x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_8x32 aom_highbd_dc_predictor_8x32_c
-
-void aom_highbd_dc_predictor_8x4_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_dc_predictor_8x4 aom_highbd_dc_predictor_8x4_c
-
-void aom_highbd_dc_predictor_8x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_dc_predictor_8x8 aom_highbd_dc_predictor_8x8_c
-
-void aom_highbd_dc_top_predictor_16x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_16x16 aom_highbd_dc_top_predictor_16x16_c
-
-void aom_highbd_dc_top_predictor_16x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_16x32 aom_highbd_dc_top_predictor_16x32_c
-
-void aom_highbd_dc_top_predictor_16x4_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_16x4 aom_highbd_dc_top_predictor_16x4_c
-
-void aom_highbd_dc_top_predictor_16x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_16x64 aom_highbd_dc_top_predictor_16x64_c
-
-void aom_highbd_dc_top_predictor_16x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_16x8 aom_highbd_dc_top_predictor_16x8_c
-
-void aom_highbd_dc_top_predictor_2x2_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_top_predictor_2x2 aom_highbd_dc_top_predictor_2x2_c
-
-void aom_highbd_dc_top_predictor_32x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_32x16 aom_highbd_dc_top_predictor_32x16_c
-
-void aom_highbd_dc_top_predictor_32x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_32x32 aom_highbd_dc_top_predictor_32x32_c
-
-void aom_highbd_dc_top_predictor_32x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_32x64 aom_highbd_dc_top_predictor_32x64_c
-
-void aom_highbd_dc_top_predictor_32x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_32x8 aom_highbd_dc_top_predictor_32x8_c
-
-void aom_highbd_dc_top_predictor_4x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_4x16 aom_highbd_dc_top_predictor_4x16_c
-
-void aom_highbd_dc_top_predictor_4x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_top_predictor_4x4 aom_highbd_dc_top_predictor_4x4_c
-
-void aom_highbd_dc_top_predictor_4x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_top_predictor_4x8 aom_highbd_dc_top_predictor_4x8_c
-
-void aom_highbd_dc_top_predictor_64x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_64x16 aom_highbd_dc_top_predictor_64x16_c
-
-void aom_highbd_dc_top_predictor_64x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_64x32 aom_highbd_dc_top_predictor_64x32_c
-
-void aom_highbd_dc_top_predictor_64x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_64x64 aom_highbd_dc_top_predictor_64x64_c
-
-void aom_highbd_dc_top_predictor_8x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_8x16 aom_highbd_dc_top_predictor_8x16_c
-
-void aom_highbd_dc_top_predictor_8x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_8x32 aom_highbd_dc_top_predictor_8x32_c
-
-void aom_highbd_dc_top_predictor_8x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_top_predictor_8x4 aom_highbd_dc_top_predictor_8x4_c
-
-void aom_highbd_dc_top_predictor_8x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_top_predictor_8x8 aom_highbd_dc_top_predictor_8x8_c
-
-void aom_highbd_dist_wtd_comp_avg_pred_c(uint8_t* comp_pred8,
-                                         const uint8_t* pred8,
-                                         int width,
-                                         int height,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_comp_avg_pred aom_highbd_dist_wtd_comp_avg_pred_c
-
-void aom_highbd_dist_wtd_comp_avg_upsampled_pred_c(
-    MACROBLOCKD* xd,
-    const struct AV1Common* const cm,
-    int mi_row,
-    int mi_col,
-    const MV* const mv,
-    uint8_t* comp_pred8,
-    const uint8_t* pred8,
-    int width,
-    int height,
-    int subpel_x_q3,
-    int subpel_y_q3,
-    const uint8_t* ref8,
-    int ref_stride,
-    int bd,
-    const DIST_WTD_COMP_PARAMS* jcp_param,
-    int subpel_search);
-#define aom_highbd_dist_wtd_comp_avg_upsampled_pred \
-  aom_highbd_dist_wtd_comp_avg_upsampled_pred_c
-
-unsigned int aom_highbd_dist_wtd_sad128x128_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad128x128_avg aom_highbd_dist_wtd_sad128x128_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad128x64_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad128x64_avg aom_highbd_dist_wtd_sad128x64_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad16x16_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad16x16_avg aom_highbd_dist_wtd_sad16x16_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad16x32_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad16x32_avg aom_highbd_dist_wtd_sad16x32_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad16x4_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad16x4_avg aom_highbd_dist_wtd_sad16x4_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad16x64_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad16x64_avg aom_highbd_dist_wtd_sad16x64_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad16x8_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad16x8_avg aom_highbd_dist_wtd_sad16x8_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad32x16_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad32x16_avg aom_highbd_dist_wtd_sad32x16_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad32x32_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad32x32_avg aom_highbd_dist_wtd_sad32x32_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad32x64_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad32x64_avg aom_highbd_dist_wtd_sad32x64_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad32x8_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad32x8_avg aom_highbd_dist_wtd_sad32x8_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad4x16_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad4x16_avg aom_highbd_dist_wtd_sad4x16_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad4x4_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad4x4_avg aom_highbd_dist_wtd_sad4x4_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad4x8_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad4x8_avg aom_highbd_dist_wtd_sad4x8_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad64x128_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad64x128_avg aom_highbd_dist_wtd_sad64x128_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad64x16_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad64x16_avg aom_highbd_dist_wtd_sad64x16_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad64x32_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad64x32_avg aom_highbd_dist_wtd_sad64x32_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad64x64_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad64x64_avg aom_highbd_dist_wtd_sad64x64_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad8x16_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad8x16_avg aom_highbd_dist_wtd_sad8x16_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad8x32_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad8x32_avg aom_highbd_dist_wtd_sad8x32_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad8x4_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad8x4_avg aom_highbd_dist_wtd_sad8x4_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad8x8_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad8x8_avg aom_highbd_dist_wtd_sad8x8_avg_c
-
-void aom_highbd_fdct8x8_c(const int16_t* input, tran_low_t* output, int stride);
-#define aom_highbd_fdct8x8 aom_highbd_fdct8x8_c
-
-void aom_highbd_h_predictor_16x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_16x16 aom_highbd_h_predictor_16x16_c
-
-void aom_highbd_h_predictor_16x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_16x32 aom_highbd_h_predictor_16x32_c
-
-void aom_highbd_h_predictor_16x4_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_16x4 aom_highbd_h_predictor_16x4_c
-
-void aom_highbd_h_predictor_16x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_16x64 aom_highbd_h_predictor_16x64_c
-
-void aom_highbd_h_predictor_16x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_16x8 aom_highbd_h_predictor_16x8_c
-
-void aom_highbd_h_predictor_2x2_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_h_predictor_2x2 aom_highbd_h_predictor_2x2_c
-
-void aom_highbd_h_predictor_32x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_32x16 aom_highbd_h_predictor_32x16_c
-
-void aom_highbd_h_predictor_32x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_32x32 aom_highbd_h_predictor_32x32_c
-
-void aom_highbd_h_predictor_32x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_32x64 aom_highbd_h_predictor_32x64_c
-
-void aom_highbd_h_predictor_32x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_32x8 aom_highbd_h_predictor_32x8_c
-
-void aom_highbd_h_predictor_4x16_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_4x16 aom_highbd_h_predictor_4x16_c
-
-void aom_highbd_h_predictor_4x4_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_h_predictor_4x4 aom_highbd_h_predictor_4x4_c
-
-void aom_highbd_h_predictor_4x8_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_h_predictor_4x8 aom_highbd_h_predictor_4x8_c
-
-void aom_highbd_h_predictor_64x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_64x16 aom_highbd_h_predictor_64x16_c
-
-void aom_highbd_h_predictor_64x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_64x32 aom_highbd_h_predictor_64x32_c
-
-void aom_highbd_h_predictor_64x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_64x64 aom_highbd_h_predictor_64x64_c
-
-void aom_highbd_h_predictor_8x16_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_8x16 aom_highbd_h_predictor_8x16_c
-
-void aom_highbd_h_predictor_8x32_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_8x32 aom_highbd_h_predictor_8x32_c
-
-void aom_highbd_h_predictor_8x4_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_h_predictor_8x4 aom_highbd_h_predictor_8x4_c
-
-void aom_highbd_h_predictor_8x8_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_h_predictor_8x8 aom_highbd_h_predictor_8x8_c
-
-void aom_highbd_hadamard_16x16_c(const int16_t* src_diff,
-                                 ptrdiff_t src_stride,
-                                 tran_low_t* coeff);
-#define aom_highbd_hadamard_16x16 aom_highbd_hadamard_16x16_c
-
-void aom_highbd_hadamard_32x32_c(const int16_t* src_diff,
-                                 ptrdiff_t src_stride,
-                                 tran_low_t* coeff);
-#define aom_highbd_hadamard_32x32 aom_highbd_hadamard_32x32_c
-
-void aom_highbd_hadamard_8x8_c(const int16_t* src_diff,
-                               ptrdiff_t src_stride,
-                               tran_low_t* coeff);
-#define aom_highbd_hadamard_8x8 aom_highbd_hadamard_8x8_c
-
-void aom_highbd_lpf_horizontal_14_c(uint16_t* s,
-                                    int pitch,
-                                    const uint8_t* blimit,
-                                    const uint8_t* limit,
-                                    const uint8_t* thresh,
-                                    int bd);
-#define aom_highbd_lpf_horizontal_14 aom_highbd_lpf_horizontal_14_c
-
-void aom_highbd_lpf_horizontal_14_dual_c(uint16_t* s,
-                                         int pitch,
-                                         const uint8_t* blimit0,
-                                         const uint8_t* limit0,
-                                         const uint8_t* thresh0,
-                                         const uint8_t* blimit1,
-                                         const uint8_t* limit1,
-                                         const uint8_t* thresh1,
-                                         int bd);
-#define aom_highbd_lpf_horizontal_14_dual aom_highbd_lpf_horizontal_14_dual_c
-
-void aom_highbd_lpf_horizontal_4_c(uint16_t* s,
-                                   int pitch,
-                                   const uint8_t* blimit,
-                                   const uint8_t* limit,
-                                   const uint8_t* thresh,
-                                   int bd);
-#define aom_highbd_lpf_horizontal_4 aom_highbd_lpf_horizontal_4_c
-
-void aom_highbd_lpf_horizontal_4_dual_c(uint16_t* s,
-                                        int pitch,
-                                        const uint8_t* blimit0,
-                                        const uint8_t* limit0,
-                                        const uint8_t* thresh0,
-                                        const uint8_t* blimit1,
-                                        const uint8_t* limit1,
-                                        const uint8_t* thresh1,
-                                        int bd);
-#define aom_highbd_lpf_horizontal_4_dual aom_highbd_lpf_horizontal_4_dual_c
-
-void aom_highbd_lpf_horizontal_6_c(uint16_t* s,
-                                   int pitch,
-                                   const uint8_t* blimit,
-                                   const uint8_t* limit,
-                                   const uint8_t* thresh,
-                                   int bd);
-#define aom_highbd_lpf_horizontal_6 aom_highbd_lpf_horizontal_6_c
-
-void aom_highbd_lpf_horizontal_6_dual_c(uint16_t* s,
-                                        int pitch,
-                                        const uint8_t* blimit0,
-                                        const uint8_t* limit0,
-                                        const uint8_t* thresh0,
-                                        const uint8_t* blimit1,
-                                        const uint8_t* limit1,
-                                        const uint8_t* thresh1,
-                                        int bd);
-#define aom_highbd_lpf_horizontal_6_dual aom_highbd_lpf_horizontal_6_dual_c
-
-void aom_highbd_lpf_horizontal_8_c(uint16_t* s,
-                                   int pitch,
-                                   const uint8_t* blimit,
-                                   const uint8_t* limit,
-                                   const uint8_t* thresh,
-                                   int bd);
-#define aom_highbd_lpf_horizontal_8 aom_highbd_lpf_horizontal_8_c
-
-void aom_highbd_lpf_horizontal_8_dual_c(uint16_t* s,
-                                        int pitch,
-                                        const uint8_t* blimit0,
-                                        const uint8_t* limit0,
-                                        const uint8_t* thresh0,
-                                        const uint8_t* blimit1,
-                                        const uint8_t* limit1,
-                                        const uint8_t* thresh1,
-                                        int bd);
-#define aom_highbd_lpf_horizontal_8_dual aom_highbd_lpf_horizontal_8_dual_c
-
-void aom_highbd_lpf_vertical_14_c(uint16_t* s,
-                                  int pitch,
-                                  const uint8_t* blimit,
-                                  const uint8_t* limit,
-                                  const uint8_t* thresh,
-                                  int bd);
-#define aom_highbd_lpf_vertical_14 aom_highbd_lpf_vertical_14_c
-
-void aom_highbd_lpf_vertical_14_dual_c(uint16_t* s,
-                                       int pitch,
-                                       const uint8_t* blimit0,
-                                       const uint8_t* limit0,
-                                       const uint8_t* thresh0,
-                                       const uint8_t* blimit1,
-                                       const uint8_t* limit1,
-                                       const uint8_t* thresh1,
-                                       int bd);
-#define aom_highbd_lpf_vertical_14_dual aom_highbd_lpf_vertical_14_dual_c
-
-void aom_highbd_lpf_vertical_4_c(uint16_t* s,
-                                 int pitch,
-                                 const uint8_t* blimit,
-                                 const uint8_t* limit,
-                                 const uint8_t* thresh,
-                                 int bd);
-#define aom_highbd_lpf_vertical_4 aom_highbd_lpf_vertical_4_c
-
-void aom_highbd_lpf_vertical_4_dual_c(uint16_t* s,
-                                      int pitch,
-                                      const uint8_t* blimit0,
-                                      const uint8_t* limit0,
-                                      const uint8_t* thresh0,
-                                      const uint8_t* blimit1,
-                                      const uint8_t* limit1,
-                                      const uint8_t* thresh1,
-                                      int bd);
-#define aom_highbd_lpf_vertical_4_dual aom_highbd_lpf_vertical_4_dual_c
-
-void aom_highbd_lpf_vertical_6_c(uint16_t* s,
-                                 int pitch,
-                                 const uint8_t* blimit,
-                                 const uint8_t* limit,
-                                 const uint8_t* thresh,
-                                 int bd);
-#define aom_highbd_lpf_vertical_6 aom_highbd_lpf_vertical_6_c
-
-void aom_highbd_lpf_vertical_6_dual_c(uint16_t* s,
-                                      int pitch,
-                                      const uint8_t* blimit0,
-                                      const uint8_t* limit0,
-                                      const uint8_t* thresh0,
-                                      const uint8_t* blimit1,
-                                      const uint8_t* limit1,
-                                      const uint8_t* thresh1,
-                                      int bd);
-#define aom_highbd_lpf_vertical_6_dual aom_highbd_lpf_vertical_6_dual_c
-
-void aom_highbd_lpf_vertical_8_c(uint16_t* s,
-                                 int pitch,
-                                 const uint8_t* blimit,
-                                 const uint8_t* limit,
-                                 const uint8_t* thresh,
-                                 int bd);
-#define aom_highbd_lpf_vertical_8 aom_highbd_lpf_vertical_8_c
-
-void aom_highbd_lpf_vertical_8_dual_c(uint16_t* s,
-                                      int pitch,
-                                      const uint8_t* blimit0,
-                                      const uint8_t* limit0,
-                                      const uint8_t* thresh0,
-                                      const uint8_t* blimit1,
-                                      const uint8_t* limit1,
-                                      const uint8_t* thresh1,
-                                      int bd);
-#define aom_highbd_lpf_vertical_8_dual aom_highbd_lpf_vertical_8_dual_c
-
-unsigned int aom_highbd_masked_sad128x128_c(const uint8_t* src8,
-                                            int src_stride,
-                                            const uint8_t* ref8,
-                                            int ref_stride,
-                                            const uint8_t* second_pred8,
-                                            const uint8_t* msk,
-                                            int msk_stride,
-                                            int invert_mask);
-#define aom_highbd_masked_sad128x128 aom_highbd_masked_sad128x128_c
-
-unsigned int aom_highbd_masked_sad128x64_c(const uint8_t* src8,
-                                           int src_stride,
-                                           const uint8_t* ref8,
-                                           int ref_stride,
-                                           const uint8_t* second_pred8,
-                                           const uint8_t* msk,
-                                           int msk_stride,
-                                           int invert_mask);
-#define aom_highbd_masked_sad128x64 aom_highbd_masked_sad128x64_c
-
-unsigned int aom_highbd_masked_sad16x16_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad16x16 aom_highbd_masked_sad16x16_c
-
-unsigned int aom_highbd_masked_sad16x32_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad16x32 aom_highbd_masked_sad16x32_c
-
-unsigned int aom_highbd_masked_sad16x4_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-#define aom_highbd_masked_sad16x4 aom_highbd_masked_sad16x4_c
-
-unsigned int aom_highbd_masked_sad16x64_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad16x64 aom_highbd_masked_sad16x64_c
-
-unsigned int aom_highbd_masked_sad16x8_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-#define aom_highbd_masked_sad16x8 aom_highbd_masked_sad16x8_c
-
-unsigned int aom_highbd_masked_sad32x16_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad32x16 aom_highbd_masked_sad32x16_c
-
-unsigned int aom_highbd_masked_sad32x32_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad32x32 aom_highbd_masked_sad32x32_c
-
-unsigned int aom_highbd_masked_sad32x64_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad32x64 aom_highbd_masked_sad32x64_c
-
-unsigned int aom_highbd_masked_sad32x8_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-#define aom_highbd_masked_sad32x8 aom_highbd_masked_sad32x8_c
-
-unsigned int aom_highbd_masked_sad4x16_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-#define aom_highbd_masked_sad4x16 aom_highbd_masked_sad4x16_c
-
-unsigned int aom_highbd_masked_sad4x4_c(const uint8_t* src8,
-                                        int src_stride,
-                                        const uint8_t* ref8,
-                                        int ref_stride,
-                                        const uint8_t* second_pred8,
-                                        const uint8_t* msk,
-                                        int msk_stride,
-                                        int invert_mask);
-#define aom_highbd_masked_sad4x4 aom_highbd_masked_sad4x4_c
-
-unsigned int aom_highbd_masked_sad4x8_c(const uint8_t* src8,
-                                        int src_stride,
-                                        const uint8_t* ref8,
-                                        int ref_stride,
-                                        const uint8_t* second_pred8,
-                                        const uint8_t* msk,
-                                        int msk_stride,
-                                        int invert_mask);
-#define aom_highbd_masked_sad4x8 aom_highbd_masked_sad4x8_c
-
-unsigned int aom_highbd_masked_sad64x128_c(const uint8_t* src8,
-                                           int src_stride,
-                                           const uint8_t* ref8,
-                                           int ref_stride,
-                                           const uint8_t* second_pred8,
-                                           const uint8_t* msk,
-                                           int msk_stride,
-                                           int invert_mask);
-#define aom_highbd_masked_sad64x128 aom_highbd_masked_sad64x128_c
-
-unsigned int aom_highbd_masked_sad64x16_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad64x16 aom_highbd_masked_sad64x16_c
-
-unsigned int aom_highbd_masked_sad64x32_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad64x32 aom_highbd_masked_sad64x32_c
-
-unsigned int aom_highbd_masked_sad64x64_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad64x64 aom_highbd_masked_sad64x64_c
-
-unsigned int aom_highbd_masked_sad8x16_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-#define aom_highbd_masked_sad8x16 aom_highbd_masked_sad8x16_c
-
-unsigned int aom_highbd_masked_sad8x32_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-#define aom_highbd_masked_sad8x32 aom_highbd_masked_sad8x32_c
-
-unsigned int aom_highbd_masked_sad8x4_c(const uint8_t* src8,
-                                        int src_stride,
-                                        const uint8_t* ref8,
-                                        int ref_stride,
-                                        const uint8_t* second_pred8,
-                                        const uint8_t* msk,
-                                        int msk_stride,
-                                        int invert_mask);
-#define aom_highbd_masked_sad8x4 aom_highbd_masked_sad8x4_c
-
-unsigned int aom_highbd_masked_sad8x8_c(const uint8_t* src8,
-                                        int src_stride,
-                                        const uint8_t* ref8,
-                                        int ref_stride,
-                                        const uint8_t* second_pred8,
-                                        const uint8_t* msk,
-                                        int msk_stride,
-                                        int invert_mask);
-#define aom_highbd_masked_sad8x8 aom_highbd_masked_sad8x8_c
-
-void aom_highbd_minmax_8x8_c(const uint8_t* s,
-                             int p,
-                             const uint8_t* d,
-                             int dp,
-                             int* min,
-                             int* max);
-#define aom_highbd_minmax_8x8 aom_highbd_minmax_8x8_c
-
-unsigned int aom_highbd_obmc_sad128x128_c(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask);
-#define aom_highbd_obmc_sad128x128 aom_highbd_obmc_sad128x128_c
-
-unsigned int aom_highbd_obmc_sad128x64_c(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask);
-#define aom_highbd_obmc_sad128x64 aom_highbd_obmc_sad128x64_c
-
-unsigned int aom_highbd_obmc_sad16x16_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad16x16 aom_highbd_obmc_sad16x16_c
-
-unsigned int aom_highbd_obmc_sad16x32_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad16x32 aom_highbd_obmc_sad16x32_c
-
-unsigned int aom_highbd_obmc_sad16x4_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-#define aom_highbd_obmc_sad16x4 aom_highbd_obmc_sad16x4_c
-
-unsigned int aom_highbd_obmc_sad16x64_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad16x64 aom_highbd_obmc_sad16x64_c
-
-unsigned int aom_highbd_obmc_sad16x8_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-#define aom_highbd_obmc_sad16x8 aom_highbd_obmc_sad16x8_c
-
-unsigned int aom_highbd_obmc_sad32x16_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad32x16 aom_highbd_obmc_sad32x16_c
-
-unsigned int aom_highbd_obmc_sad32x32_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad32x32 aom_highbd_obmc_sad32x32_c
-
-unsigned int aom_highbd_obmc_sad32x64_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad32x64 aom_highbd_obmc_sad32x64_c
-
-unsigned int aom_highbd_obmc_sad32x8_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-#define aom_highbd_obmc_sad32x8 aom_highbd_obmc_sad32x8_c
-
-unsigned int aom_highbd_obmc_sad4x16_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-#define aom_highbd_obmc_sad4x16 aom_highbd_obmc_sad4x16_c
-
-unsigned int aom_highbd_obmc_sad4x4_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-#define aom_highbd_obmc_sad4x4 aom_highbd_obmc_sad4x4_c
-
-unsigned int aom_highbd_obmc_sad4x8_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-#define aom_highbd_obmc_sad4x8 aom_highbd_obmc_sad4x8_c
-
-unsigned int aom_highbd_obmc_sad64x128_c(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask);
-#define aom_highbd_obmc_sad64x128 aom_highbd_obmc_sad64x128_c
-
-unsigned int aom_highbd_obmc_sad64x16_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad64x16 aom_highbd_obmc_sad64x16_c
-
-unsigned int aom_highbd_obmc_sad64x32_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad64x32 aom_highbd_obmc_sad64x32_c
-
-unsigned int aom_highbd_obmc_sad64x64_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad64x64 aom_highbd_obmc_sad64x64_c
-
-unsigned int aom_highbd_obmc_sad8x16_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-#define aom_highbd_obmc_sad8x16 aom_highbd_obmc_sad8x16_c
-
-unsigned int aom_highbd_obmc_sad8x32_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-#define aom_highbd_obmc_sad8x32 aom_highbd_obmc_sad8x32_c
-
-unsigned int aom_highbd_obmc_sad8x4_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-#define aom_highbd_obmc_sad8x4 aom_highbd_obmc_sad8x4_c
-
-unsigned int aom_highbd_obmc_sad8x8_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-#define aom_highbd_obmc_sad8x8 aom_highbd_obmc_sad8x8_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance128x128_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance128x128 \
-  aom_highbd_obmc_sub_pixel_variance128x128_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance128x64_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance128x64 \
-  aom_highbd_obmc_sub_pixel_variance128x64_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance16x16_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance16x16 \
-  aom_highbd_obmc_sub_pixel_variance16x16_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance16x32_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance16x32 \
-  aom_highbd_obmc_sub_pixel_variance16x32_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance16x4_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance16x4 \
-  aom_highbd_obmc_sub_pixel_variance16x4_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance16x64_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance16x64 \
-  aom_highbd_obmc_sub_pixel_variance16x64_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance16x8_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance16x8 \
-  aom_highbd_obmc_sub_pixel_variance16x8_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance32x16_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance32x16 \
-  aom_highbd_obmc_sub_pixel_variance32x16_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance32x32_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance32x32 \
-  aom_highbd_obmc_sub_pixel_variance32x32_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance32x64_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance32x64 \
-  aom_highbd_obmc_sub_pixel_variance32x64_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance32x8_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance32x8 \
-  aom_highbd_obmc_sub_pixel_variance32x8_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance4x16_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance4x16 \
-  aom_highbd_obmc_sub_pixel_variance4x16_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance4x4_c(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance4x4 \
-  aom_highbd_obmc_sub_pixel_variance4x4_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance4x8_c(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance4x8 \
-  aom_highbd_obmc_sub_pixel_variance4x8_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance64x128_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance64x128 \
-  aom_highbd_obmc_sub_pixel_variance64x128_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance64x16_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance64x16 \
-  aom_highbd_obmc_sub_pixel_variance64x16_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance64x32_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance64x32 \
-  aom_highbd_obmc_sub_pixel_variance64x32_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance64x64_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance64x64 \
-  aom_highbd_obmc_sub_pixel_variance64x64_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance8x16_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance8x16 \
-  aom_highbd_obmc_sub_pixel_variance8x16_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance8x32_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance8x32 \
-  aom_highbd_obmc_sub_pixel_variance8x32_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance8x4_c(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance8x4 \
-  aom_highbd_obmc_sub_pixel_variance8x4_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance8x8_c(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance8x8 \
-  aom_highbd_obmc_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_obmc_variance128x128_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_obmc_variance128x128 aom_highbd_obmc_variance128x128_c
-
-unsigned int aom_highbd_obmc_variance128x64_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_obmc_variance128x64 aom_highbd_obmc_variance128x64_c
-
-unsigned int aom_highbd_obmc_variance16x16_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance16x16 aom_highbd_obmc_variance16x16_c
-
-unsigned int aom_highbd_obmc_variance16x32_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance16x32 aom_highbd_obmc_variance16x32_c
-
-unsigned int aom_highbd_obmc_variance16x4_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-#define aom_highbd_obmc_variance16x4 aom_highbd_obmc_variance16x4_c
-
-unsigned int aom_highbd_obmc_variance16x64_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance16x64 aom_highbd_obmc_variance16x64_c
-
-unsigned int aom_highbd_obmc_variance16x8_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-#define aom_highbd_obmc_variance16x8 aom_highbd_obmc_variance16x8_c
-
-unsigned int aom_highbd_obmc_variance32x16_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance32x16 aom_highbd_obmc_variance32x16_c
-
-unsigned int aom_highbd_obmc_variance32x32_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance32x32 aom_highbd_obmc_variance32x32_c
-
-unsigned int aom_highbd_obmc_variance32x64_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance32x64 aom_highbd_obmc_variance32x64_c
-
-unsigned int aom_highbd_obmc_variance32x8_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-#define aom_highbd_obmc_variance32x8 aom_highbd_obmc_variance32x8_c
-
-unsigned int aom_highbd_obmc_variance4x16_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-#define aom_highbd_obmc_variance4x16 aom_highbd_obmc_variance4x16_c
-
-unsigned int aom_highbd_obmc_variance4x4_c(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-#define aom_highbd_obmc_variance4x4 aom_highbd_obmc_variance4x4_c
-
-unsigned int aom_highbd_obmc_variance4x8_c(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-#define aom_highbd_obmc_variance4x8 aom_highbd_obmc_variance4x8_c
-
-unsigned int aom_highbd_obmc_variance64x128_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_obmc_variance64x128 aom_highbd_obmc_variance64x128_c
-
-unsigned int aom_highbd_obmc_variance64x16_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance64x16 aom_highbd_obmc_variance64x16_c
-
-unsigned int aom_highbd_obmc_variance64x32_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance64x32 aom_highbd_obmc_variance64x32_c
-
-unsigned int aom_highbd_obmc_variance64x64_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance64x64 aom_highbd_obmc_variance64x64_c
-
-unsigned int aom_highbd_obmc_variance8x16_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-#define aom_highbd_obmc_variance8x16 aom_highbd_obmc_variance8x16_c
-
-unsigned int aom_highbd_obmc_variance8x32_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-#define aom_highbd_obmc_variance8x32 aom_highbd_obmc_variance8x32_c
-
-unsigned int aom_highbd_obmc_variance8x4_c(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-#define aom_highbd_obmc_variance8x4 aom_highbd_obmc_variance8x4_c
-
-unsigned int aom_highbd_obmc_variance8x8_c(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-#define aom_highbd_obmc_variance8x8 aom_highbd_obmc_variance8x8_c
-
-void aom_highbd_paeth_predictor_16x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_16x16 aom_highbd_paeth_predictor_16x16_c
-
-void aom_highbd_paeth_predictor_16x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_16x32 aom_highbd_paeth_predictor_16x32_c
-
-void aom_highbd_paeth_predictor_16x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_16x4 aom_highbd_paeth_predictor_16x4_c
-
-void aom_highbd_paeth_predictor_16x64_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_16x64 aom_highbd_paeth_predictor_16x64_c
-
-void aom_highbd_paeth_predictor_16x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_16x8 aom_highbd_paeth_predictor_16x8_c
-
-void aom_highbd_paeth_predictor_2x2_c(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_paeth_predictor_2x2 aom_highbd_paeth_predictor_2x2_c
-
-void aom_highbd_paeth_predictor_32x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_32x16 aom_highbd_paeth_predictor_32x16_c
-
-void aom_highbd_paeth_predictor_32x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_32x32 aom_highbd_paeth_predictor_32x32_c
-
-void aom_highbd_paeth_predictor_32x64_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_32x64 aom_highbd_paeth_predictor_32x64_c
-
-void aom_highbd_paeth_predictor_32x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_32x8 aom_highbd_paeth_predictor_32x8_c
-
-void aom_highbd_paeth_predictor_4x16_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_4x16 aom_highbd_paeth_predictor_4x16_c
-
-void aom_highbd_paeth_predictor_4x4_c(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_paeth_predictor_4x4 aom_highbd_paeth_predictor_4x4_c
-
-void aom_highbd_paeth_predictor_4x8_c(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_paeth_predictor_4x8 aom_highbd_paeth_predictor_4x8_c
-
-void aom_highbd_paeth_predictor_64x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_64x16 aom_highbd_paeth_predictor_64x16_c
-
-void aom_highbd_paeth_predictor_64x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_64x32 aom_highbd_paeth_predictor_64x32_c
-
-void aom_highbd_paeth_predictor_64x64_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_64x64 aom_highbd_paeth_predictor_64x64_c
-
-void aom_highbd_paeth_predictor_8x16_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_8x16 aom_highbd_paeth_predictor_8x16_c
-
-void aom_highbd_paeth_predictor_8x32_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_8x32 aom_highbd_paeth_predictor_8x32_c
-
-void aom_highbd_paeth_predictor_8x4_c(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_paeth_predictor_8x4 aom_highbd_paeth_predictor_8x4_c
-
-void aom_highbd_paeth_predictor_8x8_c(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_paeth_predictor_8x8 aom_highbd_paeth_predictor_8x8_c
-
-void aom_highbd_quantize_b_c(const tran_low_t* coeff_ptr,
-                             intptr_t n_coeffs,
-                             const int16_t* zbin_ptr,
-                             const int16_t* round_ptr,
-                             const int16_t* quant_ptr,
-                             const int16_t* quant_shift_ptr,
-                             tran_low_t* qcoeff_ptr,
-                             tran_low_t* dqcoeff_ptr,
-                             const int16_t* dequant_ptr,
-                             uint16_t* eob_ptr,
-                             const int16_t* scan,
-                             const int16_t* iscan);
-#define aom_highbd_quantize_b aom_highbd_quantize_b_c
-
-void aom_highbd_quantize_b_32x32_c(const tran_low_t* coeff_ptr,
-                                   intptr_t n_coeffs,
-                                   const int16_t* zbin_ptr,
-                                   const int16_t* round_ptr,
-                                   const int16_t* quant_ptr,
-                                   const int16_t* quant_shift_ptr,
-                                   tran_low_t* qcoeff_ptr,
-                                   tran_low_t* dqcoeff_ptr,
-                                   const int16_t* dequant_ptr,
-                                   uint16_t* eob_ptr,
-                                   const int16_t* scan,
-                                   const int16_t* iscan);
-#define aom_highbd_quantize_b_32x32 aom_highbd_quantize_b_32x32_c
-
-void aom_highbd_quantize_b_32x32_adaptive_c(const tran_low_t* coeff_ptr,
-                                            intptr_t n_coeffs,
-                                            const int16_t* zbin_ptr,
-                                            const int16_t* round_ptr,
-                                            const int16_t* quant_ptr,
-                                            const int16_t* quant_shift_ptr,
-                                            tran_low_t* qcoeff_ptr,
-                                            tran_low_t* dqcoeff_ptr,
-                                            const int16_t* dequant_ptr,
-                                            uint16_t* eob_ptr,
-                                            const int16_t* scan,
-                                            const int16_t* iscan);
-#define aom_highbd_quantize_b_32x32_adaptive \
-  aom_highbd_quantize_b_32x32_adaptive_c
-
-void aom_highbd_quantize_b_64x64_c(const tran_low_t* coeff_ptr,
-                                   intptr_t n_coeffs,
-                                   const int16_t* zbin_ptr,
-                                   const int16_t* round_ptr,
-                                   const int16_t* quant_ptr,
-                                   const int16_t* quant_shift_ptr,
-                                   tran_low_t* qcoeff_ptr,
-                                   tran_low_t* dqcoeff_ptr,
-                                   const int16_t* dequant_ptr,
-                                   uint16_t* eob_ptr,
-                                   const int16_t* scan,
-                                   const int16_t* iscan);
-#define aom_highbd_quantize_b_64x64 aom_highbd_quantize_b_64x64_c
-
-void aom_highbd_quantize_b_64x64_adaptive_c(const tran_low_t* coeff_ptr,
-                                            intptr_t n_coeffs,
-                                            const int16_t* zbin_ptr,
-                                            const int16_t* round_ptr,
-                                            const int16_t* quant_ptr,
-                                            const int16_t* quant_shift_ptr,
-                                            tran_low_t* qcoeff_ptr,
-                                            tran_low_t* dqcoeff_ptr,
-                                            const int16_t* dequant_ptr,
-                                            uint16_t* eob_ptr,
-                                            const int16_t* scan,
-                                            const int16_t* iscan);
-#define aom_highbd_quantize_b_64x64_adaptive \
-  aom_highbd_quantize_b_64x64_adaptive_c
-
-void aom_highbd_quantize_b_adaptive_c(const tran_low_t* coeff_ptr,
-                                      intptr_t n_coeffs,
-                                      const int16_t* zbin_ptr,
-                                      const int16_t* round_ptr,
-                                      const int16_t* quant_ptr,
-                                      const int16_t* quant_shift_ptr,
-                                      tran_low_t* qcoeff_ptr,
-                                      tran_low_t* dqcoeff_ptr,
-                                      const int16_t* dequant_ptr,
-                                      uint16_t* eob_ptr,
-                                      const int16_t* scan,
-                                      const int16_t* iscan);
-#define aom_highbd_quantize_b_adaptive aom_highbd_quantize_b_adaptive_c
-
-unsigned int aom_highbd_sad128x128_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride);
-#define aom_highbd_sad128x128 aom_highbd_sad128x128_c
-
-unsigned int aom_highbd_sad128x128_avg_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         const uint8_t* second_pred);
-#define aom_highbd_sad128x128_avg aom_highbd_sad128x128_avg_c
-
-void aom_highbd_sad128x128x4d_c(const uint8_t* src_ptr,
-                                int src_stride,
-                                const uint8_t* const ref_ptr[],
-                                int ref_stride,
-                                uint32_t* sad_array);
-#define aom_highbd_sad128x128x4d aom_highbd_sad128x128x4d_c
-
-unsigned int aom_highbd_sad128x64_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* ref_ptr,
-                                    int ref_stride);
-#define aom_highbd_sad128x64 aom_highbd_sad128x64_c
-
-unsigned int aom_highbd_sad128x64_avg_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        const uint8_t* second_pred);
-#define aom_highbd_sad128x64_avg aom_highbd_sad128x64_avg_c
-
-void aom_highbd_sad128x64x4d_c(const uint8_t* src_ptr,
-                               int src_stride,
-                               const uint8_t* const ref_ptr[],
-                               int ref_stride,
-                               uint32_t* sad_array);
-#define aom_highbd_sad128x64x4d aom_highbd_sad128x64x4d_c
-
-unsigned int aom_highbd_sad16x16_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad16x16 aom_highbd_sad16x16_c
-
-unsigned int aom_highbd_sad16x16_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad16x16_avg aom_highbd_sad16x16_avg_c
-
-void aom_highbd_sad16x16x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad16x16x4d aom_highbd_sad16x16x4d_c
-
-unsigned int aom_highbd_sad16x32_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad16x32 aom_highbd_sad16x32_c
-
-unsigned int aom_highbd_sad16x32_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad16x32_avg aom_highbd_sad16x32_avg_c
-
-void aom_highbd_sad16x32x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad16x32x4d aom_highbd_sad16x32x4d_c
-
-unsigned int aom_highbd_sad16x4_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-#define aom_highbd_sad16x4 aom_highbd_sad16x4_c
-
-unsigned int aom_highbd_sad16x4_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-#define aom_highbd_sad16x4_avg aom_highbd_sad16x4_avg_c
-
-void aom_highbd_sad16x4x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-#define aom_highbd_sad16x4x4d aom_highbd_sad16x4x4d_c
-
-unsigned int aom_highbd_sad16x64_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad16x64 aom_highbd_sad16x64_c
-
-unsigned int aom_highbd_sad16x64_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad16x64_avg aom_highbd_sad16x64_avg_c
-
-void aom_highbd_sad16x64x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad16x64x4d aom_highbd_sad16x64x4d_c
-
-unsigned int aom_highbd_sad16x8_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-#define aom_highbd_sad16x8 aom_highbd_sad16x8_c
-
-unsigned int aom_highbd_sad16x8_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-#define aom_highbd_sad16x8_avg aom_highbd_sad16x8_avg_c
-
-void aom_highbd_sad16x8x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-#define aom_highbd_sad16x8x4d aom_highbd_sad16x8x4d_c
-
-unsigned int aom_highbd_sad32x16_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad32x16 aom_highbd_sad32x16_c
-
-unsigned int aom_highbd_sad32x16_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad32x16_avg aom_highbd_sad32x16_avg_c
-
-void aom_highbd_sad32x16x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad32x16x4d aom_highbd_sad32x16x4d_c
-
-unsigned int aom_highbd_sad32x32_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad32x32 aom_highbd_sad32x32_c
-
-unsigned int aom_highbd_sad32x32_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad32x32_avg aom_highbd_sad32x32_avg_c
-
-void aom_highbd_sad32x32x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad32x32x4d aom_highbd_sad32x32x4d_c
-
-unsigned int aom_highbd_sad32x64_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad32x64 aom_highbd_sad32x64_c
-
-unsigned int aom_highbd_sad32x64_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad32x64_avg aom_highbd_sad32x64_avg_c
-
-void aom_highbd_sad32x64x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad32x64x4d aom_highbd_sad32x64x4d_c
-
-unsigned int aom_highbd_sad32x8_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-#define aom_highbd_sad32x8 aom_highbd_sad32x8_c
-
-unsigned int aom_highbd_sad32x8_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-#define aom_highbd_sad32x8_avg aom_highbd_sad32x8_avg_c
-
-void aom_highbd_sad32x8x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-#define aom_highbd_sad32x8x4d aom_highbd_sad32x8x4d_c
-
-unsigned int aom_highbd_sad4x16_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-#define aom_highbd_sad4x16 aom_highbd_sad4x16_c
-
-unsigned int aom_highbd_sad4x16_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-#define aom_highbd_sad4x16_avg aom_highbd_sad4x16_avg_c
-
-void aom_highbd_sad4x16x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-#define aom_highbd_sad4x16x4d aom_highbd_sad4x16x4d_c
-
-unsigned int aom_highbd_sad4x4_c(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride);
-#define aom_highbd_sad4x4 aom_highbd_sad4x4_c
-
-unsigned int aom_highbd_sad4x4_avg_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride,
-                                     const uint8_t* second_pred);
-#define aom_highbd_sad4x4_avg aom_highbd_sad4x4_avg_c
-
-void aom_highbd_sad4x4x4d_c(const uint8_t* src_ptr,
-                            int src_stride,
-                            const uint8_t* const ref_ptr[],
-                            int ref_stride,
-                            uint32_t* sad_array);
-#define aom_highbd_sad4x4x4d aom_highbd_sad4x4x4d_c
-
-unsigned int aom_highbd_sad4x8_c(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride);
-#define aom_highbd_sad4x8 aom_highbd_sad4x8_c
-
-unsigned int aom_highbd_sad4x8_avg_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride,
-                                     const uint8_t* second_pred);
-#define aom_highbd_sad4x8_avg aom_highbd_sad4x8_avg_c
-
-void aom_highbd_sad4x8x4d_c(const uint8_t* src_ptr,
-                            int src_stride,
-                            const uint8_t* const ref_ptr[],
-                            int ref_stride,
-                            uint32_t* sad_array);
-#define aom_highbd_sad4x8x4d aom_highbd_sad4x8x4d_c
-
-unsigned int aom_highbd_sad64x128_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* ref_ptr,
-                                    int ref_stride);
-#define aom_highbd_sad64x128 aom_highbd_sad64x128_c
-
-unsigned int aom_highbd_sad64x128_avg_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        const uint8_t* second_pred);
-#define aom_highbd_sad64x128_avg aom_highbd_sad64x128_avg_c
-
-void aom_highbd_sad64x128x4d_c(const uint8_t* src_ptr,
-                               int src_stride,
-                               const uint8_t* const ref_ptr[],
-                               int ref_stride,
-                               uint32_t* sad_array);
-#define aom_highbd_sad64x128x4d aom_highbd_sad64x128x4d_c
-
-unsigned int aom_highbd_sad64x16_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad64x16 aom_highbd_sad64x16_c
-
-unsigned int aom_highbd_sad64x16_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad64x16_avg aom_highbd_sad64x16_avg_c
-
-void aom_highbd_sad64x16x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad64x16x4d aom_highbd_sad64x16x4d_c
-
-unsigned int aom_highbd_sad64x32_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad64x32 aom_highbd_sad64x32_c
-
-unsigned int aom_highbd_sad64x32_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad64x32_avg aom_highbd_sad64x32_avg_c
-
-void aom_highbd_sad64x32x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad64x32x4d aom_highbd_sad64x32x4d_c
-
-unsigned int aom_highbd_sad64x64_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad64x64 aom_highbd_sad64x64_c
-
-unsigned int aom_highbd_sad64x64_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad64x64_avg aom_highbd_sad64x64_avg_c
-
-void aom_highbd_sad64x64x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad64x64x4d aom_highbd_sad64x64x4d_c
-
-unsigned int aom_highbd_sad8x16_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-#define aom_highbd_sad8x16 aom_highbd_sad8x16_c
-
-unsigned int aom_highbd_sad8x16_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-#define aom_highbd_sad8x16_avg aom_highbd_sad8x16_avg_c
-
-void aom_highbd_sad8x16x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-#define aom_highbd_sad8x16x4d aom_highbd_sad8x16x4d_c
-
-unsigned int aom_highbd_sad8x32_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-#define aom_highbd_sad8x32 aom_highbd_sad8x32_c
-
-unsigned int aom_highbd_sad8x32_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-#define aom_highbd_sad8x32_avg aom_highbd_sad8x32_avg_c
-
-void aom_highbd_sad8x32x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-#define aom_highbd_sad8x32x4d aom_highbd_sad8x32x4d_c
-
-unsigned int aom_highbd_sad8x4_c(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride);
-#define aom_highbd_sad8x4 aom_highbd_sad8x4_c
-
-unsigned int aom_highbd_sad8x4_avg_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride,
-                                     const uint8_t* second_pred);
-#define aom_highbd_sad8x4_avg aom_highbd_sad8x4_avg_c
-
-void aom_highbd_sad8x4x4d_c(const uint8_t* src_ptr,
-                            int src_stride,
-                            const uint8_t* const ref_ptr[],
-                            int ref_stride,
-                            uint32_t* sad_array);
-#define aom_highbd_sad8x4x4d aom_highbd_sad8x4x4d_c
-
-unsigned int aom_highbd_sad8x8_c(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride);
-#define aom_highbd_sad8x8 aom_highbd_sad8x8_c
-
-unsigned int aom_highbd_sad8x8_avg_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride,
-                                     const uint8_t* second_pred);
-#define aom_highbd_sad8x8_avg aom_highbd_sad8x8_avg_c
-
-void aom_highbd_sad8x8x4d_c(const uint8_t* src_ptr,
-                            int src_stride,
-                            const uint8_t* const ref_ptr[],
-                            int ref_stride,
-                            uint32_t* sad_array);
-#define aom_highbd_sad8x8x4d aom_highbd_sad8x8x4d_c
-
-unsigned int aom_highbd_sad_skip_128x128_c(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride);
-#define aom_highbd_sad_skip_128x128 aom_highbd_sad_skip_128x128_c
-
-void aom_highbd_sad_skip_128x128x4d_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* const ref_ptr[],
-                                      int ref_stride,
-                                      uint32_t* sad_array);
-#define aom_highbd_sad_skip_128x128x4d aom_highbd_sad_skip_128x128x4d_c
-
-unsigned int aom_highbd_sad_skip_128x64_c(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride);
-#define aom_highbd_sad_skip_128x64 aom_highbd_sad_skip_128x64_c
-
-void aom_highbd_sad_skip_128x64x4d_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* const ref_ptr[],
-                                     int ref_stride,
-                                     uint32_t* sad_array);
-#define aom_highbd_sad_skip_128x64x4d aom_highbd_sad_skip_128x64x4d_c
-
-unsigned int aom_highbd_sad_skip_16x16_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_16x16 aom_highbd_sad_skip_16x16_c
-
-void aom_highbd_sad_skip_16x16x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_16x16x4d aom_highbd_sad_skip_16x16x4d_c
-
-unsigned int aom_highbd_sad_skip_16x32_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_16x32 aom_highbd_sad_skip_16x32_c
-
-void aom_highbd_sad_skip_16x32x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_16x32x4d aom_highbd_sad_skip_16x32x4d_c
-
-unsigned int aom_highbd_sad_skip_16x4_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-#define aom_highbd_sad_skip_16x4 aom_highbd_sad_skip_16x4_c
-
-void aom_highbd_sad_skip_16x4x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-#define aom_highbd_sad_skip_16x4x4d aom_highbd_sad_skip_16x4x4d_c
-
-unsigned int aom_highbd_sad_skip_16x64_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_16x64 aom_highbd_sad_skip_16x64_c
-
-void aom_highbd_sad_skip_16x64x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_16x64x4d aom_highbd_sad_skip_16x64x4d_c
-
-unsigned int aom_highbd_sad_skip_16x8_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-#define aom_highbd_sad_skip_16x8 aom_highbd_sad_skip_16x8_c
-
-void aom_highbd_sad_skip_16x8x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-#define aom_highbd_sad_skip_16x8x4d aom_highbd_sad_skip_16x8x4d_c
-
-unsigned int aom_highbd_sad_skip_32x16_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_32x16 aom_highbd_sad_skip_32x16_c
-
-void aom_highbd_sad_skip_32x16x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_32x16x4d aom_highbd_sad_skip_32x16x4d_c
-
-unsigned int aom_highbd_sad_skip_32x32_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_32x32 aom_highbd_sad_skip_32x32_c
-
-void aom_highbd_sad_skip_32x32x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_32x32x4d aom_highbd_sad_skip_32x32x4d_c
-
-unsigned int aom_highbd_sad_skip_32x64_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_32x64 aom_highbd_sad_skip_32x64_c
-
-void aom_highbd_sad_skip_32x64x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_32x64x4d aom_highbd_sad_skip_32x64x4d_c
-
-unsigned int aom_highbd_sad_skip_32x8_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-#define aom_highbd_sad_skip_32x8 aom_highbd_sad_skip_32x8_c
-
-void aom_highbd_sad_skip_32x8x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-#define aom_highbd_sad_skip_32x8x4d aom_highbd_sad_skip_32x8x4d_c
-
-unsigned int aom_highbd_sad_skip_4x16_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-#define aom_highbd_sad_skip_4x16 aom_highbd_sad_skip_4x16_c
-
-void aom_highbd_sad_skip_4x16x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-#define aom_highbd_sad_skip_4x16x4d aom_highbd_sad_skip_4x16x4d_c
-
-unsigned int aom_highbd_sad_skip_4x4_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride);
-#define aom_highbd_sad_skip_4x4 aom_highbd_sad_skip_4x4_c
-
-void aom_highbd_sad_skip_4x4x4d_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* const ref_ptr[],
-                                  int ref_stride,
-                                  uint32_t* sad_array);
-#define aom_highbd_sad_skip_4x4x4d aom_highbd_sad_skip_4x4x4d_c
-
-unsigned int aom_highbd_sad_skip_4x8_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride);
-#define aom_highbd_sad_skip_4x8 aom_highbd_sad_skip_4x8_c
-
-void aom_highbd_sad_skip_4x8x4d_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* const ref_ptr[],
-                                  int ref_stride,
-                                  uint32_t* sad_array);
-#define aom_highbd_sad_skip_4x8x4d aom_highbd_sad_skip_4x8x4d_c
-
-unsigned int aom_highbd_sad_skip_64x128_c(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride);
-#define aom_highbd_sad_skip_64x128 aom_highbd_sad_skip_64x128_c
-
-void aom_highbd_sad_skip_64x128x4d_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* const ref_ptr[],
-                                     int ref_stride,
-                                     uint32_t* sad_array);
-#define aom_highbd_sad_skip_64x128x4d aom_highbd_sad_skip_64x128x4d_c
-
-unsigned int aom_highbd_sad_skip_64x16_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_64x16 aom_highbd_sad_skip_64x16_c
-
-void aom_highbd_sad_skip_64x16x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_64x16x4d aom_highbd_sad_skip_64x16x4d_c
-
-unsigned int aom_highbd_sad_skip_64x32_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_64x32 aom_highbd_sad_skip_64x32_c
-
-void aom_highbd_sad_skip_64x32x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_64x32x4d aom_highbd_sad_skip_64x32x4d_c
-
-unsigned int aom_highbd_sad_skip_64x64_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_64x64 aom_highbd_sad_skip_64x64_c
-
-void aom_highbd_sad_skip_64x64x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_64x64x4d aom_highbd_sad_skip_64x64x4d_c
-
-unsigned int aom_highbd_sad_skip_8x16_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-#define aom_highbd_sad_skip_8x16 aom_highbd_sad_skip_8x16_c
-
-void aom_highbd_sad_skip_8x16x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-#define aom_highbd_sad_skip_8x16x4d aom_highbd_sad_skip_8x16x4d_c
-
-unsigned int aom_highbd_sad_skip_8x32_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-#define aom_highbd_sad_skip_8x32 aom_highbd_sad_skip_8x32_c
-
-void aom_highbd_sad_skip_8x32x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-#define aom_highbd_sad_skip_8x32x4d aom_highbd_sad_skip_8x32x4d_c
-
-unsigned int aom_highbd_sad_skip_8x4_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride);
-#define aom_highbd_sad_skip_8x4 aom_highbd_sad_skip_8x4_c
-
-void aom_highbd_sad_skip_8x4x4d_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* const ref_ptr[],
-                                  int ref_stride,
-                                  uint32_t* sad_array);
-#define aom_highbd_sad_skip_8x4x4d aom_highbd_sad_skip_8x4x4d_c
-
-unsigned int aom_highbd_sad_skip_8x8_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride);
-#define aom_highbd_sad_skip_8x8 aom_highbd_sad_skip_8x8_c
-
-void aom_highbd_sad_skip_8x8x4d_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* const ref_ptr[],
-                                  int ref_stride,
-                                  uint32_t* sad_array);
-#define aom_highbd_sad_skip_8x8x4d aom_highbd_sad_skip_8x8x4d_c
-
-void aom_highbd_smooth_h_predictor_16x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_16x16 \
-  aom_highbd_smooth_h_predictor_16x16_c
-
-void aom_highbd_smooth_h_predictor_16x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_16x32 \
-  aom_highbd_smooth_h_predictor_16x32_c
-
-void aom_highbd_smooth_h_predictor_16x4_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_16x4 aom_highbd_smooth_h_predictor_16x4_c
-
-void aom_highbd_smooth_h_predictor_16x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_16x64 \
-  aom_highbd_smooth_h_predictor_16x64_c
-
-void aom_highbd_smooth_h_predictor_16x8_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_16x8 aom_highbd_smooth_h_predictor_16x8_c
-
-void aom_highbd_smooth_h_predictor_2x2_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_h_predictor_2x2 aom_highbd_smooth_h_predictor_2x2_c
-
-void aom_highbd_smooth_h_predictor_32x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_32x16 \
-  aom_highbd_smooth_h_predictor_32x16_c
-
-void aom_highbd_smooth_h_predictor_32x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_32x32 \
-  aom_highbd_smooth_h_predictor_32x32_c
-
-void aom_highbd_smooth_h_predictor_32x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_32x64 \
-  aom_highbd_smooth_h_predictor_32x64_c
-
-void aom_highbd_smooth_h_predictor_32x8_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_32x8 aom_highbd_smooth_h_predictor_32x8_c
-
-void aom_highbd_smooth_h_predictor_4x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_4x16 aom_highbd_smooth_h_predictor_4x16_c
-
-void aom_highbd_smooth_h_predictor_4x4_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_h_predictor_4x4 aom_highbd_smooth_h_predictor_4x4_c
-
-void aom_highbd_smooth_h_predictor_4x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_h_predictor_4x8 aom_highbd_smooth_h_predictor_4x8_c
-
-void aom_highbd_smooth_h_predictor_64x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_64x16 \
-  aom_highbd_smooth_h_predictor_64x16_c
-
-void aom_highbd_smooth_h_predictor_64x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_64x32 \
-  aom_highbd_smooth_h_predictor_64x32_c
-
-void aom_highbd_smooth_h_predictor_64x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_64x64 \
-  aom_highbd_smooth_h_predictor_64x64_c
-
-void aom_highbd_smooth_h_predictor_8x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_8x16 aom_highbd_smooth_h_predictor_8x16_c
-
-void aom_highbd_smooth_h_predictor_8x32_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_8x32 aom_highbd_smooth_h_predictor_8x32_c
-
-void aom_highbd_smooth_h_predictor_8x4_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_h_predictor_8x4 aom_highbd_smooth_h_predictor_8x4_c
-
-void aom_highbd_smooth_h_predictor_8x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_h_predictor_8x8 aom_highbd_smooth_h_predictor_8x8_c
-
-void aom_highbd_smooth_predictor_16x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_16x16 aom_highbd_smooth_predictor_16x16_c
-
-void aom_highbd_smooth_predictor_16x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_16x32 aom_highbd_smooth_predictor_16x32_c
-
-void aom_highbd_smooth_predictor_16x4_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_16x4 aom_highbd_smooth_predictor_16x4_c
-
-void aom_highbd_smooth_predictor_16x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_16x64 aom_highbd_smooth_predictor_16x64_c
-
-void aom_highbd_smooth_predictor_16x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_16x8 aom_highbd_smooth_predictor_16x8_c
-
-void aom_highbd_smooth_predictor_2x2_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_smooth_predictor_2x2 aom_highbd_smooth_predictor_2x2_c
-
-void aom_highbd_smooth_predictor_32x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_32x16 aom_highbd_smooth_predictor_32x16_c
-
-void aom_highbd_smooth_predictor_32x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_32x32 aom_highbd_smooth_predictor_32x32_c
-
-void aom_highbd_smooth_predictor_32x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_32x64 aom_highbd_smooth_predictor_32x64_c
-
-void aom_highbd_smooth_predictor_32x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_32x8 aom_highbd_smooth_predictor_32x8_c
-
-void aom_highbd_smooth_predictor_4x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_4x16 aom_highbd_smooth_predictor_4x16_c
-
-void aom_highbd_smooth_predictor_4x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_smooth_predictor_4x4 aom_highbd_smooth_predictor_4x4_c
-
-void aom_highbd_smooth_predictor_4x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_smooth_predictor_4x8 aom_highbd_smooth_predictor_4x8_c
-
-void aom_highbd_smooth_predictor_64x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_64x16 aom_highbd_smooth_predictor_64x16_c
-
-void aom_highbd_smooth_predictor_64x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_64x32 aom_highbd_smooth_predictor_64x32_c
-
-void aom_highbd_smooth_predictor_64x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_64x64 aom_highbd_smooth_predictor_64x64_c
-
-void aom_highbd_smooth_predictor_8x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_8x16 aom_highbd_smooth_predictor_8x16_c
-
-void aom_highbd_smooth_predictor_8x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_8x32 aom_highbd_smooth_predictor_8x32_c
-
-void aom_highbd_smooth_predictor_8x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_smooth_predictor_8x4 aom_highbd_smooth_predictor_8x4_c
-
-void aom_highbd_smooth_predictor_8x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_smooth_predictor_8x8 aom_highbd_smooth_predictor_8x8_c
-
-void aom_highbd_smooth_v_predictor_16x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_16x16 \
-  aom_highbd_smooth_v_predictor_16x16_c
-
-void aom_highbd_smooth_v_predictor_16x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_16x32 \
-  aom_highbd_smooth_v_predictor_16x32_c
-
-void aom_highbd_smooth_v_predictor_16x4_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_16x4 aom_highbd_smooth_v_predictor_16x4_c
-
-void aom_highbd_smooth_v_predictor_16x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_16x64 \
-  aom_highbd_smooth_v_predictor_16x64_c
-
-void aom_highbd_smooth_v_predictor_16x8_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_16x8 aom_highbd_smooth_v_predictor_16x8_c
-
-void aom_highbd_smooth_v_predictor_2x2_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_v_predictor_2x2 aom_highbd_smooth_v_predictor_2x2_c
-
-void aom_highbd_smooth_v_predictor_32x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_32x16 \
-  aom_highbd_smooth_v_predictor_32x16_c
-
-void aom_highbd_smooth_v_predictor_32x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_32x32 \
-  aom_highbd_smooth_v_predictor_32x32_c
-
-void aom_highbd_smooth_v_predictor_32x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_32x64 \
-  aom_highbd_smooth_v_predictor_32x64_c
-
-void aom_highbd_smooth_v_predictor_32x8_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_32x8 aom_highbd_smooth_v_predictor_32x8_c
-
-void aom_highbd_smooth_v_predictor_4x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_4x16 aom_highbd_smooth_v_predictor_4x16_c
-
-void aom_highbd_smooth_v_predictor_4x4_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_v_predictor_4x4 aom_highbd_smooth_v_predictor_4x4_c
-
-void aom_highbd_smooth_v_predictor_4x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_v_predictor_4x8 aom_highbd_smooth_v_predictor_4x8_c
-
-void aom_highbd_smooth_v_predictor_64x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_64x16 \
-  aom_highbd_smooth_v_predictor_64x16_c
-
-void aom_highbd_smooth_v_predictor_64x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_64x32 \
-  aom_highbd_smooth_v_predictor_64x32_c
-
-void aom_highbd_smooth_v_predictor_64x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_64x64 \
-  aom_highbd_smooth_v_predictor_64x64_c
-
-void aom_highbd_smooth_v_predictor_8x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_8x16 aom_highbd_smooth_v_predictor_8x16_c
-
-void aom_highbd_smooth_v_predictor_8x32_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_8x32 aom_highbd_smooth_v_predictor_8x32_c
-
-void aom_highbd_smooth_v_predictor_8x4_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_v_predictor_8x4 aom_highbd_smooth_v_predictor_8x4_c
-
-void aom_highbd_smooth_v_predictor_8x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_v_predictor_8x8 aom_highbd_smooth_v_predictor_8x8_c
-
-int64_t aom_highbd_sse_c(const uint8_t* a8,
-                         int a_stride,
-                         const uint8_t* b8,
-                         int b_stride,
-                         int width,
-                         int height);
-#define aom_highbd_sse aom_highbd_sse_c
-
-void aom_highbd_subtract_block_c(int rows,
-                                 int cols,
-                                 int16_t* diff_ptr,
-                                 ptrdiff_t diff_stride,
-                                 const uint8_t* src_ptr,
-                                 ptrdiff_t src_stride,
-                                 const uint8_t* pred_ptr,
-                                 ptrdiff_t pred_stride,
-                                 int bd);
-#define aom_highbd_subtract_block aom_highbd_subtract_block_c
-
-void aom_highbd_upsampled_pred_c(MACROBLOCKD* xd,
-                                 const struct AV1Common* const cm,
-                                 int mi_row,
-                                 int mi_col,
-                                 const MV* const mv,
-                                 uint8_t* comp_pred8,
-                                 int width,
-                                 int height,
-                                 int subpel_x_q3,
-                                 int subpel_y_q3,
-                                 const uint8_t* ref8,
-                                 int ref_stride,
-                                 int bd,
-                                 int subpel_search);
-#define aom_highbd_upsampled_pred aom_highbd_upsampled_pred_c
-
-void aom_highbd_v_predictor_16x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_16x16 aom_highbd_v_predictor_16x16_c
-
-void aom_highbd_v_predictor_16x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_16x32 aom_highbd_v_predictor_16x32_c
-
-void aom_highbd_v_predictor_16x4_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_16x4 aom_highbd_v_predictor_16x4_c
-
-void aom_highbd_v_predictor_16x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_16x64 aom_highbd_v_predictor_16x64_c
-
-void aom_highbd_v_predictor_16x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_16x8 aom_highbd_v_predictor_16x8_c
-
-void aom_highbd_v_predictor_2x2_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_v_predictor_2x2 aom_highbd_v_predictor_2x2_c
-
-void aom_highbd_v_predictor_32x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_32x16 aom_highbd_v_predictor_32x16_c
-
-void aom_highbd_v_predictor_32x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_32x32 aom_highbd_v_predictor_32x32_c
-
-void aom_highbd_v_predictor_32x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_32x64 aom_highbd_v_predictor_32x64_c
-
-void aom_highbd_v_predictor_32x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_32x8 aom_highbd_v_predictor_32x8_c
-
-void aom_highbd_v_predictor_4x16_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_4x16 aom_highbd_v_predictor_4x16_c
-
-void aom_highbd_v_predictor_4x4_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_v_predictor_4x4 aom_highbd_v_predictor_4x4_c
-
-void aom_highbd_v_predictor_4x8_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_v_predictor_4x8 aom_highbd_v_predictor_4x8_c
-
-void aom_highbd_v_predictor_64x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_64x16 aom_highbd_v_predictor_64x16_c
-
-void aom_highbd_v_predictor_64x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_64x32 aom_highbd_v_predictor_64x32_c
-
-void aom_highbd_v_predictor_64x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_64x64 aom_highbd_v_predictor_64x64_c
-
-void aom_highbd_v_predictor_8x16_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_8x16 aom_highbd_v_predictor_8x16_c
-
-void aom_highbd_v_predictor_8x32_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_8x32 aom_highbd_v_predictor_8x32_c
-
-void aom_highbd_v_predictor_8x4_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_v_predictor_8x4 aom_highbd_v_predictor_8x4_c
-
-void aom_highbd_v_predictor_8x8_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_v_predictor_8x8 aom_highbd_v_predictor_8x8_c
-
 void aom_ifft16x16_float_c(const float* input, float* temp, float* output);
 #define aom_ifft16x16_float aom_ifft16x16_float_c
 
@@ -10496,498 +2307,6 @@
                              int h);
 #define aom_mse_wxh_16bit aom_mse_wxh_16bit_c
 
-uint64_t aom_mse_wxh_16bit_highbd_c(uint16_t* dst,
-                                    int dstride,
-                                    uint16_t* src,
-                                    int sstride,
-                                    int w,
-                                    int h);
-#define aom_mse_wxh_16bit_highbd aom_mse_wxh_16bit_highbd_c
-
-unsigned int aom_obmc_sad128x128_c(const uint8_t* pre,
-                                   int pre_stride,
-                                   const int32_t* wsrc,
-                                   const int32_t* mask);
-#define aom_obmc_sad128x128 aom_obmc_sad128x128_c
-
-unsigned int aom_obmc_sad128x64_c(const uint8_t* pre,
-                                  int pre_stride,
-                                  const int32_t* wsrc,
-                                  const int32_t* mask);
-#define aom_obmc_sad128x64 aom_obmc_sad128x64_c
-
-unsigned int aom_obmc_sad16x16_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad16x16 aom_obmc_sad16x16_c
-
-unsigned int aom_obmc_sad16x32_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad16x32 aom_obmc_sad16x32_c
-
-unsigned int aom_obmc_sad16x4_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-#define aom_obmc_sad16x4 aom_obmc_sad16x4_c
-
-unsigned int aom_obmc_sad16x64_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad16x64 aom_obmc_sad16x64_c
-
-unsigned int aom_obmc_sad16x8_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-#define aom_obmc_sad16x8 aom_obmc_sad16x8_c
-
-unsigned int aom_obmc_sad32x16_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad32x16 aom_obmc_sad32x16_c
-
-unsigned int aom_obmc_sad32x32_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad32x32 aom_obmc_sad32x32_c
-
-unsigned int aom_obmc_sad32x64_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad32x64 aom_obmc_sad32x64_c
-
-unsigned int aom_obmc_sad32x8_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-#define aom_obmc_sad32x8 aom_obmc_sad32x8_c
-
-unsigned int aom_obmc_sad4x16_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-#define aom_obmc_sad4x16 aom_obmc_sad4x16_c
-
-unsigned int aom_obmc_sad4x4_c(const uint8_t* pre,
-                               int pre_stride,
-                               const int32_t* wsrc,
-                               const int32_t* mask);
-#define aom_obmc_sad4x4 aom_obmc_sad4x4_c
-
-unsigned int aom_obmc_sad4x8_c(const uint8_t* pre,
-                               int pre_stride,
-                               const int32_t* wsrc,
-                               const int32_t* mask);
-#define aom_obmc_sad4x8 aom_obmc_sad4x8_c
-
-unsigned int aom_obmc_sad64x128_c(const uint8_t* pre,
-                                  int pre_stride,
-                                  const int32_t* wsrc,
-                                  const int32_t* mask);
-#define aom_obmc_sad64x128 aom_obmc_sad64x128_c
-
-unsigned int aom_obmc_sad64x16_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad64x16 aom_obmc_sad64x16_c
-
-unsigned int aom_obmc_sad64x32_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad64x32 aom_obmc_sad64x32_c
-
-unsigned int aom_obmc_sad64x64_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad64x64 aom_obmc_sad64x64_c
-
-unsigned int aom_obmc_sad8x16_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-#define aom_obmc_sad8x16 aom_obmc_sad8x16_c
-
-unsigned int aom_obmc_sad8x32_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-#define aom_obmc_sad8x32 aom_obmc_sad8x32_c
-
-unsigned int aom_obmc_sad8x4_c(const uint8_t* pre,
-                               int pre_stride,
-                               const int32_t* wsrc,
-                               const int32_t* mask);
-#define aom_obmc_sad8x4 aom_obmc_sad8x4_c
-
-unsigned int aom_obmc_sad8x8_c(const uint8_t* pre,
-                               int pre_stride,
-                               const int32_t* wsrc,
-                               const int32_t* mask);
-#define aom_obmc_sad8x8 aom_obmc_sad8x8_c
-
-unsigned int aom_obmc_sub_pixel_variance128x128_c(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-#define aom_obmc_sub_pixel_variance128x128 aom_obmc_sub_pixel_variance128x128_c
-
-unsigned int aom_obmc_sub_pixel_variance128x64_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-#define aom_obmc_sub_pixel_variance128x64 aom_obmc_sub_pixel_variance128x64_c
-
-unsigned int aom_obmc_sub_pixel_variance16x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance16x16 aom_obmc_sub_pixel_variance16x16_c
-
-unsigned int aom_obmc_sub_pixel_variance16x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance16x32 aom_obmc_sub_pixel_variance16x32_c
-
-unsigned int aom_obmc_sub_pixel_variance16x4_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_obmc_sub_pixel_variance16x4 aom_obmc_sub_pixel_variance16x4_c
-
-unsigned int aom_obmc_sub_pixel_variance16x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance16x64 aom_obmc_sub_pixel_variance16x64_c
-
-unsigned int aom_obmc_sub_pixel_variance16x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_obmc_sub_pixel_variance16x8 aom_obmc_sub_pixel_variance16x8_c
-
-unsigned int aom_obmc_sub_pixel_variance32x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance32x16 aom_obmc_sub_pixel_variance32x16_c
-
-unsigned int aom_obmc_sub_pixel_variance32x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance32x32 aom_obmc_sub_pixel_variance32x32_c
-
-unsigned int aom_obmc_sub_pixel_variance32x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance32x64 aom_obmc_sub_pixel_variance32x64_c
-
-unsigned int aom_obmc_sub_pixel_variance32x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_obmc_sub_pixel_variance32x8 aom_obmc_sub_pixel_variance32x8_c
-
-unsigned int aom_obmc_sub_pixel_variance4x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_obmc_sub_pixel_variance4x16 aom_obmc_sub_pixel_variance4x16_c
-
-unsigned int aom_obmc_sub_pixel_variance4x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_obmc_sub_pixel_variance4x4 aom_obmc_sub_pixel_variance4x4_c
-
-unsigned int aom_obmc_sub_pixel_variance4x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_obmc_sub_pixel_variance4x8 aom_obmc_sub_pixel_variance4x8_c
-
-unsigned int aom_obmc_sub_pixel_variance64x128_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-#define aom_obmc_sub_pixel_variance64x128 aom_obmc_sub_pixel_variance64x128_c
-
-unsigned int aom_obmc_sub_pixel_variance64x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance64x16 aom_obmc_sub_pixel_variance64x16_c
-
-unsigned int aom_obmc_sub_pixel_variance64x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance64x32 aom_obmc_sub_pixel_variance64x32_c
-
-unsigned int aom_obmc_sub_pixel_variance64x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance64x64 aom_obmc_sub_pixel_variance64x64_c
-
-unsigned int aom_obmc_sub_pixel_variance8x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_obmc_sub_pixel_variance8x16 aom_obmc_sub_pixel_variance8x16_c
-
-unsigned int aom_obmc_sub_pixel_variance8x32_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_obmc_sub_pixel_variance8x32 aom_obmc_sub_pixel_variance8x32_c
-
-unsigned int aom_obmc_sub_pixel_variance8x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_obmc_sub_pixel_variance8x4 aom_obmc_sub_pixel_variance8x4_c
-
-unsigned int aom_obmc_sub_pixel_variance8x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_obmc_sub_pixel_variance8x8 aom_obmc_sub_pixel_variance8x8_c
-
-unsigned int aom_obmc_variance128x128_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask,
-                                        unsigned int* sse);
-#define aom_obmc_variance128x128 aom_obmc_variance128x128_c
-
-unsigned int aom_obmc_variance128x64_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask,
-                                       unsigned int* sse);
-#define aom_obmc_variance128x64 aom_obmc_variance128x64_c
-
-unsigned int aom_obmc_variance16x16_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance16x16 aom_obmc_variance16x16_c
-
-unsigned int aom_obmc_variance16x32_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance16x32 aom_obmc_variance16x32_c
-
-unsigned int aom_obmc_variance16x4_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-#define aom_obmc_variance16x4 aom_obmc_variance16x4_c
-
-unsigned int aom_obmc_variance16x64_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance16x64 aom_obmc_variance16x64_c
-
-unsigned int aom_obmc_variance16x8_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-#define aom_obmc_variance16x8 aom_obmc_variance16x8_c
-
-unsigned int aom_obmc_variance32x16_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance32x16 aom_obmc_variance32x16_c
-
-unsigned int aom_obmc_variance32x32_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance32x32 aom_obmc_variance32x32_c
-
-unsigned int aom_obmc_variance32x64_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance32x64 aom_obmc_variance32x64_c
-
-unsigned int aom_obmc_variance32x8_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-#define aom_obmc_variance32x8 aom_obmc_variance32x8_c
-
-unsigned int aom_obmc_variance4x16_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-#define aom_obmc_variance4x16 aom_obmc_variance4x16_c
-
-unsigned int aom_obmc_variance4x4_c(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask,
-                                    unsigned int* sse);
-#define aom_obmc_variance4x4 aom_obmc_variance4x4_c
-
-unsigned int aom_obmc_variance4x8_c(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask,
-                                    unsigned int* sse);
-#define aom_obmc_variance4x8 aom_obmc_variance4x8_c
-
-unsigned int aom_obmc_variance64x128_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask,
-                                       unsigned int* sse);
-#define aom_obmc_variance64x128 aom_obmc_variance64x128_c
-
-unsigned int aom_obmc_variance64x16_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance64x16 aom_obmc_variance64x16_c
-
-unsigned int aom_obmc_variance64x32_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance64x32 aom_obmc_variance64x32_c
-
-unsigned int aom_obmc_variance64x64_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance64x64 aom_obmc_variance64x64_c
-
-unsigned int aom_obmc_variance8x16_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-#define aom_obmc_variance8x16 aom_obmc_variance8x16_c
-
-unsigned int aom_obmc_variance8x32_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-#define aom_obmc_variance8x32 aom_obmc_variance8x32_c
-
-unsigned int aom_obmc_variance8x4_c(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask,
-                                    unsigned int* sse);
-#define aom_obmc_variance8x4 aom_obmc_variance8x4_c
-
-unsigned int aom_obmc_variance8x8_c(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask,
-                                    unsigned int* sse);
-#define aom_obmc_variance8x8 aom_obmc_variance8x8_c
-
 void aom_paeth_predictor_16x16_c(uint8_t* dst,
                                  ptrdiff_t y_stride,
                                  const uint8_t* above,
diff --git a/third_party/libaom/source/config/linux/generic/config/av1_rtcd.h b/third_party/libaom/source/config/linux/generic/config/av1_rtcd.h
index d377169..9a730a0 100644
--- a/third_party/libaom/source/config/linux/generic/config/av1_rtcd.h
+++ b/third_party/libaom/source/config/linux/generic/config/av1_rtcd.h
@@ -99,35 +99,6 @@
                              const int log_scale);
 #define aom_quantize_b_helper aom_quantize_b_helper_c
 
-void av1_apply_selfguided_restoration_c(const uint8_t* dat,
-                                        int width,
-                                        int height,
-                                        int stride,
-                                        int eps,
-                                        const int* xqd,
-                                        uint8_t* dst,
-                                        int dst_stride,
-                                        int32_t* tmpbuf,
-                                        int bit_depth,
-                                        int highbd);
-#define av1_apply_selfguided_restoration av1_apply_selfguided_restoration_c
-
-void av1_apply_temporal_filter_c(const struct yv12_buffer_config* ref_frame,
-                                 const struct macroblockd* mbd,
-                                 const BLOCK_SIZE block_size,
-                                 const int mb_row,
-                                 const int mb_col,
-                                 const int num_planes,
-                                 const double* noise_levels,
-                                 const MV* subblock_mvs,
-                                 const int* subblock_mses,
-                                 const int q_factor,
-                                 const int filter_strength,
-                                 const uint8_t* pred,
-                                 uint32_t* accum,
-                                 uint16_t* count);
-#define av1_apply_temporal_filter av1_apply_temporal_filter_c
-
 int64_t av1_block_error_c(const tran_low_t* coeff,
                           const tran_low_t* dqcoeff,
                           intptr_t block_size,
@@ -174,44 +145,6 @@
 #define av1_build_compound_diffwtd_mask_highbd \
   av1_build_compound_diffwtd_mask_highbd_c
 
-int64_t av1_calc_frame_error_c(const uint8_t* const ref,
-                               int stride,
-                               const uint8_t* const dst,
-                               int p_width,
-                               int p_height,
-                               int p_stride);
-#define av1_calc_frame_error av1_calc_frame_error_c
-
-void av1_calc_proj_params_c(const uint8_t* src8,
-                            int width,
-                            int height,
-                            int src_stride,
-                            const uint8_t* dat8,
-                            int dat_stride,
-                            int32_t* flt0,
-                            int flt0_stride,
-                            int32_t* flt1,
-                            int flt1_stride,
-                            int64_t H[2][2],
-                            int64_t C[2],
-                            const sgr_params_type* params);
-#define av1_calc_proj_params av1_calc_proj_params_c
-
-void av1_calc_proj_params_high_bd_c(const uint8_t* src8,
-                                    int width,
-                                    int height,
-                                    int src_stride,
-                                    const uint8_t* dat8,
-                                    int dat_stride,
-                                    int32_t* flt0,
-                                    int flt0_stride,
-                                    int32_t* flt1,
-                                    int flt1_stride,
-                                    int64_t H[2][2],
-                                    int64_t C[2],
-                                    const sgr_params_type* params);
-#define av1_calc_proj_params_high_bd av1_calc_proj_params_high_bd_c
-
 void av1_cnn_activate_c(float** input,
                         int channels,
                         int width,
@@ -278,33 +211,6 @@
                                        int y2);
 #define av1_compute_cross_correlation av1_compute_cross_correlation_c
 
-void av1_compute_stats_c(int wiener_win,
-                         const uint8_t* dgd8,
-                         const uint8_t* src8,
-                         int h_start,
-                         int h_end,
-                         int v_start,
-                         int v_end,
-                         int dgd_stride,
-                         int src_stride,
-                         int64_t* M,
-                         int64_t* H);
-#define av1_compute_stats av1_compute_stats_c
-
-void av1_compute_stats_highbd_c(int wiener_win,
-                                const uint8_t* dgd8,
-                                const uint8_t* src8,
-                                int h_start,
-                                int h_end,
-                                int v_start,
-                                int v_end,
-                                int dgd_stride,
-                                int src_stride,
-                                int64_t* M,
-                                int64_t* H,
-                                aom_bit_depth_t bit_depth);
-#define av1_compute_stats_highbd av1_compute_stats_highbd_c
-
 void av1_convolve_2d_scale_c(const uint8_t* src,
                              int src_stride,
                              uint8_t* dst,
@@ -614,30 +520,6 @@
                                int8_t* const coeff_contexts);
 #define av1_get_nz_map_contexts av1_get_nz_map_contexts_c
 
-void av1_highbd_apply_temporal_filter_c(
-    const struct yv12_buffer_config* ref_frame,
-    const struct macroblockd* mbd,
-    const BLOCK_SIZE block_size,
-    const int mb_row,
-    const int mb_col,
-    const int num_planes,
-    const double* noise_levels,
-    const MV* subblock_mvs,
-    const int* subblock_mses,
-    const int q_factor,
-    const int filter_strength,
-    const uint8_t* pred,
-    uint32_t* accum,
-    uint16_t* count);
-#define av1_highbd_apply_temporal_filter av1_highbd_apply_temporal_filter_c
-
-int64_t av1_highbd_block_error_c(const tran_low_t* coeff,
-                                 const tran_low_t* dqcoeff,
-                                 intptr_t block_size,
-                                 int64_t* ssz,
-                                 int bd);
-#define av1_highbd_block_error av1_highbd_block_error_c
-
 void av1_highbd_convolve8_c(const uint8_t* src,
                             ptrdiff_t src_stride,
                             uint8_t* dst,
@@ -677,36 +559,6 @@
                                  int bps);
 #define av1_highbd_convolve8_vert av1_highbd_convolve8_vert_c
 
-void av1_highbd_convolve_2d_scale_c(const uint16_t* src,
-                                    int src_stride,
-                                    uint16_t* dst,
-                                    int dst_stride,
-                                    int w,
-                                    int h,
-                                    const InterpFilterParams* filter_params_x,
-                                    const InterpFilterParams* filter_params_y,
-                                    const int subpel_x_qn,
-                                    const int x_step_qn,
-                                    const int subpel_y_qn,
-                                    const int y_step_qn,
-                                    ConvolveParams* conv_params,
-                                    int bd);
-#define av1_highbd_convolve_2d_scale av1_highbd_convolve_2d_scale_c
-
-void av1_highbd_convolve_2d_sr_c(const uint16_t* src,
-                                 int src_stride,
-                                 uint16_t* dst,
-                                 int dst_stride,
-                                 int w,
-                                 int h,
-                                 const InterpFilterParams* filter_params_x,
-                                 const InterpFilterParams* filter_params_y,
-                                 const int subpel_x_qn,
-                                 const int subpel_y_qn,
-                                 ConvolveParams* conv_params,
-                                 int bd);
-#define av1_highbd_convolve_2d_sr av1_highbd_convolve_2d_sr_c
-
 void av1_highbd_convolve_avg_c(const uint8_t* src,
                                ptrdiff_t src_stride,
                                uint8_t* dst,
@@ -733,128 +585,6 @@
                                 int bps);
 #define av1_highbd_convolve_copy av1_highbd_convolve_copy_c
 
-void av1_highbd_convolve_horiz_rs_c(const uint16_t* src,
-                                    int src_stride,
-                                    uint16_t* dst,
-                                    int dst_stride,
-                                    int w,
-                                    int h,
-                                    const int16_t* x_filters,
-                                    int x0_qn,
-                                    int x_step_qn,
-                                    int bd);
-#define av1_highbd_convolve_horiz_rs av1_highbd_convolve_horiz_rs_c
-
-void av1_highbd_convolve_x_sr_c(const uint16_t* src,
-                                int src_stride,
-                                uint16_t* dst,
-                                int dst_stride,
-                                int w,
-                                int h,
-                                const InterpFilterParams* filter_params_x,
-                                const int subpel_x_qn,
-                                ConvolveParams* conv_params,
-                                int bd);
-#define av1_highbd_convolve_x_sr av1_highbd_convolve_x_sr_c
-
-void av1_highbd_convolve_y_sr_c(const uint16_t* src,
-                                int src_stride,
-                                uint16_t* dst,
-                                int dst_stride,
-                                int w,
-                                int h,
-                                const InterpFilterParams* filter_params_y,
-                                const int subpel_y_qn,
-                                int bd);
-#define av1_highbd_convolve_y_sr av1_highbd_convolve_y_sr_c
-
-void av1_highbd_dist_wtd_convolve_2d_c(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_x,
-    const InterpFilterParams* filter_params_y,
-    const int subpel_x_qn,
-    const int subpel_y_qn,
-    ConvolveParams* conv_params,
-    int bd);
-#define av1_highbd_dist_wtd_convolve_2d av1_highbd_dist_wtd_convolve_2d_c
-
-void av1_highbd_dist_wtd_convolve_2d_copy_c(const uint16_t* src,
-                                            int src_stride,
-                                            uint16_t* dst,
-                                            int dst_stride,
-                                            int w,
-                                            int h,
-                                            ConvolveParams* conv_params,
-                                            int bd);
-#define av1_highbd_dist_wtd_convolve_2d_copy \
-  av1_highbd_dist_wtd_convolve_2d_copy_c
-
-void av1_highbd_dist_wtd_convolve_x_c(const uint16_t* src,
-                                      int src_stride,
-                                      uint16_t* dst,
-                                      int dst_stride,
-                                      int w,
-                                      int h,
-                                      const InterpFilterParams* filter_params_x,
-                                      const int subpel_x_qn,
-                                      ConvolveParams* conv_params,
-                                      int bd);
-#define av1_highbd_dist_wtd_convolve_x av1_highbd_dist_wtd_convolve_x_c
-
-void av1_highbd_dist_wtd_convolve_y_c(const uint16_t* src,
-                                      int src_stride,
-                                      uint16_t* dst,
-                                      int dst_stride,
-                                      int w,
-                                      int h,
-                                      const InterpFilterParams* filter_params_y,
-                                      const int subpel_y_qn,
-                                      ConvolveParams* conv_params,
-                                      int bd);
-#define av1_highbd_dist_wtd_convolve_y av1_highbd_dist_wtd_convolve_y_c
-
-void av1_highbd_dr_prediction_z1_c(uint16_t* dst,
-                                   ptrdiff_t stride,
-                                   int bw,
-                                   int bh,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int upsample_above,
-                                   int dx,
-                                   int dy,
-                                   int bd);
-#define av1_highbd_dr_prediction_z1 av1_highbd_dr_prediction_z1_c
-
-void av1_highbd_dr_prediction_z2_c(uint16_t* dst,
-                                   ptrdiff_t stride,
-                                   int bw,
-                                   int bh,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int upsample_above,
-                                   int upsample_left,
-                                   int dx,
-                                   int dy,
-                                   int bd);
-#define av1_highbd_dr_prediction_z2 av1_highbd_dr_prediction_z2_c
-
-void av1_highbd_dr_prediction_z3_c(uint16_t* dst,
-                                   ptrdiff_t stride,
-                                   int bw,
-                                   int bh,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int upsample_left,
-                                   int dx,
-                                   int dy,
-                                   int bd);
-#define av1_highbd_dr_prediction_z3 av1_highbd_dr_prediction_z3_c
-
 void av1_highbd_fwht4x4_c(const int16_t* input, tran_low_t* output, int stride);
 #define av1_highbd_fwht4x4 av1_highbd_fwht4x4_c
 
@@ -984,70 +714,6 @@
                                 int bd);
 #define av1_highbd_iwht4x4_1_add av1_highbd_iwht4x4_1_add_c
 
-int64_t av1_highbd_pixel_proj_error_c(const uint8_t* src8,
-                                      int width,
-                                      int height,
-                                      int src_stride,
-                                      const uint8_t* dat8,
-                                      int dat_stride,
-                                      int32_t* flt0,
-                                      int flt0_stride,
-                                      int32_t* flt1,
-                                      int flt1_stride,
-                                      int xq[2],
-                                      const sgr_params_type* params);
-#define av1_highbd_pixel_proj_error av1_highbd_pixel_proj_error_c
-
-void av1_highbd_quantize_fp_c(const tran_low_t* coeff_ptr,
-                              intptr_t n_coeffs,
-                              const int16_t* zbin_ptr,
-                              const int16_t* round_ptr,
-                              const int16_t* quant_ptr,
-                              const int16_t* quant_shift_ptr,
-                              tran_low_t* qcoeff_ptr,
-                              tran_low_t* dqcoeff_ptr,
-                              const int16_t* dequant_ptr,
-                              uint16_t* eob_ptr,
-                              const int16_t* scan,
-                              const int16_t* iscan,
-                              int log_scale);
-#define av1_highbd_quantize_fp av1_highbd_quantize_fp_c
-
-void av1_highbd_warp_affine_c(const int32_t* mat,
-                              const uint16_t* ref,
-                              int width,
-                              int height,
-                              int stride,
-                              uint16_t* pred,
-                              int p_col,
-                              int p_row,
-                              int p_width,
-                              int p_height,
-                              int p_stride,
-                              int subsampling_x,
-                              int subsampling_y,
-                              int bd,
-                              ConvolveParams* conv_params,
-                              int16_t alpha,
-                              int16_t beta,
-                              int16_t gamma,
-                              int16_t delta);
-#define av1_highbd_warp_affine av1_highbd_warp_affine_c
-
-void av1_highbd_wiener_convolve_add_src_c(const uint8_t* src,
-                                          ptrdiff_t src_stride,
-                                          uint8_t* dst,
-                                          ptrdiff_t dst_stride,
-                                          const int16_t* filter_x,
-                                          int x_step_q4,
-                                          const int16_t* filter_y,
-                                          int y_step_q4,
-                                          int w,
-                                          int h,
-                                          const ConvolveParams* conv_params,
-                                          int bd);
-#define av1_highbd_wiener_convolve_add_src av1_highbd_wiener_convolve_add_src_c
-
 void av1_inv_txfm2d_add_16x16_c(const int32_t* input,
                                 uint16_t* output,
                                 int stride,
@@ -1193,20 +859,6 @@
                           TxfmParam* txfm_param);
 #define av1_lowbd_fwd_txfm av1_lowbd_fwd_txfm_c
 
-int64_t av1_lowbd_pixel_proj_error_c(const uint8_t* src8,
-                                     int width,
-                                     int height,
-                                     int src_stride,
-                                     const uint8_t* dat8,
-                                     int dat_stride,
-                                     int32_t* flt0,
-                                     int flt0_stride,
-                                     int32_t* flt1,
-                                     int flt1_stride,
-                                     int xq[2],
-                                     const sgr_params_type* params);
-#define av1_lowbd_pixel_proj_error av1_lowbd_pixel_proj_error_c
-
 void av1_nn_predict_c(const float* input_nodes,
                       const NN_CONFIG* const nn_config,
                       int reduce_prec,
@@ -1293,18 +945,6 @@
 void av1_round_shift_array_c(int32_t* arr, int size, int bit);
 #define av1_round_shift_array av1_round_shift_array_c
 
-int av1_selfguided_restoration_c(const uint8_t* dgd8,
-                                 int width,
-                                 int height,
-                                 int dgd_stride,
-                                 int32_t* flt0,
-                                 int32_t* flt1,
-                                 int flt_stride,
-                                 int sgr_params_idx,
-                                 int bit_depth,
-                                 int highbd);
-#define av1_selfguided_restoration av1_selfguided_restoration_c
-
 void av1_txb_init_levels_c(const tran_low_t* const coeff,
                            const int width,
                            const int height,
@@ -1317,26 +957,6 @@
 void av1_upsample_intra_edge_high_c(uint16_t* p, int sz, int bd);
 #define av1_upsample_intra_edge_high av1_upsample_intra_edge_high_c
 
-void av1_warp_affine_c(const int32_t* mat,
-                       const uint8_t* ref,
-                       int width,
-                       int height,
-                       int stride,
-                       uint8_t* pred,
-                       int p_col,
-                       int p_row,
-                       int p_width,
-                       int p_height,
-                       int p_stride,
-                       int subsampling_x,
-                       int subsampling_y,
-                       ConvolveParams* conv_params,
-                       int16_t alpha,
-                       int16_t beta,
-                       int16_t gamma,
-                       int16_t delta);
-#define av1_warp_affine av1_warp_affine_c
-
 void av1_wedge_compute_delta_squares_c(int16_t* d,
                                        const int16_t* a,
                                        const int16_t* b,
@@ -1403,27 +1023,15 @@
                     int coeff_shift);
 #define cdef_find_dir cdef_find_dir_c
 
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_420_hbd_c(TX_SIZE tx_size);
-#define cfl_get_luma_subsampling_420_hbd cfl_get_luma_subsampling_420_hbd_c
-
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_420_lbd_c(TX_SIZE tx_size);
 #define cfl_get_luma_subsampling_420_lbd cfl_get_luma_subsampling_420_lbd_c
 
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_422_hbd_c(TX_SIZE tx_size);
-#define cfl_get_luma_subsampling_422_hbd cfl_get_luma_subsampling_422_hbd_c
-
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_422_lbd_c(TX_SIZE tx_size);
 #define cfl_get_luma_subsampling_422_lbd cfl_get_luma_subsampling_422_lbd_c
 
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_444_hbd_c(TX_SIZE tx_size);
-#define cfl_get_luma_subsampling_444_hbd cfl_get_luma_subsampling_444_hbd_c
-
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_444_lbd_c(TX_SIZE tx_size);
 #define cfl_get_luma_subsampling_444_lbd cfl_get_luma_subsampling_444_lbd_c
 
-cfl_predict_hbd_fn cfl_get_predict_hbd_fn_c(TX_SIZE tx_size);
-#define cfl_get_predict_hbd_fn cfl_get_predict_hbd_fn_c
-
 cfl_predict_lbd_fn cfl_get_predict_lbd_fn_c(TX_SIZE tx_size);
 #define cfl_get_predict_lbd_fn cfl_get_predict_lbd_fn_c
 
diff --git a/third_party/libaom/source/config/linux/ia32/config/aom_config.asm b/third_party/libaom/source/config/linux/ia32/config/aom_config.asm
index b611074..e04a488 100644
--- a/third_party/libaom/source/config/linux/ia32/config/aom_config.asm
+++ b/third_party/libaom/source/config/linux/ia32/config/aom_config.asm
@@ -7,7 +7,7 @@
 %define CONFIG_ANALYZER 0
 %define CONFIG_AV1_DECODER 1
 %define CONFIG_AV1_ENCODER 1
-%define CONFIG_AV1_HIGHBITDEPTH 1
+%define CONFIG_AV1_HIGHBITDEPTH 0
 %define CONFIG_AV1_TEMPORAL_DENOISING 0
 %define CONFIG_BIG_ENDIAN 0
 %define CONFIG_BITSTREAM_DEBUG 0
@@ -37,7 +37,7 @@
 %define CONFIG_OS_SUPPORT 1
 %define CONFIG_PIC 1
 %define CONFIG_RD_DEBUG 0
-%define CONFIG_REALTIME_ONLY 0
+%define CONFIG_REALTIME_ONLY 1
 %define CONFIG_RUNTIME_CPU_DETECT 1
 %define CONFIG_SHARED 0
 %define CONFIG_SHARP_SETTINGS 0
diff --git a/third_party/libaom/source/config/linux/ia32/config/aom_config.c b/third_party/libaom/source/config/linux/ia32/config/aom_config.c
index 70b383ef..81d7896 100644
--- a/third_party/libaom/source/config/linux/ia32/config/aom_config.c
+++ b/third_party/libaom/source/config/linux/ia32/config/aom_config.c
@@ -9,5 +9,5 @@
  * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
  */
 #include "aom/aom_codec.h"
-static const char* const cfg = "cmake ../source/libaom -G \"Unix Makefiles\" -DCMAKE_TOOLCHAIN_FILE=\"../source/libaom/build/cmake/toolchains/x86-linux.cmake\" -DAOM_RTCD_FLAGS=--require-mmx;--require-sse;--require-sse2 -DCONFIG_AV1_ENCODER=1 -DCONFIG_LIBYUV=0 -DCONFIG_PIC=1 -DCONFIG_MAX_DECODE_PROFILE=0 -DCONFIG_NORMAL_TILE_MODE=1 -DCONFIG_SIZE_LIMIT=1 -DDECODE_HEIGHT_LIMIT=16384 -DDECODE_WIDTH_LIMIT=16384";
+static const char* const cfg = "cmake ../source/libaom -G \"Unix Makefiles\" -DCMAKE_TOOLCHAIN_FILE=\"../source/libaom/build/cmake/toolchains/x86-linux.cmake\" -DAOM_RTCD_FLAGS=--require-mmx;--require-sse;--require-sse2 -DCONFIG_AV1_ENCODER=1 -DCONFIG_LIBYUV=0 -DCONFIG_PIC=1 -DCONFIG_MAX_DECODE_PROFILE=0 -DCONFIG_NORMAL_TILE_MODE=1 -DCONFIG_SIZE_LIMIT=1 -DDECODE_HEIGHT_LIMIT=16384 -DDECODE_WIDTH_LIMIT=16384 -DCONFIG_REALTIME_ONLY=1 -DCONFIG_AV1_HIGHBITDEPTH=0";
 const char *aom_codec_build_config(void) {return cfg;}
diff --git a/third_party/libaom/source/config/linux/ia32/config/aom_config.h b/third_party/libaom/source/config/linux/ia32/config/aom_config.h
index 17ab81e..0e1e154 100644
--- a/third_party/libaom/source/config/linux/ia32/config/aom_config.h
+++ b/third_party/libaom/source/config/linux/ia32/config/aom_config.h
@@ -19,7 +19,7 @@
 #define CONFIG_ANALYZER 0
 #define CONFIG_AV1_DECODER 1
 #define CONFIG_AV1_ENCODER 1
-#define CONFIG_AV1_HIGHBITDEPTH 1
+#define CONFIG_AV1_HIGHBITDEPTH 0
 #define CONFIG_AV1_TEMPORAL_DENOISING 0
 #define CONFIG_BIG_ENDIAN 0
 #define CONFIG_BITSTREAM_DEBUG 0
@@ -49,7 +49,7 @@
 #define CONFIG_OS_SUPPORT 1
 #define CONFIG_PIC 1
 #define CONFIG_RD_DEBUG 0
-#define CONFIG_REALTIME_ONLY 0
+#define CONFIG_REALTIME_ONLY 1
 #define CONFIG_RUNTIME_CPU_DETECT 1
 #define CONFIG_SHARED 0
 #define CONFIG_SHARP_SETTINGS 0
diff --git a/third_party/libaom/source/config/linux/ia32/config/aom_dsp_rtcd.h b/third_party/libaom/source/config/linux/ia32/config/aom_dsp_rtcd.h
index 9994e757..305982d 100644
--- a/third_party/libaom/source/config/linux/ia32/config/aom_dsp_rtcd.h
+++ b/third_party/libaom/source/config/linux/ia32/config/aom_dsp_rtcd.h
@@ -2908,14548 +2908,6 @@
                               int16_t* coeff);
 #define aom_hadamard_lp_8x8 aom_hadamard_lp_8x8_sse2
 
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x128 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x64 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x16 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x16_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x32 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x32_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x4 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x4_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x64 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x64_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x8 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x8_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x16 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x16_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x32 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x32_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x64 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x64_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x8 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x8_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x16 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x4 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x4_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x8 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x128 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x16 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x16_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x32 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x32_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x64 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x64_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x16 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x16_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x32 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x32_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x4 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x4_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x8 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x8_c
-
-void aom_highbd_10_get16x16var_c(const uint8_t* src_ptr,
-                                 int source_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride,
-                                 unsigned int* sse,
-                                 int* sum);
-#define aom_highbd_10_get16x16var aom_highbd_10_get16x16var_c
-
-void aom_highbd_10_get8x8var_c(const uint8_t* src_ptr,
-                               int source_stride,
-                               const uint8_t* ref_ptr,
-                               int ref_stride,
-                               unsigned int* sse,
-                               int* sum);
-#define aom_highbd_10_get8x8var aom_highbd_10_get8x8var_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance128x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance128x128_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance128x128)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance128x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance128x64_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance128x64)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x16_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance16x16)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x32_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance16x32)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x4_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance16x4)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x64_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance16x64)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x8_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance16x8)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x16_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance32x16)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x32_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance32x32)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x64_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance32x64)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x8_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance32x8)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance4x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance4x16_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance4x16)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance4x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance4x4_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance4x4)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance4x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance4x8_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance4x8)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x128_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance64x128)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x16_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance64x16)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x32_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance64x32)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x64_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance64x64)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x16_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance8x16)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x32_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance8x32)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x4_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance8x4)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x8_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance8x8)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_mse16x16_c(const uint8_t* src_ptr,
-                                      int source_stride,
-                                      const uint8_t* ref_ptr,
-                                      int recon_stride,
-                                      unsigned int* sse);
-unsigned int aom_highbd_10_mse16x16_sse2(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int recon_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_mse16x16 aom_highbd_10_mse16x16_sse2
-
-unsigned int aom_highbd_10_mse16x8_c(const uint8_t* src_ptr,
-                                     int source_stride,
-                                     const uint8_t* ref_ptr,
-                                     int recon_stride,
-                                     unsigned int* sse);
-#define aom_highbd_10_mse16x8 aom_highbd_10_mse16x8_c
-
-unsigned int aom_highbd_10_mse8x16_c(const uint8_t* src_ptr,
-                                     int source_stride,
-                                     const uint8_t* ref_ptr,
-                                     int recon_stride,
-                                     unsigned int* sse);
-#define aom_highbd_10_mse8x16 aom_highbd_10_mse8x16_c
-
-unsigned int aom_highbd_10_mse8x8_c(const uint8_t* src_ptr,
-                                    int source_stride,
-                                    const uint8_t* ref_ptr,
-                                    int recon_stride,
-                                    unsigned int* sse);
-unsigned int aom_highbd_10_mse8x8_sse2(const uint8_t* src_ptr,
-                                       int source_stride,
-                                       const uint8_t* ref_ptr,
-                                       int recon_stride,
-                                       unsigned int* sse);
-#define aom_highbd_10_mse8x8 aom_highbd_10_mse8x8_sse2
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance128x128_c(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            int xoffset,
-                                                            int yoffset,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance128x128 \
-  aom_highbd_10_obmc_sub_pixel_variance128x128_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance128x64_c(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance128x64 \
-  aom_highbd_10_obmc_sub_pixel_variance128x64_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance16x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance16x16 \
-  aom_highbd_10_obmc_sub_pixel_variance16x16_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance16x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance16x32 \
-  aom_highbd_10_obmc_sub_pixel_variance16x32_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance16x4_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance16x4 \
-  aom_highbd_10_obmc_sub_pixel_variance16x4_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance16x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance16x64 \
-  aom_highbd_10_obmc_sub_pixel_variance16x64_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance16x8_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance16x8 \
-  aom_highbd_10_obmc_sub_pixel_variance16x8_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance32x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance32x16 \
-  aom_highbd_10_obmc_sub_pixel_variance32x16_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance32x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance32x32 \
-  aom_highbd_10_obmc_sub_pixel_variance32x32_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance32x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance32x64 \
-  aom_highbd_10_obmc_sub_pixel_variance32x64_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance32x8_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance32x8 \
-  aom_highbd_10_obmc_sub_pixel_variance32x8_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance4x16_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance4x16 \
-  aom_highbd_10_obmc_sub_pixel_variance4x16_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance4x4_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance4x4 \
-  aom_highbd_10_obmc_sub_pixel_variance4x4_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance4x8_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance4x8 \
-  aom_highbd_10_obmc_sub_pixel_variance4x8_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance64x128_c(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance64x128 \
-  aom_highbd_10_obmc_sub_pixel_variance64x128_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance64x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance64x16 \
-  aom_highbd_10_obmc_sub_pixel_variance64x16_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance64x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance64x32 \
-  aom_highbd_10_obmc_sub_pixel_variance64x32_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance64x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance64x64 \
-  aom_highbd_10_obmc_sub_pixel_variance64x64_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance8x16_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance8x16 \
-  aom_highbd_10_obmc_sub_pixel_variance8x16_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance8x32_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance8x32 \
-  aom_highbd_10_obmc_sub_pixel_variance8x32_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance8x4_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance8x4 \
-  aom_highbd_10_obmc_sub_pixel_variance8x4_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance8x8_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance8x8 \
-  aom_highbd_10_obmc_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_10_obmc_variance128x128_c(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance128x128_sse4_1(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance128x128)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance128x64_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance128x64_sse4_1(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance128x64)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance16x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance16x16_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance16x16)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance16x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance16x32_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance16x32)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance16x4_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance16x4_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance16x4)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance16x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance16x64_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance16x64)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance16x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance16x8_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance16x8)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance32x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance32x16_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance32x16)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance32x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance32x32_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance32x32)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance32x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance32x64_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance32x64)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance32x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance32x8_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance32x8)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance4x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance4x16_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance4x16)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance4x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance4x4_sse4_1(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance4x4)(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance4x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance4x8_sse4_1(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance4x8)(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance64x128_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance64x128_sse4_1(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance64x128)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance64x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance64x16_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance64x16)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance64x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance64x32_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance64x32)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance64x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance64x64_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance64x64)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance8x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance8x16_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance8x16)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance8x32_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance8x32_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance8x32)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance8x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance8x4_sse4_1(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance8x4)(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance8x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance8x8_sse4_1(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance8x8)(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance128x128 \
-  aom_highbd_10_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance128x64 \
-  aom_highbd_10_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x16_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance16x16 \
-  aom_highbd_10_sub_pixel_avg_variance16x16_sse2
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x32_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance16x32 \
-  aom_highbd_10_sub_pixel_avg_variance16x32_sse2
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x4_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x4_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance16x4 \
-  aom_highbd_10_sub_pixel_avg_variance16x4_sse2
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x64_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance16x64 \
-  aom_highbd_10_sub_pixel_avg_variance16x64_sse2
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x8_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance16x8 \
-  aom_highbd_10_sub_pixel_avg_variance16x8_sse2
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x16_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance32x16 \
-  aom_highbd_10_sub_pixel_avg_variance32x16_sse2
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x32_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance32x32 \
-  aom_highbd_10_sub_pixel_avg_variance32x32_sse2
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x64_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance32x64 \
-  aom_highbd_10_sub_pixel_avg_variance32x64_sse2
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x8_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x8_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance32x8 \
-  aom_highbd_10_sub_pixel_avg_variance32x8_sse2
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance4x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance4x16 \
-  aom_highbd_10_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance4x4_sse4_1(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-RTCD_EXTERN uint32_t (*aom_highbd_10_sub_pixel_avg_variance4x4)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance4x8 \
-  aom_highbd_10_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance64x128 \
-  aom_highbd_10_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance64x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance64x16_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance64x16 \
-  aom_highbd_10_sub_pixel_avg_variance64x16_sse2
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance64x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance64x32_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance64x32 \
-  aom_highbd_10_sub_pixel_avg_variance64x32_sse2
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance64x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance64x64_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance64x64 \
-  aom_highbd_10_sub_pixel_avg_variance64x64_sse2
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x16_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance8x16 \
-  aom_highbd_10_sub_pixel_avg_variance8x16_sse2
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x32_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x32_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance8x32 \
-  aom_highbd_10_sub_pixel_avg_variance8x32_sse2
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x4_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance8x4 \
-  aom_highbd_10_sub_pixel_avg_variance8x4_sse2
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x8_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance8x8 \
-  aom_highbd_10_sub_pixel_avg_variance8x8_sse2
-
-uint32_t aom_highbd_10_sub_pixel_variance128x128_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance128x128_sse2(const uint8_t* src_ptr,
-                                                      int source_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const uint8_t* ref_ptr,
-                                                      int ref_stride,
-                                                      uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance128x128_avx2(const uint8_t* src_ptr,
-                                                      int source_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const uint8_t* ref_ptr,
-                                                      int ref_stride,
-                                                      uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_10_sub_pixel_variance128x128)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-uint32_t aom_highbd_10_sub_pixel_variance128x64_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance128x64_sse2(const uint8_t* src_ptr,
-                                                     int source_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const uint8_t* ref_ptr,
-                                                     int ref_stride,
-                                                     uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance128x64_avx2(const uint8_t* src_ptr,
-                                                     int source_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const uint8_t* ref_ptr,
-                                                     int ref_stride,
-                                                     uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_10_sub_pixel_variance128x64)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-uint32_t aom_highbd_10_sub_pixel_variance16x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance16x16_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance16x16_avx2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_10_sub_pixel_variance16x16)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-uint32_t aom_highbd_10_sub_pixel_variance16x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance16x32_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance16x32_avx2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_10_sub_pixel_variance16x32)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-uint32_t aom_highbd_10_sub_pixel_variance16x4_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance16x4_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance16x4 \
-  aom_highbd_10_sub_pixel_variance16x4_sse2
-
-uint32_t aom_highbd_10_sub_pixel_variance16x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance16x64_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance16x64 \
-  aom_highbd_10_sub_pixel_variance16x64_sse2
-
-uint32_t aom_highbd_10_sub_pixel_variance16x8_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance16x8_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance16x8_avx2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_10_sub_pixel_variance16x8)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-uint32_t aom_highbd_10_sub_pixel_variance32x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance32x16_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance32x16_avx2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_10_sub_pixel_variance32x16)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-uint32_t aom_highbd_10_sub_pixel_variance32x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance32x32_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance32x32_avx2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_10_sub_pixel_variance32x32)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-uint32_t aom_highbd_10_sub_pixel_variance32x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance32x64_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance32x64_avx2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_10_sub_pixel_variance32x64)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-uint32_t aom_highbd_10_sub_pixel_variance32x8_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance32x8_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance32x8 \
-  aom_highbd_10_sub_pixel_variance32x8_sse2
-
-uint32_t aom_highbd_10_sub_pixel_variance4x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance4x16 \
-  aom_highbd_10_sub_pixel_variance4x16_c
-
-uint32_t aom_highbd_10_sub_pixel_variance4x4_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance4x4_sse4_1(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_10_sub_pixel_variance4x4)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-uint32_t aom_highbd_10_sub_pixel_variance4x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance4x8 \
-  aom_highbd_10_sub_pixel_variance4x8_c
-
-uint32_t aom_highbd_10_sub_pixel_variance64x128_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance64x128_sse2(const uint8_t* src_ptr,
-                                                     int source_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const uint8_t* ref_ptr,
-                                                     int ref_stride,
-                                                     uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance64x128_avx2(const uint8_t* src_ptr,
-                                                     int source_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const uint8_t* ref_ptr,
-                                                     int ref_stride,
-                                                     uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_10_sub_pixel_variance64x128)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-uint32_t aom_highbd_10_sub_pixel_variance64x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance64x16_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance64x16 \
-  aom_highbd_10_sub_pixel_variance64x16_sse2
-
-uint32_t aom_highbd_10_sub_pixel_variance64x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance64x32_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance64x32_avx2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_10_sub_pixel_variance64x32)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-uint32_t aom_highbd_10_sub_pixel_variance64x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance64x64_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance64x64_avx2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_10_sub_pixel_variance64x64)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-uint32_t aom_highbd_10_sub_pixel_variance8x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance8x16_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance8x16_avx2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_10_sub_pixel_variance8x16)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-uint32_t aom_highbd_10_sub_pixel_variance8x32_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance8x32_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance8x32 \
-  aom_highbd_10_sub_pixel_variance8x32_sse2
-
-uint32_t aom_highbd_10_sub_pixel_variance8x4_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance8x4_sse2(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance8x4 \
-  aom_highbd_10_sub_pixel_variance8x4_sse2
-
-uint32_t aom_highbd_10_sub_pixel_variance8x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance8x8_sse2(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance8x8_avx2(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_10_sub_pixel_variance8x8)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-unsigned int aom_highbd_10_variance128x128_c(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-unsigned int aom_highbd_10_variance128x128_sse2(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                unsigned int* sse);
-unsigned int aom_highbd_10_variance128x128_avx2(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_variance128x128)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_variance128x64_c(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-unsigned int aom_highbd_10_variance128x64_sse2(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               unsigned int* sse);
-unsigned int aom_highbd_10_variance128x64_avx2(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_variance128x64)(const uint8_t* src_ptr,
-                                                         int source_stride,
-                                                         const uint8_t* ref_ptr,
-                                                         int ref_stride,
-                                                         unsigned int* sse);
-
-unsigned int aom_highbd_10_variance16x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_10_variance16x16_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-unsigned int aom_highbd_10_variance16x16_avx2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_variance16x16)(const uint8_t* src_ptr,
-                                                        int source_stride,
-                                                        const uint8_t* ref_ptr,
-                                                        int ref_stride,
-                                                        unsigned int* sse);
-
-unsigned int aom_highbd_10_variance16x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_10_variance16x32_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-unsigned int aom_highbd_10_variance16x32_avx2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_variance16x32)(const uint8_t* src_ptr,
-                                                        int source_stride,
-                                                        const uint8_t* ref_ptr,
-                                                        int ref_stride,
-                                                        unsigned int* sse);
-
-unsigned int aom_highbd_10_variance16x4_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_10_variance16x4 aom_highbd_10_variance16x4_c
-
-unsigned int aom_highbd_10_variance16x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           uint32_t* sse);
-unsigned int aom_highbd_10_variance16x64_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-#define aom_highbd_10_variance16x64 aom_highbd_10_variance16x64_sse2
-
-unsigned int aom_highbd_10_variance16x8_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-unsigned int aom_highbd_10_variance16x8_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-unsigned int aom_highbd_10_variance16x8_avx2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_variance16x8)(const uint8_t* src_ptr,
-                                                       int source_stride,
-                                                       const uint8_t* ref_ptr,
-                                                       int ref_stride,
-                                                       unsigned int* sse);
-
-unsigned int aom_highbd_10_variance2x2_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance2x2 aom_highbd_10_variance2x2_c
-
-unsigned int aom_highbd_10_variance2x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance2x4 aom_highbd_10_variance2x4_c
-
-unsigned int aom_highbd_10_variance32x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_10_variance32x16_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-unsigned int aom_highbd_10_variance32x16_avx2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_variance32x16)(const uint8_t* src_ptr,
-                                                        int source_stride,
-                                                        const uint8_t* ref_ptr,
-                                                        int ref_stride,
-                                                        unsigned int* sse);
-
-unsigned int aom_highbd_10_variance32x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_10_variance32x32_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-unsigned int aom_highbd_10_variance32x32_avx2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_variance32x32)(const uint8_t* src_ptr,
-                                                        int source_stride,
-                                                        const uint8_t* ref_ptr,
-                                                        int ref_stride,
-                                                        unsigned int* sse);
-
-unsigned int aom_highbd_10_variance32x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_10_variance32x64_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-unsigned int aom_highbd_10_variance32x64_avx2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_variance32x64)(const uint8_t* src_ptr,
-                                                        int source_stride,
-                                                        const uint8_t* ref_ptr,
-                                                        int ref_stride,
-                                                        unsigned int* sse);
-
-unsigned int aom_highbd_10_variance32x8_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-unsigned int aom_highbd_10_variance32x8_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             uint32_t* sse);
-#define aom_highbd_10_variance32x8 aom_highbd_10_variance32x8_sse2
-
-unsigned int aom_highbd_10_variance4x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_10_variance4x16 aom_highbd_10_variance4x16_c
-
-unsigned int aom_highbd_10_variance4x2_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance4x2 aom_highbd_10_variance4x2_c
-
-unsigned int aom_highbd_10_variance4x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-unsigned int aom_highbd_10_variance4x4_sse4_1(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_variance4x4)(const uint8_t* src_ptr,
-                                                      int source_stride,
-                                                      const uint8_t* ref_ptr,
-                                                      int ref_stride,
-                                                      unsigned int* sse);
-
-unsigned int aom_highbd_10_variance4x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance4x8 aom_highbd_10_variance4x8_c
-
-unsigned int aom_highbd_10_variance64x128_c(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-unsigned int aom_highbd_10_variance64x128_sse2(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               unsigned int* sse);
-unsigned int aom_highbd_10_variance64x128_avx2(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_variance64x128)(const uint8_t* src_ptr,
-                                                         int source_stride,
-                                                         const uint8_t* ref_ptr,
-                                                         int ref_stride,
-                                                         unsigned int* sse);
-
-unsigned int aom_highbd_10_variance64x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           uint32_t* sse);
-unsigned int aom_highbd_10_variance64x16_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-#define aom_highbd_10_variance64x16 aom_highbd_10_variance64x16_sse2
-
-unsigned int aom_highbd_10_variance64x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_10_variance64x32_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-unsigned int aom_highbd_10_variance64x32_avx2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_variance64x32)(const uint8_t* src_ptr,
-                                                        int source_stride,
-                                                        const uint8_t* ref_ptr,
-                                                        int ref_stride,
-                                                        unsigned int* sse);
-
-unsigned int aom_highbd_10_variance64x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_10_variance64x64_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-unsigned int aom_highbd_10_variance64x64_avx2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_variance64x64)(const uint8_t* src_ptr,
-                                                        int source_stride,
-                                                        const uint8_t* ref_ptr,
-                                                        int ref_stride,
-                                                        unsigned int* sse);
-
-unsigned int aom_highbd_10_variance8x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-unsigned int aom_highbd_10_variance8x16_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-unsigned int aom_highbd_10_variance8x16_avx2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_variance8x16)(const uint8_t* src_ptr,
-                                                       int source_stride,
-                                                       const uint8_t* ref_ptr,
-                                                       int ref_stride,
-                                                       unsigned int* sse);
-
-unsigned int aom_highbd_10_variance8x32_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-unsigned int aom_highbd_10_variance8x32_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             uint32_t* sse);
-#define aom_highbd_10_variance8x32 aom_highbd_10_variance8x32_sse2
-
-unsigned int aom_highbd_10_variance8x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance8x4 aom_highbd_10_variance8x4_c
-
-unsigned int aom_highbd_10_variance8x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-unsigned int aom_highbd_10_variance8x8_sse2(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-unsigned int aom_highbd_10_variance8x8_avx2(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_variance8x8)(const uint8_t* src_ptr,
-                                                      int source_stride,
-                                                      const uint8_t* ref_ptr,
-                                                      int ref_stride,
-                                                      unsigned int* sse);
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x128 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x64 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x16 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x16_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x32 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x32_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x4 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x4_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x64 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x64_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x8 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x8_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x16 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x16_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x32 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x32_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x64 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x64_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x8 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x8_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x16 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x4 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x4_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x8 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x128 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x16 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x16_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x32 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x32_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x64 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x64_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x16 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x16_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x32 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x32_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x4 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x4_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x8 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x8_c
-
-void aom_highbd_12_get16x16var_c(const uint8_t* src_ptr,
-                                 int source_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride,
-                                 unsigned int* sse,
-                                 int* sum);
-#define aom_highbd_12_get16x16var aom_highbd_12_get16x16var_c
-
-void aom_highbd_12_get8x8var_c(const uint8_t* src_ptr,
-                               int source_stride,
-                               const uint8_t* ref_ptr,
-                               int ref_stride,
-                               unsigned int* sse,
-                               int* sum);
-#define aom_highbd_12_get8x8var aom_highbd_12_get8x8var_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance128x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance128x128_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance128x128)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance128x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance128x64_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance128x64)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x16_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance16x16)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x32_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance16x32)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x4_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance16x4)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x64_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance16x64)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x8_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance16x8)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x16_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance32x16)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x32_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance32x32)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x64_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance32x64)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x8_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance32x8)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance4x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance4x16_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance4x16)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance4x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance4x4_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance4x4)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance4x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance4x8_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance4x8)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x128_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance64x128)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x16_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance64x16)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x32_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance64x32)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x64_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance64x64)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x16_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance8x16)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x32_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance8x32)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x4_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance8x4)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x8_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance8x8)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_mse16x16_c(const uint8_t* src_ptr,
-                                      int source_stride,
-                                      const uint8_t* ref_ptr,
-                                      int recon_stride,
-                                      unsigned int* sse);
-unsigned int aom_highbd_12_mse16x16_sse2(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int recon_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_mse16x16 aom_highbd_12_mse16x16_sse2
-
-unsigned int aom_highbd_12_mse16x8_c(const uint8_t* src_ptr,
-                                     int source_stride,
-                                     const uint8_t* ref_ptr,
-                                     int recon_stride,
-                                     unsigned int* sse);
-#define aom_highbd_12_mse16x8 aom_highbd_12_mse16x8_c
-
-unsigned int aom_highbd_12_mse8x16_c(const uint8_t* src_ptr,
-                                     int source_stride,
-                                     const uint8_t* ref_ptr,
-                                     int recon_stride,
-                                     unsigned int* sse);
-#define aom_highbd_12_mse8x16 aom_highbd_12_mse8x16_c
-
-unsigned int aom_highbd_12_mse8x8_c(const uint8_t* src_ptr,
-                                    int source_stride,
-                                    const uint8_t* ref_ptr,
-                                    int recon_stride,
-                                    unsigned int* sse);
-unsigned int aom_highbd_12_mse8x8_sse2(const uint8_t* src_ptr,
-                                       int source_stride,
-                                       const uint8_t* ref_ptr,
-                                       int recon_stride,
-                                       unsigned int* sse);
-#define aom_highbd_12_mse8x8 aom_highbd_12_mse8x8_sse2
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance128x128_c(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            int xoffset,
-                                                            int yoffset,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance128x128 \
-  aom_highbd_12_obmc_sub_pixel_variance128x128_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance128x64_c(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance128x64 \
-  aom_highbd_12_obmc_sub_pixel_variance128x64_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance16x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance16x16 \
-  aom_highbd_12_obmc_sub_pixel_variance16x16_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance16x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance16x32 \
-  aom_highbd_12_obmc_sub_pixel_variance16x32_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance16x4_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance16x4 \
-  aom_highbd_12_obmc_sub_pixel_variance16x4_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance16x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance16x64 \
-  aom_highbd_12_obmc_sub_pixel_variance16x64_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance16x8_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance16x8 \
-  aom_highbd_12_obmc_sub_pixel_variance16x8_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance32x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance32x16 \
-  aom_highbd_12_obmc_sub_pixel_variance32x16_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance32x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance32x32 \
-  aom_highbd_12_obmc_sub_pixel_variance32x32_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance32x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance32x64 \
-  aom_highbd_12_obmc_sub_pixel_variance32x64_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance32x8_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance32x8 \
-  aom_highbd_12_obmc_sub_pixel_variance32x8_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance4x16_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance4x16 \
-  aom_highbd_12_obmc_sub_pixel_variance4x16_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance4x4_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance4x4 \
-  aom_highbd_12_obmc_sub_pixel_variance4x4_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance4x8_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance4x8 \
-  aom_highbd_12_obmc_sub_pixel_variance4x8_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance64x128_c(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance64x128 \
-  aom_highbd_12_obmc_sub_pixel_variance64x128_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance64x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance64x16 \
-  aom_highbd_12_obmc_sub_pixel_variance64x16_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance64x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance64x32 \
-  aom_highbd_12_obmc_sub_pixel_variance64x32_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance64x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance64x64 \
-  aom_highbd_12_obmc_sub_pixel_variance64x64_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance8x16_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance8x16 \
-  aom_highbd_12_obmc_sub_pixel_variance8x16_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance8x32_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance8x32 \
-  aom_highbd_12_obmc_sub_pixel_variance8x32_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance8x4_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance8x4 \
-  aom_highbd_12_obmc_sub_pixel_variance8x4_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance8x8_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance8x8 \
-  aom_highbd_12_obmc_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_12_obmc_variance128x128_c(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance128x128_sse4_1(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance128x128)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance128x64_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance128x64_sse4_1(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance128x64)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance16x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance16x16_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance16x16)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance16x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance16x32_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance16x32)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance16x4_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance16x4_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance16x4)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance16x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance16x64_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance16x64)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance16x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance16x8_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance16x8)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance32x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance32x16_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance32x16)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance32x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance32x32_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance32x32)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance32x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance32x64_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance32x64)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance32x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance32x8_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance32x8)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance4x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance4x16_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance4x16)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance4x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance4x4_sse4_1(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance4x4)(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance4x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance4x8_sse4_1(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance4x8)(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance64x128_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance64x128_sse4_1(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance64x128)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance64x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance64x16_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance64x16)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance64x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance64x32_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance64x32)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance64x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance64x64_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance64x64)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance8x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance8x16_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance8x16)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance8x32_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance8x32_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance8x32)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance8x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance8x4_sse4_1(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance8x4)(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance8x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance8x8_sse4_1(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance8x8)(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance128x128 \
-  aom_highbd_12_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance128x64 \
-  aom_highbd_12_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x16_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance16x16 \
-  aom_highbd_12_sub_pixel_avg_variance16x16_sse2
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x32_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance16x32 \
-  aom_highbd_12_sub_pixel_avg_variance16x32_sse2
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x4_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x4_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance16x4 \
-  aom_highbd_12_sub_pixel_avg_variance16x4_sse2
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x64_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance16x64 \
-  aom_highbd_12_sub_pixel_avg_variance16x64_sse2
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x8_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance16x8 \
-  aom_highbd_12_sub_pixel_avg_variance16x8_sse2
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x16_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance32x16 \
-  aom_highbd_12_sub_pixel_avg_variance32x16_sse2
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x32_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance32x32 \
-  aom_highbd_12_sub_pixel_avg_variance32x32_sse2
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x64_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance32x64 \
-  aom_highbd_12_sub_pixel_avg_variance32x64_sse2
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x8_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x8_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance32x8 \
-  aom_highbd_12_sub_pixel_avg_variance32x8_sse2
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance4x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance4x16 \
-  aom_highbd_12_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance4x4_sse4_1(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-RTCD_EXTERN uint32_t (*aom_highbd_12_sub_pixel_avg_variance4x4)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance4x8 \
-  aom_highbd_12_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance64x128 \
-  aom_highbd_12_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance64x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance64x16_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance64x16 \
-  aom_highbd_12_sub_pixel_avg_variance64x16_sse2
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance64x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance64x32_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance64x32 \
-  aom_highbd_12_sub_pixel_avg_variance64x32_sse2
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance64x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance64x64_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance64x64 \
-  aom_highbd_12_sub_pixel_avg_variance64x64_sse2
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x16_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance8x16 \
-  aom_highbd_12_sub_pixel_avg_variance8x16_sse2
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x32_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x32_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance8x32 \
-  aom_highbd_12_sub_pixel_avg_variance8x32_sse2
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x4_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance8x4 \
-  aom_highbd_12_sub_pixel_avg_variance8x4_sse2
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x8_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance8x8 \
-  aom_highbd_12_sub_pixel_avg_variance8x8_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance128x128_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance128x128_sse2(const uint8_t* src_ptr,
-                                                      int source_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const uint8_t* ref_ptr,
-                                                      int ref_stride,
-                                                      uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance128x128 \
-  aom_highbd_12_sub_pixel_variance128x128_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance128x64_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance128x64_sse2(const uint8_t* src_ptr,
-                                                     int source_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const uint8_t* ref_ptr,
-                                                     int ref_stride,
-                                                     uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance128x64 \
-  aom_highbd_12_sub_pixel_variance128x64_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance16x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance16x16_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance16x16 \
-  aom_highbd_12_sub_pixel_variance16x16_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance16x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance16x32_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance16x32 \
-  aom_highbd_12_sub_pixel_variance16x32_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance16x4_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance16x4_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance16x4 \
-  aom_highbd_12_sub_pixel_variance16x4_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance16x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance16x64_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance16x64 \
-  aom_highbd_12_sub_pixel_variance16x64_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance16x8_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance16x8_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance16x8 \
-  aom_highbd_12_sub_pixel_variance16x8_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance32x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance32x16_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance32x16 \
-  aom_highbd_12_sub_pixel_variance32x16_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance32x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance32x32_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance32x32 \
-  aom_highbd_12_sub_pixel_variance32x32_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance32x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance32x64_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance32x64 \
-  aom_highbd_12_sub_pixel_variance32x64_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance32x8_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance32x8_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance32x8 \
-  aom_highbd_12_sub_pixel_variance32x8_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance4x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance4x16 \
-  aom_highbd_12_sub_pixel_variance4x16_c
-
-uint32_t aom_highbd_12_sub_pixel_variance4x4_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance4x4_sse4_1(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_12_sub_pixel_variance4x4)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-uint32_t aom_highbd_12_sub_pixel_variance4x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance4x8 \
-  aom_highbd_12_sub_pixel_variance4x8_c
-
-uint32_t aom_highbd_12_sub_pixel_variance64x128_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance64x128_sse2(const uint8_t* src_ptr,
-                                                     int source_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const uint8_t* ref_ptr,
-                                                     int ref_stride,
-                                                     uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance64x128 \
-  aom_highbd_12_sub_pixel_variance64x128_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance64x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance64x16_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance64x16 \
-  aom_highbd_12_sub_pixel_variance64x16_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance64x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance64x32_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance64x32 \
-  aom_highbd_12_sub_pixel_variance64x32_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance64x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance64x64_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance64x64 \
-  aom_highbd_12_sub_pixel_variance64x64_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance8x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance8x16_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance8x16 \
-  aom_highbd_12_sub_pixel_variance8x16_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance8x32_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance8x32_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance8x32 \
-  aom_highbd_12_sub_pixel_variance8x32_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance8x4_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance8x4_sse2(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance8x4 \
-  aom_highbd_12_sub_pixel_variance8x4_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance8x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance8x8_sse2(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance8x8 \
-  aom_highbd_12_sub_pixel_variance8x8_sse2
-
-unsigned int aom_highbd_12_variance128x128_c(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-unsigned int aom_highbd_12_variance128x128_sse2(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                unsigned int* sse);
-#define aom_highbd_12_variance128x128 aom_highbd_12_variance128x128_sse2
-
-unsigned int aom_highbd_12_variance128x64_c(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-unsigned int aom_highbd_12_variance128x64_sse2(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               unsigned int* sse);
-#define aom_highbd_12_variance128x64 aom_highbd_12_variance128x64_sse2
-
-unsigned int aom_highbd_12_variance16x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_12_variance16x16_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-#define aom_highbd_12_variance16x16 aom_highbd_12_variance16x16_sse2
-
-unsigned int aom_highbd_12_variance16x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_12_variance16x32_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-#define aom_highbd_12_variance16x32 aom_highbd_12_variance16x32_sse2
-
-unsigned int aom_highbd_12_variance16x4_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_12_variance16x4 aom_highbd_12_variance16x4_c
-
-unsigned int aom_highbd_12_variance16x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           uint32_t* sse);
-unsigned int aom_highbd_12_variance16x64_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-#define aom_highbd_12_variance16x64 aom_highbd_12_variance16x64_sse2
-
-unsigned int aom_highbd_12_variance16x8_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-unsigned int aom_highbd_12_variance16x8_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-#define aom_highbd_12_variance16x8 aom_highbd_12_variance16x8_sse2
-
-unsigned int aom_highbd_12_variance2x2_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance2x2 aom_highbd_12_variance2x2_c
-
-unsigned int aom_highbd_12_variance2x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance2x4 aom_highbd_12_variance2x4_c
-
-unsigned int aom_highbd_12_variance32x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_12_variance32x16_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-#define aom_highbd_12_variance32x16 aom_highbd_12_variance32x16_sse2
-
-unsigned int aom_highbd_12_variance32x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_12_variance32x32_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-#define aom_highbd_12_variance32x32 aom_highbd_12_variance32x32_sse2
-
-unsigned int aom_highbd_12_variance32x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_12_variance32x64_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-#define aom_highbd_12_variance32x64 aom_highbd_12_variance32x64_sse2
-
-unsigned int aom_highbd_12_variance32x8_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-unsigned int aom_highbd_12_variance32x8_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             uint32_t* sse);
-#define aom_highbd_12_variance32x8 aom_highbd_12_variance32x8_sse2
-
-unsigned int aom_highbd_12_variance4x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_12_variance4x16 aom_highbd_12_variance4x16_c
-
-unsigned int aom_highbd_12_variance4x2_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance4x2 aom_highbd_12_variance4x2_c
-
-unsigned int aom_highbd_12_variance4x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-unsigned int aom_highbd_12_variance4x4_sse4_1(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_variance4x4)(const uint8_t* src_ptr,
-                                                      int source_stride,
-                                                      const uint8_t* ref_ptr,
-                                                      int ref_stride,
-                                                      unsigned int* sse);
-
-unsigned int aom_highbd_12_variance4x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance4x8 aom_highbd_12_variance4x8_c
-
-unsigned int aom_highbd_12_variance64x128_c(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-unsigned int aom_highbd_12_variance64x128_sse2(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               unsigned int* sse);
-#define aom_highbd_12_variance64x128 aom_highbd_12_variance64x128_sse2
-
-unsigned int aom_highbd_12_variance64x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           uint32_t* sse);
-unsigned int aom_highbd_12_variance64x16_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-#define aom_highbd_12_variance64x16 aom_highbd_12_variance64x16_sse2
-
-unsigned int aom_highbd_12_variance64x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_12_variance64x32_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-#define aom_highbd_12_variance64x32 aom_highbd_12_variance64x32_sse2
-
-unsigned int aom_highbd_12_variance64x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_12_variance64x64_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-#define aom_highbd_12_variance64x64 aom_highbd_12_variance64x64_sse2
-
-unsigned int aom_highbd_12_variance8x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-unsigned int aom_highbd_12_variance8x16_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-#define aom_highbd_12_variance8x16 aom_highbd_12_variance8x16_sse2
-
-unsigned int aom_highbd_12_variance8x32_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-unsigned int aom_highbd_12_variance8x32_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             uint32_t* sse);
-#define aom_highbd_12_variance8x32 aom_highbd_12_variance8x32_sse2
-
-unsigned int aom_highbd_12_variance8x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance8x4 aom_highbd_12_variance8x4_c
-
-unsigned int aom_highbd_12_variance8x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-unsigned int aom_highbd_12_variance8x8_sse2(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-#define aom_highbd_12_variance8x8 aom_highbd_12_variance8x8_sse2
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x128 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x64 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x16 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x16_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x32 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x32_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x4 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x4_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x64 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x64_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x8 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x8_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x16 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x16_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x32 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x32_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x64 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x64_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x8 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x8_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x16 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x4 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x4_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x8 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x128 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x16 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x16_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x32 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x32_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x64 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x64_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x16 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x16_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x32 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x32_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x4 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x4_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x8 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x8_c
-
-void aom_highbd_8_get16x16var_c(const uint8_t* src_ptr,
-                                int source_stride,
-                                const uint8_t* ref_ptr,
-                                int ref_stride,
-                                unsigned int* sse,
-                                int* sum);
-#define aom_highbd_8_get16x16var aom_highbd_8_get16x16var_c
-
-void aom_highbd_8_get8x8var_c(const uint8_t* src_ptr,
-                              int source_stride,
-                              const uint8_t* ref_ptr,
-                              int ref_stride,
-                              unsigned int* sse,
-                              int* sum);
-#define aom_highbd_8_get8x8var aom_highbd_8_get8x8var_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance128x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance128x128_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance128x128)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance128x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance128x64_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance128x64)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x16_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance16x16)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x32_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance16x32)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x4_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance16x4)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x64_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance16x64)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x8_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance16x8)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x16_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance32x16)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x32_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance32x32)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x64_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance32x64)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x8_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance32x8)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance4x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance4x16_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance4x16)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance4x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance4x4_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance4x4)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance4x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance4x8_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance4x8)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x128_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance64x128)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x16_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance64x16)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x32_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance64x32)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x64_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance64x64)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x16_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance8x16)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x32_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance8x32)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x4_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance8x4)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x8_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance8x8)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_mse16x16_c(const uint8_t* src_ptr,
-                                     int source_stride,
-                                     const uint8_t* ref_ptr,
-                                     int recon_stride,
-                                     unsigned int* sse);
-unsigned int aom_highbd_8_mse16x16_sse2(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int recon_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_mse16x16 aom_highbd_8_mse16x16_sse2
-
-unsigned int aom_highbd_8_mse16x8_c(const uint8_t* src_ptr,
-                                    int source_stride,
-                                    const uint8_t* ref_ptr,
-                                    int recon_stride,
-                                    unsigned int* sse);
-#define aom_highbd_8_mse16x8 aom_highbd_8_mse16x8_c
-
-unsigned int aom_highbd_8_mse8x16_c(const uint8_t* src_ptr,
-                                    int source_stride,
-                                    const uint8_t* ref_ptr,
-                                    int recon_stride,
-                                    unsigned int* sse);
-#define aom_highbd_8_mse8x16 aom_highbd_8_mse8x16_c
-
-unsigned int aom_highbd_8_mse8x8_c(const uint8_t* src_ptr,
-                                   int source_stride,
-                                   const uint8_t* ref_ptr,
-                                   int recon_stride,
-                                   unsigned int* sse);
-unsigned int aom_highbd_8_mse8x8_sse2(const uint8_t* src_ptr,
-                                      int source_stride,
-                                      const uint8_t* ref_ptr,
-                                      int recon_stride,
-                                      unsigned int* sse);
-#define aom_highbd_8_mse8x8 aom_highbd_8_mse8x8_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance128x128 \
-  aom_highbd_8_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance128x64 \
-  aom_highbd_8_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x16_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance16x16 \
-  aom_highbd_8_sub_pixel_avg_variance16x16_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x32_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x32_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance16x32 \
-  aom_highbd_8_sub_pixel_avg_variance16x32_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x4_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x4_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance16x4 \
-  aom_highbd_8_sub_pixel_avg_variance16x4_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x64_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x64_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance16x64 \
-  aom_highbd_8_sub_pixel_avg_variance16x64_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x8_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance16x8 \
-  aom_highbd_8_sub_pixel_avg_variance16x8_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x16_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance32x16 \
-  aom_highbd_8_sub_pixel_avg_variance32x16_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x32_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x32_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance32x32 \
-  aom_highbd_8_sub_pixel_avg_variance32x32_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x64_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x64_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance32x64 \
-  aom_highbd_8_sub_pixel_avg_variance32x64_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x8_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance32x8 \
-  aom_highbd_8_sub_pixel_avg_variance32x8_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance4x16_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance4x16 \
-  aom_highbd_8_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse,
-                                                  const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance4x4_sse4_1(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-RTCD_EXTERN uint32_t (*aom_highbd_8_sub_pixel_avg_variance4x4)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse,
-                                                  const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance4x8 \
-  aom_highbd_8_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance64x128 \
-  aom_highbd_8_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance64x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance64x16_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance64x16 \
-  aom_highbd_8_sub_pixel_avg_variance64x16_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance64x32_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance64x32_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance64x32 \
-  aom_highbd_8_sub_pixel_avg_variance64x32_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance64x64_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance64x64_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance64x64 \
-  aom_highbd_8_sub_pixel_avg_variance64x64_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x16_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance8x16 \
-  aom_highbd_8_sub_pixel_avg_variance8x16_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x32_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x32_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance8x32 \
-  aom_highbd_8_sub_pixel_avg_variance8x32_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse,
-                                                  const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x4_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance8x4 \
-  aom_highbd_8_sub_pixel_avg_variance8x4_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse,
-                                                  const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x8_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance8x8 \
-  aom_highbd_8_sub_pixel_avg_variance8x8_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance128x128_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance128x128_sse2(const uint8_t* src_ptr,
-                                                     int source_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const uint8_t* ref_ptr,
-                                                     int ref_stride,
-                                                     uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance128x128 \
-  aom_highbd_8_sub_pixel_variance128x128_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance128x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance128x64_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance128x64 \
-  aom_highbd_8_sub_pixel_variance128x64_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance16x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance16x16_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance16x16 \
-  aom_highbd_8_sub_pixel_variance16x16_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance16x32_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance16x32_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance16x32 \
-  aom_highbd_8_sub_pixel_variance16x32_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance16x4_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance16x4_sse2(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance16x4 \
-  aom_highbd_8_sub_pixel_variance16x4_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance16x64_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance16x64_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance16x64 \
-  aom_highbd_8_sub_pixel_variance16x64_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance16x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance16x8_sse2(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance16x8 \
-  aom_highbd_8_sub_pixel_variance16x8_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance32x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance32x16_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance32x16 \
-  aom_highbd_8_sub_pixel_variance32x16_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance32x32_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance32x32_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance32x32 \
-  aom_highbd_8_sub_pixel_variance32x32_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance32x64_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance32x64_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance32x64 \
-  aom_highbd_8_sub_pixel_variance32x64_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance32x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance32x8_sse2(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance32x8 \
-  aom_highbd_8_sub_pixel_variance32x8_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance4x16_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance4x16 \
-  aom_highbd_8_sub_pixel_variance4x16_c
-
-uint32_t aom_highbd_8_sub_pixel_variance4x4_c(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance4x4_sse4_1(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_8_sub_pixel_variance4x4)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-uint32_t aom_highbd_8_sub_pixel_variance4x8_c(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance4x8 aom_highbd_8_sub_pixel_variance4x8_c
-
-uint32_t aom_highbd_8_sub_pixel_variance64x128_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance64x128_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance64x128 \
-  aom_highbd_8_sub_pixel_variance64x128_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance64x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance64x16_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance64x16 \
-  aom_highbd_8_sub_pixel_variance64x16_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance64x32_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance64x32_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance64x32 \
-  aom_highbd_8_sub_pixel_variance64x32_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance64x64_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance64x64_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance64x64 \
-  aom_highbd_8_sub_pixel_variance64x64_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance8x16_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance8x16_sse2(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance8x16 \
-  aom_highbd_8_sub_pixel_variance8x16_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance8x32_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance8x32_sse2(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance8x32 \
-  aom_highbd_8_sub_pixel_variance8x32_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance8x4_c(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance8x4_sse2(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance8x4 \
-  aom_highbd_8_sub_pixel_variance8x4_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance8x8_c(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance8x8_sse2(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance8x8 \
-  aom_highbd_8_sub_pixel_variance8x8_sse2
-
-unsigned int aom_highbd_8_variance128x128_c(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-unsigned int aom_highbd_8_variance128x128_sse2(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               unsigned int* sse);
-#define aom_highbd_8_variance128x128 aom_highbd_8_variance128x128_sse2
-
-unsigned int aom_highbd_8_variance128x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_8_variance128x64_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-#define aom_highbd_8_variance128x64 aom_highbd_8_variance128x64_sse2
-
-unsigned int aom_highbd_8_variance16x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-unsigned int aom_highbd_8_variance16x16_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-#define aom_highbd_8_variance16x16 aom_highbd_8_variance16x16_sse2
-
-unsigned int aom_highbd_8_variance16x32_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-unsigned int aom_highbd_8_variance16x32_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-#define aom_highbd_8_variance16x32 aom_highbd_8_variance16x32_sse2
-
-unsigned int aom_highbd_8_variance16x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         uint32_t* sse);
-#define aom_highbd_8_variance16x4 aom_highbd_8_variance16x4_c
-
-unsigned int aom_highbd_8_variance16x64_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-unsigned int aom_highbd_8_variance16x64_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             uint32_t* sse);
-#define aom_highbd_8_variance16x64 aom_highbd_8_variance16x64_sse2
-
-unsigned int aom_highbd_8_variance16x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-unsigned int aom_highbd_8_variance16x8_sse2(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-#define aom_highbd_8_variance16x8 aom_highbd_8_variance16x8_sse2
-
-unsigned int aom_highbd_8_variance2x2_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance2x2 aom_highbd_8_variance2x2_c
-
-unsigned int aom_highbd_8_variance2x4_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance2x4 aom_highbd_8_variance2x4_c
-
-unsigned int aom_highbd_8_variance32x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-unsigned int aom_highbd_8_variance32x16_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-#define aom_highbd_8_variance32x16 aom_highbd_8_variance32x16_sse2
-
-unsigned int aom_highbd_8_variance32x32_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-unsigned int aom_highbd_8_variance32x32_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-#define aom_highbd_8_variance32x32 aom_highbd_8_variance32x32_sse2
-
-unsigned int aom_highbd_8_variance32x64_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-unsigned int aom_highbd_8_variance32x64_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-#define aom_highbd_8_variance32x64 aom_highbd_8_variance32x64_sse2
-
-unsigned int aom_highbd_8_variance32x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         uint32_t* sse);
-unsigned int aom_highbd_8_variance32x8_sse2(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            uint32_t* sse);
-#define aom_highbd_8_variance32x8 aom_highbd_8_variance32x8_sse2
-
-unsigned int aom_highbd_8_variance4x16_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         uint32_t* sse);
-#define aom_highbd_8_variance4x16 aom_highbd_8_variance4x16_c
-
-unsigned int aom_highbd_8_variance4x2_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance4x2 aom_highbd_8_variance4x2_c
-
-unsigned int aom_highbd_8_variance4x4_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-unsigned int aom_highbd_8_variance4x4_sse4_1(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_variance4x4)(const uint8_t* src_ptr,
-                                                     int source_stride,
-                                                     const uint8_t* ref_ptr,
-                                                     int ref_stride,
-                                                     unsigned int* sse);
-
-unsigned int aom_highbd_8_variance4x8_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance4x8 aom_highbd_8_variance4x8_c
-
-unsigned int aom_highbd_8_variance64x128_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_8_variance64x128_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-#define aom_highbd_8_variance64x128 aom_highbd_8_variance64x128_sse2
-
-unsigned int aom_highbd_8_variance64x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-unsigned int aom_highbd_8_variance64x16_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             uint32_t* sse);
-#define aom_highbd_8_variance64x16 aom_highbd_8_variance64x16_sse2
-
-unsigned int aom_highbd_8_variance64x32_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-unsigned int aom_highbd_8_variance64x32_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-#define aom_highbd_8_variance64x32 aom_highbd_8_variance64x32_sse2
-
-unsigned int aom_highbd_8_variance64x64_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-unsigned int aom_highbd_8_variance64x64_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-#define aom_highbd_8_variance64x64 aom_highbd_8_variance64x64_sse2
-
-unsigned int aom_highbd_8_variance8x16_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-unsigned int aom_highbd_8_variance8x16_sse2(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-#define aom_highbd_8_variance8x16 aom_highbd_8_variance8x16_sse2
-
-unsigned int aom_highbd_8_variance8x32_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         uint32_t* sse);
-unsigned int aom_highbd_8_variance8x32_sse2(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            uint32_t* sse);
-#define aom_highbd_8_variance8x32 aom_highbd_8_variance8x32_sse2
-
-unsigned int aom_highbd_8_variance8x4_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance8x4 aom_highbd_8_variance8x4_c
-
-unsigned int aom_highbd_8_variance8x8_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-unsigned int aom_highbd_8_variance8x8_sse2(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_8_variance8x8 aom_highbd_8_variance8x8_sse2
-
-unsigned int aom_highbd_avg_4x4_c(const uint8_t*, int p);
-#define aom_highbd_avg_4x4 aom_highbd_avg_4x4_c
-
-unsigned int aom_highbd_avg_8x8_c(const uint8_t*, int p);
-#define aom_highbd_avg_8x8 aom_highbd_avg_8x8_c
-
-void aom_highbd_blend_a64_d16_mask_c(uint8_t* dst,
-                                     uint32_t dst_stride,
-                                     const CONV_BUF_TYPE* src0,
-                                     uint32_t src0_stride,
-                                     const CONV_BUF_TYPE* src1,
-                                     uint32_t src1_stride,
-                                     const uint8_t* mask,
-                                     uint32_t mask_stride,
-                                     int w,
-                                     int h,
-                                     int subw,
-                                     int subh,
-                                     ConvolveParams* conv_params,
-                                     const int bd);
-void aom_highbd_blend_a64_d16_mask_sse4_1(uint8_t* dst,
-                                          uint32_t dst_stride,
-                                          const CONV_BUF_TYPE* src0,
-                                          uint32_t src0_stride,
-                                          const CONV_BUF_TYPE* src1,
-                                          uint32_t src1_stride,
-                                          const uint8_t* mask,
-                                          uint32_t mask_stride,
-                                          int w,
-                                          int h,
-                                          int subw,
-                                          int subh,
-                                          ConvolveParams* conv_params,
-                                          const int bd);
-void aom_highbd_blend_a64_d16_mask_avx2(uint8_t* dst,
-                                        uint32_t dst_stride,
-                                        const CONV_BUF_TYPE* src0,
-                                        uint32_t src0_stride,
-                                        const CONV_BUF_TYPE* src1,
-                                        uint32_t src1_stride,
-                                        const uint8_t* mask,
-                                        uint32_t mask_stride,
-                                        int w,
-                                        int h,
-                                        int subw,
-                                        int subh,
-                                        ConvolveParams* conv_params,
-                                        const int bd);
-RTCD_EXTERN void (*aom_highbd_blend_a64_d16_mask)(uint8_t* dst,
-                                                  uint32_t dst_stride,
-                                                  const CONV_BUF_TYPE* src0,
-                                                  uint32_t src0_stride,
-                                                  const CONV_BUF_TYPE* src1,
-                                                  uint32_t src1_stride,
-                                                  const uint8_t* mask,
-                                                  uint32_t mask_stride,
-                                                  int w,
-                                                  int h,
-                                                  int subw,
-                                                  int subh,
-                                                  ConvolveParams* conv_params,
-                                                  const int bd);
-
-void aom_highbd_blend_a64_hmask_c(uint8_t* dst,
-                                  uint32_t dst_stride,
-                                  const uint8_t* src0,
-                                  uint32_t src0_stride,
-                                  const uint8_t* src1,
-                                  uint32_t src1_stride,
-                                  const uint8_t* mask,
-                                  int w,
-                                  int h,
-                                  int bd);
-void aom_highbd_blend_a64_hmask_sse4_1(uint8_t* dst,
-                                       uint32_t dst_stride,
-                                       const uint8_t* src0,
-                                       uint32_t src0_stride,
-                                       const uint8_t* src1,
-                                       uint32_t src1_stride,
-                                       const uint8_t* mask,
-                                       int w,
-                                       int h,
-                                       int bd);
-RTCD_EXTERN void (*aom_highbd_blend_a64_hmask)(uint8_t* dst,
-                                               uint32_t dst_stride,
-                                               const uint8_t* src0,
-                                               uint32_t src0_stride,
-                                               const uint8_t* src1,
-                                               uint32_t src1_stride,
-                                               const uint8_t* mask,
-                                               int w,
-                                               int h,
-                                               int bd);
-
-void aom_highbd_blend_a64_mask_c(uint8_t* dst,
-                                 uint32_t dst_stride,
-                                 const uint8_t* src0,
-                                 uint32_t src0_stride,
-                                 const uint8_t* src1,
-                                 uint32_t src1_stride,
-                                 const uint8_t* mask,
-                                 uint32_t mask_stride,
-                                 int w,
-                                 int h,
-                                 int subw,
-                                 int subh,
-                                 int bd);
-void aom_highbd_blend_a64_mask_sse4_1(uint8_t* dst,
-                                      uint32_t dst_stride,
-                                      const uint8_t* src0,
-                                      uint32_t src0_stride,
-                                      const uint8_t* src1,
-                                      uint32_t src1_stride,
-                                      const uint8_t* mask,
-                                      uint32_t mask_stride,
-                                      int w,
-                                      int h,
-                                      int subw,
-                                      int subh,
-                                      int bd);
-RTCD_EXTERN void (*aom_highbd_blend_a64_mask)(uint8_t* dst,
-                                              uint32_t dst_stride,
-                                              const uint8_t* src0,
-                                              uint32_t src0_stride,
-                                              const uint8_t* src1,
-                                              uint32_t src1_stride,
-                                              const uint8_t* mask,
-                                              uint32_t mask_stride,
-                                              int w,
-                                              int h,
-                                              int subw,
-                                              int subh,
-                                              int bd);
-
-void aom_highbd_blend_a64_vmask_c(uint8_t* dst,
-                                  uint32_t dst_stride,
-                                  const uint8_t* src0,
-                                  uint32_t src0_stride,
-                                  const uint8_t* src1,
-                                  uint32_t src1_stride,
-                                  const uint8_t* mask,
-                                  int w,
-                                  int h,
-                                  int bd);
-void aom_highbd_blend_a64_vmask_sse4_1(uint8_t* dst,
-                                       uint32_t dst_stride,
-                                       const uint8_t* src0,
-                                       uint32_t src0_stride,
-                                       const uint8_t* src1,
-                                       uint32_t src1_stride,
-                                       const uint8_t* mask,
-                                       int w,
-                                       int h,
-                                       int bd);
-RTCD_EXTERN void (*aom_highbd_blend_a64_vmask)(uint8_t* dst,
-                                               uint32_t dst_stride,
-                                               const uint8_t* src0,
-                                               uint32_t src0_stride,
-                                               const uint8_t* src1,
-                                               uint32_t src1_stride,
-                                               const uint8_t* mask,
-                                               int w,
-                                               int h,
-                                               int bd);
-
-void aom_highbd_comp_avg_pred_c(uint8_t* comp_pred8,
-                                const uint8_t* pred8,
-                                int width,
-                                int height,
-                                const uint8_t* ref8,
-                                int ref_stride);
-#define aom_highbd_comp_avg_pred aom_highbd_comp_avg_pred_c
-
-void aom_highbd_comp_avg_upsampled_pred_c(MACROBLOCKD* xd,
-                                          const struct AV1Common* const cm,
-                                          int mi_row,
-                                          int mi_col,
-                                          const MV* const mv,
-                                          uint8_t* comp_pred8,
-                                          const uint8_t* pred8,
-                                          int width,
-                                          int height,
-                                          int subpel_x_q3,
-                                          int subpel_y_q3,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          int bd,
-                                          int subpel_search);
-void aom_highbd_comp_avg_upsampled_pred_sse2(MACROBLOCKD* xd,
-                                             const struct AV1Common* const cm,
-                                             int mi_row,
-                                             int mi_col,
-                                             const MV* const mv,
-                                             uint8_t* comp_pred8,
-                                             const uint8_t* pred8,
-                                             int width,
-                                             int height,
-                                             int subpel_x_q3,
-                                             int subpel_y_q3,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             int bd,
-                                             int subpel_search);
-#define aom_highbd_comp_avg_upsampled_pred \
-  aom_highbd_comp_avg_upsampled_pred_sse2
-
-void aom_highbd_comp_mask_pred_c(uint8_t* comp_pred,
-                                 const uint8_t* pred8,
-                                 int width,
-                                 int height,
-                                 const uint8_t* ref8,
-                                 int ref_stride,
-                                 const uint8_t* mask,
-                                 int mask_stride,
-                                 int invert_mask);
-void aom_highbd_comp_mask_pred_sse2(uint8_t* comp_pred,
-                                    const uint8_t* pred8,
-                                    int width,
-                                    int height,
-                                    const uint8_t* ref8,
-                                    int ref_stride,
-                                    const uint8_t* mask,
-                                    int mask_stride,
-                                    int invert_mask);
-void aom_highbd_comp_mask_pred_avx2(uint8_t* comp_pred,
-                                    const uint8_t* pred8,
-                                    int width,
-                                    int height,
-                                    const uint8_t* ref8,
-                                    int ref_stride,
-                                    const uint8_t* mask,
-                                    int mask_stride,
-                                    int invert_mask);
-RTCD_EXTERN void (*aom_highbd_comp_mask_pred)(uint8_t* comp_pred,
-                                              const uint8_t* pred8,
-                                              int width,
-                                              int height,
-                                              const uint8_t* ref8,
-                                              int ref_stride,
-                                              const uint8_t* mask,
-                                              int mask_stride,
-                                              int invert_mask);
-
-void aom_highbd_convolve8_horiz_c(const uint8_t* src,
-                                  ptrdiff_t src_stride,
-                                  uint8_t* dst,
-                                  ptrdiff_t dst_stride,
-                                  const int16_t* filter_x,
-                                  int x_step_q4,
-                                  const int16_t* filter_y,
-                                  int y_step_q4,
-                                  int w,
-                                  int h,
-                                  int bd);
-void aom_highbd_convolve8_horiz_sse2(const uint8_t* src,
-                                     ptrdiff_t src_stride,
-                                     uint8_t* dst,
-                                     ptrdiff_t dst_stride,
-                                     const int16_t* filter_x,
-                                     int x_step_q4,
-                                     const int16_t* filter_y,
-                                     int y_step_q4,
-                                     int w,
-                                     int h,
-                                     int bd);
-void aom_highbd_convolve8_horiz_avx2(const uint8_t* src,
-                                     ptrdiff_t src_stride,
-                                     uint8_t* dst,
-                                     ptrdiff_t dst_stride,
-                                     const int16_t* filter_x,
-                                     int x_step_q4,
-                                     const int16_t* filter_y,
-                                     int y_step_q4,
-                                     int w,
-                                     int h,
-                                     int bd);
-RTCD_EXTERN void (*aom_highbd_convolve8_horiz)(const uint8_t* src,
-                                               ptrdiff_t src_stride,
-                                               uint8_t* dst,
-                                               ptrdiff_t dst_stride,
-                                               const int16_t* filter_x,
-                                               int x_step_q4,
-                                               const int16_t* filter_y,
-                                               int y_step_q4,
-                                               int w,
-                                               int h,
-                                               int bd);
-
-void aom_highbd_convolve8_vert_c(const uint8_t* src,
-                                 ptrdiff_t src_stride,
-                                 uint8_t* dst,
-                                 ptrdiff_t dst_stride,
-                                 const int16_t* filter_x,
-                                 int x_step_q4,
-                                 const int16_t* filter_y,
-                                 int y_step_q4,
-                                 int w,
-                                 int h,
-                                 int bd);
-void aom_highbd_convolve8_vert_sse2(const uint8_t* src,
-                                    ptrdiff_t src_stride,
-                                    uint8_t* dst,
-                                    ptrdiff_t dst_stride,
-                                    const int16_t* filter_x,
-                                    int x_step_q4,
-                                    const int16_t* filter_y,
-                                    int y_step_q4,
-                                    int w,
-                                    int h,
-                                    int bd);
-void aom_highbd_convolve8_vert_avx2(const uint8_t* src,
-                                    ptrdiff_t src_stride,
-                                    uint8_t* dst,
-                                    ptrdiff_t dst_stride,
-                                    const int16_t* filter_x,
-                                    int x_step_q4,
-                                    const int16_t* filter_y,
-                                    int y_step_q4,
-                                    int w,
-                                    int h,
-                                    int bd);
-RTCD_EXTERN void (*aom_highbd_convolve8_vert)(const uint8_t* src,
-                                              ptrdiff_t src_stride,
-                                              uint8_t* dst,
-                                              ptrdiff_t dst_stride,
-                                              const int16_t* filter_x,
-                                              int x_step_q4,
-                                              const int16_t* filter_y,
-                                              int y_step_q4,
-                                              int w,
-                                              int h,
-                                              int bd);
-
-void aom_highbd_convolve_copy_c(const uint16_t* src,
-                                ptrdiff_t src_stride,
-                                uint16_t* dst,
-                                ptrdiff_t dst_stride,
-                                int w,
-                                int h);
-void aom_highbd_convolve_copy_sse2(const uint16_t* src,
-                                   ptrdiff_t src_stride,
-                                   uint16_t* dst,
-                                   ptrdiff_t dst_stride,
-                                   int w,
-                                   int h);
-void aom_highbd_convolve_copy_avx2(const uint16_t* src,
-                                   ptrdiff_t src_stride,
-                                   uint16_t* dst,
-                                   ptrdiff_t dst_stride,
-                                   int w,
-                                   int h);
-RTCD_EXTERN void (*aom_highbd_convolve_copy)(const uint16_t* src,
-                                             ptrdiff_t src_stride,
-                                             uint16_t* dst,
-                                             ptrdiff_t dst_stride,
-                                             int w,
-                                             int h);
-
-void aom_highbd_dc_128_predictor_16x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-void aom_highbd_dc_128_predictor_16x16_sse2(uint16_t* dst,
-                                            ptrdiff_t y_stride,
-                                            const uint16_t* above,
-                                            const uint16_t* left,
-                                            int bd);
-#define aom_highbd_dc_128_predictor_16x16 aom_highbd_dc_128_predictor_16x16_sse2
-
-void aom_highbd_dc_128_predictor_16x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-void aom_highbd_dc_128_predictor_16x32_sse2(uint16_t* dst,
-                                            ptrdiff_t y_stride,
-                                            const uint16_t* above,
-                                            const uint16_t* left,
-                                            int bd);
-#define aom_highbd_dc_128_predictor_16x32 aom_highbd_dc_128_predictor_16x32_sse2
-
-void aom_highbd_dc_128_predictor_16x4_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_16x4 aom_highbd_dc_128_predictor_16x4_c
-
-void aom_highbd_dc_128_predictor_16x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_16x64 aom_highbd_dc_128_predictor_16x64_c
-
-void aom_highbd_dc_128_predictor_16x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-void aom_highbd_dc_128_predictor_16x8_sse2(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_dc_128_predictor_16x8 aom_highbd_dc_128_predictor_16x8_sse2
-
-void aom_highbd_dc_128_predictor_2x2_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_128_predictor_2x2 aom_highbd_dc_128_predictor_2x2_c
-
-void aom_highbd_dc_128_predictor_32x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-void aom_highbd_dc_128_predictor_32x16_sse2(uint16_t* dst,
-                                            ptrdiff_t y_stride,
-                                            const uint16_t* above,
-                                            const uint16_t* left,
-                                            int bd);
-#define aom_highbd_dc_128_predictor_32x16 aom_highbd_dc_128_predictor_32x16_sse2
-
-void aom_highbd_dc_128_predictor_32x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-void aom_highbd_dc_128_predictor_32x32_sse2(uint16_t* dst,
-                                            ptrdiff_t y_stride,
-                                            const uint16_t* above,
-                                            const uint16_t* left,
-                                            int bd);
-#define aom_highbd_dc_128_predictor_32x32 aom_highbd_dc_128_predictor_32x32_sse2
-
-void aom_highbd_dc_128_predictor_32x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_32x64 aom_highbd_dc_128_predictor_32x64_c
-
-void aom_highbd_dc_128_predictor_32x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_32x8 aom_highbd_dc_128_predictor_32x8_c
-
-void aom_highbd_dc_128_predictor_4x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_4x16 aom_highbd_dc_128_predictor_4x16_c
-
-void aom_highbd_dc_128_predictor_4x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-void aom_highbd_dc_128_predictor_4x4_sse2(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_128_predictor_4x4 aom_highbd_dc_128_predictor_4x4_sse2
-
-void aom_highbd_dc_128_predictor_4x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-void aom_highbd_dc_128_predictor_4x8_sse2(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_128_predictor_4x8 aom_highbd_dc_128_predictor_4x8_sse2
-
-void aom_highbd_dc_128_predictor_64x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_64x16 aom_highbd_dc_128_predictor_64x16_c
-
-void aom_highbd_dc_128_predictor_64x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_64x32 aom_highbd_dc_128_predictor_64x32_c
-
-void aom_highbd_dc_128_predictor_64x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_64x64 aom_highbd_dc_128_predictor_64x64_c
-
-void aom_highbd_dc_128_predictor_8x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-void aom_highbd_dc_128_predictor_8x16_sse2(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_dc_128_predictor_8x16 aom_highbd_dc_128_predictor_8x16_sse2
-
-void aom_highbd_dc_128_predictor_8x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_8x32 aom_highbd_dc_128_predictor_8x32_c
-
-void aom_highbd_dc_128_predictor_8x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-void aom_highbd_dc_128_predictor_8x4_sse2(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_128_predictor_8x4 aom_highbd_dc_128_predictor_8x4_sse2
-
-void aom_highbd_dc_128_predictor_8x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-void aom_highbd_dc_128_predictor_8x8_sse2(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_128_predictor_8x8 aom_highbd_dc_128_predictor_8x8_sse2
-
-void aom_highbd_dc_left_predictor_16x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-void aom_highbd_dc_left_predictor_16x16_sse2(uint16_t* dst,
-                                             ptrdiff_t y_stride,
-                                             const uint16_t* above,
-                                             const uint16_t* left,
-                                             int bd);
-#define aom_highbd_dc_left_predictor_16x16 \
-  aom_highbd_dc_left_predictor_16x16_sse2
-
-void aom_highbd_dc_left_predictor_16x32_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-void aom_highbd_dc_left_predictor_16x32_sse2(uint16_t* dst,
-                                             ptrdiff_t y_stride,
-                                             const uint16_t* above,
-                                             const uint16_t* left,
-                                             int bd);
-#define aom_highbd_dc_left_predictor_16x32 \
-  aom_highbd_dc_left_predictor_16x32_sse2
-
-void aom_highbd_dc_left_predictor_16x4_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_16x4 aom_highbd_dc_left_predictor_16x4_c
-
-void aom_highbd_dc_left_predictor_16x64_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_16x64 aom_highbd_dc_left_predictor_16x64_c
-
-void aom_highbd_dc_left_predictor_16x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-void aom_highbd_dc_left_predictor_16x8_sse2(uint16_t* dst,
-                                            ptrdiff_t y_stride,
-                                            const uint16_t* above,
-                                            const uint16_t* left,
-                                            int bd);
-#define aom_highbd_dc_left_predictor_16x8 aom_highbd_dc_left_predictor_16x8_sse2
-
-void aom_highbd_dc_left_predictor_2x2_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_left_predictor_2x2 aom_highbd_dc_left_predictor_2x2_c
-
-void aom_highbd_dc_left_predictor_32x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-void aom_highbd_dc_left_predictor_32x16_sse2(uint16_t* dst,
-                                             ptrdiff_t y_stride,
-                                             const uint16_t* above,
-                                             const uint16_t* left,
-                                             int bd);
-#define aom_highbd_dc_left_predictor_32x16 \
-  aom_highbd_dc_left_predictor_32x16_sse2
-
-void aom_highbd_dc_left_predictor_32x32_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-void aom_highbd_dc_left_predictor_32x32_sse2(uint16_t* dst,
-                                             ptrdiff_t y_stride,
-                                             const uint16_t* above,
-                                             const uint16_t* left,
-                                             int bd);
-#define aom_highbd_dc_left_predictor_32x32 \
-  aom_highbd_dc_left_predictor_32x32_sse2
-
-void aom_highbd_dc_left_predictor_32x64_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_32x64 aom_highbd_dc_left_predictor_32x64_c
-
-void aom_highbd_dc_left_predictor_32x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_32x8 aom_highbd_dc_left_predictor_32x8_c
-
-void aom_highbd_dc_left_predictor_4x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_4x16 aom_highbd_dc_left_predictor_4x16_c
-
-void aom_highbd_dc_left_predictor_4x4_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-void aom_highbd_dc_left_predictor_4x4_sse2(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_dc_left_predictor_4x4 aom_highbd_dc_left_predictor_4x4_sse2
-
-void aom_highbd_dc_left_predictor_4x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-void aom_highbd_dc_left_predictor_4x8_sse2(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_dc_left_predictor_4x8 aom_highbd_dc_left_predictor_4x8_sse2
-
-void aom_highbd_dc_left_predictor_64x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_64x16 aom_highbd_dc_left_predictor_64x16_c
-
-void aom_highbd_dc_left_predictor_64x32_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_64x32 aom_highbd_dc_left_predictor_64x32_c
-
-void aom_highbd_dc_left_predictor_64x64_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_64x64 aom_highbd_dc_left_predictor_64x64_c
-
-void aom_highbd_dc_left_predictor_8x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-void aom_highbd_dc_left_predictor_8x16_sse2(uint16_t* dst,
-                                            ptrdiff_t y_stride,
-                                            const uint16_t* above,
-                                            const uint16_t* left,
-                                            int bd);
-#define aom_highbd_dc_left_predictor_8x16 aom_highbd_dc_left_predictor_8x16_sse2
-
-void aom_highbd_dc_left_predictor_8x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_8x32 aom_highbd_dc_left_predictor_8x32_c
-
-void aom_highbd_dc_left_predictor_8x4_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-void aom_highbd_dc_left_predictor_8x4_sse2(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_dc_left_predictor_8x4 aom_highbd_dc_left_predictor_8x4_sse2
-
-void aom_highbd_dc_left_predictor_8x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-void aom_highbd_dc_left_predictor_8x8_sse2(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_dc_left_predictor_8x8 aom_highbd_dc_left_predictor_8x8_sse2
-
-void aom_highbd_dc_predictor_16x16_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-void aom_highbd_dc_predictor_16x16_sse2(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_predictor_16x16 aom_highbd_dc_predictor_16x16_sse2
-
-void aom_highbd_dc_predictor_16x32_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-void aom_highbd_dc_predictor_16x32_sse2(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_predictor_16x32 aom_highbd_dc_predictor_16x32_sse2
-
-void aom_highbd_dc_predictor_16x4_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_16x4 aom_highbd_dc_predictor_16x4_c
-
-void aom_highbd_dc_predictor_16x64_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_16x64 aom_highbd_dc_predictor_16x64_c
-
-void aom_highbd_dc_predictor_16x8_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-void aom_highbd_dc_predictor_16x8_sse2(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_predictor_16x8 aom_highbd_dc_predictor_16x8_sse2
-
-void aom_highbd_dc_predictor_2x2_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_dc_predictor_2x2 aom_highbd_dc_predictor_2x2_c
-
-void aom_highbd_dc_predictor_32x16_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-void aom_highbd_dc_predictor_32x16_sse2(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_predictor_32x16 aom_highbd_dc_predictor_32x16_sse2
-
-void aom_highbd_dc_predictor_32x32_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-void aom_highbd_dc_predictor_32x32_sse2(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_predictor_32x32 aom_highbd_dc_predictor_32x32_sse2
-
-void aom_highbd_dc_predictor_32x64_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_32x64 aom_highbd_dc_predictor_32x64_c
-
-void aom_highbd_dc_predictor_32x8_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_32x8 aom_highbd_dc_predictor_32x8_c
-
-void aom_highbd_dc_predictor_4x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_4x16 aom_highbd_dc_predictor_4x16_c
-
-void aom_highbd_dc_predictor_4x4_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-void aom_highbd_dc_predictor_4x4_sse2(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_dc_predictor_4x4 aom_highbd_dc_predictor_4x4_sse2
-
-void aom_highbd_dc_predictor_4x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-void aom_highbd_dc_predictor_4x8_sse2(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_dc_predictor_4x8 aom_highbd_dc_predictor_4x8_sse2
-
-void aom_highbd_dc_predictor_64x16_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_64x16 aom_highbd_dc_predictor_64x16_c
-
-void aom_highbd_dc_predictor_64x32_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_64x32 aom_highbd_dc_predictor_64x32_c
-
-void aom_highbd_dc_predictor_64x64_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_64x64 aom_highbd_dc_predictor_64x64_c
-
-void aom_highbd_dc_predictor_8x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-void aom_highbd_dc_predictor_8x16_sse2(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_predictor_8x16 aom_highbd_dc_predictor_8x16_sse2
-
-void aom_highbd_dc_predictor_8x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_8x32 aom_highbd_dc_predictor_8x32_c
-
-void aom_highbd_dc_predictor_8x4_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-void aom_highbd_dc_predictor_8x4_sse2(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_dc_predictor_8x4 aom_highbd_dc_predictor_8x4_sse2
-
-void aom_highbd_dc_predictor_8x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-void aom_highbd_dc_predictor_8x8_sse2(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_dc_predictor_8x8 aom_highbd_dc_predictor_8x8_sse2
-
-void aom_highbd_dc_top_predictor_16x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-void aom_highbd_dc_top_predictor_16x16_sse2(uint16_t* dst,
-                                            ptrdiff_t y_stride,
-                                            const uint16_t* above,
-                                            const uint16_t* left,
-                                            int bd);
-#define aom_highbd_dc_top_predictor_16x16 aom_highbd_dc_top_predictor_16x16_sse2
-
-void aom_highbd_dc_top_predictor_16x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-void aom_highbd_dc_top_predictor_16x32_sse2(uint16_t* dst,
-                                            ptrdiff_t y_stride,
-                                            const uint16_t* above,
-                                            const uint16_t* left,
-                                            int bd);
-#define aom_highbd_dc_top_predictor_16x32 aom_highbd_dc_top_predictor_16x32_sse2
-
-void aom_highbd_dc_top_predictor_16x4_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_16x4 aom_highbd_dc_top_predictor_16x4_c
-
-void aom_highbd_dc_top_predictor_16x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_16x64 aom_highbd_dc_top_predictor_16x64_c
-
-void aom_highbd_dc_top_predictor_16x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-void aom_highbd_dc_top_predictor_16x8_sse2(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_dc_top_predictor_16x8 aom_highbd_dc_top_predictor_16x8_sse2
-
-void aom_highbd_dc_top_predictor_2x2_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_top_predictor_2x2 aom_highbd_dc_top_predictor_2x2_c
-
-void aom_highbd_dc_top_predictor_32x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-void aom_highbd_dc_top_predictor_32x16_sse2(uint16_t* dst,
-                                            ptrdiff_t y_stride,
-                                            const uint16_t* above,
-                                            const uint16_t* left,
-                                            int bd);
-#define aom_highbd_dc_top_predictor_32x16 aom_highbd_dc_top_predictor_32x16_sse2
-
-void aom_highbd_dc_top_predictor_32x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-void aom_highbd_dc_top_predictor_32x32_sse2(uint16_t* dst,
-                                            ptrdiff_t y_stride,
-                                            const uint16_t* above,
-                                            const uint16_t* left,
-                                            int bd);
-#define aom_highbd_dc_top_predictor_32x32 aom_highbd_dc_top_predictor_32x32_sse2
-
-void aom_highbd_dc_top_predictor_32x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_32x64 aom_highbd_dc_top_predictor_32x64_c
-
-void aom_highbd_dc_top_predictor_32x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_32x8 aom_highbd_dc_top_predictor_32x8_c
-
-void aom_highbd_dc_top_predictor_4x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_4x16 aom_highbd_dc_top_predictor_4x16_c
-
-void aom_highbd_dc_top_predictor_4x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-void aom_highbd_dc_top_predictor_4x4_sse2(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_top_predictor_4x4 aom_highbd_dc_top_predictor_4x4_sse2
-
-void aom_highbd_dc_top_predictor_4x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-void aom_highbd_dc_top_predictor_4x8_sse2(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_top_predictor_4x8 aom_highbd_dc_top_predictor_4x8_sse2
-
-void aom_highbd_dc_top_predictor_64x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_64x16 aom_highbd_dc_top_predictor_64x16_c
-
-void aom_highbd_dc_top_predictor_64x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_64x32 aom_highbd_dc_top_predictor_64x32_c
-
-void aom_highbd_dc_top_predictor_64x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_64x64 aom_highbd_dc_top_predictor_64x64_c
-
-void aom_highbd_dc_top_predictor_8x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-void aom_highbd_dc_top_predictor_8x16_sse2(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_dc_top_predictor_8x16 aom_highbd_dc_top_predictor_8x16_sse2
-
-void aom_highbd_dc_top_predictor_8x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_8x32 aom_highbd_dc_top_predictor_8x32_c
-
-void aom_highbd_dc_top_predictor_8x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-void aom_highbd_dc_top_predictor_8x4_sse2(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_top_predictor_8x4 aom_highbd_dc_top_predictor_8x4_sse2
-
-void aom_highbd_dc_top_predictor_8x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-void aom_highbd_dc_top_predictor_8x8_sse2(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_top_predictor_8x8 aom_highbd_dc_top_predictor_8x8_sse2
-
-void aom_highbd_dist_wtd_comp_avg_pred_c(uint8_t* comp_pred8,
-                                         const uint8_t* pred8,
-                                         int width,
-                                         int height,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const DIST_WTD_COMP_PARAMS* jcp_param);
-void aom_highbd_dist_wtd_comp_avg_pred_sse2(
-    uint8_t* comp_pred8,
-    const uint8_t* pred8,
-    int width,
-    int height,
-    const uint8_t* ref8,
-    int ref_stride,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_comp_avg_pred aom_highbd_dist_wtd_comp_avg_pred_sse2
-
-void aom_highbd_dist_wtd_comp_avg_upsampled_pred_c(
-    MACROBLOCKD* xd,
-    const struct AV1Common* const cm,
-    int mi_row,
-    int mi_col,
-    const MV* const mv,
-    uint8_t* comp_pred8,
-    const uint8_t* pred8,
-    int width,
-    int height,
-    int subpel_x_q3,
-    int subpel_y_q3,
-    const uint8_t* ref8,
-    int ref_stride,
-    int bd,
-    const DIST_WTD_COMP_PARAMS* jcp_param,
-    int subpel_search);
-void aom_highbd_dist_wtd_comp_avg_upsampled_pred_sse2(
-    MACROBLOCKD* xd,
-    const struct AV1Common* const cm,
-    int mi_row,
-    int mi_col,
-    const MV* const mv,
-    uint8_t* comp_pred8,
-    const uint8_t* pred8,
-    int width,
-    int height,
-    int subpel_x_q3,
-    int subpel_y_q3,
-    const uint8_t* ref8,
-    int ref_stride,
-    int bd,
-    const DIST_WTD_COMP_PARAMS* jcp_param,
-    int subpel_search);
-#define aom_highbd_dist_wtd_comp_avg_upsampled_pred \
-  aom_highbd_dist_wtd_comp_avg_upsampled_pred_sse2
-
-unsigned int aom_highbd_dist_wtd_sad128x128_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad128x128_avg aom_highbd_dist_wtd_sad128x128_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad128x64_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad128x64_avg aom_highbd_dist_wtd_sad128x64_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad16x16_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad16x16_avg aom_highbd_dist_wtd_sad16x16_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad16x32_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad16x32_avg aom_highbd_dist_wtd_sad16x32_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad16x4_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad16x4_avg aom_highbd_dist_wtd_sad16x4_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad16x64_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad16x64_avg aom_highbd_dist_wtd_sad16x64_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad16x8_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad16x8_avg aom_highbd_dist_wtd_sad16x8_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad32x16_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad32x16_avg aom_highbd_dist_wtd_sad32x16_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad32x32_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad32x32_avg aom_highbd_dist_wtd_sad32x32_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad32x64_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad32x64_avg aom_highbd_dist_wtd_sad32x64_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad32x8_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad32x8_avg aom_highbd_dist_wtd_sad32x8_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad4x16_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad4x16_avg aom_highbd_dist_wtd_sad4x16_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad4x4_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad4x4_avg aom_highbd_dist_wtd_sad4x4_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad4x8_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad4x8_avg aom_highbd_dist_wtd_sad4x8_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad64x128_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad64x128_avg aom_highbd_dist_wtd_sad64x128_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad64x16_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad64x16_avg aom_highbd_dist_wtd_sad64x16_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad64x32_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad64x32_avg aom_highbd_dist_wtd_sad64x32_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad64x64_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad64x64_avg aom_highbd_dist_wtd_sad64x64_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad8x16_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad8x16_avg aom_highbd_dist_wtd_sad8x16_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad8x32_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad8x32_avg aom_highbd_dist_wtd_sad8x32_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad8x4_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad8x4_avg aom_highbd_dist_wtd_sad8x4_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad8x8_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad8x8_avg aom_highbd_dist_wtd_sad8x8_avg_c
-
-void aom_highbd_fdct8x8_c(const int16_t* input, tran_low_t* output, int stride);
-void aom_highbd_fdct8x8_sse2(const int16_t* input,
-                             tran_low_t* output,
-                             int stride);
-#define aom_highbd_fdct8x8 aom_highbd_fdct8x8_sse2
-
-void aom_highbd_h_predictor_16x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-void aom_highbd_h_predictor_16x16_sse2(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_h_predictor_16x16 aom_highbd_h_predictor_16x16_sse2
-
-void aom_highbd_h_predictor_16x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-void aom_highbd_h_predictor_16x32_sse2(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_h_predictor_16x32 aom_highbd_h_predictor_16x32_sse2
-
-void aom_highbd_h_predictor_16x4_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_16x4 aom_highbd_h_predictor_16x4_c
-
-void aom_highbd_h_predictor_16x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_16x64 aom_highbd_h_predictor_16x64_c
-
-void aom_highbd_h_predictor_16x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-void aom_highbd_h_predictor_16x8_sse2(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_h_predictor_16x8 aom_highbd_h_predictor_16x8_sse2
-
-void aom_highbd_h_predictor_2x2_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_h_predictor_2x2 aom_highbd_h_predictor_2x2_c
-
-void aom_highbd_h_predictor_32x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-void aom_highbd_h_predictor_32x16_sse2(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_h_predictor_32x16 aom_highbd_h_predictor_32x16_sse2
-
-void aom_highbd_h_predictor_32x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-void aom_highbd_h_predictor_32x32_sse2(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_h_predictor_32x32 aom_highbd_h_predictor_32x32_sse2
-
-void aom_highbd_h_predictor_32x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_32x64 aom_highbd_h_predictor_32x64_c
-
-void aom_highbd_h_predictor_32x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_32x8 aom_highbd_h_predictor_32x8_c
-
-void aom_highbd_h_predictor_4x16_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_4x16 aom_highbd_h_predictor_4x16_c
-
-void aom_highbd_h_predictor_4x4_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-void aom_highbd_h_predictor_4x4_sse2(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_h_predictor_4x4 aom_highbd_h_predictor_4x4_sse2
-
-void aom_highbd_h_predictor_4x8_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-void aom_highbd_h_predictor_4x8_sse2(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_h_predictor_4x8 aom_highbd_h_predictor_4x8_sse2
-
-void aom_highbd_h_predictor_64x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_64x16 aom_highbd_h_predictor_64x16_c
-
-void aom_highbd_h_predictor_64x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_64x32 aom_highbd_h_predictor_64x32_c
-
-void aom_highbd_h_predictor_64x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_64x64 aom_highbd_h_predictor_64x64_c
-
-void aom_highbd_h_predictor_8x16_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-void aom_highbd_h_predictor_8x16_sse2(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_h_predictor_8x16 aom_highbd_h_predictor_8x16_sse2
-
-void aom_highbd_h_predictor_8x32_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_8x32 aom_highbd_h_predictor_8x32_c
-
-void aom_highbd_h_predictor_8x4_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-void aom_highbd_h_predictor_8x4_sse2(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_h_predictor_8x4 aom_highbd_h_predictor_8x4_sse2
-
-void aom_highbd_h_predictor_8x8_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-void aom_highbd_h_predictor_8x8_sse2(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_h_predictor_8x8 aom_highbd_h_predictor_8x8_sse2
-
-void aom_highbd_hadamard_16x16_c(const int16_t* src_diff,
-                                 ptrdiff_t src_stride,
-                                 tran_low_t* coeff);
-void aom_highbd_hadamard_16x16_avx2(const int16_t* src_diff,
-                                    ptrdiff_t src_stride,
-                                    tran_low_t* coeff);
-RTCD_EXTERN void (*aom_highbd_hadamard_16x16)(const int16_t* src_diff,
-                                              ptrdiff_t src_stride,
-                                              tran_low_t* coeff);
-
-void aom_highbd_hadamard_32x32_c(const int16_t* src_diff,
-                                 ptrdiff_t src_stride,
-                                 tran_low_t* coeff);
-void aom_highbd_hadamard_32x32_avx2(const int16_t* src_diff,
-                                    ptrdiff_t src_stride,
-                                    tran_low_t* coeff);
-RTCD_EXTERN void (*aom_highbd_hadamard_32x32)(const int16_t* src_diff,
-                                              ptrdiff_t src_stride,
-                                              tran_low_t* coeff);
-
-void aom_highbd_hadamard_8x8_c(const int16_t* src_diff,
-                               ptrdiff_t src_stride,
-                               tran_low_t* coeff);
-void aom_highbd_hadamard_8x8_avx2(const int16_t* src_diff,
-                                  ptrdiff_t src_stride,
-                                  tran_low_t* coeff);
-RTCD_EXTERN void (*aom_highbd_hadamard_8x8)(const int16_t* src_diff,
-                                            ptrdiff_t src_stride,
-                                            tran_low_t* coeff);
-
-void aom_highbd_lpf_horizontal_14_c(uint16_t* s,
-                                    int pitch,
-                                    const uint8_t* blimit,
-                                    const uint8_t* limit,
-                                    const uint8_t* thresh,
-                                    int bd);
-void aom_highbd_lpf_horizontal_14_sse2(uint16_t* s,
-                                       int pitch,
-                                       const uint8_t* blimit,
-                                       const uint8_t* limit,
-                                       const uint8_t* thresh,
-                                       int bd);
-#define aom_highbd_lpf_horizontal_14 aom_highbd_lpf_horizontal_14_sse2
-
-void aom_highbd_lpf_horizontal_14_dual_c(uint16_t* s,
-                                         int pitch,
-                                         const uint8_t* blimit0,
-                                         const uint8_t* limit0,
-                                         const uint8_t* thresh0,
-                                         const uint8_t* blimit1,
-                                         const uint8_t* limit1,
-                                         const uint8_t* thresh1,
-                                         int bd);
-void aom_highbd_lpf_horizontal_14_dual_sse2(uint16_t* s,
-                                            int pitch,
-                                            const uint8_t* blimit0,
-                                            const uint8_t* limit0,
-                                            const uint8_t* thresh0,
-                                            const uint8_t* blimit1,
-                                            const uint8_t* limit1,
-                                            const uint8_t* thresh1,
-                                            int bd);
-void aom_highbd_lpf_horizontal_14_dual_avx2(uint16_t* s,
-                                            int pitch,
-                                            const uint8_t* blimit0,
-                                            const uint8_t* limit0,
-                                            const uint8_t* thresh0,
-                                            const uint8_t* blimit1,
-                                            const uint8_t* limit1,
-                                            const uint8_t* thresh1,
-                                            int bd);
-RTCD_EXTERN void (*aom_highbd_lpf_horizontal_14_dual)(uint16_t* s,
-                                                      int pitch,
-                                                      const uint8_t* blimit0,
-                                                      const uint8_t* limit0,
-                                                      const uint8_t* thresh0,
-                                                      const uint8_t* blimit1,
-                                                      const uint8_t* limit1,
-                                                      const uint8_t* thresh1,
-                                                      int bd);
-
-void aom_highbd_lpf_horizontal_4_c(uint16_t* s,
-                                   int pitch,
-                                   const uint8_t* blimit,
-                                   const uint8_t* limit,
-                                   const uint8_t* thresh,
-                                   int bd);
-void aom_highbd_lpf_horizontal_4_sse2(uint16_t* s,
-                                      int pitch,
-                                      const uint8_t* blimit,
-                                      const uint8_t* limit,
-                                      const uint8_t* thresh,
-                                      int bd);
-#define aom_highbd_lpf_horizontal_4 aom_highbd_lpf_horizontal_4_sse2
-
-void aom_highbd_lpf_horizontal_4_dual_c(uint16_t* s,
-                                        int pitch,
-                                        const uint8_t* blimit0,
-                                        const uint8_t* limit0,
-                                        const uint8_t* thresh0,
-                                        const uint8_t* blimit1,
-                                        const uint8_t* limit1,
-                                        const uint8_t* thresh1,
-                                        int bd);
-void aom_highbd_lpf_horizontal_4_dual_sse2(uint16_t* s,
-                                           int pitch,
-                                           const uint8_t* blimit0,
-                                           const uint8_t* limit0,
-                                           const uint8_t* thresh0,
-                                           const uint8_t* blimit1,
-                                           const uint8_t* limit1,
-                                           const uint8_t* thresh1,
-                                           int bd);
-void aom_highbd_lpf_horizontal_4_dual_avx2(uint16_t* s,
-                                           int pitch,
-                                           const uint8_t* blimit0,
-                                           const uint8_t* limit0,
-                                           const uint8_t* thresh0,
-                                           const uint8_t* blimit1,
-                                           const uint8_t* limit1,
-                                           const uint8_t* thresh1,
-                                           int bd);
-RTCD_EXTERN void (*aom_highbd_lpf_horizontal_4_dual)(uint16_t* s,
-                                                     int pitch,
-                                                     const uint8_t* blimit0,
-                                                     const uint8_t* limit0,
-                                                     const uint8_t* thresh0,
-                                                     const uint8_t* blimit1,
-                                                     const uint8_t* limit1,
-                                                     const uint8_t* thresh1,
-                                                     int bd);
-
-void aom_highbd_lpf_horizontal_6_c(uint16_t* s,
-                                   int pitch,
-                                   const uint8_t* blimit,
-                                   const uint8_t* limit,
-                                   const uint8_t* thresh,
-                                   int bd);
-void aom_highbd_lpf_horizontal_6_sse2(uint16_t* s,
-                                      int pitch,
-                                      const uint8_t* blimit,
-                                      const uint8_t* limit,
-                                      const uint8_t* thresh,
-                                      int bd);
-#define aom_highbd_lpf_horizontal_6 aom_highbd_lpf_horizontal_6_sse2
-
-void aom_highbd_lpf_horizontal_6_dual_c(uint16_t* s,
-                                        int pitch,
-                                        const uint8_t* blimit0,
-                                        const uint8_t* limit0,
-                                        const uint8_t* thresh0,
-                                        const uint8_t* blimit1,
-                                        const uint8_t* limit1,
-                                        const uint8_t* thresh1,
-                                        int bd);
-void aom_highbd_lpf_horizontal_6_dual_sse2(uint16_t* s,
-                                           int pitch,
-                                           const uint8_t* blimit0,
-                                           const uint8_t* limit0,
-                                           const uint8_t* thresh0,
-                                           const uint8_t* blimit1,
-                                           const uint8_t* limit1,
-                                           const uint8_t* thresh1,
-                                           int bd);
-#define aom_highbd_lpf_horizontal_6_dual aom_highbd_lpf_horizontal_6_dual_sse2
-
-void aom_highbd_lpf_horizontal_8_c(uint16_t* s,
-                                   int pitch,
-                                   const uint8_t* blimit,
-                                   const uint8_t* limit,
-                                   const uint8_t* thresh,
-                                   int bd);
-void aom_highbd_lpf_horizontal_8_sse2(uint16_t* s,
-                                      int pitch,
-                                      const uint8_t* blimit,
-                                      const uint8_t* limit,
-                                      const uint8_t* thresh,
-                                      int bd);
-#define aom_highbd_lpf_horizontal_8 aom_highbd_lpf_horizontal_8_sse2
-
-void aom_highbd_lpf_horizontal_8_dual_c(uint16_t* s,
-                                        int pitch,
-                                        const uint8_t* blimit0,
-                                        const uint8_t* limit0,
-                                        const uint8_t* thresh0,
-                                        const uint8_t* blimit1,
-                                        const uint8_t* limit1,
-                                        const uint8_t* thresh1,
-                                        int bd);
-void aom_highbd_lpf_horizontal_8_dual_sse2(uint16_t* s,
-                                           int pitch,
-                                           const uint8_t* blimit0,
-                                           const uint8_t* limit0,
-                                           const uint8_t* thresh0,
-                                           const uint8_t* blimit1,
-                                           const uint8_t* limit1,
-                                           const uint8_t* thresh1,
-                                           int bd);
-void aom_highbd_lpf_horizontal_8_dual_avx2(uint16_t* s,
-                                           int pitch,
-                                           const uint8_t* blimit0,
-                                           const uint8_t* limit0,
-                                           const uint8_t* thresh0,
-                                           const uint8_t* blimit1,
-                                           const uint8_t* limit1,
-                                           const uint8_t* thresh1,
-                                           int bd);
-RTCD_EXTERN void (*aom_highbd_lpf_horizontal_8_dual)(uint16_t* s,
-                                                     int pitch,
-                                                     const uint8_t* blimit0,
-                                                     const uint8_t* limit0,
-                                                     const uint8_t* thresh0,
-                                                     const uint8_t* blimit1,
-                                                     const uint8_t* limit1,
-                                                     const uint8_t* thresh1,
-                                                     int bd);
-
-void aom_highbd_lpf_vertical_14_c(uint16_t* s,
-                                  int pitch,
-                                  const uint8_t* blimit,
-                                  const uint8_t* limit,
-                                  const uint8_t* thresh,
-                                  int bd);
-void aom_highbd_lpf_vertical_14_sse2(uint16_t* s,
-                                     int pitch,
-                                     const uint8_t* blimit,
-                                     const uint8_t* limit,
-                                     const uint8_t* thresh,
-                                     int bd);
-#define aom_highbd_lpf_vertical_14 aom_highbd_lpf_vertical_14_sse2
-
-void aom_highbd_lpf_vertical_14_dual_c(uint16_t* s,
-                                       int pitch,
-                                       const uint8_t* blimit0,
-                                       const uint8_t* limit0,
-                                       const uint8_t* thresh0,
-                                       const uint8_t* blimit1,
-                                       const uint8_t* limit1,
-                                       const uint8_t* thresh1,
-                                       int bd);
-void aom_highbd_lpf_vertical_14_dual_sse2(uint16_t* s,
-                                          int pitch,
-                                          const uint8_t* blimit0,
-                                          const uint8_t* limit0,
-                                          const uint8_t* thresh0,
-                                          const uint8_t* blimit1,
-                                          const uint8_t* limit1,
-                                          const uint8_t* thresh1,
-                                          int bd);
-void aom_highbd_lpf_vertical_14_dual_avx2(uint16_t* s,
-                                          int pitch,
-                                          const uint8_t* blimit0,
-                                          const uint8_t* limit0,
-                                          const uint8_t* thresh0,
-                                          const uint8_t* blimit1,
-                                          const uint8_t* limit1,
-                                          const uint8_t* thresh1,
-                                          int bd);
-RTCD_EXTERN void (*aom_highbd_lpf_vertical_14_dual)(uint16_t* s,
-                                                    int pitch,
-                                                    const uint8_t* blimit0,
-                                                    const uint8_t* limit0,
-                                                    const uint8_t* thresh0,
-                                                    const uint8_t* blimit1,
-                                                    const uint8_t* limit1,
-                                                    const uint8_t* thresh1,
-                                                    int bd);
-
-void aom_highbd_lpf_vertical_4_c(uint16_t* s,
-                                 int pitch,
-                                 const uint8_t* blimit,
-                                 const uint8_t* limit,
-                                 const uint8_t* thresh,
-                                 int bd);
-void aom_highbd_lpf_vertical_4_sse2(uint16_t* s,
-                                    int pitch,
-                                    const uint8_t* blimit,
-                                    const uint8_t* limit,
-                                    const uint8_t* thresh,
-                                    int bd);
-#define aom_highbd_lpf_vertical_4 aom_highbd_lpf_vertical_4_sse2
-
-void aom_highbd_lpf_vertical_4_dual_c(uint16_t* s,
-                                      int pitch,
-                                      const uint8_t* blimit0,
-                                      const uint8_t* limit0,
-                                      const uint8_t* thresh0,
-                                      const uint8_t* blimit1,
-                                      const uint8_t* limit1,
-                                      const uint8_t* thresh1,
-                                      int bd);
-void aom_highbd_lpf_vertical_4_dual_sse2(uint16_t* s,
-                                         int pitch,
-                                         const uint8_t* blimit0,
-                                         const uint8_t* limit0,
-                                         const uint8_t* thresh0,
-                                         const uint8_t* blimit1,
-                                         const uint8_t* limit1,
-                                         const uint8_t* thresh1,
-                                         int bd);
-void aom_highbd_lpf_vertical_4_dual_avx2(uint16_t* s,
-                                         int pitch,
-                                         const uint8_t* blimit0,
-                                         const uint8_t* limit0,
-                                         const uint8_t* thresh0,
-                                         const uint8_t* blimit1,
-                                         const uint8_t* limit1,
-                                         const uint8_t* thresh1,
-                                         int bd);
-RTCD_EXTERN void (*aom_highbd_lpf_vertical_4_dual)(uint16_t* s,
-                                                   int pitch,
-                                                   const uint8_t* blimit0,
-                                                   const uint8_t* limit0,
-                                                   const uint8_t* thresh0,
-                                                   const uint8_t* blimit1,
-                                                   const uint8_t* limit1,
-                                                   const uint8_t* thresh1,
-                                                   int bd);
-
-void aom_highbd_lpf_vertical_6_c(uint16_t* s,
-                                 int pitch,
-                                 const uint8_t* blimit,
-                                 const uint8_t* limit,
-                                 const uint8_t* thresh,
-                                 int bd);
-void aom_highbd_lpf_vertical_6_sse2(uint16_t* s,
-                                    int pitch,
-                                    const uint8_t* blimit,
-                                    const uint8_t* limit,
-                                    const uint8_t* thresh,
-                                    int bd);
-#define aom_highbd_lpf_vertical_6 aom_highbd_lpf_vertical_6_sse2
-
-void aom_highbd_lpf_vertical_6_dual_c(uint16_t* s,
-                                      int pitch,
-                                      const uint8_t* blimit0,
-                                      const uint8_t* limit0,
-                                      const uint8_t* thresh0,
-                                      const uint8_t* blimit1,
-                                      const uint8_t* limit1,
-                                      const uint8_t* thresh1,
-                                      int bd);
-void aom_highbd_lpf_vertical_6_dual_sse2(uint16_t* s,
-                                         int pitch,
-                                         const uint8_t* blimit0,
-                                         const uint8_t* limit0,
-                                         const uint8_t* thresh0,
-                                         const uint8_t* blimit1,
-                                         const uint8_t* limit1,
-                                         const uint8_t* thresh1,
-                                         int bd);
-#define aom_highbd_lpf_vertical_6_dual aom_highbd_lpf_vertical_6_dual_sse2
-
-void aom_highbd_lpf_vertical_8_c(uint16_t* s,
-                                 int pitch,
-                                 const uint8_t* blimit,
-                                 const uint8_t* limit,
-                                 const uint8_t* thresh,
-                                 int bd);
-void aom_highbd_lpf_vertical_8_sse2(uint16_t* s,
-                                    int pitch,
-                                    const uint8_t* blimit,
-                                    const uint8_t* limit,
-                                    const uint8_t* thresh,
-                                    int bd);
-#define aom_highbd_lpf_vertical_8 aom_highbd_lpf_vertical_8_sse2
-
-void aom_highbd_lpf_vertical_8_dual_c(uint16_t* s,
-                                      int pitch,
-                                      const uint8_t* blimit0,
-                                      const uint8_t* limit0,
-                                      const uint8_t* thresh0,
-                                      const uint8_t* blimit1,
-                                      const uint8_t* limit1,
-                                      const uint8_t* thresh1,
-                                      int bd);
-void aom_highbd_lpf_vertical_8_dual_sse2(uint16_t* s,
-                                         int pitch,
-                                         const uint8_t* blimit0,
-                                         const uint8_t* limit0,
-                                         const uint8_t* thresh0,
-                                         const uint8_t* blimit1,
-                                         const uint8_t* limit1,
-                                         const uint8_t* thresh1,
-                                         int bd);
-void aom_highbd_lpf_vertical_8_dual_avx2(uint16_t* s,
-                                         int pitch,
-                                         const uint8_t* blimit0,
-                                         const uint8_t* limit0,
-                                         const uint8_t* thresh0,
-                                         const uint8_t* blimit1,
-                                         const uint8_t* limit1,
-                                         const uint8_t* thresh1,
-                                         int bd);
-RTCD_EXTERN void (*aom_highbd_lpf_vertical_8_dual)(uint16_t* s,
-                                                   int pitch,
-                                                   const uint8_t* blimit0,
-                                                   const uint8_t* limit0,
-                                                   const uint8_t* thresh0,
-                                                   const uint8_t* blimit1,
-                                                   const uint8_t* limit1,
-                                                   const uint8_t* thresh1,
-                                                   int bd);
-
-unsigned int aom_highbd_masked_sad128x128_c(const uint8_t* src8,
-                                            int src_stride,
-                                            const uint8_t* ref8,
-                                            int ref_stride,
-                                            const uint8_t* second_pred8,
-                                            const uint8_t* msk,
-                                            int msk_stride,
-                                            int invert_mask);
-unsigned int aom_highbd_masked_sad128x128_ssse3(const uint8_t* src8,
-                                                int src_stride,
-                                                const uint8_t* ref8,
-                                                int ref_stride,
-                                                const uint8_t* second_pred8,
-                                                const uint8_t* msk,
-                                                int msk_stride,
-                                                int invert_mask);
-unsigned int aom_highbd_masked_sad128x128_avx2(const uint8_t* src8,
-                                               int src_stride,
-                                               const uint8_t* ref8,
-                                               int ref_stride,
-                                               const uint8_t* second_pred8,
-                                               const uint8_t* msk,
-                                               int msk_stride,
-                                               int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad128x128)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad128x64_c(const uint8_t* src8,
-                                           int src_stride,
-                                           const uint8_t* ref8,
-                                           int ref_stride,
-                                           const uint8_t* second_pred8,
-                                           const uint8_t* msk,
-                                           int msk_stride,
-                                           int invert_mask);
-unsigned int aom_highbd_masked_sad128x64_ssse3(const uint8_t* src8,
-                                               int src_stride,
-                                               const uint8_t* ref8,
-                                               int ref_stride,
-                                               const uint8_t* second_pred8,
-                                               const uint8_t* msk,
-                                               int msk_stride,
-                                               int invert_mask);
-unsigned int aom_highbd_masked_sad128x64_avx2(const uint8_t* src8,
-                                              int src_stride,
-                                              const uint8_t* ref8,
-                                              int ref_stride,
-                                              const uint8_t* second_pred8,
-                                              const uint8_t* msk,
-                                              int msk_stride,
-                                              int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad128x64)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad16x16_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-unsigned int aom_highbd_masked_sad16x16_ssse3(const uint8_t* src8,
-                                              int src_stride,
-                                              const uint8_t* ref8,
-                                              int ref_stride,
-                                              const uint8_t* second_pred8,
-                                              const uint8_t* msk,
-                                              int msk_stride,
-                                              int invert_mask);
-unsigned int aom_highbd_masked_sad16x16_avx2(const uint8_t* src8,
-                                             int src_stride,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             const uint8_t* second_pred8,
-                                             const uint8_t* msk,
-                                             int msk_stride,
-                                             int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad16x16)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad16x32_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-unsigned int aom_highbd_masked_sad16x32_ssse3(const uint8_t* src8,
-                                              int src_stride,
-                                              const uint8_t* ref8,
-                                              int ref_stride,
-                                              const uint8_t* second_pred8,
-                                              const uint8_t* msk,
-                                              int msk_stride,
-                                              int invert_mask);
-unsigned int aom_highbd_masked_sad16x32_avx2(const uint8_t* src8,
-                                             int src_stride,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             const uint8_t* second_pred8,
-                                             const uint8_t* msk,
-                                             int msk_stride,
-                                             int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad16x32)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad16x4_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-unsigned int aom_highbd_masked_sad16x4_ssse3(const uint8_t* src8,
-                                             int src_stride,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             const uint8_t* second_pred8,
-                                             const uint8_t* msk,
-                                             int msk_stride,
-                                             int invert_mask);
-unsigned int aom_highbd_masked_sad16x4_avx2(const uint8_t* src8,
-                                            int src_stride,
-                                            const uint8_t* ref8,
-                                            int ref_stride,
-                                            const uint8_t* second_pred8,
-                                            const uint8_t* msk,
-                                            int msk_stride,
-                                            int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad16x4)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad16x64_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-unsigned int aom_highbd_masked_sad16x64_ssse3(const uint8_t* src8,
-                                              int src_stride,
-                                              const uint8_t* ref8,
-                                              int ref_stride,
-                                              const uint8_t* second_pred8,
-                                              const uint8_t* msk,
-                                              int msk_stride,
-                                              int invert_mask);
-unsigned int aom_highbd_masked_sad16x64_avx2(const uint8_t* src8,
-                                             int src_stride,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             const uint8_t* second_pred8,
-                                             const uint8_t* msk,
-                                             int msk_stride,
-                                             int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad16x64)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad16x8_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-unsigned int aom_highbd_masked_sad16x8_ssse3(const uint8_t* src8,
-                                             int src_stride,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             const uint8_t* second_pred8,
-                                             const uint8_t* msk,
-                                             int msk_stride,
-                                             int invert_mask);
-unsigned int aom_highbd_masked_sad16x8_avx2(const uint8_t* src8,
-                                            int src_stride,
-                                            const uint8_t* ref8,
-                                            int ref_stride,
-                                            const uint8_t* second_pred8,
-                                            const uint8_t* msk,
-                                            int msk_stride,
-                                            int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad16x8)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad32x16_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-unsigned int aom_highbd_masked_sad32x16_ssse3(const uint8_t* src8,
-                                              int src_stride,
-                                              const uint8_t* ref8,
-                                              int ref_stride,
-                                              const uint8_t* second_pred8,
-                                              const uint8_t* msk,
-                                              int msk_stride,
-                                              int invert_mask);
-unsigned int aom_highbd_masked_sad32x16_avx2(const uint8_t* src8,
-                                             int src_stride,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             const uint8_t* second_pred8,
-                                             const uint8_t* msk,
-                                             int msk_stride,
-                                             int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad32x16)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad32x32_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-unsigned int aom_highbd_masked_sad32x32_ssse3(const uint8_t* src8,
-                                              int src_stride,
-                                              const uint8_t* ref8,
-                                              int ref_stride,
-                                              const uint8_t* second_pred8,
-                                              const uint8_t* msk,
-                                              int msk_stride,
-                                              int invert_mask);
-unsigned int aom_highbd_masked_sad32x32_avx2(const uint8_t* src8,
-                                             int src_stride,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             const uint8_t* second_pred8,
-                                             const uint8_t* msk,
-                                             int msk_stride,
-                                             int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad32x32)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad32x64_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-unsigned int aom_highbd_masked_sad32x64_ssse3(const uint8_t* src8,
-                                              int src_stride,
-                                              const uint8_t* ref8,
-                                              int ref_stride,
-                                              const uint8_t* second_pred8,
-                                              const uint8_t* msk,
-                                              int msk_stride,
-                                              int invert_mask);
-unsigned int aom_highbd_masked_sad32x64_avx2(const uint8_t* src8,
-                                             int src_stride,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             const uint8_t* second_pred8,
-                                             const uint8_t* msk,
-                                             int msk_stride,
-                                             int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad32x64)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad32x8_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-unsigned int aom_highbd_masked_sad32x8_ssse3(const uint8_t* src8,
-                                             int src_stride,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             const uint8_t* second_pred8,
-                                             const uint8_t* msk,
-                                             int msk_stride,
-                                             int invert_mask);
-unsigned int aom_highbd_masked_sad32x8_avx2(const uint8_t* src8,
-                                            int src_stride,
-                                            const uint8_t* ref8,
-                                            int ref_stride,
-                                            const uint8_t* second_pred8,
-                                            const uint8_t* msk,
-                                            int msk_stride,
-                                            int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad32x8)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad4x16_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-unsigned int aom_highbd_masked_sad4x16_ssse3(const uint8_t* src8,
-                                             int src_stride,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             const uint8_t* second_pred8,
-                                             const uint8_t* msk,
-                                             int msk_stride,
-                                             int invert_mask);
-unsigned int aom_highbd_masked_sad4x16_avx2(const uint8_t* src8,
-                                            int src_stride,
-                                            const uint8_t* ref8,
-                                            int ref_stride,
-                                            const uint8_t* second_pred8,
-                                            const uint8_t* msk,
-                                            int msk_stride,
-                                            int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad4x16)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad4x4_c(const uint8_t* src8,
-                                        int src_stride,
-                                        const uint8_t* ref8,
-                                        int ref_stride,
-                                        const uint8_t* second_pred8,
-                                        const uint8_t* msk,
-                                        int msk_stride,
-                                        int invert_mask);
-unsigned int aom_highbd_masked_sad4x4_ssse3(const uint8_t* src8,
-                                            int src_stride,
-                                            const uint8_t* ref8,
-                                            int ref_stride,
-                                            const uint8_t* second_pred8,
-                                            const uint8_t* msk,
-                                            int msk_stride,
-                                            int invert_mask);
-unsigned int aom_highbd_masked_sad4x4_avx2(const uint8_t* src8,
-                                           int src_stride,
-                                           const uint8_t* ref8,
-                                           int ref_stride,
-                                           const uint8_t* second_pred8,
-                                           const uint8_t* msk,
-                                           int msk_stride,
-                                           int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad4x4)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad4x8_c(const uint8_t* src8,
-                                        int src_stride,
-                                        const uint8_t* ref8,
-                                        int ref_stride,
-                                        const uint8_t* second_pred8,
-                                        const uint8_t* msk,
-                                        int msk_stride,
-                                        int invert_mask);
-unsigned int aom_highbd_masked_sad4x8_ssse3(const uint8_t* src8,
-                                            int src_stride,
-                                            const uint8_t* ref8,
-                                            int ref_stride,
-                                            const uint8_t* second_pred8,
-                                            const uint8_t* msk,
-                                            int msk_stride,
-                                            int invert_mask);
-unsigned int aom_highbd_masked_sad4x8_avx2(const uint8_t* src8,
-                                           int src_stride,
-                                           const uint8_t* ref8,
-                                           int ref_stride,
-                                           const uint8_t* second_pred8,
-                                           const uint8_t* msk,
-                                           int msk_stride,
-                                           int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad4x8)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad64x128_c(const uint8_t* src8,
-                                           int src_stride,
-                                           const uint8_t* ref8,
-                                           int ref_stride,
-                                           const uint8_t* second_pred8,
-                                           const uint8_t* msk,
-                                           int msk_stride,
-                                           int invert_mask);
-unsigned int aom_highbd_masked_sad64x128_ssse3(const uint8_t* src8,
-                                               int src_stride,
-                                               const uint8_t* ref8,
-                                               int ref_stride,
-                                               const uint8_t* second_pred8,
-                                               const uint8_t* msk,
-                                               int msk_stride,
-                                               int invert_mask);
-unsigned int aom_highbd_masked_sad64x128_avx2(const uint8_t* src8,
-                                              int src_stride,
-                                              const uint8_t* ref8,
-                                              int ref_stride,
-                                              const uint8_t* second_pred8,
-                                              const uint8_t* msk,
-                                              int msk_stride,
-                                              int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad64x128)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad64x16_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-unsigned int aom_highbd_masked_sad64x16_ssse3(const uint8_t* src8,
-                                              int src_stride,
-                                              const uint8_t* ref8,
-                                              int ref_stride,
-                                              const uint8_t* second_pred8,
-                                              const uint8_t* msk,
-                                              int msk_stride,
-                                              int invert_mask);
-unsigned int aom_highbd_masked_sad64x16_avx2(const uint8_t* src8,
-                                             int src_stride,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             const uint8_t* second_pred8,
-                                             const uint8_t* msk,
-                                             int msk_stride,
-                                             int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad64x16)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad64x32_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-unsigned int aom_highbd_masked_sad64x32_ssse3(const uint8_t* src8,
-                                              int src_stride,
-                                              const uint8_t* ref8,
-                                              int ref_stride,
-                                              const uint8_t* second_pred8,
-                                              const uint8_t* msk,
-                                              int msk_stride,
-                                              int invert_mask);
-unsigned int aom_highbd_masked_sad64x32_avx2(const uint8_t* src8,
-                                             int src_stride,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             const uint8_t* second_pred8,
-                                             const uint8_t* msk,
-                                             int msk_stride,
-                                             int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad64x32)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad64x64_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-unsigned int aom_highbd_masked_sad64x64_ssse3(const uint8_t* src8,
-                                              int src_stride,
-                                              const uint8_t* ref8,
-                                              int ref_stride,
-                                              const uint8_t* second_pred8,
-                                              const uint8_t* msk,
-                                              int msk_stride,
-                                              int invert_mask);
-unsigned int aom_highbd_masked_sad64x64_avx2(const uint8_t* src8,
-                                             int src_stride,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             const uint8_t* second_pred8,
-                                             const uint8_t* msk,
-                                             int msk_stride,
-                                             int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad64x64)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad8x16_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-unsigned int aom_highbd_masked_sad8x16_ssse3(const uint8_t* src8,
-                                             int src_stride,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             const uint8_t* second_pred8,
-                                             const uint8_t* msk,
-                                             int msk_stride,
-                                             int invert_mask);
-unsigned int aom_highbd_masked_sad8x16_avx2(const uint8_t* src8,
-                                            int src_stride,
-                                            const uint8_t* ref8,
-                                            int ref_stride,
-                                            const uint8_t* second_pred8,
-                                            const uint8_t* msk,
-                                            int msk_stride,
-                                            int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad8x16)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad8x32_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-unsigned int aom_highbd_masked_sad8x32_ssse3(const uint8_t* src8,
-                                             int src_stride,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             const uint8_t* second_pred8,
-                                             const uint8_t* msk,
-                                             int msk_stride,
-                                             int invert_mask);
-unsigned int aom_highbd_masked_sad8x32_avx2(const uint8_t* src8,
-                                            int src_stride,
-                                            const uint8_t* ref8,
-                                            int ref_stride,
-                                            const uint8_t* second_pred8,
-                                            const uint8_t* msk,
-                                            int msk_stride,
-                                            int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad8x32)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad8x4_c(const uint8_t* src8,
-                                        int src_stride,
-                                        const uint8_t* ref8,
-                                        int ref_stride,
-                                        const uint8_t* second_pred8,
-                                        const uint8_t* msk,
-                                        int msk_stride,
-                                        int invert_mask);
-unsigned int aom_highbd_masked_sad8x4_ssse3(const uint8_t* src8,
-                                            int src_stride,
-                                            const uint8_t* ref8,
-                                            int ref_stride,
-                                            const uint8_t* second_pred8,
-                                            const uint8_t* msk,
-                                            int msk_stride,
-                                            int invert_mask);
-unsigned int aom_highbd_masked_sad8x4_avx2(const uint8_t* src8,
-                                           int src_stride,
-                                           const uint8_t* ref8,
-                                           int ref_stride,
-                                           const uint8_t* second_pred8,
-                                           const uint8_t* msk,
-                                           int msk_stride,
-                                           int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad8x4)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad8x8_c(const uint8_t* src8,
-                                        int src_stride,
-                                        const uint8_t* ref8,
-                                        int ref_stride,
-                                        const uint8_t* second_pred8,
-                                        const uint8_t* msk,
-                                        int msk_stride,
-                                        int invert_mask);
-unsigned int aom_highbd_masked_sad8x8_ssse3(const uint8_t* src8,
-                                            int src_stride,
-                                            const uint8_t* ref8,
-                                            int ref_stride,
-                                            const uint8_t* second_pred8,
-                                            const uint8_t* msk,
-                                            int msk_stride,
-                                            int invert_mask);
-unsigned int aom_highbd_masked_sad8x8_avx2(const uint8_t* src8,
-                                           int src_stride,
-                                           const uint8_t* ref8,
-                                           int ref_stride,
-                                           const uint8_t* second_pred8,
-                                           const uint8_t* msk,
-                                           int msk_stride,
-                                           int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad8x8)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-void aom_highbd_minmax_8x8_c(const uint8_t* s,
-                             int p,
-                             const uint8_t* d,
-                             int dp,
-                             int* min,
-                             int* max);
-#define aom_highbd_minmax_8x8 aom_highbd_minmax_8x8_c
-
-unsigned int aom_highbd_obmc_sad128x128_c(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask);
-unsigned int aom_highbd_obmc_sad128x128_sse4_1(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask);
-unsigned int aom_highbd_obmc_sad128x128_avx2(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad128x128)(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad128x64_c(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask);
-unsigned int aom_highbd_obmc_sad128x64_sse4_1(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask);
-unsigned int aom_highbd_obmc_sad128x64_avx2(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad128x64)(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad16x16_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-unsigned int aom_highbd_obmc_sad16x16_sse4_1(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-unsigned int aom_highbd_obmc_sad16x16_avx2(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad16x16)(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad16x32_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-unsigned int aom_highbd_obmc_sad16x32_sse4_1(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-unsigned int aom_highbd_obmc_sad16x32_avx2(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad16x32)(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad16x4_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-unsigned int aom_highbd_obmc_sad16x4_sse4_1(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask);
-unsigned int aom_highbd_obmc_sad16x4_avx2(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad16x4)(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad16x64_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-unsigned int aom_highbd_obmc_sad16x64_sse4_1(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-unsigned int aom_highbd_obmc_sad16x64_avx2(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad16x64)(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad16x8_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-unsigned int aom_highbd_obmc_sad16x8_sse4_1(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask);
-unsigned int aom_highbd_obmc_sad16x8_avx2(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad16x8)(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad32x16_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-unsigned int aom_highbd_obmc_sad32x16_sse4_1(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-unsigned int aom_highbd_obmc_sad32x16_avx2(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad32x16)(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad32x32_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-unsigned int aom_highbd_obmc_sad32x32_sse4_1(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-unsigned int aom_highbd_obmc_sad32x32_avx2(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad32x32)(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad32x64_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-unsigned int aom_highbd_obmc_sad32x64_sse4_1(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-unsigned int aom_highbd_obmc_sad32x64_avx2(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad32x64)(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad32x8_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-unsigned int aom_highbd_obmc_sad32x8_sse4_1(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask);
-unsigned int aom_highbd_obmc_sad32x8_avx2(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad32x8)(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad4x16_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-unsigned int aom_highbd_obmc_sad4x16_sse4_1(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask);
-unsigned int aom_highbd_obmc_sad4x16_avx2(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad4x16)(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad4x4_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-unsigned int aom_highbd_obmc_sad4x4_sse4_1(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask);
-unsigned int aom_highbd_obmc_sad4x4_avx2(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad4x4)(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad4x8_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-unsigned int aom_highbd_obmc_sad4x8_sse4_1(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask);
-unsigned int aom_highbd_obmc_sad4x8_avx2(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad4x8)(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad64x128_c(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask);
-unsigned int aom_highbd_obmc_sad64x128_sse4_1(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask);
-unsigned int aom_highbd_obmc_sad64x128_avx2(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad64x128)(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad64x16_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-unsigned int aom_highbd_obmc_sad64x16_sse4_1(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-unsigned int aom_highbd_obmc_sad64x16_avx2(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad64x16)(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad64x32_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-unsigned int aom_highbd_obmc_sad64x32_sse4_1(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-unsigned int aom_highbd_obmc_sad64x32_avx2(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad64x32)(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad64x64_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-unsigned int aom_highbd_obmc_sad64x64_sse4_1(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-unsigned int aom_highbd_obmc_sad64x64_avx2(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad64x64)(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad8x16_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-unsigned int aom_highbd_obmc_sad8x16_sse4_1(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask);
-unsigned int aom_highbd_obmc_sad8x16_avx2(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad8x16)(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad8x32_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-unsigned int aom_highbd_obmc_sad8x32_sse4_1(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask);
-unsigned int aom_highbd_obmc_sad8x32_avx2(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad8x32)(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad8x4_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-unsigned int aom_highbd_obmc_sad8x4_sse4_1(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask);
-unsigned int aom_highbd_obmc_sad8x4_avx2(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad8x4)(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad8x8_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-unsigned int aom_highbd_obmc_sad8x8_sse4_1(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask);
-unsigned int aom_highbd_obmc_sad8x8_avx2(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad8x8)(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sub_pixel_variance128x128_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance128x128 \
-  aom_highbd_obmc_sub_pixel_variance128x128_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance128x64_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance128x64 \
-  aom_highbd_obmc_sub_pixel_variance128x64_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance16x16_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance16x16 \
-  aom_highbd_obmc_sub_pixel_variance16x16_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance16x32_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance16x32 \
-  aom_highbd_obmc_sub_pixel_variance16x32_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance16x4_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance16x4 \
-  aom_highbd_obmc_sub_pixel_variance16x4_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance16x64_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance16x64 \
-  aom_highbd_obmc_sub_pixel_variance16x64_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance16x8_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance16x8 \
-  aom_highbd_obmc_sub_pixel_variance16x8_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance32x16_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance32x16 \
-  aom_highbd_obmc_sub_pixel_variance32x16_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance32x32_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance32x32 \
-  aom_highbd_obmc_sub_pixel_variance32x32_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance32x64_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance32x64 \
-  aom_highbd_obmc_sub_pixel_variance32x64_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance32x8_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance32x8 \
-  aom_highbd_obmc_sub_pixel_variance32x8_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance4x16_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance4x16 \
-  aom_highbd_obmc_sub_pixel_variance4x16_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance4x4_c(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance4x4 \
-  aom_highbd_obmc_sub_pixel_variance4x4_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance4x8_c(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance4x8 \
-  aom_highbd_obmc_sub_pixel_variance4x8_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance64x128_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance64x128 \
-  aom_highbd_obmc_sub_pixel_variance64x128_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance64x16_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance64x16 \
-  aom_highbd_obmc_sub_pixel_variance64x16_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance64x32_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance64x32 \
-  aom_highbd_obmc_sub_pixel_variance64x32_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance64x64_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance64x64 \
-  aom_highbd_obmc_sub_pixel_variance64x64_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance8x16_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance8x16 \
-  aom_highbd_obmc_sub_pixel_variance8x16_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance8x32_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance8x32 \
-  aom_highbd_obmc_sub_pixel_variance8x32_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance8x4_c(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance8x4 \
-  aom_highbd_obmc_sub_pixel_variance8x4_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance8x8_c(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance8x8 \
-  aom_highbd_obmc_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_obmc_variance128x128_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_highbd_obmc_variance128x128_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance128x128)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance128x64_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-unsigned int aom_highbd_obmc_variance128x64_sse4_1(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance128x64)(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance16x16_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-unsigned int aom_highbd_obmc_variance16x16_sse4_1(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance16x16)(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance16x32_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-unsigned int aom_highbd_obmc_variance16x32_sse4_1(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance16x32)(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance16x4_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-unsigned int aom_highbd_obmc_variance16x4_sse4_1(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance16x4)(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance16x64_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-unsigned int aom_highbd_obmc_variance16x64_sse4_1(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance16x64)(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance16x8_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-unsigned int aom_highbd_obmc_variance16x8_sse4_1(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance16x8)(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance32x16_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-unsigned int aom_highbd_obmc_variance32x16_sse4_1(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance32x16)(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance32x32_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-unsigned int aom_highbd_obmc_variance32x32_sse4_1(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance32x32)(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance32x64_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-unsigned int aom_highbd_obmc_variance32x64_sse4_1(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance32x64)(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance32x8_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-unsigned int aom_highbd_obmc_variance32x8_sse4_1(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance32x8)(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance4x16_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-unsigned int aom_highbd_obmc_variance4x16_sse4_1(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance4x16)(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance4x4_c(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-unsigned int aom_highbd_obmc_variance4x4_sse4_1(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance4x4)(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance4x8_c(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-unsigned int aom_highbd_obmc_variance4x8_sse4_1(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance4x8)(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance64x128_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-unsigned int aom_highbd_obmc_variance64x128_sse4_1(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance64x128)(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance64x16_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-unsigned int aom_highbd_obmc_variance64x16_sse4_1(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance64x16)(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance64x32_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-unsigned int aom_highbd_obmc_variance64x32_sse4_1(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance64x32)(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance64x64_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-unsigned int aom_highbd_obmc_variance64x64_sse4_1(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance64x64)(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance8x16_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-unsigned int aom_highbd_obmc_variance8x16_sse4_1(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance8x16)(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance8x32_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-unsigned int aom_highbd_obmc_variance8x32_sse4_1(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance8x32)(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance8x4_c(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-unsigned int aom_highbd_obmc_variance8x4_sse4_1(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance8x4)(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance8x8_c(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-unsigned int aom_highbd_obmc_variance8x8_sse4_1(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance8x8)(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-
-void aom_highbd_paeth_predictor_16x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_16x16 aom_highbd_paeth_predictor_16x16_c
-
-void aom_highbd_paeth_predictor_16x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_16x32 aom_highbd_paeth_predictor_16x32_c
-
-void aom_highbd_paeth_predictor_16x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_16x4 aom_highbd_paeth_predictor_16x4_c
-
-void aom_highbd_paeth_predictor_16x64_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_16x64 aom_highbd_paeth_predictor_16x64_c
-
-void aom_highbd_paeth_predictor_16x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_16x8 aom_highbd_paeth_predictor_16x8_c
-
-void aom_highbd_paeth_predictor_2x2_c(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_paeth_predictor_2x2 aom_highbd_paeth_predictor_2x2_c
-
-void aom_highbd_paeth_predictor_32x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_32x16 aom_highbd_paeth_predictor_32x16_c
-
-void aom_highbd_paeth_predictor_32x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_32x32 aom_highbd_paeth_predictor_32x32_c
-
-void aom_highbd_paeth_predictor_32x64_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_32x64 aom_highbd_paeth_predictor_32x64_c
-
-void aom_highbd_paeth_predictor_32x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_32x8 aom_highbd_paeth_predictor_32x8_c
-
-void aom_highbd_paeth_predictor_4x16_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_4x16 aom_highbd_paeth_predictor_4x16_c
-
-void aom_highbd_paeth_predictor_4x4_c(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_paeth_predictor_4x4 aom_highbd_paeth_predictor_4x4_c
-
-void aom_highbd_paeth_predictor_4x8_c(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_paeth_predictor_4x8 aom_highbd_paeth_predictor_4x8_c
-
-void aom_highbd_paeth_predictor_64x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_64x16 aom_highbd_paeth_predictor_64x16_c
-
-void aom_highbd_paeth_predictor_64x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_64x32 aom_highbd_paeth_predictor_64x32_c
-
-void aom_highbd_paeth_predictor_64x64_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_64x64 aom_highbd_paeth_predictor_64x64_c
-
-void aom_highbd_paeth_predictor_8x16_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_8x16 aom_highbd_paeth_predictor_8x16_c
-
-void aom_highbd_paeth_predictor_8x32_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_8x32 aom_highbd_paeth_predictor_8x32_c
-
-void aom_highbd_paeth_predictor_8x4_c(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_paeth_predictor_8x4 aom_highbd_paeth_predictor_8x4_c
-
-void aom_highbd_paeth_predictor_8x8_c(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_paeth_predictor_8x8 aom_highbd_paeth_predictor_8x8_c
-
-void aom_highbd_quantize_b_c(const tran_low_t* coeff_ptr,
-                             intptr_t n_coeffs,
-                             const int16_t* zbin_ptr,
-                             const int16_t* round_ptr,
-                             const int16_t* quant_ptr,
-                             const int16_t* quant_shift_ptr,
-                             tran_low_t* qcoeff_ptr,
-                             tran_low_t* dqcoeff_ptr,
-                             const int16_t* dequant_ptr,
-                             uint16_t* eob_ptr,
-                             const int16_t* scan,
-                             const int16_t* iscan);
-void aom_highbd_quantize_b_sse2(const tran_low_t* coeff_ptr,
-                                intptr_t n_coeffs,
-                                const int16_t* zbin_ptr,
-                                const int16_t* round_ptr,
-                                const int16_t* quant_ptr,
-                                const int16_t* quant_shift_ptr,
-                                tran_low_t* qcoeff_ptr,
-                                tran_low_t* dqcoeff_ptr,
-                                const int16_t* dequant_ptr,
-                                uint16_t* eob_ptr,
-                                const int16_t* scan,
-                                const int16_t* iscan);
-void aom_highbd_quantize_b_avx2(const tran_low_t* coeff_ptr,
-                                intptr_t n_coeffs,
-                                const int16_t* zbin_ptr,
-                                const int16_t* round_ptr,
-                                const int16_t* quant_ptr,
-                                const int16_t* quant_shift_ptr,
-                                tran_low_t* qcoeff_ptr,
-                                tran_low_t* dqcoeff_ptr,
-                                const int16_t* dequant_ptr,
-                                uint16_t* eob_ptr,
-                                const int16_t* scan,
-                                const int16_t* iscan);
-RTCD_EXTERN void (*aom_highbd_quantize_b)(const tran_low_t* coeff_ptr,
-                                          intptr_t n_coeffs,
-                                          const int16_t* zbin_ptr,
-                                          const int16_t* round_ptr,
-                                          const int16_t* quant_ptr,
-                                          const int16_t* quant_shift_ptr,
-                                          tran_low_t* qcoeff_ptr,
-                                          tran_low_t* dqcoeff_ptr,
-                                          const int16_t* dequant_ptr,
-                                          uint16_t* eob_ptr,
-                                          const int16_t* scan,
-                                          const int16_t* iscan);
-
-void aom_highbd_quantize_b_32x32_c(const tran_low_t* coeff_ptr,
-                                   intptr_t n_coeffs,
-                                   const int16_t* zbin_ptr,
-                                   const int16_t* round_ptr,
-                                   const int16_t* quant_ptr,
-                                   const int16_t* quant_shift_ptr,
-                                   tran_low_t* qcoeff_ptr,
-                                   tran_low_t* dqcoeff_ptr,
-                                   const int16_t* dequant_ptr,
-                                   uint16_t* eob_ptr,
-                                   const int16_t* scan,
-                                   const int16_t* iscan);
-void aom_highbd_quantize_b_32x32_sse2(const tran_low_t* coeff_ptr,
-                                      intptr_t n_coeffs,
-                                      const int16_t* zbin_ptr,
-                                      const int16_t* round_ptr,
-                                      const int16_t* quant_ptr,
-                                      const int16_t* quant_shift_ptr,
-                                      tran_low_t* qcoeff_ptr,
-                                      tran_low_t* dqcoeff_ptr,
-                                      const int16_t* dequant_ptr,
-                                      uint16_t* eob_ptr,
-                                      const int16_t* scan,
-                                      const int16_t* iscan);
-#define aom_highbd_quantize_b_32x32 aom_highbd_quantize_b_32x32_sse2
-
-void aom_highbd_quantize_b_32x32_adaptive_c(const tran_low_t* coeff_ptr,
-                                            intptr_t n_coeffs,
-                                            const int16_t* zbin_ptr,
-                                            const int16_t* round_ptr,
-                                            const int16_t* quant_ptr,
-                                            const int16_t* quant_shift_ptr,
-                                            tran_low_t* qcoeff_ptr,
-                                            tran_low_t* dqcoeff_ptr,
-                                            const int16_t* dequant_ptr,
-                                            uint16_t* eob_ptr,
-                                            const int16_t* scan,
-                                            const int16_t* iscan);
-void aom_highbd_quantize_b_32x32_adaptive_sse2(const tran_low_t* coeff_ptr,
-                                               intptr_t n_coeffs,
-                                               const int16_t* zbin_ptr,
-                                               const int16_t* round_ptr,
-                                               const int16_t* quant_ptr,
-                                               const int16_t* quant_shift_ptr,
-                                               tran_low_t* qcoeff_ptr,
-                                               tran_low_t* dqcoeff_ptr,
-                                               const int16_t* dequant_ptr,
-                                               uint16_t* eob_ptr,
-                                               const int16_t* scan,
-                                               const int16_t* iscan);
-void aom_highbd_quantize_b_32x32_adaptive_avx2(const tran_low_t* coeff_ptr,
-                                               intptr_t n_coeffs,
-                                               const int16_t* zbin_ptr,
-                                               const int16_t* round_ptr,
-                                               const int16_t* quant_ptr,
-                                               const int16_t* quant_shift_ptr,
-                                               tran_low_t* qcoeff_ptr,
-                                               tran_low_t* dqcoeff_ptr,
-                                               const int16_t* dequant_ptr,
-                                               uint16_t* eob_ptr,
-                                               const int16_t* scan,
-                                               const int16_t* iscan);
-RTCD_EXTERN void (*aom_highbd_quantize_b_32x32_adaptive)(
-    const tran_low_t* coeff_ptr,
-    intptr_t n_coeffs,
-    const int16_t* zbin_ptr,
-    const int16_t* round_ptr,
-    const int16_t* quant_ptr,
-    const int16_t* quant_shift_ptr,
-    tran_low_t* qcoeff_ptr,
-    tran_low_t* dqcoeff_ptr,
-    const int16_t* dequant_ptr,
-    uint16_t* eob_ptr,
-    const int16_t* scan,
-    const int16_t* iscan);
-
-void aom_highbd_quantize_b_64x64_c(const tran_low_t* coeff_ptr,
-                                   intptr_t n_coeffs,
-                                   const int16_t* zbin_ptr,
-                                   const int16_t* round_ptr,
-                                   const int16_t* quant_ptr,
-                                   const int16_t* quant_shift_ptr,
-                                   tran_low_t* qcoeff_ptr,
-                                   tran_low_t* dqcoeff_ptr,
-                                   const int16_t* dequant_ptr,
-                                   uint16_t* eob_ptr,
-                                   const int16_t* scan,
-                                   const int16_t* iscan);
-void aom_highbd_quantize_b_64x64_sse2(const tran_low_t* coeff_ptr,
-                                      intptr_t n_coeffs,
-                                      const int16_t* zbin_ptr,
-                                      const int16_t* round_ptr,
-                                      const int16_t* quant_ptr,
-                                      const int16_t* quant_shift_ptr,
-                                      tran_low_t* qcoeff_ptr,
-                                      tran_low_t* dqcoeff_ptr,
-                                      const int16_t* dequant_ptr,
-                                      uint16_t* eob_ptr,
-                                      const int16_t* scan,
-                                      const int16_t* iscan);
-#define aom_highbd_quantize_b_64x64 aom_highbd_quantize_b_64x64_sse2
-
-void aom_highbd_quantize_b_64x64_adaptive_c(const tran_low_t* coeff_ptr,
-                                            intptr_t n_coeffs,
-                                            const int16_t* zbin_ptr,
-                                            const int16_t* round_ptr,
-                                            const int16_t* quant_ptr,
-                                            const int16_t* quant_shift_ptr,
-                                            tran_low_t* qcoeff_ptr,
-                                            tran_low_t* dqcoeff_ptr,
-                                            const int16_t* dequant_ptr,
-                                            uint16_t* eob_ptr,
-                                            const int16_t* scan,
-                                            const int16_t* iscan);
-void aom_highbd_quantize_b_64x64_adaptive_sse2(const tran_low_t* coeff_ptr,
-                                               intptr_t n_coeffs,
-                                               const int16_t* zbin_ptr,
-                                               const int16_t* round_ptr,
-                                               const int16_t* quant_ptr,
-                                               const int16_t* quant_shift_ptr,
-                                               tran_low_t* qcoeff_ptr,
-                                               tran_low_t* dqcoeff_ptr,
-                                               const int16_t* dequant_ptr,
-                                               uint16_t* eob_ptr,
-                                               const int16_t* scan,
-                                               const int16_t* iscan);
-#define aom_highbd_quantize_b_64x64_adaptive \
-  aom_highbd_quantize_b_64x64_adaptive_sse2
-
-void aom_highbd_quantize_b_adaptive_c(const tran_low_t* coeff_ptr,
-                                      intptr_t n_coeffs,
-                                      const int16_t* zbin_ptr,
-                                      const int16_t* round_ptr,
-                                      const int16_t* quant_ptr,
-                                      const int16_t* quant_shift_ptr,
-                                      tran_low_t* qcoeff_ptr,
-                                      tran_low_t* dqcoeff_ptr,
-                                      const int16_t* dequant_ptr,
-                                      uint16_t* eob_ptr,
-                                      const int16_t* scan,
-                                      const int16_t* iscan);
-void aom_highbd_quantize_b_adaptive_sse2(const tran_low_t* coeff_ptr,
-                                         intptr_t n_coeffs,
-                                         const int16_t* zbin_ptr,
-                                         const int16_t* round_ptr,
-                                         const int16_t* quant_ptr,
-                                         const int16_t* quant_shift_ptr,
-                                         tran_low_t* qcoeff_ptr,
-                                         tran_low_t* dqcoeff_ptr,
-                                         const int16_t* dequant_ptr,
-                                         uint16_t* eob_ptr,
-                                         const int16_t* scan,
-                                         const int16_t* iscan);
-void aom_highbd_quantize_b_adaptive_avx2(const tran_low_t* coeff_ptr,
-                                         intptr_t n_coeffs,
-                                         const int16_t* zbin_ptr,
-                                         const int16_t* round_ptr,
-                                         const int16_t* quant_ptr,
-                                         const int16_t* quant_shift_ptr,
-                                         tran_low_t* qcoeff_ptr,
-                                         tran_low_t* dqcoeff_ptr,
-                                         const int16_t* dequant_ptr,
-                                         uint16_t* eob_ptr,
-                                         const int16_t* scan,
-                                         const int16_t* iscan);
-RTCD_EXTERN void (*aom_highbd_quantize_b_adaptive)(
-    const tran_low_t* coeff_ptr,
-    intptr_t n_coeffs,
-    const int16_t* zbin_ptr,
-    const int16_t* round_ptr,
-    const int16_t* quant_ptr,
-    const int16_t* quant_shift_ptr,
-    tran_low_t* qcoeff_ptr,
-    tran_low_t* dqcoeff_ptr,
-    const int16_t* dequant_ptr,
-    uint16_t* eob_ptr,
-    const int16_t* scan,
-    const int16_t* iscan);
-
-unsigned int aom_highbd_sad128x128_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride);
-unsigned int aom_highbd_sad128x128_avx2(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad128x128)(const uint8_t* src_ptr,
-                                                  int src_stride,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride);
-
-unsigned int aom_highbd_sad128x128_avg_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         const uint8_t* second_pred);
-unsigned int aom_highbd_sad128x128_avg_avx2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            const uint8_t* second_pred);
-RTCD_EXTERN unsigned int (*aom_highbd_sad128x128_avg)(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred);
-
-void aom_highbd_sad128x128x4d_c(const uint8_t* src_ptr,
-                                int src_stride,
-                                const uint8_t* const ref_ptr[],
-                                int ref_stride,
-                                uint32_t* sad_array);
-void aom_highbd_sad128x128x4d_avx2(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad128x128x4d)(const uint8_t* src_ptr,
-                                             int src_stride,
-                                             const uint8_t* const ref_ptr[],
-                                             int ref_stride,
-                                             uint32_t* sad_array);
-
-unsigned int aom_highbd_sad128x64_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* ref_ptr,
-                                    int ref_stride);
-unsigned int aom_highbd_sad128x64_avx2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad128x64)(const uint8_t* src_ptr,
-                                                 int src_stride,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride);
-
-unsigned int aom_highbd_sad128x64_avg_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        const uint8_t* second_pred);
-unsigned int aom_highbd_sad128x64_avg_avx2(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           const uint8_t* second_pred);
-RTCD_EXTERN unsigned int (*aom_highbd_sad128x64_avg)(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred);
-
-void aom_highbd_sad128x64x4d_c(const uint8_t* src_ptr,
-                               int src_stride,
-                               const uint8_t* const ref_ptr[],
-                               int ref_stride,
-                               uint32_t* sad_array);
-void aom_highbd_sad128x64x4d_avx2(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* const ref_ptr[],
-                                  int ref_stride,
-                                  uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad128x64x4d)(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* const ref_ptr[],
-                                            int ref_stride,
-                                            uint32_t* sad_array);
-
-unsigned int aom_highbd_sad16x16_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-unsigned int aom_highbd_sad16x16_sse2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-unsigned int aom_highbd_sad16x16_avx2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad16x16)(const uint8_t* src_ptr,
-                                                int src_stride,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride);
-
-unsigned int aom_highbd_sad16x16_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-unsigned int aom_highbd_sad16x16_avg_sse2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-unsigned int aom_highbd_sad16x16_avg_avx2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-RTCD_EXTERN unsigned int (*aom_highbd_sad16x16_avg)(const uint8_t* src_ptr,
-                                                    int src_stride,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    const uint8_t* second_pred);
-
-void aom_highbd_sad16x16x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-void aom_highbd_sad16x16x4d_sse2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-void aom_highbd_sad16x16x4d_avx2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad16x16x4d)(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* const ref_ptr[],
-                                           int ref_stride,
-                                           uint32_t* sad_array);
-
-unsigned int aom_highbd_sad16x32_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-unsigned int aom_highbd_sad16x32_sse2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-unsigned int aom_highbd_sad16x32_avx2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad16x32)(const uint8_t* src_ptr,
-                                                int src_stride,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride);
-
-unsigned int aom_highbd_sad16x32_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-unsigned int aom_highbd_sad16x32_avg_sse2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-unsigned int aom_highbd_sad16x32_avg_avx2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-RTCD_EXTERN unsigned int (*aom_highbd_sad16x32_avg)(const uint8_t* src_ptr,
-                                                    int src_stride,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    const uint8_t* second_pred);
-
-void aom_highbd_sad16x32x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-void aom_highbd_sad16x32x4d_sse2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-void aom_highbd_sad16x32x4d_avx2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad16x32x4d)(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* const ref_ptr[],
-                                           int ref_stride,
-                                           uint32_t* sad_array);
-
-unsigned int aom_highbd_sad16x4_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-unsigned int aom_highbd_sad16x4_sse2(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride);
-unsigned int aom_highbd_sad16x4_avx2(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad16x4)(const uint8_t* src_ptr,
-                                               int src_stride,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride);
-
-unsigned int aom_highbd_sad16x4_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-unsigned int aom_highbd_sad16x4_avg_sse2(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         const uint8_t* second_pred);
-unsigned int aom_highbd_sad16x4_avg_avx2(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         const uint8_t* second_pred);
-RTCD_EXTERN unsigned int (*aom_highbd_sad16x4_avg)(const uint8_t* src_ptr,
-                                                   int src_stride,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   const uint8_t* second_pred);
-
-void aom_highbd_sad16x4x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-void aom_highbd_sad16x4x4d_sse2(const uint8_t* src_ptr,
-                                int src_stride,
-                                const uint8_t* const ref_ptr[],
-                                int ref_stride,
-                                uint32_t* sad_array);
-void aom_highbd_sad16x4x4d_avx2(const uint8_t* src_ptr,
-                                int src_stride,
-                                const uint8_t* const ref_ptr[],
-                                int ref_stride,
-                                uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad16x4x4d)(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* const ref_ptr[],
-                                          int ref_stride,
-                                          uint32_t* sad_array);
-
-unsigned int aom_highbd_sad16x64_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-unsigned int aom_highbd_sad16x64_sse2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-unsigned int aom_highbd_sad16x64_avx2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad16x64)(const uint8_t* src_ptr,
-                                                int src_stride,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride);
-
-unsigned int aom_highbd_sad16x64_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-unsigned int aom_highbd_sad16x64_avg_sse2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-unsigned int aom_highbd_sad16x64_avg_avx2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-RTCD_EXTERN unsigned int (*aom_highbd_sad16x64_avg)(const uint8_t* src_ptr,
-                                                    int src_stride,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    const uint8_t* second_pred);
-
-void aom_highbd_sad16x64x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-void aom_highbd_sad16x64x4d_sse2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-void aom_highbd_sad16x64x4d_avx2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad16x64x4d)(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* const ref_ptr[],
-                                           int ref_stride,
-                                           uint32_t* sad_array);
-
-unsigned int aom_highbd_sad16x8_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-unsigned int aom_highbd_sad16x8_sse2(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride);
-unsigned int aom_highbd_sad16x8_avx2(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad16x8)(const uint8_t* src_ptr,
-                                               int src_stride,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride);
-
-unsigned int aom_highbd_sad16x8_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-unsigned int aom_highbd_sad16x8_avg_sse2(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         const uint8_t* second_pred);
-unsigned int aom_highbd_sad16x8_avg_avx2(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         const uint8_t* second_pred);
-RTCD_EXTERN unsigned int (*aom_highbd_sad16x8_avg)(const uint8_t* src_ptr,
-                                                   int src_stride,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   const uint8_t* second_pred);
-
-void aom_highbd_sad16x8x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-void aom_highbd_sad16x8x4d_sse2(const uint8_t* src_ptr,
-                                int src_stride,
-                                const uint8_t* const ref_ptr[],
-                                int ref_stride,
-                                uint32_t* sad_array);
-void aom_highbd_sad16x8x4d_avx2(const uint8_t* src_ptr,
-                                int src_stride,
-                                const uint8_t* const ref_ptr[],
-                                int ref_stride,
-                                uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad16x8x4d)(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* const ref_ptr[],
-                                          int ref_stride,
-                                          uint32_t* sad_array);
-
-unsigned int aom_highbd_sad32x16_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-unsigned int aom_highbd_sad32x16_sse2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-unsigned int aom_highbd_sad32x16_avx2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad32x16)(const uint8_t* src_ptr,
-                                                int src_stride,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride);
-
-unsigned int aom_highbd_sad32x16_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-unsigned int aom_highbd_sad32x16_avg_sse2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-unsigned int aom_highbd_sad32x16_avg_avx2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-RTCD_EXTERN unsigned int (*aom_highbd_sad32x16_avg)(const uint8_t* src_ptr,
-                                                    int src_stride,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    const uint8_t* second_pred);
-
-void aom_highbd_sad32x16x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-void aom_highbd_sad32x16x4d_sse2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-void aom_highbd_sad32x16x4d_avx2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad32x16x4d)(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* const ref_ptr[],
-                                           int ref_stride,
-                                           uint32_t* sad_array);
-
-unsigned int aom_highbd_sad32x32_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-unsigned int aom_highbd_sad32x32_sse2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-unsigned int aom_highbd_sad32x32_avx2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad32x32)(const uint8_t* src_ptr,
-                                                int src_stride,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride);
-
-unsigned int aom_highbd_sad32x32_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-unsigned int aom_highbd_sad32x32_avg_sse2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-unsigned int aom_highbd_sad32x32_avg_avx2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-RTCD_EXTERN unsigned int (*aom_highbd_sad32x32_avg)(const uint8_t* src_ptr,
-                                                    int src_stride,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    const uint8_t* second_pred);
-
-void aom_highbd_sad32x32x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-void aom_highbd_sad32x32x4d_sse2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-void aom_highbd_sad32x32x4d_avx2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad32x32x4d)(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* const ref_ptr[],
-                                           int ref_stride,
-                                           uint32_t* sad_array);
-
-unsigned int aom_highbd_sad32x64_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-unsigned int aom_highbd_sad32x64_sse2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-unsigned int aom_highbd_sad32x64_avx2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad32x64)(const uint8_t* src_ptr,
-                                                int src_stride,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride);
-
-unsigned int aom_highbd_sad32x64_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-unsigned int aom_highbd_sad32x64_avg_sse2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-unsigned int aom_highbd_sad32x64_avg_avx2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-RTCD_EXTERN unsigned int (*aom_highbd_sad32x64_avg)(const uint8_t* src_ptr,
-                                                    int src_stride,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    const uint8_t* second_pred);
-
-void aom_highbd_sad32x64x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-void aom_highbd_sad32x64x4d_sse2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-void aom_highbd_sad32x64x4d_avx2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad32x64x4d)(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* const ref_ptr[],
-                                           int ref_stride,
-                                           uint32_t* sad_array);
-
-unsigned int aom_highbd_sad32x8_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-unsigned int aom_highbd_sad32x8_sse2(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride);
-unsigned int aom_highbd_sad32x8_avx2(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad32x8)(const uint8_t* src_ptr,
-                                               int src_stride,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride);
-
-unsigned int aom_highbd_sad32x8_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-unsigned int aom_highbd_sad32x8_avg_sse2(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         const uint8_t* second_pred);
-unsigned int aom_highbd_sad32x8_avg_avx2(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         const uint8_t* second_pred);
-RTCD_EXTERN unsigned int (*aom_highbd_sad32x8_avg)(const uint8_t* src_ptr,
-                                                   int src_stride,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   const uint8_t* second_pred);
-
-void aom_highbd_sad32x8x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-void aom_highbd_sad32x8x4d_sse2(const uint8_t* src_ptr,
-                                int src_stride,
-                                const uint8_t* const ref_ptr[],
-                                int ref_stride,
-                                uint32_t* sad_array);
-void aom_highbd_sad32x8x4d_avx2(const uint8_t* src_ptr,
-                                int src_stride,
-                                const uint8_t* const ref_ptr[],
-                                int ref_stride,
-                                uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad32x8x4d)(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* const ref_ptr[],
-                                          int ref_stride,
-                                          uint32_t* sad_array);
-
-unsigned int aom_highbd_sad4x16_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-unsigned int aom_highbd_sad4x16_sse2(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride);
-#define aom_highbd_sad4x16 aom_highbd_sad4x16_sse2
-
-unsigned int aom_highbd_sad4x16_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-unsigned int aom_highbd_sad4x16_avg_sse2(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         const uint8_t* second_pred);
-#define aom_highbd_sad4x16_avg aom_highbd_sad4x16_avg_sse2
-
-void aom_highbd_sad4x16x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-void aom_highbd_sad4x16x4d_sse2(const uint8_t* src_ptr,
-                                int src_stride,
-                                const uint8_t* const ref_ptr[],
-                                int ref_stride,
-                                uint32_t* sad_array);
-#define aom_highbd_sad4x16x4d aom_highbd_sad4x16x4d_sse2
-
-unsigned int aom_highbd_sad4x4_c(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride);
-unsigned int aom_highbd_sad4x4_sse2(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* ref_ptr,
-                                    int ref_stride);
-#define aom_highbd_sad4x4 aom_highbd_sad4x4_sse2
-
-unsigned int aom_highbd_sad4x4_avg_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride,
-                                     const uint8_t* second_pred);
-unsigned int aom_highbd_sad4x4_avg_sse2(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        const uint8_t* second_pred);
-#define aom_highbd_sad4x4_avg aom_highbd_sad4x4_avg_sse2
-
-void aom_highbd_sad4x4x4d_c(const uint8_t* src_ptr,
-                            int src_stride,
-                            const uint8_t* const ref_ptr[],
-                            int ref_stride,
-                            uint32_t* sad_array);
-void aom_highbd_sad4x4x4d_sse2(const uint8_t* src_ptr,
-                               int src_stride,
-                               const uint8_t* const ref_ptr[],
-                               int ref_stride,
-                               uint32_t* sad_array);
-#define aom_highbd_sad4x4x4d aom_highbd_sad4x4x4d_sse2
-
-unsigned int aom_highbd_sad4x8_c(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride);
-unsigned int aom_highbd_sad4x8_sse2(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* ref_ptr,
-                                    int ref_stride);
-#define aom_highbd_sad4x8 aom_highbd_sad4x8_sse2
-
-unsigned int aom_highbd_sad4x8_avg_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride,
-                                     const uint8_t* second_pred);
-unsigned int aom_highbd_sad4x8_avg_sse2(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        const uint8_t* second_pred);
-#define aom_highbd_sad4x8_avg aom_highbd_sad4x8_avg_sse2
-
-void aom_highbd_sad4x8x4d_c(const uint8_t* src_ptr,
-                            int src_stride,
-                            const uint8_t* const ref_ptr[],
-                            int ref_stride,
-                            uint32_t* sad_array);
-void aom_highbd_sad4x8x4d_sse2(const uint8_t* src_ptr,
-                               int src_stride,
-                               const uint8_t* const ref_ptr[],
-                               int ref_stride,
-                               uint32_t* sad_array);
-#define aom_highbd_sad4x8x4d aom_highbd_sad4x8x4d_sse2
-
-unsigned int aom_highbd_sad64x128_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* ref_ptr,
-                                    int ref_stride);
-unsigned int aom_highbd_sad64x128_avx2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad64x128)(const uint8_t* src_ptr,
-                                                 int src_stride,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride);
-
-unsigned int aom_highbd_sad64x128_avg_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        const uint8_t* second_pred);
-unsigned int aom_highbd_sad64x128_avg_avx2(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           const uint8_t* second_pred);
-RTCD_EXTERN unsigned int (*aom_highbd_sad64x128_avg)(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred);
-
-void aom_highbd_sad64x128x4d_c(const uint8_t* src_ptr,
-                               int src_stride,
-                               const uint8_t* const ref_ptr[],
-                               int ref_stride,
-                               uint32_t* sad_array);
-void aom_highbd_sad64x128x4d_avx2(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* const ref_ptr[],
-                                  int ref_stride,
-                                  uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad64x128x4d)(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* const ref_ptr[],
-                                            int ref_stride,
-                                            uint32_t* sad_array);
-
-unsigned int aom_highbd_sad64x16_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-unsigned int aom_highbd_sad64x16_sse2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-unsigned int aom_highbd_sad64x16_avx2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad64x16)(const uint8_t* src_ptr,
-                                                int src_stride,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride);
-
-unsigned int aom_highbd_sad64x16_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-unsigned int aom_highbd_sad64x16_avg_sse2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-unsigned int aom_highbd_sad64x16_avg_avx2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-RTCD_EXTERN unsigned int (*aom_highbd_sad64x16_avg)(const uint8_t* src_ptr,
-                                                    int src_stride,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    const uint8_t* second_pred);
-
-void aom_highbd_sad64x16x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-void aom_highbd_sad64x16x4d_sse2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-void aom_highbd_sad64x16x4d_avx2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad64x16x4d)(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* const ref_ptr[],
-                                           int ref_stride,
-                                           uint32_t* sad_array);
-
-unsigned int aom_highbd_sad64x32_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-unsigned int aom_highbd_sad64x32_sse2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-unsigned int aom_highbd_sad64x32_avx2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad64x32)(const uint8_t* src_ptr,
-                                                int src_stride,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride);
-
-unsigned int aom_highbd_sad64x32_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-unsigned int aom_highbd_sad64x32_avg_sse2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-unsigned int aom_highbd_sad64x32_avg_avx2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-RTCD_EXTERN unsigned int (*aom_highbd_sad64x32_avg)(const uint8_t* src_ptr,
-                                                    int src_stride,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    const uint8_t* second_pred);
-
-void aom_highbd_sad64x32x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-void aom_highbd_sad64x32x4d_sse2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-void aom_highbd_sad64x32x4d_avx2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad64x32x4d)(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* const ref_ptr[],
-                                           int ref_stride,
-                                           uint32_t* sad_array);
-
-unsigned int aom_highbd_sad64x64_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-unsigned int aom_highbd_sad64x64_sse2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-unsigned int aom_highbd_sad64x64_avx2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad64x64)(const uint8_t* src_ptr,
-                                                int src_stride,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride);
-
-unsigned int aom_highbd_sad64x64_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-unsigned int aom_highbd_sad64x64_avg_sse2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-unsigned int aom_highbd_sad64x64_avg_avx2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-RTCD_EXTERN unsigned int (*aom_highbd_sad64x64_avg)(const uint8_t* src_ptr,
-                                                    int src_stride,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    const uint8_t* second_pred);
-
-void aom_highbd_sad64x64x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-void aom_highbd_sad64x64x4d_sse2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-void aom_highbd_sad64x64x4d_avx2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad64x64x4d)(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* const ref_ptr[],
-                                           int ref_stride,
-                                           uint32_t* sad_array);
-
-unsigned int aom_highbd_sad8x16_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-unsigned int aom_highbd_sad8x16_sse2(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride);
-#define aom_highbd_sad8x16 aom_highbd_sad8x16_sse2
-
-unsigned int aom_highbd_sad8x16_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-unsigned int aom_highbd_sad8x16_avg_sse2(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         const uint8_t* second_pred);
-#define aom_highbd_sad8x16_avg aom_highbd_sad8x16_avg_sse2
-
-void aom_highbd_sad8x16x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-void aom_highbd_sad8x16x4d_sse2(const uint8_t* src_ptr,
-                                int src_stride,
-                                const uint8_t* const ref_ptr[],
-                                int ref_stride,
-                                uint32_t* sad_array);
-#define aom_highbd_sad8x16x4d aom_highbd_sad8x16x4d_sse2
-
-unsigned int aom_highbd_sad8x32_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-unsigned int aom_highbd_sad8x32_sse2(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride);
-#define aom_highbd_sad8x32 aom_highbd_sad8x32_sse2
-
-unsigned int aom_highbd_sad8x32_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-unsigned int aom_highbd_sad8x32_avg_sse2(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         const uint8_t* second_pred);
-#define aom_highbd_sad8x32_avg aom_highbd_sad8x32_avg_sse2
-
-void aom_highbd_sad8x32x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-void aom_highbd_sad8x32x4d_sse2(const uint8_t* src_ptr,
-                                int src_stride,
-                                const uint8_t* const ref_ptr[],
-                                int ref_stride,
-                                uint32_t* sad_array);
-#define aom_highbd_sad8x32x4d aom_highbd_sad8x32x4d_sse2
-
-unsigned int aom_highbd_sad8x4_c(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride);
-unsigned int aom_highbd_sad8x4_sse2(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* ref_ptr,
-                                    int ref_stride);
-#define aom_highbd_sad8x4 aom_highbd_sad8x4_sse2
-
-unsigned int aom_highbd_sad8x4_avg_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride,
-                                     const uint8_t* second_pred);
-unsigned int aom_highbd_sad8x4_avg_sse2(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        const uint8_t* second_pred);
-#define aom_highbd_sad8x4_avg aom_highbd_sad8x4_avg_sse2
-
-void aom_highbd_sad8x4x4d_c(const uint8_t* src_ptr,
-                            int src_stride,
-                            const uint8_t* const ref_ptr[],
-                            int ref_stride,
-                            uint32_t* sad_array);
-void aom_highbd_sad8x4x4d_sse2(const uint8_t* src_ptr,
-                               int src_stride,
-                               const uint8_t* const ref_ptr[],
-                               int ref_stride,
-                               uint32_t* sad_array);
-#define aom_highbd_sad8x4x4d aom_highbd_sad8x4x4d_sse2
-
-unsigned int aom_highbd_sad8x8_c(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride);
-unsigned int aom_highbd_sad8x8_sse2(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* ref_ptr,
-                                    int ref_stride);
-#define aom_highbd_sad8x8 aom_highbd_sad8x8_sse2
-
-unsigned int aom_highbd_sad8x8_avg_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride,
-                                     const uint8_t* second_pred);
-unsigned int aom_highbd_sad8x8_avg_sse2(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        const uint8_t* second_pred);
-#define aom_highbd_sad8x8_avg aom_highbd_sad8x8_avg_sse2
-
-void aom_highbd_sad8x8x4d_c(const uint8_t* src_ptr,
-                            int src_stride,
-                            const uint8_t* const ref_ptr[],
-                            int ref_stride,
-                            uint32_t* sad_array);
-void aom_highbd_sad8x8x4d_sse2(const uint8_t* src_ptr,
-                               int src_stride,
-                               const uint8_t* const ref_ptr[],
-                               int ref_stride,
-                               uint32_t* sad_array);
-#define aom_highbd_sad8x8x4d aom_highbd_sad8x8x4d_sse2
-
-unsigned int aom_highbd_sad_skip_128x128_c(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride);
-unsigned int aom_highbd_sad_skip_128x128_avx2(const uint8_t* src_ptr,
-                                              int src_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad_skip_128x128)(const uint8_t* src_ptr,
-                                                        int src_stride,
-                                                        const uint8_t* ref_ptr,
-                                                        int ref_stride);
-
-void aom_highbd_sad_skip_128x128x4d_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* const ref_ptr[],
-                                      int ref_stride,
-                                      uint32_t* sad_array);
-void aom_highbd_sad_skip_128x128x4d_avx2(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* const ref_ptr[],
-                                         int ref_stride,
-                                         uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad_skip_128x128x4d)(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* const ref_ptr[],
-    int ref_stride,
-    uint32_t* sad_array);
-
-unsigned int aom_highbd_sad_skip_128x64_c(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride);
-unsigned int aom_highbd_sad_skip_128x64_avx2(const uint8_t* src_ptr,
-                                             int src_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad_skip_128x64)(const uint8_t* src_ptr,
-                                                       int src_stride,
-                                                       const uint8_t* ref_ptr,
-                                                       int ref_stride);
-
-void aom_highbd_sad_skip_128x64x4d_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* const ref_ptr[],
-                                     int ref_stride,
-                                     uint32_t* sad_array);
-void aom_highbd_sad_skip_128x64x4d_avx2(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* const ref_ptr[],
-                                        int ref_stride,
-                                        uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad_skip_128x64x4d)(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* const ref_ptr[],
-    int ref_stride,
-    uint32_t* sad_array);
-
-unsigned int aom_highbd_sad_skip_16x16_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-unsigned int aom_highbd_sad_skip_16x16_sse2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-unsigned int aom_highbd_sad_skip_16x16_avx2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad_skip_16x16)(const uint8_t* src_ptr,
-                                                      int src_stride,
-                                                      const uint8_t* ref_ptr,
-                                                      int ref_stride);
-
-void aom_highbd_sad_skip_16x16x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-void aom_highbd_sad_skip_16x16x4d_sse2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-void aom_highbd_sad_skip_16x16x4d_avx2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad_skip_16x16x4d)(const uint8_t* src_ptr,
-                                                 int src_stride,
-                                                 const uint8_t* const ref_ptr[],
-                                                 int ref_stride,
-                                                 uint32_t* sad_array);
-
-unsigned int aom_highbd_sad_skip_16x32_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-unsigned int aom_highbd_sad_skip_16x32_sse2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-unsigned int aom_highbd_sad_skip_16x32_avx2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad_skip_16x32)(const uint8_t* src_ptr,
-                                                      int src_stride,
-                                                      const uint8_t* ref_ptr,
-                                                      int ref_stride);
-
-void aom_highbd_sad_skip_16x32x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-void aom_highbd_sad_skip_16x32x4d_sse2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-void aom_highbd_sad_skip_16x32x4d_avx2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad_skip_16x32x4d)(const uint8_t* src_ptr,
-                                                 int src_stride,
-                                                 const uint8_t* const ref_ptr[],
-                                                 int ref_stride,
-                                                 uint32_t* sad_array);
-
-unsigned int aom_highbd_sad_skip_16x4_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-#define aom_highbd_sad_skip_16x4 aom_highbd_sad_skip_16x4_c
-
-void aom_highbd_sad_skip_16x4x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-#define aom_highbd_sad_skip_16x4x4d aom_highbd_sad_skip_16x4x4d_c
-
-unsigned int aom_highbd_sad_skip_16x64_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-unsigned int aom_highbd_sad_skip_16x64_sse2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-unsigned int aom_highbd_sad_skip_16x64_avx2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad_skip_16x64)(const uint8_t* src_ptr,
-                                                      int src_stride,
-                                                      const uint8_t* ref_ptr,
-                                                      int ref_stride);
-
-void aom_highbd_sad_skip_16x64x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-void aom_highbd_sad_skip_16x64x4d_sse2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-void aom_highbd_sad_skip_16x64x4d_avx2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad_skip_16x64x4d)(const uint8_t* src_ptr,
-                                                 int src_stride,
-                                                 const uint8_t* const ref_ptr[],
-                                                 int ref_stride,
-                                                 uint32_t* sad_array);
-
-unsigned int aom_highbd_sad_skip_16x8_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-unsigned int aom_highbd_sad_skip_16x8_sse2(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride);
-unsigned int aom_highbd_sad_skip_16x8_avx2(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad_skip_16x8)(const uint8_t* src_ptr,
-                                                     int src_stride,
-                                                     const uint8_t* ref_ptr,
-                                                     int ref_stride);
-
-void aom_highbd_sad_skip_16x8x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-void aom_highbd_sad_skip_16x8x4d_sse2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* const ref_ptr[],
-                                      int ref_stride,
-                                      uint32_t* sad_array);
-void aom_highbd_sad_skip_16x8x4d_avx2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* const ref_ptr[],
-                                      int ref_stride,
-                                      uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad_skip_16x8x4d)(const uint8_t* src_ptr,
-                                                int src_stride,
-                                                const uint8_t* const ref_ptr[],
-                                                int ref_stride,
-                                                uint32_t* sad_array);
-
-unsigned int aom_highbd_sad_skip_32x16_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-unsigned int aom_highbd_sad_skip_32x16_sse2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-unsigned int aom_highbd_sad_skip_32x16_avx2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad_skip_32x16)(const uint8_t* src_ptr,
-                                                      int src_stride,
-                                                      const uint8_t* ref_ptr,
-                                                      int ref_stride);
-
-void aom_highbd_sad_skip_32x16x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-void aom_highbd_sad_skip_32x16x4d_sse2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-void aom_highbd_sad_skip_32x16x4d_avx2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad_skip_32x16x4d)(const uint8_t* src_ptr,
-                                                 int src_stride,
-                                                 const uint8_t* const ref_ptr[],
-                                                 int ref_stride,
-                                                 uint32_t* sad_array);
-
-unsigned int aom_highbd_sad_skip_32x32_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-unsigned int aom_highbd_sad_skip_32x32_sse2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-unsigned int aom_highbd_sad_skip_32x32_avx2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad_skip_32x32)(const uint8_t* src_ptr,
-                                                      int src_stride,
-                                                      const uint8_t* ref_ptr,
-                                                      int ref_stride);
-
-void aom_highbd_sad_skip_32x32x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-void aom_highbd_sad_skip_32x32x4d_sse2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-void aom_highbd_sad_skip_32x32x4d_avx2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad_skip_32x32x4d)(const uint8_t* src_ptr,
-                                                 int src_stride,
-                                                 const uint8_t* const ref_ptr[],
-                                                 int ref_stride,
-                                                 uint32_t* sad_array);
-
-unsigned int aom_highbd_sad_skip_32x64_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-unsigned int aom_highbd_sad_skip_32x64_sse2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-unsigned int aom_highbd_sad_skip_32x64_avx2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad_skip_32x64)(const uint8_t* src_ptr,
-                                                      int src_stride,
-                                                      const uint8_t* ref_ptr,
-                                                      int ref_stride);
-
-void aom_highbd_sad_skip_32x64x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-void aom_highbd_sad_skip_32x64x4d_sse2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-void aom_highbd_sad_skip_32x64x4d_avx2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad_skip_32x64x4d)(const uint8_t* src_ptr,
-                                                 int src_stride,
-                                                 const uint8_t* const ref_ptr[],
-                                                 int ref_stride,
-                                                 uint32_t* sad_array);
-
-unsigned int aom_highbd_sad_skip_32x8_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-unsigned int aom_highbd_sad_skip_32x8_sse2(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride);
-unsigned int aom_highbd_sad_skip_32x8_avx2(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad_skip_32x8)(const uint8_t* src_ptr,
-                                                     int src_stride,
-                                                     const uint8_t* ref_ptr,
-                                                     int ref_stride);
-
-void aom_highbd_sad_skip_32x8x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-void aom_highbd_sad_skip_32x8x4d_sse2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* const ref_ptr[],
-                                      int ref_stride,
-                                      uint32_t* sad_array);
-void aom_highbd_sad_skip_32x8x4d_avx2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* const ref_ptr[],
-                                      int ref_stride,
-                                      uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad_skip_32x8x4d)(const uint8_t* src_ptr,
-                                                int src_stride,
-                                                const uint8_t* const ref_ptr[],
-                                                int ref_stride,
-                                                uint32_t* sad_array);
-
-unsigned int aom_highbd_sad_skip_4x16_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-unsigned int aom_highbd_sad_skip_4x16_sse2(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride);
-#define aom_highbd_sad_skip_4x16 aom_highbd_sad_skip_4x16_sse2
-
-void aom_highbd_sad_skip_4x16x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-void aom_highbd_sad_skip_4x16x4d_sse2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* const ref_ptr[],
-                                      int ref_stride,
-                                      uint32_t* sad_array);
-#define aom_highbd_sad_skip_4x16x4d aom_highbd_sad_skip_4x16x4d_sse2
-
-unsigned int aom_highbd_sad_skip_4x4_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride);
-#define aom_highbd_sad_skip_4x4 aom_highbd_sad_skip_4x4_c
-
-void aom_highbd_sad_skip_4x4x4d_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* const ref_ptr[],
-                                  int ref_stride,
-                                  uint32_t* sad_array);
-#define aom_highbd_sad_skip_4x4x4d aom_highbd_sad_skip_4x4x4d_c
-
-unsigned int aom_highbd_sad_skip_4x8_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride);
-unsigned int aom_highbd_sad_skip_4x8_sse2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride);
-#define aom_highbd_sad_skip_4x8 aom_highbd_sad_skip_4x8_sse2
-
-void aom_highbd_sad_skip_4x8x4d_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* const ref_ptr[],
-                                  int ref_stride,
-                                  uint32_t* sad_array);
-void aom_highbd_sad_skip_4x8x4d_sse2(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* const ref_ptr[],
-                                     int ref_stride,
-                                     uint32_t* sad_array);
-#define aom_highbd_sad_skip_4x8x4d aom_highbd_sad_skip_4x8x4d_sse2
-
-unsigned int aom_highbd_sad_skip_64x128_c(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride);
-unsigned int aom_highbd_sad_skip_64x128_avx2(const uint8_t* src_ptr,
-                                             int src_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad_skip_64x128)(const uint8_t* src_ptr,
-                                                       int src_stride,
-                                                       const uint8_t* ref_ptr,
-                                                       int ref_stride);
-
-void aom_highbd_sad_skip_64x128x4d_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* const ref_ptr[],
-                                     int ref_stride,
-                                     uint32_t* sad_array);
-void aom_highbd_sad_skip_64x128x4d_avx2(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* const ref_ptr[],
-                                        int ref_stride,
-                                        uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad_skip_64x128x4d)(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* const ref_ptr[],
-    int ref_stride,
-    uint32_t* sad_array);
-
-unsigned int aom_highbd_sad_skip_64x16_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-unsigned int aom_highbd_sad_skip_64x16_sse2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-unsigned int aom_highbd_sad_skip_64x16_avx2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad_skip_64x16)(const uint8_t* src_ptr,
-                                                      int src_stride,
-                                                      const uint8_t* ref_ptr,
-                                                      int ref_stride);
-
-void aom_highbd_sad_skip_64x16x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-void aom_highbd_sad_skip_64x16x4d_sse2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-void aom_highbd_sad_skip_64x16x4d_avx2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad_skip_64x16x4d)(const uint8_t* src_ptr,
-                                                 int src_stride,
-                                                 const uint8_t* const ref_ptr[],
-                                                 int ref_stride,
-                                                 uint32_t* sad_array);
-
-unsigned int aom_highbd_sad_skip_64x32_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-unsigned int aom_highbd_sad_skip_64x32_sse2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-unsigned int aom_highbd_sad_skip_64x32_avx2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad_skip_64x32)(const uint8_t* src_ptr,
-                                                      int src_stride,
-                                                      const uint8_t* ref_ptr,
-                                                      int ref_stride);
-
-void aom_highbd_sad_skip_64x32x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-void aom_highbd_sad_skip_64x32x4d_sse2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-void aom_highbd_sad_skip_64x32x4d_avx2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad_skip_64x32x4d)(const uint8_t* src_ptr,
-                                                 int src_stride,
-                                                 const uint8_t* const ref_ptr[],
-                                                 int ref_stride,
-                                                 uint32_t* sad_array);
-
-unsigned int aom_highbd_sad_skip_64x64_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-unsigned int aom_highbd_sad_skip_64x64_sse2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-unsigned int aom_highbd_sad_skip_64x64_avx2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad_skip_64x64)(const uint8_t* src_ptr,
-                                                      int src_stride,
-                                                      const uint8_t* ref_ptr,
-                                                      int ref_stride);
-
-void aom_highbd_sad_skip_64x64x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-void aom_highbd_sad_skip_64x64x4d_sse2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-void aom_highbd_sad_skip_64x64x4d_avx2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad_skip_64x64x4d)(const uint8_t* src_ptr,
-                                                 int src_stride,
-                                                 const uint8_t* const ref_ptr[],
-                                                 int ref_stride,
-                                                 uint32_t* sad_array);
-
-unsigned int aom_highbd_sad_skip_8x16_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-unsigned int aom_highbd_sad_skip_8x16_sse2(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride);
-#define aom_highbd_sad_skip_8x16 aom_highbd_sad_skip_8x16_sse2
-
-void aom_highbd_sad_skip_8x16x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-void aom_highbd_sad_skip_8x16x4d_sse2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* const ref_ptr[],
-                                      int ref_stride,
-                                      uint32_t* sad_array);
-#define aom_highbd_sad_skip_8x16x4d aom_highbd_sad_skip_8x16x4d_sse2
-
-unsigned int aom_highbd_sad_skip_8x32_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-unsigned int aom_highbd_sad_skip_8x32_sse2(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride);
-#define aom_highbd_sad_skip_8x32 aom_highbd_sad_skip_8x32_sse2
-
-void aom_highbd_sad_skip_8x32x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-void aom_highbd_sad_skip_8x32x4d_sse2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* const ref_ptr[],
-                                      int ref_stride,
-                                      uint32_t* sad_array);
-#define aom_highbd_sad_skip_8x32x4d aom_highbd_sad_skip_8x32x4d_sse2
-
-unsigned int aom_highbd_sad_skip_8x4_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride);
-#define aom_highbd_sad_skip_8x4 aom_highbd_sad_skip_8x4_c
-
-void aom_highbd_sad_skip_8x4x4d_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* const ref_ptr[],
-                                  int ref_stride,
-                                  uint32_t* sad_array);
-#define aom_highbd_sad_skip_8x4x4d aom_highbd_sad_skip_8x4x4d_c
-
-unsigned int aom_highbd_sad_skip_8x8_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride);
-unsigned int aom_highbd_sad_skip_8x8_sse2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride);
-#define aom_highbd_sad_skip_8x8 aom_highbd_sad_skip_8x8_sse2
-
-void aom_highbd_sad_skip_8x8x4d_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* const ref_ptr[],
-                                  int ref_stride,
-                                  uint32_t* sad_array);
-void aom_highbd_sad_skip_8x8x4d_sse2(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* const ref_ptr[],
-                                     int ref_stride,
-                                     uint32_t* sad_array);
-#define aom_highbd_sad_skip_8x8x4d aom_highbd_sad_skip_8x8x4d_sse2
-
-void aom_highbd_smooth_h_predictor_16x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_16x16 \
-  aom_highbd_smooth_h_predictor_16x16_c
-
-void aom_highbd_smooth_h_predictor_16x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_16x32 \
-  aom_highbd_smooth_h_predictor_16x32_c
-
-void aom_highbd_smooth_h_predictor_16x4_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_16x4 aom_highbd_smooth_h_predictor_16x4_c
-
-void aom_highbd_smooth_h_predictor_16x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_16x64 \
-  aom_highbd_smooth_h_predictor_16x64_c
-
-void aom_highbd_smooth_h_predictor_16x8_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_16x8 aom_highbd_smooth_h_predictor_16x8_c
-
-void aom_highbd_smooth_h_predictor_2x2_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_h_predictor_2x2 aom_highbd_smooth_h_predictor_2x2_c
-
-void aom_highbd_smooth_h_predictor_32x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_32x16 \
-  aom_highbd_smooth_h_predictor_32x16_c
-
-void aom_highbd_smooth_h_predictor_32x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_32x32 \
-  aom_highbd_smooth_h_predictor_32x32_c
-
-void aom_highbd_smooth_h_predictor_32x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_32x64 \
-  aom_highbd_smooth_h_predictor_32x64_c
-
-void aom_highbd_smooth_h_predictor_32x8_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_32x8 aom_highbd_smooth_h_predictor_32x8_c
-
-void aom_highbd_smooth_h_predictor_4x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_4x16 aom_highbd_smooth_h_predictor_4x16_c
-
-void aom_highbd_smooth_h_predictor_4x4_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_h_predictor_4x4 aom_highbd_smooth_h_predictor_4x4_c
-
-void aom_highbd_smooth_h_predictor_4x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_h_predictor_4x8 aom_highbd_smooth_h_predictor_4x8_c
-
-void aom_highbd_smooth_h_predictor_64x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_64x16 \
-  aom_highbd_smooth_h_predictor_64x16_c
-
-void aom_highbd_smooth_h_predictor_64x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_64x32 \
-  aom_highbd_smooth_h_predictor_64x32_c
-
-void aom_highbd_smooth_h_predictor_64x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_64x64 \
-  aom_highbd_smooth_h_predictor_64x64_c
-
-void aom_highbd_smooth_h_predictor_8x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_8x16 aom_highbd_smooth_h_predictor_8x16_c
-
-void aom_highbd_smooth_h_predictor_8x32_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_8x32 aom_highbd_smooth_h_predictor_8x32_c
-
-void aom_highbd_smooth_h_predictor_8x4_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_h_predictor_8x4 aom_highbd_smooth_h_predictor_8x4_c
-
-void aom_highbd_smooth_h_predictor_8x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_h_predictor_8x8 aom_highbd_smooth_h_predictor_8x8_c
-
-void aom_highbd_smooth_predictor_16x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_16x16 aom_highbd_smooth_predictor_16x16_c
-
-void aom_highbd_smooth_predictor_16x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_16x32 aom_highbd_smooth_predictor_16x32_c
-
-void aom_highbd_smooth_predictor_16x4_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_16x4 aom_highbd_smooth_predictor_16x4_c
-
-void aom_highbd_smooth_predictor_16x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_16x64 aom_highbd_smooth_predictor_16x64_c
-
-void aom_highbd_smooth_predictor_16x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_16x8 aom_highbd_smooth_predictor_16x8_c
-
-void aom_highbd_smooth_predictor_2x2_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_smooth_predictor_2x2 aom_highbd_smooth_predictor_2x2_c
-
-void aom_highbd_smooth_predictor_32x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_32x16 aom_highbd_smooth_predictor_32x16_c
-
-void aom_highbd_smooth_predictor_32x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_32x32 aom_highbd_smooth_predictor_32x32_c
-
-void aom_highbd_smooth_predictor_32x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_32x64 aom_highbd_smooth_predictor_32x64_c
-
-void aom_highbd_smooth_predictor_32x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_32x8 aom_highbd_smooth_predictor_32x8_c
-
-void aom_highbd_smooth_predictor_4x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_4x16 aom_highbd_smooth_predictor_4x16_c
-
-void aom_highbd_smooth_predictor_4x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_smooth_predictor_4x4 aom_highbd_smooth_predictor_4x4_c
-
-void aom_highbd_smooth_predictor_4x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_smooth_predictor_4x8 aom_highbd_smooth_predictor_4x8_c
-
-void aom_highbd_smooth_predictor_64x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_64x16 aom_highbd_smooth_predictor_64x16_c
-
-void aom_highbd_smooth_predictor_64x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_64x32 aom_highbd_smooth_predictor_64x32_c
-
-void aom_highbd_smooth_predictor_64x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_64x64 aom_highbd_smooth_predictor_64x64_c
-
-void aom_highbd_smooth_predictor_8x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_8x16 aom_highbd_smooth_predictor_8x16_c
-
-void aom_highbd_smooth_predictor_8x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_8x32 aom_highbd_smooth_predictor_8x32_c
-
-void aom_highbd_smooth_predictor_8x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_smooth_predictor_8x4 aom_highbd_smooth_predictor_8x4_c
-
-void aom_highbd_smooth_predictor_8x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_smooth_predictor_8x8 aom_highbd_smooth_predictor_8x8_c
-
-void aom_highbd_smooth_v_predictor_16x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_16x16 \
-  aom_highbd_smooth_v_predictor_16x16_c
-
-void aom_highbd_smooth_v_predictor_16x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_16x32 \
-  aom_highbd_smooth_v_predictor_16x32_c
-
-void aom_highbd_smooth_v_predictor_16x4_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_16x4 aom_highbd_smooth_v_predictor_16x4_c
-
-void aom_highbd_smooth_v_predictor_16x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_16x64 \
-  aom_highbd_smooth_v_predictor_16x64_c
-
-void aom_highbd_smooth_v_predictor_16x8_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_16x8 aom_highbd_smooth_v_predictor_16x8_c
-
-void aom_highbd_smooth_v_predictor_2x2_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_v_predictor_2x2 aom_highbd_smooth_v_predictor_2x2_c
-
-void aom_highbd_smooth_v_predictor_32x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_32x16 \
-  aom_highbd_smooth_v_predictor_32x16_c
-
-void aom_highbd_smooth_v_predictor_32x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_32x32 \
-  aom_highbd_smooth_v_predictor_32x32_c
-
-void aom_highbd_smooth_v_predictor_32x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_32x64 \
-  aom_highbd_smooth_v_predictor_32x64_c
-
-void aom_highbd_smooth_v_predictor_32x8_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_32x8 aom_highbd_smooth_v_predictor_32x8_c
-
-void aom_highbd_smooth_v_predictor_4x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_4x16 aom_highbd_smooth_v_predictor_4x16_c
-
-void aom_highbd_smooth_v_predictor_4x4_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_v_predictor_4x4 aom_highbd_smooth_v_predictor_4x4_c
-
-void aom_highbd_smooth_v_predictor_4x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_v_predictor_4x8 aom_highbd_smooth_v_predictor_4x8_c
-
-void aom_highbd_smooth_v_predictor_64x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_64x16 \
-  aom_highbd_smooth_v_predictor_64x16_c
-
-void aom_highbd_smooth_v_predictor_64x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_64x32 \
-  aom_highbd_smooth_v_predictor_64x32_c
-
-void aom_highbd_smooth_v_predictor_64x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_64x64 \
-  aom_highbd_smooth_v_predictor_64x64_c
-
-void aom_highbd_smooth_v_predictor_8x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_8x16 aom_highbd_smooth_v_predictor_8x16_c
-
-void aom_highbd_smooth_v_predictor_8x32_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_8x32 aom_highbd_smooth_v_predictor_8x32_c
-
-void aom_highbd_smooth_v_predictor_8x4_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_v_predictor_8x4 aom_highbd_smooth_v_predictor_8x4_c
-
-void aom_highbd_smooth_v_predictor_8x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_v_predictor_8x8 aom_highbd_smooth_v_predictor_8x8_c
-
-int64_t aom_highbd_sse_c(const uint8_t* a8,
-                         int a_stride,
-                         const uint8_t* b8,
-                         int b_stride,
-                         int width,
-                         int height);
-int64_t aom_highbd_sse_sse4_1(const uint8_t* a8,
-                              int a_stride,
-                              const uint8_t* b8,
-                              int b_stride,
-                              int width,
-                              int height);
-int64_t aom_highbd_sse_avx2(const uint8_t* a8,
-                            int a_stride,
-                            const uint8_t* b8,
-                            int b_stride,
-                            int width,
-                            int height);
-RTCD_EXTERN int64_t (*aom_highbd_sse)(const uint8_t* a8,
-                                      int a_stride,
-                                      const uint8_t* b8,
-                                      int b_stride,
-                                      int width,
-                                      int height);
-
-void aom_highbd_subtract_block_c(int rows,
-                                 int cols,
-                                 int16_t* diff_ptr,
-                                 ptrdiff_t diff_stride,
-                                 const uint8_t* src_ptr,
-                                 ptrdiff_t src_stride,
-                                 const uint8_t* pred_ptr,
-                                 ptrdiff_t pred_stride,
-                                 int bd);
-void aom_highbd_subtract_block_sse2(int rows,
-                                    int cols,
-                                    int16_t* diff_ptr,
-                                    ptrdiff_t diff_stride,
-                                    const uint8_t* src_ptr,
-                                    ptrdiff_t src_stride,
-                                    const uint8_t* pred_ptr,
-                                    ptrdiff_t pred_stride,
-                                    int bd);
-#define aom_highbd_subtract_block aom_highbd_subtract_block_sse2
-
-void aom_highbd_upsampled_pred_c(MACROBLOCKD* xd,
-                                 const struct AV1Common* const cm,
-                                 int mi_row,
-                                 int mi_col,
-                                 const MV* const mv,
-                                 uint8_t* comp_pred8,
-                                 int width,
-                                 int height,
-                                 int subpel_x_q3,
-                                 int subpel_y_q3,
-                                 const uint8_t* ref8,
-                                 int ref_stride,
-                                 int bd,
-                                 int subpel_search);
-void aom_highbd_upsampled_pred_sse2(MACROBLOCKD* xd,
-                                    const struct AV1Common* const cm,
-                                    int mi_row,
-                                    int mi_col,
-                                    const MV* const mv,
-                                    uint8_t* comp_pred8,
-                                    int width,
-                                    int height,
-                                    int subpel_x_q3,
-                                    int subpel_y_q3,
-                                    const uint8_t* ref8,
-                                    int ref_stride,
-                                    int bd,
-                                    int subpel_search);
-#define aom_highbd_upsampled_pred aom_highbd_upsampled_pred_sse2
-
-void aom_highbd_v_predictor_16x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-void aom_highbd_v_predictor_16x16_sse2(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_v_predictor_16x16 aom_highbd_v_predictor_16x16_sse2
-
-void aom_highbd_v_predictor_16x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-void aom_highbd_v_predictor_16x32_sse2(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_v_predictor_16x32 aom_highbd_v_predictor_16x32_sse2
-
-void aom_highbd_v_predictor_16x4_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_16x4 aom_highbd_v_predictor_16x4_c
-
-void aom_highbd_v_predictor_16x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_16x64 aom_highbd_v_predictor_16x64_c
-
-void aom_highbd_v_predictor_16x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-void aom_highbd_v_predictor_16x8_sse2(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_v_predictor_16x8 aom_highbd_v_predictor_16x8_sse2
-
-void aom_highbd_v_predictor_2x2_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_v_predictor_2x2 aom_highbd_v_predictor_2x2_c
-
-void aom_highbd_v_predictor_32x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-void aom_highbd_v_predictor_32x16_sse2(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_v_predictor_32x16 aom_highbd_v_predictor_32x16_sse2
-
-void aom_highbd_v_predictor_32x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-void aom_highbd_v_predictor_32x32_sse2(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_v_predictor_32x32 aom_highbd_v_predictor_32x32_sse2
-
-void aom_highbd_v_predictor_32x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_32x64 aom_highbd_v_predictor_32x64_c
-
-void aom_highbd_v_predictor_32x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_32x8 aom_highbd_v_predictor_32x8_c
-
-void aom_highbd_v_predictor_4x16_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_4x16 aom_highbd_v_predictor_4x16_c
-
-void aom_highbd_v_predictor_4x4_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-void aom_highbd_v_predictor_4x4_sse2(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_v_predictor_4x4 aom_highbd_v_predictor_4x4_sse2
-
-void aom_highbd_v_predictor_4x8_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-void aom_highbd_v_predictor_4x8_sse2(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_v_predictor_4x8 aom_highbd_v_predictor_4x8_sse2
-
-void aom_highbd_v_predictor_64x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_64x16 aom_highbd_v_predictor_64x16_c
-
-void aom_highbd_v_predictor_64x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_64x32 aom_highbd_v_predictor_64x32_c
-
-void aom_highbd_v_predictor_64x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_64x64 aom_highbd_v_predictor_64x64_c
-
-void aom_highbd_v_predictor_8x16_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-void aom_highbd_v_predictor_8x16_sse2(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_v_predictor_8x16 aom_highbd_v_predictor_8x16_sse2
-
-void aom_highbd_v_predictor_8x32_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_8x32 aom_highbd_v_predictor_8x32_c
-
-void aom_highbd_v_predictor_8x4_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-void aom_highbd_v_predictor_8x4_sse2(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_v_predictor_8x4 aom_highbd_v_predictor_8x4_sse2
-
-void aom_highbd_v_predictor_8x8_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-void aom_highbd_v_predictor_8x8_sse2(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_v_predictor_8x8 aom_highbd_v_predictor_8x8_sse2
-
 void aom_ifft16x16_float_c(const float* input, float* temp, float* output);
 void aom_ifft16x16_float_sse2(const float* input, float* temp, float* output);
 void aom_ifft16x16_float_avx2(const float* input, float* temp, float* output);
@@ -20005,1363 +5463,6 @@
                                           int w,
                                           int h);
 
-uint64_t aom_mse_wxh_16bit_highbd_c(uint16_t* dst,
-                                    int dstride,
-                                    uint16_t* src,
-                                    int sstride,
-                                    int w,
-                                    int h);
-uint64_t aom_mse_wxh_16bit_highbd_sse2(uint16_t* dst,
-                                       int dstride,
-                                       uint16_t* src,
-                                       int sstride,
-                                       int w,
-                                       int h);
-uint64_t aom_mse_wxh_16bit_highbd_avx2(uint16_t* dst,
-                                       int dstride,
-                                       uint16_t* src,
-                                       int sstride,
-                                       int w,
-                                       int h);
-RTCD_EXTERN uint64_t (*aom_mse_wxh_16bit_highbd)(uint16_t* dst,
-                                                 int dstride,
-                                                 uint16_t* src,
-                                                 int sstride,
-                                                 int w,
-                                                 int h);
-
-unsigned int aom_obmc_sad128x128_c(const uint8_t* pre,
-                                   int pre_stride,
-                                   const int32_t* wsrc,
-                                   const int32_t* mask);
-unsigned int aom_obmc_sad128x128_sse4_1(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-unsigned int aom_obmc_sad128x128_avx2(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad128x128)(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask);
-
-unsigned int aom_obmc_sad128x64_c(const uint8_t* pre,
-                                  int pre_stride,
-                                  const int32_t* wsrc,
-                                  const int32_t* mask);
-unsigned int aom_obmc_sad128x64_sse4_1(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-unsigned int aom_obmc_sad128x64_avx2(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad128x64)(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask);
-
-unsigned int aom_obmc_sad16x16_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-unsigned int aom_obmc_sad16x16_sse4_1(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-unsigned int aom_obmc_sad16x16_avx2(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad16x16)(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask);
-
-unsigned int aom_obmc_sad16x32_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-unsigned int aom_obmc_sad16x32_sse4_1(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-unsigned int aom_obmc_sad16x32_avx2(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad16x32)(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask);
-
-unsigned int aom_obmc_sad16x4_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-unsigned int aom_obmc_sad16x4_sse4_1(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask);
-unsigned int aom_obmc_sad16x4_avx2(const uint8_t* pre,
-                                   int pre_stride,
-                                   const int32_t* wsrc,
-                                   const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad16x4)(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-
-unsigned int aom_obmc_sad16x64_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-unsigned int aom_obmc_sad16x64_sse4_1(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-unsigned int aom_obmc_sad16x64_avx2(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad16x64)(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask);
-
-unsigned int aom_obmc_sad16x8_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-unsigned int aom_obmc_sad16x8_sse4_1(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask);
-unsigned int aom_obmc_sad16x8_avx2(const uint8_t* pre,
-                                   int pre_stride,
-                                   const int32_t* wsrc,
-                                   const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad16x8)(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-
-unsigned int aom_obmc_sad32x16_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-unsigned int aom_obmc_sad32x16_sse4_1(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-unsigned int aom_obmc_sad32x16_avx2(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad32x16)(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask);
-
-unsigned int aom_obmc_sad32x32_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-unsigned int aom_obmc_sad32x32_sse4_1(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-unsigned int aom_obmc_sad32x32_avx2(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad32x32)(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask);
-
-unsigned int aom_obmc_sad32x64_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-unsigned int aom_obmc_sad32x64_sse4_1(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-unsigned int aom_obmc_sad32x64_avx2(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad32x64)(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask);
-
-unsigned int aom_obmc_sad32x8_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-unsigned int aom_obmc_sad32x8_sse4_1(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask);
-unsigned int aom_obmc_sad32x8_avx2(const uint8_t* pre,
-                                   int pre_stride,
-                                   const int32_t* wsrc,
-                                   const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad32x8)(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-
-unsigned int aom_obmc_sad4x16_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-unsigned int aom_obmc_sad4x16_sse4_1(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask);
-unsigned int aom_obmc_sad4x16_avx2(const uint8_t* pre,
-                                   int pre_stride,
-                                   const int32_t* wsrc,
-                                   const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad4x16)(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-
-unsigned int aom_obmc_sad4x4_c(const uint8_t* pre,
-                               int pre_stride,
-                               const int32_t* wsrc,
-                               const int32_t* mask);
-unsigned int aom_obmc_sad4x4_sse4_1(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask);
-unsigned int aom_obmc_sad4x4_avx2(const uint8_t* pre,
-                                  int pre_stride,
-                                  const int32_t* wsrc,
-                                  const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad4x4)(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask);
-
-unsigned int aom_obmc_sad4x8_c(const uint8_t* pre,
-                               int pre_stride,
-                               const int32_t* wsrc,
-                               const int32_t* mask);
-unsigned int aom_obmc_sad4x8_sse4_1(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask);
-unsigned int aom_obmc_sad4x8_avx2(const uint8_t* pre,
-                                  int pre_stride,
-                                  const int32_t* wsrc,
-                                  const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad4x8)(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask);
-
-unsigned int aom_obmc_sad64x128_c(const uint8_t* pre,
-                                  int pre_stride,
-                                  const int32_t* wsrc,
-                                  const int32_t* mask);
-unsigned int aom_obmc_sad64x128_sse4_1(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-unsigned int aom_obmc_sad64x128_avx2(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad64x128)(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask);
-
-unsigned int aom_obmc_sad64x16_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-unsigned int aom_obmc_sad64x16_sse4_1(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-unsigned int aom_obmc_sad64x16_avx2(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad64x16)(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask);
-
-unsigned int aom_obmc_sad64x32_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-unsigned int aom_obmc_sad64x32_sse4_1(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-unsigned int aom_obmc_sad64x32_avx2(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad64x32)(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask);
-
-unsigned int aom_obmc_sad64x64_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-unsigned int aom_obmc_sad64x64_sse4_1(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-unsigned int aom_obmc_sad64x64_avx2(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad64x64)(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask);
-
-unsigned int aom_obmc_sad8x16_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-unsigned int aom_obmc_sad8x16_sse4_1(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask);
-unsigned int aom_obmc_sad8x16_avx2(const uint8_t* pre,
-                                   int pre_stride,
-                                   const int32_t* wsrc,
-                                   const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad8x16)(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-
-unsigned int aom_obmc_sad8x32_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-unsigned int aom_obmc_sad8x32_sse4_1(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask);
-unsigned int aom_obmc_sad8x32_avx2(const uint8_t* pre,
-                                   int pre_stride,
-                                   const int32_t* wsrc,
-                                   const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad8x32)(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-
-unsigned int aom_obmc_sad8x4_c(const uint8_t* pre,
-                               int pre_stride,
-                               const int32_t* wsrc,
-                               const int32_t* mask);
-unsigned int aom_obmc_sad8x4_sse4_1(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask);
-unsigned int aom_obmc_sad8x4_avx2(const uint8_t* pre,
-                                  int pre_stride,
-                                  const int32_t* wsrc,
-                                  const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad8x4)(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask);
-
-unsigned int aom_obmc_sad8x8_c(const uint8_t* pre,
-                               int pre_stride,
-                               const int32_t* wsrc,
-                               const int32_t* mask);
-unsigned int aom_obmc_sad8x8_sse4_1(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask);
-unsigned int aom_obmc_sad8x8_avx2(const uint8_t* pre,
-                                  int pre_stride,
-                                  const int32_t* wsrc,
-                                  const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad8x8)(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask);
-
-unsigned int aom_obmc_sub_pixel_variance128x128_c(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance128x128_sse4_1(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance128x128)(
-    const uint8_t* pre,
-    int pre_stride,
-    int xoffset,
-    int yoffset,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance128x64_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance128x64_sse4_1(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance128x64)(
-    const uint8_t* pre,
-    int pre_stride,
-    int xoffset,
-    int yoffset,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance16x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance16x16_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance16x16)(
-    const uint8_t* pre,
-    int pre_stride,
-    int xoffset,
-    int yoffset,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance16x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance16x32_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance16x32)(
-    const uint8_t* pre,
-    int pre_stride,
-    int xoffset,
-    int yoffset,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance16x4_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance16x4_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance16x4)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            int xoffset,
-                                                            int yoffset,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance16x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance16x64_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance16x64)(
-    const uint8_t* pre,
-    int pre_stride,
-    int xoffset,
-    int yoffset,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance16x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance16x8_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance16x8)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            int xoffset,
-                                                            int yoffset,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance32x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance32x16_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance32x16)(
-    const uint8_t* pre,
-    int pre_stride,
-    int xoffset,
-    int yoffset,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance32x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance32x32_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance32x32)(
-    const uint8_t* pre,
-    int pre_stride,
-    int xoffset,
-    int yoffset,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance32x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance32x64_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance32x64)(
-    const uint8_t* pre,
-    int pre_stride,
-    int xoffset,
-    int yoffset,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance32x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance32x8_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance32x8)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            int xoffset,
-                                                            int yoffset,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance4x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance4x16_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance4x16)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            int xoffset,
-                                                            int yoffset,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance4x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance4x4_sse4_1(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance4x4)(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance4x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance4x8_sse4_1(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance4x8)(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance64x128_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance64x128_sse4_1(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance64x128)(
-    const uint8_t* pre,
-    int pre_stride,
-    int xoffset,
-    int yoffset,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance64x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance64x16_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance64x16)(
-    const uint8_t* pre,
-    int pre_stride,
-    int xoffset,
-    int yoffset,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance64x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance64x32_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance64x32)(
-    const uint8_t* pre,
-    int pre_stride,
-    int xoffset,
-    int yoffset,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance64x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance64x64_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance64x64)(
-    const uint8_t* pre,
-    int pre_stride,
-    int xoffset,
-    int yoffset,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance8x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance8x16_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance8x16)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            int xoffset,
-                                                            int yoffset,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance8x32_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance8x32_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance8x32)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            int xoffset,
-                                                            int yoffset,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance8x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance8x4_sse4_1(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance8x4)(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance8x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance8x8_sse4_1(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance8x8)(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-
-unsigned int aom_obmc_variance128x128_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask,
-                                        unsigned int* sse);
-unsigned int aom_obmc_variance128x128_sse4_1(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-unsigned int aom_obmc_variance128x128_avx2(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance128x128)(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-
-unsigned int aom_obmc_variance128x64_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask,
-                                       unsigned int* sse);
-unsigned int aom_obmc_variance128x64_sse4_1(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-unsigned int aom_obmc_variance128x64_avx2(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask,
-                                          unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance128x64)(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-
-unsigned int aom_obmc_variance16x16_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-unsigned int aom_obmc_variance16x16_sse4_1(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-unsigned int aom_obmc_variance16x16_avx2(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask,
-                                         unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance16x16)(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-
-unsigned int aom_obmc_variance16x32_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-unsigned int aom_obmc_variance16x32_sse4_1(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-unsigned int aom_obmc_variance16x32_avx2(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask,
-                                         unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance16x32)(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-
-unsigned int aom_obmc_variance16x4_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-unsigned int aom_obmc_variance16x4_sse4_1(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask,
-                                          unsigned int* sse);
-unsigned int aom_obmc_variance16x4_avx2(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask,
-                                        unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance16x4)(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-
-unsigned int aom_obmc_variance16x64_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-unsigned int aom_obmc_variance16x64_sse4_1(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-unsigned int aom_obmc_variance16x64_avx2(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask,
-                                         unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance16x64)(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-
-unsigned int aom_obmc_variance16x8_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-unsigned int aom_obmc_variance16x8_sse4_1(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask,
-                                          unsigned int* sse);
-unsigned int aom_obmc_variance16x8_avx2(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask,
-                                        unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance16x8)(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-
-unsigned int aom_obmc_variance32x16_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-unsigned int aom_obmc_variance32x16_sse4_1(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-unsigned int aom_obmc_variance32x16_avx2(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask,
-                                         unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance32x16)(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-
-unsigned int aom_obmc_variance32x32_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-unsigned int aom_obmc_variance32x32_sse4_1(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-unsigned int aom_obmc_variance32x32_avx2(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask,
-                                         unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance32x32)(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-
-unsigned int aom_obmc_variance32x64_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-unsigned int aom_obmc_variance32x64_sse4_1(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-unsigned int aom_obmc_variance32x64_avx2(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask,
-                                         unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance32x64)(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-
-unsigned int aom_obmc_variance32x8_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-unsigned int aom_obmc_variance32x8_sse4_1(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask,
-                                          unsigned int* sse);
-unsigned int aom_obmc_variance32x8_avx2(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask,
-                                        unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance32x8)(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-
-unsigned int aom_obmc_variance4x16_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-unsigned int aom_obmc_variance4x16_sse4_1(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask,
-                                          unsigned int* sse);
-unsigned int aom_obmc_variance4x16_avx2(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask,
-                                        unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance4x16)(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-
-unsigned int aom_obmc_variance4x4_c(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask,
-                                    unsigned int* sse);
-unsigned int aom_obmc_variance4x4_sse4_1(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask,
-                                         unsigned int* sse);
-unsigned int aom_obmc_variance4x4_avx2(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask,
-                                       unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance4x4)(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-
-unsigned int aom_obmc_variance4x8_c(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask,
-                                    unsigned int* sse);
-unsigned int aom_obmc_variance4x8_sse4_1(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask,
-                                         unsigned int* sse);
-unsigned int aom_obmc_variance4x8_avx2(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask,
-                                       unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance4x8)(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-
-unsigned int aom_obmc_variance64x128_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask,
-                                       unsigned int* sse);
-unsigned int aom_obmc_variance64x128_sse4_1(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-unsigned int aom_obmc_variance64x128_avx2(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask,
-                                          unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance64x128)(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-
-unsigned int aom_obmc_variance64x16_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-unsigned int aom_obmc_variance64x16_sse4_1(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-unsigned int aom_obmc_variance64x16_avx2(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask,
-                                         unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance64x16)(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-
-unsigned int aom_obmc_variance64x32_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-unsigned int aom_obmc_variance64x32_sse4_1(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-unsigned int aom_obmc_variance64x32_avx2(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask,
-                                         unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance64x32)(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-
-unsigned int aom_obmc_variance64x64_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-unsigned int aom_obmc_variance64x64_sse4_1(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-unsigned int aom_obmc_variance64x64_avx2(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask,
-                                         unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance64x64)(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-
-unsigned int aom_obmc_variance8x16_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-unsigned int aom_obmc_variance8x16_sse4_1(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask,
-                                          unsigned int* sse);
-unsigned int aom_obmc_variance8x16_avx2(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask,
-                                        unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance8x16)(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-
-unsigned int aom_obmc_variance8x32_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-unsigned int aom_obmc_variance8x32_sse4_1(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask,
-                                          unsigned int* sse);
-unsigned int aom_obmc_variance8x32_avx2(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask,
-                                        unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance8x32)(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-
-unsigned int aom_obmc_variance8x4_c(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask,
-                                    unsigned int* sse);
-unsigned int aom_obmc_variance8x4_sse4_1(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask,
-                                         unsigned int* sse);
-unsigned int aom_obmc_variance8x4_avx2(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask,
-                                       unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance8x4)(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-
-unsigned int aom_obmc_variance8x8_c(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask,
-                                    unsigned int* sse);
-unsigned int aom_obmc_variance8x8_sse4_1(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask,
-                                         unsigned int* sse);
-unsigned int aom_obmc_variance8x8_avx2(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask,
-                                       unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance8x8)(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-
 void aom_paeth_predictor_16x16_c(uint8_t* dst,
                                  ptrdiff_t y_stride,
                                  const uint8_t* above,
@@ -27316,1188 +11417,6 @@
   aom_hadamard_lp_16x16 = aom_hadamard_lp_16x16_c;
   if (flags & HAS_AVX2)
     aom_hadamard_lp_16x16 = aom_hadamard_lp_16x16_avx2;
-  aom_highbd_10_masked_sub_pixel_variance128x128 =
-      aom_highbd_10_masked_sub_pixel_variance128x128_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance128x128 =
-        aom_highbd_10_masked_sub_pixel_variance128x128_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance128x64 =
-      aom_highbd_10_masked_sub_pixel_variance128x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance128x64 =
-        aom_highbd_10_masked_sub_pixel_variance128x64_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance16x16 =
-      aom_highbd_10_masked_sub_pixel_variance16x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance16x16 =
-        aom_highbd_10_masked_sub_pixel_variance16x16_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance16x32 =
-      aom_highbd_10_masked_sub_pixel_variance16x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance16x32 =
-        aom_highbd_10_masked_sub_pixel_variance16x32_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance16x4 =
-      aom_highbd_10_masked_sub_pixel_variance16x4_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance16x4 =
-        aom_highbd_10_masked_sub_pixel_variance16x4_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance16x64 =
-      aom_highbd_10_masked_sub_pixel_variance16x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance16x64 =
-        aom_highbd_10_masked_sub_pixel_variance16x64_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance16x8 =
-      aom_highbd_10_masked_sub_pixel_variance16x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance16x8 =
-        aom_highbd_10_masked_sub_pixel_variance16x8_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance32x16 =
-      aom_highbd_10_masked_sub_pixel_variance32x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance32x16 =
-        aom_highbd_10_masked_sub_pixel_variance32x16_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance32x32 =
-      aom_highbd_10_masked_sub_pixel_variance32x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance32x32 =
-        aom_highbd_10_masked_sub_pixel_variance32x32_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance32x64 =
-      aom_highbd_10_masked_sub_pixel_variance32x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance32x64 =
-        aom_highbd_10_masked_sub_pixel_variance32x64_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance32x8 =
-      aom_highbd_10_masked_sub_pixel_variance32x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance32x8 =
-        aom_highbd_10_masked_sub_pixel_variance32x8_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance4x16 =
-      aom_highbd_10_masked_sub_pixel_variance4x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance4x16 =
-        aom_highbd_10_masked_sub_pixel_variance4x16_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance4x4 =
-      aom_highbd_10_masked_sub_pixel_variance4x4_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance4x4 =
-        aom_highbd_10_masked_sub_pixel_variance4x4_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance4x8 =
-      aom_highbd_10_masked_sub_pixel_variance4x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance4x8 =
-        aom_highbd_10_masked_sub_pixel_variance4x8_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance64x128 =
-      aom_highbd_10_masked_sub_pixel_variance64x128_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance64x128 =
-        aom_highbd_10_masked_sub_pixel_variance64x128_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance64x16 =
-      aom_highbd_10_masked_sub_pixel_variance64x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance64x16 =
-        aom_highbd_10_masked_sub_pixel_variance64x16_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance64x32 =
-      aom_highbd_10_masked_sub_pixel_variance64x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance64x32 =
-        aom_highbd_10_masked_sub_pixel_variance64x32_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance64x64 =
-      aom_highbd_10_masked_sub_pixel_variance64x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance64x64 =
-        aom_highbd_10_masked_sub_pixel_variance64x64_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance8x16 =
-      aom_highbd_10_masked_sub_pixel_variance8x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance8x16 =
-        aom_highbd_10_masked_sub_pixel_variance8x16_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance8x32 =
-      aom_highbd_10_masked_sub_pixel_variance8x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance8x32 =
-        aom_highbd_10_masked_sub_pixel_variance8x32_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance8x4 =
-      aom_highbd_10_masked_sub_pixel_variance8x4_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance8x4 =
-        aom_highbd_10_masked_sub_pixel_variance8x4_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance8x8 =
-      aom_highbd_10_masked_sub_pixel_variance8x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance8x8 =
-        aom_highbd_10_masked_sub_pixel_variance8x8_ssse3;
-  aom_highbd_10_obmc_variance128x128 = aom_highbd_10_obmc_variance128x128_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance128x128 =
-        aom_highbd_10_obmc_variance128x128_sse4_1;
-  aom_highbd_10_obmc_variance128x64 = aom_highbd_10_obmc_variance128x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance128x64 =
-        aom_highbd_10_obmc_variance128x64_sse4_1;
-  aom_highbd_10_obmc_variance16x16 = aom_highbd_10_obmc_variance16x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance16x16 = aom_highbd_10_obmc_variance16x16_sse4_1;
-  aom_highbd_10_obmc_variance16x32 = aom_highbd_10_obmc_variance16x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance16x32 = aom_highbd_10_obmc_variance16x32_sse4_1;
-  aom_highbd_10_obmc_variance16x4 = aom_highbd_10_obmc_variance16x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance16x4 = aom_highbd_10_obmc_variance16x4_sse4_1;
-  aom_highbd_10_obmc_variance16x64 = aom_highbd_10_obmc_variance16x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance16x64 = aom_highbd_10_obmc_variance16x64_sse4_1;
-  aom_highbd_10_obmc_variance16x8 = aom_highbd_10_obmc_variance16x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance16x8 = aom_highbd_10_obmc_variance16x8_sse4_1;
-  aom_highbd_10_obmc_variance32x16 = aom_highbd_10_obmc_variance32x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance32x16 = aom_highbd_10_obmc_variance32x16_sse4_1;
-  aom_highbd_10_obmc_variance32x32 = aom_highbd_10_obmc_variance32x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance32x32 = aom_highbd_10_obmc_variance32x32_sse4_1;
-  aom_highbd_10_obmc_variance32x64 = aom_highbd_10_obmc_variance32x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance32x64 = aom_highbd_10_obmc_variance32x64_sse4_1;
-  aom_highbd_10_obmc_variance32x8 = aom_highbd_10_obmc_variance32x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance32x8 = aom_highbd_10_obmc_variance32x8_sse4_1;
-  aom_highbd_10_obmc_variance4x16 = aom_highbd_10_obmc_variance4x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance4x16 = aom_highbd_10_obmc_variance4x16_sse4_1;
-  aom_highbd_10_obmc_variance4x4 = aom_highbd_10_obmc_variance4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance4x4 = aom_highbd_10_obmc_variance4x4_sse4_1;
-  aom_highbd_10_obmc_variance4x8 = aom_highbd_10_obmc_variance4x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance4x8 = aom_highbd_10_obmc_variance4x8_sse4_1;
-  aom_highbd_10_obmc_variance64x128 = aom_highbd_10_obmc_variance64x128_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance64x128 =
-        aom_highbd_10_obmc_variance64x128_sse4_1;
-  aom_highbd_10_obmc_variance64x16 = aom_highbd_10_obmc_variance64x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance64x16 = aom_highbd_10_obmc_variance64x16_sse4_1;
-  aom_highbd_10_obmc_variance64x32 = aom_highbd_10_obmc_variance64x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance64x32 = aom_highbd_10_obmc_variance64x32_sse4_1;
-  aom_highbd_10_obmc_variance64x64 = aom_highbd_10_obmc_variance64x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance64x64 = aom_highbd_10_obmc_variance64x64_sse4_1;
-  aom_highbd_10_obmc_variance8x16 = aom_highbd_10_obmc_variance8x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance8x16 = aom_highbd_10_obmc_variance8x16_sse4_1;
-  aom_highbd_10_obmc_variance8x32 = aom_highbd_10_obmc_variance8x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance8x32 = aom_highbd_10_obmc_variance8x32_sse4_1;
-  aom_highbd_10_obmc_variance8x4 = aom_highbd_10_obmc_variance8x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance8x4 = aom_highbd_10_obmc_variance8x4_sse4_1;
-  aom_highbd_10_obmc_variance8x8 = aom_highbd_10_obmc_variance8x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance8x8 = aom_highbd_10_obmc_variance8x8_sse4_1;
-  aom_highbd_10_sub_pixel_avg_variance4x4 =
-      aom_highbd_10_sub_pixel_avg_variance4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_sub_pixel_avg_variance4x4 =
-        aom_highbd_10_sub_pixel_avg_variance4x4_sse4_1;
-  aom_highbd_10_sub_pixel_variance128x128 =
-      aom_highbd_10_sub_pixel_variance128x128_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_sub_pixel_variance128x128 =
-        aom_highbd_10_sub_pixel_variance128x128_avx2;
-  aom_highbd_10_sub_pixel_variance128x64 =
-      aom_highbd_10_sub_pixel_variance128x64_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_sub_pixel_variance128x64 =
-        aom_highbd_10_sub_pixel_variance128x64_avx2;
-  aom_highbd_10_sub_pixel_variance16x16 =
-      aom_highbd_10_sub_pixel_variance16x16_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_sub_pixel_variance16x16 =
-        aom_highbd_10_sub_pixel_variance16x16_avx2;
-  aom_highbd_10_sub_pixel_variance16x32 =
-      aom_highbd_10_sub_pixel_variance16x32_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_sub_pixel_variance16x32 =
-        aom_highbd_10_sub_pixel_variance16x32_avx2;
-  aom_highbd_10_sub_pixel_variance16x8 =
-      aom_highbd_10_sub_pixel_variance16x8_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_sub_pixel_variance16x8 =
-        aom_highbd_10_sub_pixel_variance16x8_avx2;
-  aom_highbd_10_sub_pixel_variance32x16 =
-      aom_highbd_10_sub_pixel_variance32x16_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_sub_pixel_variance32x16 =
-        aom_highbd_10_sub_pixel_variance32x16_avx2;
-  aom_highbd_10_sub_pixel_variance32x32 =
-      aom_highbd_10_sub_pixel_variance32x32_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_sub_pixel_variance32x32 =
-        aom_highbd_10_sub_pixel_variance32x32_avx2;
-  aom_highbd_10_sub_pixel_variance32x64 =
-      aom_highbd_10_sub_pixel_variance32x64_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_sub_pixel_variance32x64 =
-        aom_highbd_10_sub_pixel_variance32x64_avx2;
-  aom_highbd_10_sub_pixel_variance4x4 = aom_highbd_10_sub_pixel_variance4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_sub_pixel_variance4x4 =
-        aom_highbd_10_sub_pixel_variance4x4_sse4_1;
-  aom_highbd_10_sub_pixel_variance64x128 =
-      aom_highbd_10_sub_pixel_variance64x128_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_sub_pixel_variance64x128 =
-        aom_highbd_10_sub_pixel_variance64x128_avx2;
-  aom_highbd_10_sub_pixel_variance64x32 =
-      aom_highbd_10_sub_pixel_variance64x32_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_sub_pixel_variance64x32 =
-        aom_highbd_10_sub_pixel_variance64x32_avx2;
-  aom_highbd_10_sub_pixel_variance64x64 =
-      aom_highbd_10_sub_pixel_variance64x64_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_sub_pixel_variance64x64 =
-        aom_highbd_10_sub_pixel_variance64x64_avx2;
-  aom_highbd_10_sub_pixel_variance8x16 =
-      aom_highbd_10_sub_pixel_variance8x16_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_sub_pixel_variance8x16 =
-        aom_highbd_10_sub_pixel_variance8x16_avx2;
-  aom_highbd_10_sub_pixel_variance8x8 =
-      aom_highbd_10_sub_pixel_variance8x8_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_sub_pixel_variance8x8 =
-        aom_highbd_10_sub_pixel_variance8x8_avx2;
-  aom_highbd_10_variance128x128 = aom_highbd_10_variance128x128_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_variance128x128 = aom_highbd_10_variance128x128_avx2;
-  aom_highbd_10_variance128x64 = aom_highbd_10_variance128x64_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_variance128x64 = aom_highbd_10_variance128x64_avx2;
-  aom_highbd_10_variance16x16 = aom_highbd_10_variance16x16_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_variance16x16 = aom_highbd_10_variance16x16_avx2;
-  aom_highbd_10_variance16x32 = aom_highbd_10_variance16x32_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_variance16x32 = aom_highbd_10_variance16x32_avx2;
-  aom_highbd_10_variance16x8 = aom_highbd_10_variance16x8_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_variance16x8 = aom_highbd_10_variance16x8_avx2;
-  aom_highbd_10_variance32x16 = aom_highbd_10_variance32x16_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_variance32x16 = aom_highbd_10_variance32x16_avx2;
-  aom_highbd_10_variance32x32 = aom_highbd_10_variance32x32_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_variance32x32 = aom_highbd_10_variance32x32_avx2;
-  aom_highbd_10_variance32x64 = aom_highbd_10_variance32x64_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_variance32x64 = aom_highbd_10_variance32x64_avx2;
-  aom_highbd_10_variance4x4 = aom_highbd_10_variance4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_variance4x4 = aom_highbd_10_variance4x4_sse4_1;
-  aom_highbd_10_variance64x128 = aom_highbd_10_variance64x128_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_variance64x128 = aom_highbd_10_variance64x128_avx2;
-  aom_highbd_10_variance64x32 = aom_highbd_10_variance64x32_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_variance64x32 = aom_highbd_10_variance64x32_avx2;
-  aom_highbd_10_variance64x64 = aom_highbd_10_variance64x64_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_variance64x64 = aom_highbd_10_variance64x64_avx2;
-  aom_highbd_10_variance8x16 = aom_highbd_10_variance8x16_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_variance8x16 = aom_highbd_10_variance8x16_avx2;
-  aom_highbd_10_variance8x8 = aom_highbd_10_variance8x8_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_variance8x8 = aom_highbd_10_variance8x8_avx2;
-  aom_highbd_12_masked_sub_pixel_variance128x128 =
-      aom_highbd_12_masked_sub_pixel_variance128x128_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance128x128 =
-        aom_highbd_12_masked_sub_pixel_variance128x128_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance128x64 =
-      aom_highbd_12_masked_sub_pixel_variance128x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance128x64 =
-        aom_highbd_12_masked_sub_pixel_variance128x64_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance16x16 =
-      aom_highbd_12_masked_sub_pixel_variance16x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance16x16 =
-        aom_highbd_12_masked_sub_pixel_variance16x16_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance16x32 =
-      aom_highbd_12_masked_sub_pixel_variance16x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance16x32 =
-        aom_highbd_12_masked_sub_pixel_variance16x32_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance16x4 =
-      aom_highbd_12_masked_sub_pixel_variance16x4_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance16x4 =
-        aom_highbd_12_masked_sub_pixel_variance16x4_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance16x64 =
-      aom_highbd_12_masked_sub_pixel_variance16x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance16x64 =
-        aom_highbd_12_masked_sub_pixel_variance16x64_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance16x8 =
-      aom_highbd_12_masked_sub_pixel_variance16x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance16x8 =
-        aom_highbd_12_masked_sub_pixel_variance16x8_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance32x16 =
-      aom_highbd_12_masked_sub_pixel_variance32x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance32x16 =
-        aom_highbd_12_masked_sub_pixel_variance32x16_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance32x32 =
-      aom_highbd_12_masked_sub_pixel_variance32x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance32x32 =
-        aom_highbd_12_masked_sub_pixel_variance32x32_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance32x64 =
-      aom_highbd_12_masked_sub_pixel_variance32x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance32x64 =
-        aom_highbd_12_masked_sub_pixel_variance32x64_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance32x8 =
-      aom_highbd_12_masked_sub_pixel_variance32x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance32x8 =
-        aom_highbd_12_masked_sub_pixel_variance32x8_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance4x16 =
-      aom_highbd_12_masked_sub_pixel_variance4x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance4x16 =
-        aom_highbd_12_masked_sub_pixel_variance4x16_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance4x4 =
-      aom_highbd_12_masked_sub_pixel_variance4x4_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance4x4 =
-        aom_highbd_12_masked_sub_pixel_variance4x4_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance4x8 =
-      aom_highbd_12_masked_sub_pixel_variance4x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance4x8 =
-        aom_highbd_12_masked_sub_pixel_variance4x8_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance64x128 =
-      aom_highbd_12_masked_sub_pixel_variance64x128_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance64x128 =
-        aom_highbd_12_masked_sub_pixel_variance64x128_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance64x16 =
-      aom_highbd_12_masked_sub_pixel_variance64x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance64x16 =
-        aom_highbd_12_masked_sub_pixel_variance64x16_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance64x32 =
-      aom_highbd_12_masked_sub_pixel_variance64x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance64x32 =
-        aom_highbd_12_masked_sub_pixel_variance64x32_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance64x64 =
-      aom_highbd_12_masked_sub_pixel_variance64x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance64x64 =
-        aom_highbd_12_masked_sub_pixel_variance64x64_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance8x16 =
-      aom_highbd_12_masked_sub_pixel_variance8x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance8x16 =
-        aom_highbd_12_masked_sub_pixel_variance8x16_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance8x32 =
-      aom_highbd_12_masked_sub_pixel_variance8x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance8x32 =
-        aom_highbd_12_masked_sub_pixel_variance8x32_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance8x4 =
-      aom_highbd_12_masked_sub_pixel_variance8x4_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance8x4 =
-        aom_highbd_12_masked_sub_pixel_variance8x4_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance8x8 =
-      aom_highbd_12_masked_sub_pixel_variance8x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance8x8 =
-        aom_highbd_12_masked_sub_pixel_variance8x8_ssse3;
-  aom_highbd_12_obmc_variance128x128 = aom_highbd_12_obmc_variance128x128_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance128x128 =
-        aom_highbd_12_obmc_variance128x128_sse4_1;
-  aom_highbd_12_obmc_variance128x64 = aom_highbd_12_obmc_variance128x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance128x64 =
-        aom_highbd_12_obmc_variance128x64_sse4_1;
-  aom_highbd_12_obmc_variance16x16 = aom_highbd_12_obmc_variance16x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance16x16 = aom_highbd_12_obmc_variance16x16_sse4_1;
-  aom_highbd_12_obmc_variance16x32 = aom_highbd_12_obmc_variance16x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance16x32 = aom_highbd_12_obmc_variance16x32_sse4_1;
-  aom_highbd_12_obmc_variance16x4 = aom_highbd_12_obmc_variance16x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance16x4 = aom_highbd_12_obmc_variance16x4_sse4_1;
-  aom_highbd_12_obmc_variance16x64 = aom_highbd_12_obmc_variance16x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance16x64 = aom_highbd_12_obmc_variance16x64_sse4_1;
-  aom_highbd_12_obmc_variance16x8 = aom_highbd_12_obmc_variance16x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance16x8 = aom_highbd_12_obmc_variance16x8_sse4_1;
-  aom_highbd_12_obmc_variance32x16 = aom_highbd_12_obmc_variance32x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance32x16 = aom_highbd_12_obmc_variance32x16_sse4_1;
-  aom_highbd_12_obmc_variance32x32 = aom_highbd_12_obmc_variance32x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance32x32 = aom_highbd_12_obmc_variance32x32_sse4_1;
-  aom_highbd_12_obmc_variance32x64 = aom_highbd_12_obmc_variance32x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance32x64 = aom_highbd_12_obmc_variance32x64_sse4_1;
-  aom_highbd_12_obmc_variance32x8 = aom_highbd_12_obmc_variance32x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance32x8 = aom_highbd_12_obmc_variance32x8_sse4_1;
-  aom_highbd_12_obmc_variance4x16 = aom_highbd_12_obmc_variance4x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance4x16 = aom_highbd_12_obmc_variance4x16_sse4_1;
-  aom_highbd_12_obmc_variance4x4 = aom_highbd_12_obmc_variance4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance4x4 = aom_highbd_12_obmc_variance4x4_sse4_1;
-  aom_highbd_12_obmc_variance4x8 = aom_highbd_12_obmc_variance4x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance4x8 = aom_highbd_12_obmc_variance4x8_sse4_1;
-  aom_highbd_12_obmc_variance64x128 = aom_highbd_12_obmc_variance64x128_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance64x128 =
-        aom_highbd_12_obmc_variance64x128_sse4_1;
-  aom_highbd_12_obmc_variance64x16 = aom_highbd_12_obmc_variance64x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance64x16 = aom_highbd_12_obmc_variance64x16_sse4_1;
-  aom_highbd_12_obmc_variance64x32 = aom_highbd_12_obmc_variance64x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance64x32 = aom_highbd_12_obmc_variance64x32_sse4_1;
-  aom_highbd_12_obmc_variance64x64 = aom_highbd_12_obmc_variance64x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance64x64 = aom_highbd_12_obmc_variance64x64_sse4_1;
-  aom_highbd_12_obmc_variance8x16 = aom_highbd_12_obmc_variance8x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance8x16 = aom_highbd_12_obmc_variance8x16_sse4_1;
-  aom_highbd_12_obmc_variance8x32 = aom_highbd_12_obmc_variance8x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance8x32 = aom_highbd_12_obmc_variance8x32_sse4_1;
-  aom_highbd_12_obmc_variance8x4 = aom_highbd_12_obmc_variance8x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance8x4 = aom_highbd_12_obmc_variance8x4_sse4_1;
-  aom_highbd_12_obmc_variance8x8 = aom_highbd_12_obmc_variance8x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance8x8 = aom_highbd_12_obmc_variance8x8_sse4_1;
-  aom_highbd_12_sub_pixel_avg_variance4x4 =
-      aom_highbd_12_sub_pixel_avg_variance4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_sub_pixel_avg_variance4x4 =
-        aom_highbd_12_sub_pixel_avg_variance4x4_sse4_1;
-  aom_highbd_12_sub_pixel_variance4x4 = aom_highbd_12_sub_pixel_variance4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_sub_pixel_variance4x4 =
-        aom_highbd_12_sub_pixel_variance4x4_sse4_1;
-  aom_highbd_12_variance4x4 = aom_highbd_12_variance4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_variance4x4 = aom_highbd_12_variance4x4_sse4_1;
-  aom_highbd_8_masked_sub_pixel_variance128x128 =
-      aom_highbd_8_masked_sub_pixel_variance128x128_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance128x128 =
-        aom_highbd_8_masked_sub_pixel_variance128x128_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance128x64 =
-      aom_highbd_8_masked_sub_pixel_variance128x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance128x64 =
-        aom_highbd_8_masked_sub_pixel_variance128x64_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance16x16 =
-      aom_highbd_8_masked_sub_pixel_variance16x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance16x16 =
-        aom_highbd_8_masked_sub_pixel_variance16x16_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance16x32 =
-      aom_highbd_8_masked_sub_pixel_variance16x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance16x32 =
-        aom_highbd_8_masked_sub_pixel_variance16x32_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance16x4 =
-      aom_highbd_8_masked_sub_pixel_variance16x4_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance16x4 =
-        aom_highbd_8_masked_sub_pixel_variance16x4_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance16x64 =
-      aom_highbd_8_masked_sub_pixel_variance16x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance16x64 =
-        aom_highbd_8_masked_sub_pixel_variance16x64_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance16x8 =
-      aom_highbd_8_masked_sub_pixel_variance16x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance16x8 =
-        aom_highbd_8_masked_sub_pixel_variance16x8_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance32x16 =
-      aom_highbd_8_masked_sub_pixel_variance32x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance32x16 =
-        aom_highbd_8_masked_sub_pixel_variance32x16_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance32x32 =
-      aom_highbd_8_masked_sub_pixel_variance32x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance32x32 =
-        aom_highbd_8_masked_sub_pixel_variance32x32_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance32x64 =
-      aom_highbd_8_masked_sub_pixel_variance32x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance32x64 =
-        aom_highbd_8_masked_sub_pixel_variance32x64_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance32x8 =
-      aom_highbd_8_masked_sub_pixel_variance32x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance32x8 =
-        aom_highbd_8_masked_sub_pixel_variance32x8_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance4x16 =
-      aom_highbd_8_masked_sub_pixel_variance4x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance4x16 =
-        aom_highbd_8_masked_sub_pixel_variance4x16_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance4x4 =
-      aom_highbd_8_masked_sub_pixel_variance4x4_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance4x4 =
-        aom_highbd_8_masked_sub_pixel_variance4x4_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance4x8 =
-      aom_highbd_8_masked_sub_pixel_variance4x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance4x8 =
-        aom_highbd_8_masked_sub_pixel_variance4x8_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance64x128 =
-      aom_highbd_8_masked_sub_pixel_variance64x128_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance64x128 =
-        aom_highbd_8_masked_sub_pixel_variance64x128_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance64x16 =
-      aom_highbd_8_masked_sub_pixel_variance64x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance64x16 =
-        aom_highbd_8_masked_sub_pixel_variance64x16_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance64x32 =
-      aom_highbd_8_masked_sub_pixel_variance64x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance64x32 =
-        aom_highbd_8_masked_sub_pixel_variance64x32_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance64x64 =
-      aom_highbd_8_masked_sub_pixel_variance64x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance64x64 =
-        aom_highbd_8_masked_sub_pixel_variance64x64_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance8x16 =
-      aom_highbd_8_masked_sub_pixel_variance8x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance8x16 =
-        aom_highbd_8_masked_sub_pixel_variance8x16_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance8x32 =
-      aom_highbd_8_masked_sub_pixel_variance8x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance8x32 =
-        aom_highbd_8_masked_sub_pixel_variance8x32_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance8x4 =
-      aom_highbd_8_masked_sub_pixel_variance8x4_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance8x4 =
-        aom_highbd_8_masked_sub_pixel_variance8x4_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance8x8 =
-      aom_highbd_8_masked_sub_pixel_variance8x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance8x8 =
-        aom_highbd_8_masked_sub_pixel_variance8x8_ssse3;
-  aom_highbd_8_sub_pixel_avg_variance4x4 =
-      aom_highbd_8_sub_pixel_avg_variance4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_8_sub_pixel_avg_variance4x4 =
-        aom_highbd_8_sub_pixel_avg_variance4x4_sse4_1;
-  aom_highbd_8_sub_pixel_variance4x4 = aom_highbd_8_sub_pixel_variance4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_8_sub_pixel_variance4x4 =
-        aom_highbd_8_sub_pixel_variance4x4_sse4_1;
-  aom_highbd_8_variance4x4 = aom_highbd_8_variance4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_8_variance4x4 = aom_highbd_8_variance4x4_sse4_1;
-  aom_highbd_blend_a64_d16_mask = aom_highbd_blend_a64_d16_mask_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_blend_a64_d16_mask = aom_highbd_blend_a64_d16_mask_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_blend_a64_d16_mask = aom_highbd_blend_a64_d16_mask_avx2;
-  aom_highbd_blend_a64_hmask = aom_highbd_blend_a64_hmask_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_blend_a64_hmask = aom_highbd_blend_a64_hmask_sse4_1;
-  aom_highbd_blend_a64_mask = aom_highbd_blend_a64_mask_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_blend_a64_mask = aom_highbd_blend_a64_mask_sse4_1;
-  aom_highbd_blend_a64_vmask = aom_highbd_blend_a64_vmask_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_blend_a64_vmask = aom_highbd_blend_a64_vmask_sse4_1;
-  aom_highbd_comp_mask_pred = aom_highbd_comp_mask_pred_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_comp_mask_pred = aom_highbd_comp_mask_pred_avx2;
-  aom_highbd_convolve8_horiz = aom_highbd_convolve8_horiz_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_convolve8_horiz = aom_highbd_convolve8_horiz_avx2;
-  aom_highbd_convolve8_vert = aom_highbd_convolve8_vert_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_convolve8_vert = aom_highbd_convolve8_vert_avx2;
-  aom_highbd_convolve_copy = aom_highbd_convolve_copy_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_convolve_copy = aom_highbd_convolve_copy_avx2;
-  aom_highbd_hadamard_16x16 = aom_highbd_hadamard_16x16_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_hadamard_16x16 = aom_highbd_hadamard_16x16_avx2;
-  aom_highbd_hadamard_32x32 = aom_highbd_hadamard_32x32_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_hadamard_32x32 = aom_highbd_hadamard_32x32_avx2;
-  aom_highbd_hadamard_8x8 = aom_highbd_hadamard_8x8_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_hadamard_8x8 = aom_highbd_hadamard_8x8_avx2;
-  aom_highbd_lpf_horizontal_14_dual = aom_highbd_lpf_horizontal_14_dual_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_lpf_horizontal_14_dual = aom_highbd_lpf_horizontal_14_dual_avx2;
-  aom_highbd_lpf_horizontal_4_dual = aom_highbd_lpf_horizontal_4_dual_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_lpf_horizontal_4_dual = aom_highbd_lpf_horizontal_4_dual_avx2;
-  aom_highbd_lpf_horizontal_8_dual = aom_highbd_lpf_horizontal_8_dual_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_lpf_horizontal_8_dual = aom_highbd_lpf_horizontal_8_dual_avx2;
-  aom_highbd_lpf_vertical_14_dual = aom_highbd_lpf_vertical_14_dual_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_lpf_vertical_14_dual = aom_highbd_lpf_vertical_14_dual_avx2;
-  aom_highbd_lpf_vertical_4_dual = aom_highbd_lpf_vertical_4_dual_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_lpf_vertical_4_dual = aom_highbd_lpf_vertical_4_dual_avx2;
-  aom_highbd_lpf_vertical_8_dual = aom_highbd_lpf_vertical_8_dual_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_lpf_vertical_8_dual = aom_highbd_lpf_vertical_8_dual_avx2;
-  aom_highbd_masked_sad128x128 = aom_highbd_masked_sad128x128_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad128x128 = aom_highbd_masked_sad128x128_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad128x128 = aom_highbd_masked_sad128x128_avx2;
-  aom_highbd_masked_sad128x64 = aom_highbd_masked_sad128x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad128x64 = aom_highbd_masked_sad128x64_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad128x64 = aom_highbd_masked_sad128x64_avx2;
-  aom_highbd_masked_sad16x16 = aom_highbd_masked_sad16x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad16x16 = aom_highbd_masked_sad16x16_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad16x16 = aom_highbd_masked_sad16x16_avx2;
-  aom_highbd_masked_sad16x32 = aom_highbd_masked_sad16x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad16x32 = aom_highbd_masked_sad16x32_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad16x32 = aom_highbd_masked_sad16x32_avx2;
-  aom_highbd_masked_sad16x4 = aom_highbd_masked_sad16x4_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad16x4 = aom_highbd_masked_sad16x4_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad16x4 = aom_highbd_masked_sad16x4_avx2;
-  aom_highbd_masked_sad16x64 = aom_highbd_masked_sad16x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad16x64 = aom_highbd_masked_sad16x64_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad16x64 = aom_highbd_masked_sad16x64_avx2;
-  aom_highbd_masked_sad16x8 = aom_highbd_masked_sad16x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad16x8 = aom_highbd_masked_sad16x8_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad16x8 = aom_highbd_masked_sad16x8_avx2;
-  aom_highbd_masked_sad32x16 = aom_highbd_masked_sad32x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad32x16 = aom_highbd_masked_sad32x16_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad32x16 = aom_highbd_masked_sad32x16_avx2;
-  aom_highbd_masked_sad32x32 = aom_highbd_masked_sad32x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad32x32 = aom_highbd_masked_sad32x32_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad32x32 = aom_highbd_masked_sad32x32_avx2;
-  aom_highbd_masked_sad32x64 = aom_highbd_masked_sad32x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad32x64 = aom_highbd_masked_sad32x64_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad32x64 = aom_highbd_masked_sad32x64_avx2;
-  aom_highbd_masked_sad32x8 = aom_highbd_masked_sad32x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad32x8 = aom_highbd_masked_sad32x8_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad32x8 = aom_highbd_masked_sad32x8_avx2;
-  aom_highbd_masked_sad4x16 = aom_highbd_masked_sad4x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad4x16 = aom_highbd_masked_sad4x16_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad4x16 = aom_highbd_masked_sad4x16_avx2;
-  aom_highbd_masked_sad4x4 = aom_highbd_masked_sad4x4_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad4x4 = aom_highbd_masked_sad4x4_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad4x4 = aom_highbd_masked_sad4x4_avx2;
-  aom_highbd_masked_sad4x8 = aom_highbd_masked_sad4x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad4x8 = aom_highbd_masked_sad4x8_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad4x8 = aom_highbd_masked_sad4x8_avx2;
-  aom_highbd_masked_sad64x128 = aom_highbd_masked_sad64x128_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad64x128 = aom_highbd_masked_sad64x128_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad64x128 = aom_highbd_masked_sad64x128_avx2;
-  aom_highbd_masked_sad64x16 = aom_highbd_masked_sad64x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad64x16 = aom_highbd_masked_sad64x16_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad64x16 = aom_highbd_masked_sad64x16_avx2;
-  aom_highbd_masked_sad64x32 = aom_highbd_masked_sad64x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad64x32 = aom_highbd_masked_sad64x32_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad64x32 = aom_highbd_masked_sad64x32_avx2;
-  aom_highbd_masked_sad64x64 = aom_highbd_masked_sad64x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad64x64 = aom_highbd_masked_sad64x64_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad64x64 = aom_highbd_masked_sad64x64_avx2;
-  aom_highbd_masked_sad8x16 = aom_highbd_masked_sad8x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad8x16 = aom_highbd_masked_sad8x16_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad8x16 = aom_highbd_masked_sad8x16_avx2;
-  aom_highbd_masked_sad8x32 = aom_highbd_masked_sad8x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad8x32 = aom_highbd_masked_sad8x32_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad8x32 = aom_highbd_masked_sad8x32_avx2;
-  aom_highbd_masked_sad8x4 = aom_highbd_masked_sad8x4_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad8x4 = aom_highbd_masked_sad8x4_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad8x4 = aom_highbd_masked_sad8x4_avx2;
-  aom_highbd_masked_sad8x8 = aom_highbd_masked_sad8x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad8x8 = aom_highbd_masked_sad8x8_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad8x8 = aom_highbd_masked_sad8x8_avx2;
-  aom_highbd_obmc_sad128x128 = aom_highbd_obmc_sad128x128_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad128x128 = aom_highbd_obmc_sad128x128_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad128x128 = aom_highbd_obmc_sad128x128_avx2;
-  aom_highbd_obmc_sad128x64 = aom_highbd_obmc_sad128x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad128x64 = aom_highbd_obmc_sad128x64_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad128x64 = aom_highbd_obmc_sad128x64_avx2;
-  aom_highbd_obmc_sad16x16 = aom_highbd_obmc_sad16x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad16x16 = aom_highbd_obmc_sad16x16_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad16x16 = aom_highbd_obmc_sad16x16_avx2;
-  aom_highbd_obmc_sad16x32 = aom_highbd_obmc_sad16x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad16x32 = aom_highbd_obmc_sad16x32_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad16x32 = aom_highbd_obmc_sad16x32_avx2;
-  aom_highbd_obmc_sad16x4 = aom_highbd_obmc_sad16x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad16x4 = aom_highbd_obmc_sad16x4_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad16x4 = aom_highbd_obmc_sad16x4_avx2;
-  aom_highbd_obmc_sad16x64 = aom_highbd_obmc_sad16x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad16x64 = aom_highbd_obmc_sad16x64_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad16x64 = aom_highbd_obmc_sad16x64_avx2;
-  aom_highbd_obmc_sad16x8 = aom_highbd_obmc_sad16x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad16x8 = aom_highbd_obmc_sad16x8_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad16x8 = aom_highbd_obmc_sad16x8_avx2;
-  aom_highbd_obmc_sad32x16 = aom_highbd_obmc_sad32x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad32x16 = aom_highbd_obmc_sad32x16_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad32x16 = aom_highbd_obmc_sad32x16_avx2;
-  aom_highbd_obmc_sad32x32 = aom_highbd_obmc_sad32x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad32x32 = aom_highbd_obmc_sad32x32_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad32x32 = aom_highbd_obmc_sad32x32_avx2;
-  aom_highbd_obmc_sad32x64 = aom_highbd_obmc_sad32x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad32x64 = aom_highbd_obmc_sad32x64_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad32x64 = aom_highbd_obmc_sad32x64_avx2;
-  aom_highbd_obmc_sad32x8 = aom_highbd_obmc_sad32x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad32x8 = aom_highbd_obmc_sad32x8_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad32x8 = aom_highbd_obmc_sad32x8_avx2;
-  aom_highbd_obmc_sad4x16 = aom_highbd_obmc_sad4x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad4x16 = aom_highbd_obmc_sad4x16_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad4x16 = aom_highbd_obmc_sad4x16_avx2;
-  aom_highbd_obmc_sad4x4 = aom_highbd_obmc_sad4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad4x4 = aom_highbd_obmc_sad4x4_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad4x4 = aom_highbd_obmc_sad4x4_avx2;
-  aom_highbd_obmc_sad4x8 = aom_highbd_obmc_sad4x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad4x8 = aom_highbd_obmc_sad4x8_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad4x8 = aom_highbd_obmc_sad4x8_avx2;
-  aom_highbd_obmc_sad64x128 = aom_highbd_obmc_sad64x128_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad64x128 = aom_highbd_obmc_sad64x128_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad64x128 = aom_highbd_obmc_sad64x128_avx2;
-  aom_highbd_obmc_sad64x16 = aom_highbd_obmc_sad64x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad64x16 = aom_highbd_obmc_sad64x16_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad64x16 = aom_highbd_obmc_sad64x16_avx2;
-  aom_highbd_obmc_sad64x32 = aom_highbd_obmc_sad64x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad64x32 = aom_highbd_obmc_sad64x32_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad64x32 = aom_highbd_obmc_sad64x32_avx2;
-  aom_highbd_obmc_sad64x64 = aom_highbd_obmc_sad64x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad64x64 = aom_highbd_obmc_sad64x64_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad64x64 = aom_highbd_obmc_sad64x64_avx2;
-  aom_highbd_obmc_sad8x16 = aom_highbd_obmc_sad8x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad8x16 = aom_highbd_obmc_sad8x16_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad8x16 = aom_highbd_obmc_sad8x16_avx2;
-  aom_highbd_obmc_sad8x32 = aom_highbd_obmc_sad8x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad8x32 = aom_highbd_obmc_sad8x32_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad8x32 = aom_highbd_obmc_sad8x32_avx2;
-  aom_highbd_obmc_sad8x4 = aom_highbd_obmc_sad8x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad8x4 = aom_highbd_obmc_sad8x4_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad8x4 = aom_highbd_obmc_sad8x4_avx2;
-  aom_highbd_obmc_sad8x8 = aom_highbd_obmc_sad8x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad8x8 = aom_highbd_obmc_sad8x8_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad8x8 = aom_highbd_obmc_sad8x8_avx2;
-  aom_highbd_obmc_variance128x128 = aom_highbd_obmc_variance128x128_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance128x128 = aom_highbd_obmc_variance128x128_sse4_1;
-  aom_highbd_obmc_variance128x64 = aom_highbd_obmc_variance128x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance128x64 = aom_highbd_obmc_variance128x64_sse4_1;
-  aom_highbd_obmc_variance16x16 = aom_highbd_obmc_variance16x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance16x16 = aom_highbd_obmc_variance16x16_sse4_1;
-  aom_highbd_obmc_variance16x32 = aom_highbd_obmc_variance16x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance16x32 = aom_highbd_obmc_variance16x32_sse4_1;
-  aom_highbd_obmc_variance16x4 = aom_highbd_obmc_variance16x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance16x4 = aom_highbd_obmc_variance16x4_sse4_1;
-  aom_highbd_obmc_variance16x64 = aom_highbd_obmc_variance16x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance16x64 = aom_highbd_obmc_variance16x64_sse4_1;
-  aom_highbd_obmc_variance16x8 = aom_highbd_obmc_variance16x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance16x8 = aom_highbd_obmc_variance16x8_sse4_1;
-  aom_highbd_obmc_variance32x16 = aom_highbd_obmc_variance32x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance32x16 = aom_highbd_obmc_variance32x16_sse4_1;
-  aom_highbd_obmc_variance32x32 = aom_highbd_obmc_variance32x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance32x32 = aom_highbd_obmc_variance32x32_sse4_1;
-  aom_highbd_obmc_variance32x64 = aom_highbd_obmc_variance32x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance32x64 = aom_highbd_obmc_variance32x64_sse4_1;
-  aom_highbd_obmc_variance32x8 = aom_highbd_obmc_variance32x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance32x8 = aom_highbd_obmc_variance32x8_sse4_1;
-  aom_highbd_obmc_variance4x16 = aom_highbd_obmc_variance4x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance4x16 = aom_highbd_obmc_variance4x16_sse4_1;
-  aom_highbd_obmc_variance4x4 = aom_highbd_obmc_variance4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance4x4 = aom_highbd_obmc_variance4x4_sse4_1;
-  aom_highbd_obmc_variance4x8 = aom_highbd_obmc_variance4x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance4x8 = aom_highbd_obmc_variance4x8_sse4_1;
-  aom_highbd_obmc_variance64x128 = aom_highbd_obmc_variance64x128_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance64x128 = aom_highbd_obmc_variance64x128_sse4_1;
-  aom_highbd_obmc_variance64x16 = aom_highbd_obmc_variance64x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance64x16 = aom_highbd_obmc_variance64x16_sse4_1;
-  aom_highbd_obmc_variance64x32 = aom_highbd_obmc_variance64x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance64x32 = aom_highbd_obmc_variance64x32_sse4_1;
-  aom_highbd_obmc_variance64x64 = aom_highbd_obmc_variance64x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance64x64 = aom_highbd_obmc_variance64x64_sse4_1;
-  aom_highbd_obmc_variance8x16 = aom_highbd_obmc_variance8x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance8x16 = aom_highbd_obmc_variance8x16_sse4_1;
-  aom_highbd_obmc_variance8x32 = aom_highbd_obmc_variance8x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance8x32 = aom_highbd_obmc_variance8x32_sse4_1;
-  aom_highbd_obmc_variance8x4 = aom_highbd_obmc_variance8x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance8x4 = aom_highbd_obmc_variance8x4_sse4_1;
-  aom_highbd_obmc_variance8x8 = aom_highbd_obmc_variance8x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance8x8 = aom_highbd_obmc_variance8x8_sse4_1;
-  aom_highbd_quantize_b = aom_highbd_quantize_b_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_quantize_b = aom_highbd_quantize_b_avx2;
-  aom_highbd_quantize_b_32x32_adaptive =
-      aom_highbd_quantize_b_32x32_adaptive_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_quantize_b_32x32_adaptive =
-        aom_highbd_quantize_b_32x32_adaptive_avx2;
-  aom_highbd_quantize_b_adaptive = aom_highbd_quantize_b_adaptive_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_quantize_b_adaptive = aom_highbd_quantize_b_adaptive_avx2;
-  aom_highbd_sad128x128 = aom_highbd_sad128x128_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad128x128 = aom_highbd_sad128x128_avx2;
-  aom_highbd_sad128x128_avg = aom_highbd_sad128x128_avg_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad128x128_avg = aom_highbd_sad128x128_avg_avx2;
-  aom_highbd_sad128x128x4d = aom_highbd_sad128x128x4d_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad128x128x4d = aom_highbd_sad128x128x4d_avx2;
-  aom_highbd_sad128x64 = aom_highbd_sad128x64_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad128x64 = aom_highbd_sad128x64_avx2;
-  aom_highbd_sad128x64_avg = aom_highbd_sad128x64_avg_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad128x64_avg = aom_highbd_sad128x64_avg_avx2;
-  aom_highbd_sad128x64x4d = aom_highbd_sad128x64x4d_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad128x64x4d = aom_highbd_sad128x64x4d_avx2;
-  aom_highbd_sad16x16 = aom_highbd_sad16x16_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad16x16 = aom_highbd_sad16x16_avx2;
-  aom_highbd_sad16x16_avg = aom_highbd_sad16x16_avg_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad16x16_avg = aom_highbd_sad16x16_avg_avx2;
-  aom_highbd_sad16x16x4d = aom_highbd_sad16x16x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad16x16x4d = aom_highbd_sad16x16x4d_avx2;
-  aom_highbd_sad16x32 = aom_highbd_sad16x32_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad16x32 = aom_highbd_sad16x32_avx2;
-  aom_highbd_sad16x32_avg = aom_highbd_sad16x32_avg_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad16x32_avg = aom_highbd_sad16x32_avg_avx2;
-  aom_highbd_sad16x32x4d = aom_highbd_sad16x32x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad16x32x4d = aom_highbd_sad16x32x4d_avx2;
-  aom_highbd_sad16x4 = aom_highbd_sad16x4_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad16x4 = aom_highbd_sad16x4_avx2;
-  aom_highbd_sad16x4_avg = aom_highbd_sad16x4_avg_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad16x4_avg = aom_highbd_sad16x4_avg_avx2;
-  aom_highbd_sad16x4x4d = aom_highbd_sad16x4x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad16x4x4d = aom_highbd_sad16x4x4d_avx2;
-  aom_highbd_sad16x64 = aom_highbd_sad16x64_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad16x64 = aom_highbd_sad16x64_avx2;
-  aom_highbd_sad16x64_avg = aom_highbd_sad16x64_avg_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad16x64_avg = aom_highbd_sad16x64_avg_avx2;
-  aom_highbd_sad16x64x4d = aom_highbd_sad16x64x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad16x64x4d = aom_highbd_sad16x64x4d_avx2;
-  aom_highbd_sad16x8 = aom_highbd_sad16x8_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad16x8 = aom_highbd_sad16x8_avx2;
-  aom_highbd_sad16x8_avg = aom_highbd_sad16x8_avg_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad16x8_avg = aom_highbd_sad16x8_avg_avx2;
-  aom_highbd_sad16x8x4d = aom_highbd_sad16x8x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad16x8x4d = aom_highbd_sad16x8x4d_avx2;
-  aom_highbd_sad32x16 = aom_highbd_sad32x16_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad32x16 = aom_highbd_sad32x16_avx2;
-  aom_highbd_sad32x16_avg = aom_highbd_sad32x16_avg_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad32x16_avg = aom_highbd_sad32x16_avg_avx2;
-  aom_highbd_sad32x16x4d = aom_highbd_sad32x16x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad32x16x4d = aom_highbd_sad32x16x4d_avx2;
-  aom_highbd_sad32x32 = aom_highbd_sad32x32_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad32x32 = aom_highbd_sad32x32_avx2;
-  aom_highbd_sad32x32_avg = aom_highbd_sad32x32_avg_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad32x32_avg = aom_highbd_sad32x32_avg_avx2;
-  aom_highbd_sad32x32x4d = aom_highbd_sad32x32x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad32x32x4d = aom_highbd_sad32x32x4d_avx2;
-  aom_highbd_sad32x64 = aom_highbd_sad32x64_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad32x64 = aom_highbd_sad32x64_avx2;
-  aom_highbd_sad32x64_avg = aom_highbd_sad32x64_avg_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad32x64_avg = aom_highbd_sad32x64_avg_avx2;
-  aom_highbd_sad32x64x4d = aom_highbd_sad32x64x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad32x64x4d = aom_highbd_sad32x64x4d_avx2;
-  aom_highbd_sad32x8 = aom_highbd_sad32x8_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad32x8 = aom_highbd_sad32x8_avx2;
-  aom_highbd_sad32x8_avg = aom_highbd_sad32x8_avg_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad32x8_avg = aom_highbd_sad32x8_avg_avx2;
-  aom_highbd_sad32x8x4d = aom_highbd_sad32x8x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad32x8x4d = aom_highbd_sad32x8x4d_avx2;
-  aom_highbd_sad64x128 = aom_highbd_sad64x128_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad64x128 = aom_highbd_sad64x128_avx2;
-  aom_highbd_sad64x128_avg = aom_highbd_sad64x128_avg_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad64x128_avg = aom_highbd_sad64x128_avg_avx2;
-  aom_highbd_sad64x128x4d = aom_highbd_sad64x128x4d_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad64x128x4d = aom_highbd_sad64x128x4d_avx2;
-  aom_highbd_sad64x16 = aom_highbd_sad64x16_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad64x16 = aom_highbd_sad64x16_avx2;
-  aom_highbd_sad64x16_avg = aom_highbd_sad64x16_avg_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad64x16_avg = aom_highbd_sad64x16_avg_avx2;
-  aom_highbd_sad64x16x4d = aom_highbd_sad64x16x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad64x16x4d = aom_highbd_sad64x16x4d_avx2;
-  aom_highbd_sad64x32 = aom_highbd_sad64x32_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad64x32 = aom_highbd_sad64x32_avx2;
-  aom_highbd_sad64x32_avg = aom_highbd_sad64x32_avg_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad64x32_avg = aom_highbd_sad64x32_avg_avx2;
-  aom_highbd_sad64x32x4d = aom_highbd_sad64x32x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad64x32x4d = aom_highbd_sad64x32x4d_avx2;
-  aom_highbd_sad64x64 = aom_highbd_sad64x64_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad64x64 = aom_highbd_sad64x64_avx2;
-  aom_highbd_sad64x64_avg = aom_highbd_sad64x64_avg_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad64x64_avg = aom_highbd_sad64x64_avg_avx2;
-  aom_highbd_sad64x64x4d = aom_highbd_sad64x64x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad64x64x4d = aom_highbd_sad64x64x4d_avx2;
-  aom_highbd_sad_skip_128x128 = aom_highbd_sad_skip_128x128_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_128x128 = aom_highbd_sad_skip_128x128_avx2;
-  aom_highbd_sad_skip_128x128x4d = aom_highbd_sad_skip_128x128x4d_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_128x128x4d = aom_highbd_sad_skip_128x128x4d_avx2;
-  aom_highbd_sad_skip_128x64 = aom_highbd_sad_skip_128x64_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_128x64 = aom_highbd_sad_skip_128x64_avx2;
-  aom_highbd_sad_skip_128x64x4d = aom_highbd_sad_skip_128x64x4d_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_128x64x4d = aom_highbd_sad_skip_128x64x4d_avx2;
-  aom_highbd_sad_skip_16x16 = aom_highbd_sad_skip_16x16_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_16x16 = aom_highbd_sad_skip_16x16_avx2;
-  aom_highbd_sad_skip_16x16x4d = aom_highbd_sad_skip_16x16x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_16x16x4d = aom_highbd_sad_skip_16x16x4d_avx2;
-  aom_highbd_sad_skip_16x32 = aom_highbd_sad_skip_16x32_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_16x32 = aom_highbd_sad_skip_16x32_avx2;
-  aom_highbd_sad_skip_16x32x4d = aom_highbd_sad_skip_16x32x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_16x32x4d = aom_highbd_sad_skip_16x32x4d_avx2;
-  aom_highbd_sad_skip_16x64 = aom_highbd_sad_skip_16x64_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_16x64 = aom_highbd_sad_skip_16x64_avx2;
-  aom_highbd_sad_skip_16x64x4d = aom_highbd_sad_skip_16x64x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_16x64x4d = aom_highbd_sad_skip_16x64x4d_avx2;
-  aom_highbd_sad_skip_16x8 = aom_highbd_sad_skip_16x8_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_16x8 = aom_highbd_sad_skip_16x8_avx2;
-  aom_highbd_sad_skip_16x8x4d = aom_highbd_sad_skip_16x8x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_16x8x4d = aom_highbd_sad_skip_16x8x4d_avx2;
-  aom_highbd_sad_skip_32x16 = aom_highbd_sad_skip_32x16_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_32x16 = aom_highbd_sad_skip_32x16_avx2;
-  aom_highbd_sad_skip_32x16x4d = aom_highbd_sad_skip_32x16x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_32x16x4d = aom_highbd_sad_skip_32x16x4d_avx2;
-  aom_highbd_sad_skip_32x32 = aom_highbd_sad_skip_32x32_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_32x32 = aom_highbd_sad_skip_32x32_avx2;
-  aom_highbd_sad_skip_32x32x4d = aom_highbd_sad_skip_32x32x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_32x32x4d = aom_highbd_sad_skip_32x32x4d_avx2;
-  aom_highbd_sad_skip_32x64 = aom_highbd_sad_skip_32x64_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_32x64 = aom_highbd_sad_skip_32x64_avx2;
-  aom_highbd_sad_skip_32x64x4d = aom_highbd_sad_skip_32x64x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_32x64x4d = aom_highbd_sad_skip_32x64x4d_avx2;
-  aom_highbd_sad_skip_32x8 = aom_highbd_sad_skip_32x8_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_32x8 = aom_highbd_sad_skip_32x8_avx2;
-  aom_highbd_sad_skip_32x8x4d = aom_highbd_sad_skip_32x8x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_32x8x4d = aom_highbd_sad_skip_32x8x4d_avx2;
-  aom_highbd_sad_skip_64x128 = aom_highbd_sad_skip_64x128_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_64x128 = aom_highbd_sad_skip_64x128_avx2;
-  aom_highbd_sad_skip_64x128x4d = aom_highbd_sad_skip_64x128x4d_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_64x128x4d = aom_highbd_sad_skip_64x128x4d_avx2;
-  aom_highbd_sad_skip_64x16 = aom_highbd_sad_skip_64x16_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_64x16 = aom_highbd_sad_skip_64x16_avx2;
-  aom_highbd_sad_skip_64x16x4d = aom_highbd_sad_skip_64x16x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_64x16x4d = aom_highbd_sad_skip_64x16x4d_avx2;
-  aom_highbd_sad_skip_64x32 = aom_highbd_sad_skip_64x32_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_64x32 = aom_highbd_sad_skip_64x32_avx2;
-  aom_highbd_sad_skip_64x32x4d = aom_highbd_sad_skip_64x32x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_64x32x4d = aom_highbd_sad_skip_64x32x4d_avx2;
-  aom_highbd_sad_skip_64x64 = aom_highbd_sad_skip_64x64_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_64x64 = aom_highbd_sad_skip_64x64_avx2;
-  aom_highbd_sad_skip_64x64x4d = aom_highbd_sad_skip_64x64x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_64x64x4d = aom_highbd_sad_skip_64x64x4d_avx2;
-  aom_highbd_sse = aom_highbd_sse_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_sse = aom_highbd_sse_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_sse = aom_highbd_sse_avx2;
   aom_ifft16x16_float = aom_ifft16x16_float_sse2;
   if (flags & HAS_AVX2)
     aom_ifft16x16_float = aom_ifft16x16_float_avx2;
@@ -28772,298 +11691,6 @@
   aom_mse_wxh_16bit = aom_mse_wxh_16bit_sse2;
   if (flags & HAS_AVX2)
     aom_mse_wxh_16bit = aom_mse_wxh_16bit_avx2;
-  aom_mse_wxh_16bit_highbd = aom_mse_wxh_16bit_highbd_sse2;
-  if (flags & HAS_AVX2)
-    aom_mse_wxh_16bit_highbd = aom_mse_wxh_16bit_highbd_avx2;
-  aom_obmc_sad128x128 = aom_obmc_sad128x128_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad128x128 = aom_obmc_sad128x128_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad128x128 = aom_obmc_sad128x128_avx2;
-  aom_obmc_sad128x64 = aom_obmc_sad128x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad128x64 = aom_obmc_sad128x64_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad128x64 = aom_obmc_sad128x64_avx2;
-  aom_obmc_sad16x16 = aom_obmc_sad16x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad16x16 = aom_obmc_sad16x16_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad16x16 = aom_obmc_sad16x16_avx2;
-  aom_obmc_sad16x32 = aom_obmc_sad16x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad16x32 = aom_obmc_sad16x32_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad16x32 = aom_obmc_sad16x32_avx2;
-  aom_obmc_sad16x4 = aom_obmc_sad16x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad16x4 = aom_obmc_sad16x4_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad16x4 = aom_obmc_sad16x4_avx2;
-  aom_obmc_sad16x64 = aom_obmc_sad16x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad16x64 = aom_obmc_sad16x64_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad16x64 = aom_obmc_sad16x64_avx2;
-  aom_obmc_sad16x8 = aom_obmc_sad16x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad16x8 = aom_obmc_sad16x8_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad16x8 = aom_obmc_sad16x8_avx2;
-  aom_obmc_sad32x16 = aom_obmc_sad32x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad32x16 = aom_obmc_sad32x16_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad32x16 = aom_obmc_sad32x16_avx2;
-  aom_obmc_sad32x32 = aom_obmc_sad32x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad32x32 = aom_obmc_sad32x32_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad32x32 = aom_obmc_sad32x32_avx2;
-  aom_obmc_sad32x64 = aom_obmc_sad32x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad32x64 = aom_obmc_sad32x64_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad32x64 = aom_obmc_sad32x64_avx2;
-  aom_obmc_sad32x8 = aom_obmc_sad32x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad32x8 = aom_obmc_sad32x8_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad32x8 = aom_obmc_sad32x8_avx2;
-  aom_obmc_sad4x16 = aom_obmc_sad4x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad4x16 = aom_obmc_sad4x16_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad4x16 = aom_obmc_sad4x16_avx2;
-  aom_obmc_sad4x4 = aom_obmc_sad4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad4x4 = aom_obmc_sad4x4_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad4x4 = aom_obmc_sad4x4_avx2;
-  aom_obmc_sad4x8 = aom_obmc_sad4x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad4x8 = aom_obmc_sad4x8_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad4x8 = aom_obmc_sad4x8_avx2;
-  aom_obmc_sad64x128 = aom_obmc_sad64x128_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad64x128 = aom_obmc_sad64x128_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad64x128 = aom_obmc_sad64x128_avx2;
-  aom_obmc_sad64x16 = aom_obmc_sad64x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad64x16 = aom_obmc_sad64x16_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad64x16 = aom_obmc_sad64x16_avx2;
-  aom_obmc_sad64x32 = aom_obmc_sad64x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad64x32 = aom_obmc_sad64x32_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad64x32 = aom_obmc_sad64x32_avx2;
-  aom_obmc_sad64x64 = aom_obmc_sad64x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad64x64 = aom_obmc_sad64x64_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad64x64 = aom_obmc_sad64x64_avx2;
-  aom_obmc_sad8x16 = aom_obmc_sad8x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad8x16 = aom_obmc_sad8x16_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad8x16 = aom_obmc_sad8x16_avx2;
-  aom_obmc_sad8x32 = aom_obmc_sad8x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad8x32 = aom_obmc_sad8x32_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad8x32 = aom_obmc_sad8x32_avx2;
-  aom_obmc_sad8x4 = aom_obmc_sad8x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad8x4 = aom_obmc_sad8x4_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad8x4 = aom_obmc_sad8x4_avx2;
-  aom_obmc_sad8x8 = aom_obmc_sad8x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad8x8 = aom_obmc_sad8x8_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad8x8 = aom_obmc_sad8x8_avx2;
-  aom_obmc_sub_pixel_variance128x128 = aom_obmc_sub_pixel_variance128x128_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance128x128 =
-        aom_obmc_sub_pixel_variance128x128_sse4_1;
-  aom_obmc_sub_pixel_variance128x64 = aom_obmc_sub_pixel_variance128x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance128x64 =
-        aom_obmc_sub_pixel_variance128x64_sse4_1;
-  aom_obmc_sub_pixel_variance16x16 = aom_obmc_sub_pixel_variance16x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance16x16 = aom_obmc_sub_pixel_variance16x16_sse4_1;
-  aom_obmc_sub_pixel_variance16x32 = aom_obmc_sub_pixel_variance16x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance16x32 = aom_obmc_sub_pixel_variance16x32_sse4_1;
-  aom_obmc_sub_pixel_variance16x4 = aom_obmc_sub_pixel_variance16x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance16x4 = aom_obmc_sub_pixel_variance16x4_sse4_1;
-  aom_obmc_sub_pixel_variance16x64 = aom_obmc_sub_pixel_variance16x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance16x64 = aom_obmc_sub_pixel_variance16x64_sse4_1;
-  aom_obmc_sub_pixel_variance16x8 = aom_obmc_sub_pixel_variance16x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance16x8 = aom_obmc_sub_pixel_variance16x8_sse4_1;
-  aom_obmc_sub_pixel_variance32x16 = aom_obmc_sub_pixel_variance32x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance32x16 = aom_obmc_sub_pixel_variance32x16_sse4_1;
-  aom_obmc_sub_pixel_variance32x32 = aom_obmc_sub_pixel_variance32x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance32x32 = aom_obmc_sub_pixel_variance32x32_sse4_1;
-  aom_obmc_sub_pixel_variance32x64 = aom_obmc_sub_pixel_variance32x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance32x64 = aom_obmc_sub_pixel_variance32x64_sse4_1;
-  aom_obmc_sub_pixel_variance32x8 = aom_obmc_sub_pixel_variance32x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance32x8 = aom_obmc_sub_pixel_variance32x8_sse4_1;
-  aom_obmc_sub_pixel_variance4x16 = aom_obmc_sub_pixel_variance4x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance4x16 = aom_obmc_sub_pixel_variance4x16_sse4_1;
-  aom_obmc_sub_pixel_variance4x4 = aom_obmc_sub_pixel_variance4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance4x4 = aom_obmc_sub_pixel_variance4x4_sse4_1;
-  aom_obmc_sub_pixel_variance4x8 = aom_obmc_sub_pixel_variance4x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance4x8 = aom_obmc_sub_pixel_variance4x8_sse4_1;
-  aom_obmc_sub_pixel_variance64x128 = aom_obmc_sub_pixel_variance64x128_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance64x128 =
-        aom_obmc_sub_pixel_variance64x128_sse4_1;
-  aom_obmc_sub_pixel_variance64x16 = aom_obmc_sub_pixel_variance64x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance64x16 = aom_obmc_sub_pixel_variance64x16_sse4_1;
-  aom_obmc_sub_pixel_variance64x32 = aom_obmc_sub_pixel_variance64x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance64x32 = aom_obmc_sub_pixel_variance64x32_sse4_1;
-  aom_obmc_sub_pixel_variance64x64 = aom_obmc_sub_pixel_variance64x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance64x64 = aom_obmc_sub_pixel_variance64x64_sse4_1;
-  aom_obmc_sub_pixel_variance8x16 = aom_obmc_sub_pixel_variance8x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance8x16 = aom_obmc_sub_pixel_variance8x16_sse4_1;
-  aom_obmc_sub_pixel_variance8x32 = aom_obmc_sub_pixel_variance8x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance8x32 = aom_obmc_sub_pixel_variance8x32_sse4_1;
-  aom_obmc_sub_pixel_variance8x4 = aom_obmc_sub_pixel_variance8x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance8x4 = aom_obmc_sub_pixel_variance8x4_sse4_1;
-  aom_obmc_sub_pixel_variance8x8 = aom_obmc_sub_pixel_variance8x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance8x8 = aom_obmc_sub_pixel_variance8x8_sse4_1;
-  aom_obmc_variance128x128 = aom_obmc_variance128x128_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance128x128 = aom_obmc_variance128x128_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance128x128 = aom_obmc_variance128x128_avx2;
-  aom_obmc_variance128x64 = aom_obmc_variance128x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance128x64 = aom_obmc_variance128x64_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance128x64 = aom_obmc_variance128x64_avx2;
-  aom_obmc_variance16x16 = aom_obmc_variance16x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance16x16 = aom_obmc_variance16x16_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance16x16 = aom_obmc_variance16x16_avx2;
-  aom_obmc_variance16x32 = aom_obmc_variance16x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance16x32 = aom_obmc_variance16x32_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance16x32 = aom_obmc_variance16x32_avx2;
-  aom_obmc_variance16x4 = aom_obmc_variance16x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance16x4 = aom_obmc_variance16x4_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance16x4 = aom_obmc_variance16x4_avx2;
-  aom_obmc_variance16x64 = aom_obmc_variance16x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance16x64 = aom_obmc_variance16x64_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance16x64 = aom_obmc_variance16x64_avx2;
-  aom_obmc_variance16x8 = aom_obmc_variance16x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance16x8 = aom_obmc_variance16x8_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance16x8 = aom_obmc_variance16x8_avx2;
-  aom_obmc_variance32x16 = aom_obmc_variance32x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance32x16 = aom_obmc_variance32x16_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance32x16 = aom_obmc_variance32x16_avx2;
-  aom_obmc_variance32x32 = aom_obmc_variance32x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance32x32 = aom_obmc_variance32x32_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance32x32 = aom_obmc_variance32x32_avx2;
-  aom_obmc_variance32x64 = aom_obmc_variance32x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance32x64 = aom_obmc_variance32x64_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance32x64 = aom_obmc_variance32x64_avx2;
-  aom_obmc_variance32x8 = aom_obmc_variance32x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance32x8 = aom_obmc_variance32x8_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance32x8 = aom_obmc_variance32x8_avx2;
-  aom_obmc_variance4x16 = aom_obmc_variance4x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance4x16 = aom_obmc_variance4x16_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance4x16 = aom_obmc_variance4x16_avx2;
-  aom_obmc_variance4x4 = aom_obmc_variance4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance4x4 = aom_obmc_variance4x4_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance4x4 = aom_obmc_variance4x4_avx2;
-  aom_obmc_variance4x8 = aom_obmc_variance4x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance4x8 = aom_obmc_variance4x8_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance4x8 = aom_obmc_variance4x8_avx2;
-  aom_obmc_variance64x128 = aom_obmc_variance64x128_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance64x128 = aom_obmc_variance64x128_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance64x128 = aom_obmc_variance64x128_avx2;
-  aom_obmc_variance64x16 = aom_obmc_variance64x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance64x16 = aom_obmc_variance64x16_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance64x16 = aom_obmc_variance64x16_avx2;
-  aom_obmc_variance64x32 = aom_obmc_variance64x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance64x32 = aom_obmc_variance64x32_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance64x32 = aom_obmc_variance64x32_avx2;
-  aom_obmc_variance64x64 = aom_obmc_variance64x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance64x64 = aom_obmc_variance64x64_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance64x64 = aom_obmc_variance64x64_avx2;
-  aom_obmc_variance8x16 = aom_obmc_variance8x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance8x16 = aom_obmc_variance8x16_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance8x16 = aom_obmc_variance8x16_avx2;
-  aom_obmc_variance8x32 = aom_obmc_variance8x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance8x32 = aom_obmc_variance8x32_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance8x32 = aom_obmc_variance8x32_avx2;
-  aom_obmc_variance8x4 = aom_obmc_variance8x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance8x4 = aom_obmc_variance8x4_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance8x4 = aom_obmc_variance8x4_avx2;
-  aom_obmc_variance8x8 = aom_obmc_variance8x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance8x8 = aom_obmc_variance8x8_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance8x8 = aom_obmc_variance8x8_avx2;
   aom_paeth_predictor_16x16 = aom_paeth_predictor_16x16_c;
   if (flags & HAS_SSSE3)
     aom_paeth_predictor_16x16 = aom_paeth_predictor_16x16_ssse3;
diff --git a/third_party/libaom/source/config/linux/ia32/config/av1_rtcd.h b/third_party/libaom/source/config/linux/ia32/config/av1_rtcd.h
index c2ef24b..fa27090 100644
--- a/third_party/libaom/source/config/linux/ia32/config/av1_rtcd.h
+++ b/third_party/libaom/source/config/linux/ia32/config/av1_rtcd.h
@@ -99,109 +99,6 @@
                              const int log_scale);
 #define aom_quantize_b_helper aom_quantize_b_helper_c
 
-void av1_apply_selfguided_restoration_c(const uint8_t* dat,
-                                        int width,
-                                        int height,
-                                        int stride,
-                                        int eps,
-                                        const int* xqd,
-                                        uint8_t* dst,
-                                        int dst_stride,
-                                        int32_t* tmpbuf,
-                                        int bit_depth,
-                                        int highbd);
-void av1_apply_selfguided_restoration_sse4_1(const uint8_t* dat,
-                                             int width,
-                                             int height,
-                                             int stride,
-                                             int eps,
-                                             const int* xqd,
-                                             uint8_t* dst,
-                                             int dst_stride,
-                                             int32_t* tmpbuf,
-                                             int bit_depth,
-                                             int highbd);
-void av1_apply_selfguided_restoration_avx2(const uint8_t* dat,
-                                           int width,
-                                           int height,
-                                           int stride,
-                                           int eps,
-                                           const int* xqd,
-                                           uint8_t* dst,
-                                           int dst_stride,
-                                           int32_t* tmpbuf,
-                                           int bit_depth,
-                                           int highbd);
-RTCD_EXTERN void (*av1_apply_selfguided_restoration)(const uint8_t* dat,
-                                                     int width,
-                                                     int height,
-                                                     int stride,
-                                                     int eps,
-                                                     const int* xqd,
-                                                     uint8_t* dst,
-                                                     int dst_stride,
-                                                     int32_t* tmpbuf,
-                                                     int bit_depth,
-                                                     int highbd);
-
-void av1_apply_temporal_filter_c(const struct yv12_buffer_config* ref_frame,
-                                 const struct macroblockd* mbd,
-                                 const BLOCK_SIZE block_size,
-                                 const int mb_row,
-                                 const int mb_col,
-                                 const int num_planes,
-                                 const double* noise_levels,
-                                 const MV* subblock_mvs,
-                                 const int* subblock_mses,
-                                 const int q_factor,
-                                 const int filter_strength,
-                                 const uint8_t* pred,
-                                 uint32_t* accum,
-                                 uint16_t* count);
-void av1_apply_temporal_filter_sse2(const struct yv12_buffer_config* ref_frame,
-                                    const struct macroblockd* mbd,
-                                    const BLOCK_SIZE block_size,
-                                    const int mb_row,
-                                    const int mb_col,
-                                    const int num_planes,
-                                    const double* noise_levels,
-                                    const MV* subblock_mvs,
-                                    const int* subblock_mses,
-                                    const int q_factor,
-                                    const int filter_strength,
-                                    const uint8_t* pred,
-                                    uint32_t* accum,
-                                    uint16_t* count);
-void av1_apply_temporal_filter_avx2(const struct yv12_buffer_config* ref_frame,
-                                    const struct macroblockd* mbd,
-                                    const BLOCK_SIZE block_size,
-                                    const int mb_row,
-                                    const int mb_col,
-                                    const int num_planes,
-                                    const double* noise_levels,
-                                    const MV* subblock_mvs,
-                                    const int* subblock_mses,
-                                    const int q_factor,
-                                    const int filter_strength,
-                                    const uint8_t* pred,
-                                    uint32_t* accum,
-                                    uint16_t* count);
-RTCD_EXTERN void (*av1_apply_temporal_filter)(
-    const struct yv12_buffer_config* ref_frame,
-    const struct macroblockd* mbd,
-    const BLOCK_SIZE block_size,
-    const int mb_row,
-    const int mb_col,
-    const int num_planes,
-    const double* noise_levels,
-    const MV* subblock_mvs,
-    const int* subblock_mses,
-    const int q_factor,
-    const int filter_strength,
-    const uint8_t* pred,
-    uint32_t* accum,
-    uint16_t* count);
-
 int64_t av1_block_error_c(const tran_low_t* coeff,
                           const tran_low_t* dqcoeff,
                           intptr_t block_size,
@@ -342,137 +239,6 @@
     int w,
     int bd);
 
-int64_t av1_calc_frame_error_c(const uint8_t* const ref,
-                               int stride,
-                               const uint8_t* const dst,
-                               int p_width,
-                               int p_height,
-                               int p_stride);
-int64_t av1_calc_frame_error_sse2(const uint8_t* const ref,
-                                  int stride,
-                                  const uint8_t* const dst,
-                                  int p_width,
-                                  int p_height,
-                                  int p_stride);
-int64_t av1_calc_frame_error_avx2(const uint8_t* const ref,
-                                  int stride,
-                                  const uint8_t* const dst,
-                                  int p_width,
-                                  int p_height,
-                                  int p_stride);
-RTCD_EXTERN int64_t (*av1_calc_frame_error)(const uint8_t* const ref,
-                                            int stride,
-                                            const uint8_t* const dst,
-                                            int p_width,
-                                            int p_height,
-                                            int p_stride);
-
-void av1_calc_proj_params_c(const uint8_t* src8,
-                            int width,
-                            int height,
-                            int src_stride,
-                            const uint8_t* dat8,
-                            int dat_stride,
-                            int32_t* flt0,
-                            int flt0_stride,
-                            int32_t* flt1,
-                            int flt1_stride,
-                            int64_t H[2][2],
-                            int64_t C[2],
-                            const sgr_params_type* params);
-void av1_calc_proj_params_sse4_1(const uint8_t* src8,
-                                 int width,
-                                 int height,
-                                 int src_stride,
-                                 const uint8_t* dat8,
-                                 int dat_stride,
-                                 int32_t* flt0,
-                                 int flt0_stride,
-                                 int32_t* flt1,
-                                 int flt1_stride,
-                                 int64_t H[2][2],
-                                 int64_t C[2],
-                                 const sgr_params_type* params);
-void av1_calc_proj_params_avx2(const uint8_t* src8,
-                               int width,
-                               int height,
-                               int src_stride,
-                               const uint8_t* dat8,
-                               int dat_stride,
-                               int32_t* flt0,
-                               int flt0_stride,
-                               int32_t* flt1,
-                               int flt1_stride,
-                               int64_t H[2][2],
-                               int64_t C[2],
-                               const sgr_params_type* params);
-RTCD_EXTERN void (*av1_calc_proj_params)(const uint8_t* src8,
-                                         int width,
-                                         int height,
-                                         int src_stride,
-                                         const uint8_t* dat8,
-                                         int dat_stride,
-                                         int32_t* flt0,
-                                         int flt0_stride,
-                                         int32_t* flt1,
-                                         int flt1_stride,
-                                         int64_t H[2][2],
-                                         int64_t C[2],
-                                         const sgr_params_type* params);
-
-void av1_calc_proj_params_high_bd_c(const uint8_t* src8,
-                                    int width,
-                                    int height,
-                                    int src_stride,
-                                    const uint8_t* dat8,
-                                    int dat_stride,
-                                    int32_t* flt0,
-                                    int flt0_stride,
-                                    int32_t* flt1,
-                                    int flt1_stride,
-                                    int64_t H[2][2],
-                                    int64_t C[2],
-                                    const sgr_params_type* params);
-void av1_calc_proj_params_high_bd_sse4_1(const uint8_t* src8,
-                                         int width,
-                                         int height,
-                                         int src_stride,
-                                         const uint8_t* dat8,
-                                         int dat_stride,
-                                         int32_t* flt0,
-                                         int flt0_stride,
-                                         int32_t* flt1,
-                                         int flt1_stride,
-                                         int64_t H[2][2],
-                                         int64_t C[2],
-                                         const sgr_params_type* params);
-void av1_calc_proj_params_high_bd_avx2(const uint8_t* src8,
-                                       int width,
-                                       int height,
-                                       int src_stride,
-                                       const uint8_t* dat8,
-                                       int dat_stride,
-                                       int32_t* flt0,
-                                       int flt0_stride,
-                                       int32_t* flt1,
-                                       int flt1_stride,
-                                       int64_t H[2][2],
-                                       int64_t C[2],
-                                       const sgr_params_type* params);
-RTCD_EXTERN void (*av1_calc_proj_params_high_bd)(const uint8_t* src8,
-                                                 int width,
-                                                 int height,
-                                                 int src_stride,
-                                                 const uint8_t* dat8,
-                                                 int dat_stride,
-                                                 int32_t* flt0,
-                                                 int flt0_stride,
-                                                 int32_t* flt1,
-                                                 int flt1_stride,
-                                                 int64_t H[2][2],
-                                                 int64_t C[2],
-                                                 const sgr_params_type* params);
-
 void av1_cnn_activate_c(float** input,
                         int channels,
                         int width,
@@ -562,100 +328,6 @@
                                                     int x2,
                                                     int y2);
 
-void av1_compute_stats_c(int wiener_win,
-                         const uint8_t* dgd8,
-                         const uint8_t* src8,
-                         int h_start,
-                         int h_end,
-                         int v_start,
-                         int v_end,
-                         int dgd_stride,
-                         int src_stride,
-                         int64_t* M,
-                         int64_t* H);
-void av1_compute_stats_sse4_1(int wiener_win,
-                              const uint8_t* dgd8,
-                              const uint8_t* src8,
-                              int h_start,
-                              int h_end,
-                              int v_start,
-                              int v_end,
-                              int dgd_stride,
-                              int src_stride,
-                              int64_t* M,
-                              int64_t* H);
-void av1_compute_stats_avx2(int wiener_win,
-                            const uint8_t* dgd8,
-                            const uint8_t* src8,
-                            int h_start,
-                            int h_end,
-                            int v_start,
-                            int v_end,
-                            int dgd_stride,
-                            int src_stride,
-                            int64_t* M,
-                            int64_t* H);
-RTCD_EXTERN void (*av1_compute_stats)(int wiener_win,
-                                      const uint8_t* dgd8,
-                                      const uint8_t* src8,
-                                      int h_start,
-                                      int h_end,
-                                      int v_start,
-                                      int v_end,
-                                      int dgd_stride,
-                                      int src_stride,
-                                      int64_t* M,
-                                      int64_t* H);
-
-void av1_compute_stats_highbd_c(int wiener_win,
-                                const uint8_t* dgd8,
-                                const uint8_t* src8,
-                                int h_start,
-                                int h_end,
-                                int v_start,
-                                int v_end,
-                                int dgd_stride,
-                                int src_stride,
-                                int64_t* M,
-                                int64_t* H,
-                                aom_bit_depth_t bit_depth);
-void av1_compute_stats_highbd_sse4_1(int wiener_win,
-                                     const uint8_t* dgd8,
-                                     const uint8_t* src8,
-                                     int h_start,
-                                     int h_end,
-                                     int v_start,
-                                     int v_end,
-                                     int dgd_stride,
-                                     int src_stride,
-                                     int64_t* M,
-                                     int64_t* H,
-                                     aom_bit_depth_t bit_depth);
-void av1_compute_stats_highbd_avx2(int wiener_win,
-                                   const uint8_t* dgd8,
-                                   const uint8_t* src8,
-                                   int h_start,
-                                   int h_end,
-                                   int v_start,
-                                   int v_end,
-                                   int dgd_stride,
-                                   int src_stride,
-                                   int64_t* M,
-                                   int64_t* H,
-                                   aom_bit_depth_t bit_depth);
-RTCD_EXTERN void (*av1_compute_stats_highbd)(int wiener_win,
-                                             const uint8_t* dgd8,
-                                             const uint8_t* src8,
-                                             int h_start,
-                                             int h_end,
-                                             int v_start,
-                                             int v_end,
-                                             int dgd_stride,
-                                             int src_stride,
-                                             int64_t* M,
-                                             int64_t* H,
-                                             aom_bit_depth_t bit_depth);
-
 void av1_convolve_2d_scale_c(const uint8_t* src,
                              int src_stride,
                              uint8_t* dst,
@@ -1505,88 +1177,6 @@
                                   int8_t* const coeff_contexts);
 #define av1_get_nz_map_contexts av1_get_nz_map_contexts_sse2
 
-void av1_highbd_apply_temporal_filter_c(
-    const struct yv12_buffer_config* ref_frame,
-    const struct macroblockd* mbd,
-    const BLOCK_SIZE block_size,
-    const int mb_row,
-    const int mb_col,
-    const int num_planes,
-    const double* noise_levels,
-    const MV* subblock_mvs,
-    const int* subblock_mses,
-    const int q_factor,
-    const int filter_strength,
-    const uint8_t* pred,
-    uint32_t* accum,
-    uint16_t* count);
-void av1_highbd_apply_temporal_filter_sse2(
-    const struct yv12_buffer_config* ref_frame,
-    const struct macroblockd* mbd,
-    const BLOCK_SIZE block_size,
-    const int mb_row,
-    const int mb_col,
-    const int num_planes,
-    const double* noise_levels,
-    const MV* subblock_mvs,
-    const int* subblock_mses,
-    const int q_factor,
-    const int filter_strength,
-    const uint8_t* pred,
-    uint32_t* accum,
-    uint16_t* count);
-void av1_highbd_apply_temporal_filter_avx2(
-    const struct yv12_buffer_config* ref_frame,
-    const struct macroblockd* mbd,
-    const BLOCK_SIZE block_size,
-    const int mb_row,
-    const int mb_col,
-    const int num_planes,
-    const double* noise_levels,
-    const MV* subblock_mvs,
-    const int* subblock_mses,
-    const int q_factor,
-    const int filter_strength,
-    const uint8_t* pred,
-    uint32_t* accum,
-    uint16_t* count);
-RTCD_EXTERN void (*av1_highbd_apply_temporal_filter)(
-    const struct yv12_buffer_config* ref_frame,
-    const struct macroblockd* mbd,
-    const BLOCK_SIZE block_size,
-    const int mb_row,
-    const int mb_col,
-    const int num_planes,
-    const double* noise_levels,
-    const MV* subblock_mvs,
-    const int* subblock_mses,
-    const int q_factor,
-    const int filter_strength,
-    const uint8_t* pred,
-    uint32_t* accum,
-    uint16_t* count);
-
-int64_t av1_highbd_block_error_c(const tran_low_t* coeff,
-                                 const tran_low_t* dqcoeff,
-                                 intptr_t block_size,
-                                 int64_t* ssz,
-                                 int bd);
-int64_t av1_highbd_block_error_sse2(const tran_low_t* coeff,
-                                    const tran_low_t* dqcoeff,
-                                    intptr_t block_size,
-                                    int64_t* ssz,
-                                    int bd);
-int64_t av1_highbd_block_error_avx2(const tran_low_t* coeff,
-                                    const tran_low_t* dqcoeff,
-                                    intptr_t block_size,
-                                    int64_t* ssz,
-                                    int bd);
-RTCD_EXTERN int64_t (*av1_highbd_block_error)(const tran_low_t* coeff,
-                                              const tran_low_t* dqcoeff,
-                                              intptr_t block_size,
-                                              int64_t* ssz,
-                                              int bd);
-
 void av1_highbd_convolve8_c(const uint8_t* src,
                             ptrdiff_t src_stride,
                             uint8_t* dst,
@@ -1626,101 +1216,6 @@
                                  int bps);
 #define av1_highbd_convolve8_vert av1_highbd_convolve8_vert_c
 
-void av1_highbd_convolve_2d_scale_c(const uint16_t* src,
-                                    int src_stride,
-                                    uint16_t* dst,
-                                    int dst_stride,
-                                    int w,
-                                    int h,
-                                    const InterpFilterParams* filter_params_x,
-                                    const InterpFilterParams* filter_params_y,
-                                    const int subpel_x_qn,
-                                    const int x_step_qn,
-                                    const int subpel_y_qn,
-                                    const int y_step_qn,
-                                    ConvolveParams* conv_params,
-                                    int bd);
-void av1_highbd_convolve_2d_scale_sse4_1(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_x,
-    const InterpFilterParams* filter_params_y,
-    const int subpel_x_qn,
-    const int x_step_qn,
-    const int subpel_y_qn,
-    const int y_step_qn,
-    ConvolveParams* conv_params,
-    int bd);
-RTCD_EXTERN void (*av1_highbd_convolve_2d_scale)(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_x,
-    const InterpFilterParams* filter_params_y,
-    const int subpel_x_qn,
-    const int x_step_qn,
-    const int subpel_y_qn,
-    const int y_step_qn,
-    ConvolveParams* conv_params,
-    int bd);
-
-void av1_highbd_convolve_2d_sr_c(const uint16_t* src,
-                                 int src_stride,
-                                 uint16_t* dst,
-                                 int dst_stride,
-                                 int w,
-                                 int h,
-                                 const InterpFilterParams* filter_params_x,
-                                 const InterpFilterParams* filter_params_y,
-                                 const int subpel_x_qn,
-                                 const int subpel_y_qn,
-                                 ConvolveParams* conv_params,
-                                 int bd);
-void av1_highbd_convolve_2d_sr_ssse3(const uint16_t* src,
-                                     int src_stride,
-                                     uint16_t* dst,
-                                     int dst_stride,
-                                     int w,
-                                     int h,
-                                     const InterpFilterParams* filter_params_x,
-                                     const InterpFilterParams* filter_params_y,
-                                     const int subpel_x_qn,
-                                     const int subpel_y_qn,
-                                     ConvolveParams* conv_params,
-                                     int bd);
-void av1_highbd_convolve_2d_sr_avx2(const uint16_t* src,
-                                    int src_stride,
-                                    uint16_t* dst,
-                                    int dst_stride,
-                                    int w,
-                                    int h,
-                                    const InterpFilterParams* filter_params_x,
-                                    const InterpFilterParams* filter_params_y,
-                                    const int subpel_x_qn,
-                                    const int subpel_y_qn,
-                                    ConvolveParams* conv_params,
-                                    int bd);
-RTCD_EXTERN void (*av1_highbd_convolve_2d_sr)(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_x,
-    const InterpFilterParams* filter_params_y,
-    const int subpel_x_qn,
-    const int subpel_y_qn,
-    ConvolveParams* conv_params,
-    int bd);
-
 void av1_highbd_convolve_avg_c(const uint8_t* src,
                                ptrdiff_t src_stride,
                                uint8_t* dst,
@@ -1747,388 +1242,6 @@
                                 int bps);
 #define av1_highbd_convolve_copy av1_highbd_convolve_copy_c
 
-void av1_highbd_convolve_horiz_rs_c(const uint16_t* src,
-                                    int src_stride,
-                                    uint16_t* dst,
-                                    int dst_stride,
-                                    int w,
-                                    int h,
-                                    const int16_t* x_filters,
-                                    int x0_qn,
-                                    int x_step_qn,
-                                    int bd);
-void av1_highbd_convolve_horiz_rs_sse4_1(const uint16_t* src,
-                                         int src_stride,
-                                         uint16_t* dst,
-                                         int dst_stride,
-                                         int w,
-                                         int h,
-                                         const int16_t* x_filters,
-                                         int x0_qn,
-                                         int x_step_qn,
-                                         int bd);
-RTCD_EXTERN void (*av1_highbd_convolve_horiz_rs)(const uint16_t* src,
-                                                 int src_stride,
-                                                 uint16_t* dst,
-                                                 int dst_stride,
-                                                 int w,
-                                                 int h,
-                                                 const int16_t* x_filters,
-                                                 int x0_qn,
-                                                 int x_step_qn,
-                                                 int bd);
-
-void av1_highbd_convolve_x_sr_c(const uint16_t* src,
-                                int src_stride,
-                                uint16_t* dst,
-                                int dst_stride,
-                                int w,
-                                int h,
-                                const InterpFilterParams* filter_params_x,
-                                const int subpel_x_qn,
-                                ConvolveParams* conv_params,
-                                int bd);
-void av1_highbd_convolve_x_sr_ssse3(const uint16_t* src,
-                                    int src_stride,
-                                    uint16_t* dst,
-                                    int dst_stride,
-                                    int w,
-                                    int h,
-                                    const InterpFilterParams* filter_params_x,
-                                    const int subpel_x_qn,
-                                    ConvolveParams* conv_params,
-                                    int bd);
-void av1_highbd_convolve_x_sr_avx2(const uint16_t* src,
-                                   int src_stride,
-                                   uint16_t* dst,
-                                   int dst_stride,
-                                   int w,
-                                   int h,
-                                   const InterpFilterParams* filter_params_x,
-                                   const int subpel_x_qn,
-                                   ConvolveParams* conv_params,
-                                   int bd);
-RTCD_EXTERN void (*av1_highbd_convolve_x_sr)(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_x,
-    const int subpel_x_qn,
-    ConvolveParams* conv_params,
-    int bd);
-
-void av1_highbd_convolve_y_sr_c(const uint16_t* src,
-                                int src_stride,
-                                uint16_t* dst,
-                                int dst_stride,
-                                int w,
-                                int h,
-                                const InterpFilterParams* filter_params_y,
-                                const int subpel_y_qn,
-                                int bd);
-void av1_highbd_convolve_y_sr_ssse3(const uint16_t* src,
-                                    int src_stride,
-                                    uint16_t* dst,
-                                    int dst_stride,
-                                    int w,
-                                    int h,
-                                    const InterpFilterParams* filter_params_y,
-                                    const int subpel_y_qn,
-                                    int bd);
-void av1_highbd_convolve_y_sr_avx2(const uint16_t* src,
-                                   int src_stride,
-                                   uint16_t* dst,
-                                   int dst_stride,
-                                   int w,
-                                   int h,
-                                   const InterpFilterParams* filter_params_y,
-                                   const int subpel_y_qn,
-                                   int bd);
-RTCD_EXTERN void (*av1_highbd_convolve_y_sr)(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_y,
-    const int subpel_y_qn,
-    int bd);
-
-void av1_highbd_dist_wtd_convolve_2d_c(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_x,
-    const InterpFilterParams* filter_params_y,
-    const int subpel_x_qn,
-    const int subpel_y_qn,
-    ConvolveParams* conv_params,
-    int bd);
-void av1_highbd_dist_wtd_convolve_2d_sse4_1(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_x,
-    const InterpFilterParams* filter_params_y,
-    const int subpel_x_qn,
-    const int subpel_y_qn,
-    ConvolveParams* conv_params,
-    int bd);
-void av1_highbd_dist_wtd_convolve_2d_avx2(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_x,
-    const InterpFilterParams* filter_params_y,
-    const int subpel_x_qn,
-    const int subpel_y_qn,
-    ConvolveParams* conv_params,
-    int bd);
-RTCD_EXTERN void (*av1_highbd_dist_wtd_convolve_2d)(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_x,
-    const InterpFilterParams* filter_params_y,
-    const int subpel_x_qn,
-    const int subpel_y_qn,
-    ConvolveParams* conv_params,
-    int bd);
-
-void av1_highbd_dist_wtd_convolve_2d_copy_c(const uint16_t* src,
-                                            int src_stride,
-                                            uint16_t* dst,
-                                            int dst_stride,
-                                            int w,
-                                            int h,
-                                            ConvolveParams* conv_params,
-                                            int bd);
-void av1_highbd_dist_wtd_convolve_2d_copy_sse4_1(const uint16_t* src,
-                                                 int src_stride,
-                                                 uint16_t* dst,
-                                                 int dst_stride,
-                                                 int w,
-                                                 int h,
-                                                 ConvolveParams* conv_params,
-                                                 int bd);
-void av1_highbd_dist_wtd_convolve_2d_copy_avx2(const uint16_t* src,
-                                               int src_stride,
-                                               uint16_t* dst,
-                                               int dst_stride,
-                                               int w,
-                                               int h,
-                                               ConvolveParams* conv_params,
-                                               int bd);
-RTCD_EXTERN void (*av1_highbd_dist_wtd_convolve_2d_copy)(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    ConvolveParams* conv_params,
-    int bd);
-
-void av1_highbd_dist_wtd_convolve_x_c(const uint16_t* src,
-                                      int src_stride,
-                                      uint16_t* dst,
-                                      int dst_stride,
-                                      int w,
-                                      int h,
-                                      const InterpFilterParams* filter_params_x,
-                                      const int subpel_x_qn,
-                                      ConvolveParams* conv_params,
-                                      int bd);
-void av1_highbd_dist_wtd_convolve_x_sse4_1(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_x,
-    const int subpel_x_qn,
-    ConvolveParams* conv_params,
-    int bd);
-void av1_highbd_dist_wtd_convolve_x_avx2(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_x,
-    const int subpel_x_qn,
-    ConvolveParams* conv_params,
-    int bd);
-RTCD_EXTERN void (*av1_highbd_dist_wtd_convolve_x)(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_x,
-    const int subpel_x_qn,
-    ConvolveParams* conv_params,
-    int bd);
-
-void av1_highbd_dist_wtd_convolve_y_c(const uint16_t* src,
-                                      int src_stride,
-                                      uint16_t* dst,
-                                      int dst_stride,
-                                      int w,
-                                      int h,
-                                      const InterpFilterParams* filter_params_y,
-                                      const int subpel_y_qn,
-                                      ConvolveParams* conv_params,
-                                      int bd);
-void av1_highbd_dist_wtd_convolve_y_sse4_1(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_y,
-    const int subpel_y_qn,
-    ConvolveParams* conv_params,
-    int bd);
-void av1_highbd_dist_wtd_convolve_y_avx2(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_y,
-    const int subpel_y_qn,
-    ConvolveParams* conv_params,
-    int bd);
-RTCD_EXTERN void (*av1_highbd_dist_wtd_convolve_y)(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_y,
-    const int subpel_y_qn,
-    ConvolveParams* conv_params,
-    int bd);
-
-void av1_highbd_dr_prediction_z1_c(uint16_t* dst,
-                                   ptrdiff_t stride,
-                                   int bw,
-                                   int bh,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int upsample_above,
-                                   int dx,
-                                   int dy,
-                                   int bd);
-void av1_highbd_dr_prediction_z1_avx2(uint16_t* dst,
-                                      ptrdiff_t stride,
-                                      int bw,
-                                      int bh,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int upsample_above,
-                                      int dx,
-                                      int dy,
-                                      int bd);
-RTCD_EXTERN void (*av1_highbd_dr_prediction_z1)(uint16_t* dst,
-                                                ptrdiff_t stride,
-                                                int bw,
-                                                int bh,
-                                                const uint16_t* above,
-                                                const uint16_t* left,
-                                                int upsample_above,
-                                                int dx,
-                                                int dy,
-                                                int bd);
-
-void av1_highbd_dr_prediction_z2_c(uint16_t* dst,
-                                   ptrdiff_t stride,
-                                   int bw,
-                                   int bh,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int upsample_above,
-                                   int upsample_left,
-                                   int dx,
-                                   int dy,
-                                   int bd);
-void av1_highbd_dr_prediction_z2_avx2(uint16_t* dst,
-                                      ptrdiff_t stride,
-                                      int bw,
-                                      int bh,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int upsample_above,
-                                      int upsample_left,
-                                      int dx,
-                                      int dy,
-                                      int bd);
-RTCD_EXTERN void (*av1_highbd_dr_prediction_z2)(uint16_t* dst,
-                                                ptrdiff_t stride,
-                                                int bw,
-                                                int bh,
-                                                const uint16_t* above,
-                                                const uint16_t* left,
-                                                int upsample_above,
-                                                int upsample_left,
-                                                int dx,
-                                                int dy,
-                                                int bd);
-
-void av1_highbd_dr_prediction_z3_c(uint16_t* dst,
-                                   ptrdiff_t stride,
-                                   int bw,
-                                   int bh,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int upsample_left,
-                                   int dx,
-                                   int dy,
-                                   int bd);
-void av1_highbd_dr_prediction_z3_avx2(uint16_t* dst,
-                                      ptrdiff_t stride,
-                                      int bw,
-                                      int bh,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int upsample_left,
-                                      int dx,
-                                      int dy,
-                                      int bd);
-RTCD_EXTERN void (*av1_highbd_dr_prediction_z3)(uint16_t* dst,
-                                                ptrdiff_t stride,
-                                                int bw,
-                                                int bh,
-                                                const uint16_t* above,
-                                                const uint16_t* left,
-                                                int upsample_left,
-                                                int dx,
-                                                int dy,
-                                                int bd);
-
 void av1_highbd_fwht4x4_c(const int16_t* input, tran_low_t* output, int stride);
 #define av1_highbd_fwht4x4 av1_highbd_fwht4x4_c
 
@@ -2311,236 +1424,6 @@
                                 int bd);
 #define av1_highbd_iwht4x4_1_add av1_highbd_iwht4x4_1_add_c
 
-int64_t av1_highbd_pixel_proj_error_c(const uint8_t* src8,
-                                      int width,
-                                      int height,
-                                      int src_stride,
-                                      const uint8_t* dat8,
-                                      int dat_stride,
-                                      int32_t* flt0,
-                                      int flt0_stride,
-                                      int32_t* flt1,
-                                      int flt1_stride,
-                                      int xq[2],
-                                      const sgr_params_type* params);
-int64_t av1_highbd_pixel_proj_error_sse4_1(const uint8_t* src8,
-                                           int width,
-                                           int height,
-                                           int src_stride,
-                                           const uint8_t* dat8,
-                                           int dat_stride,
-                                           int32_t* flt0,
-                                           int flt0_stride,
-                                           int32_t* flt1,
-                                           int flt1_stride,
-                                           int xq[2],
-                                           const sgr_params_type* params);
-int64_t av1_highbd_pixel_proj_error_avx2(const uint8_t* src8,
-                                         int width,
-                                         int height,
-                                         int src_stride,
-                                         const uint8_t* dat8,
-                                         int dat_stride,
-                                         int32_t* flt0,
-                                         int flt0_stride,
-                                         int32_t* flt1,
-                                         int flt1_stride,
-                                         int xq[2],
-                                         const sgr_params_type* params);
-RTCD_EXTERN int64_t (*av1_highbd_pixel_proj_error)(
-    const uint8_t* src8,
-    int width,
-    int height,
-    int src_stride,
-    const uint8_t* dat8,
-    int dat_stride,
-    int32_t* flt0,
-    int flt0_stride,
-    int32_t* flt1,
-    int flt1_stride,
-    int xq[2],
-    const sgr_params_type* params);
-
-void av1_highbd_quantize_fp_c(const tran_low_t* coeff_ptr,
-                              intptr_t n_coeffs,
-                              const int16_t* zbin_ptr,
-                              const int16_t* round_ptr,
-                              const int16_t* quant_ptr,
-                              const int16_t* quant_shift_ptr,
-                              tran_low_t* qcoeff_ptr,
-                              tran_low_t* dqcoeff_ptr,
-                              const int16_t* dequant_ptr,
-                              uint16_t* eob_ptr,
-                              const int16_t* scan,
-                              const int16_t* iscan,
-                              int log_scale);
-void av1_highbd_quantize_fp_sse4_1(const tran_low_t* coeff_ptr,
-                                   intptr_t n_coeffs,
-                                   const int16_t* zbin_ptr,
-                                   const int16_t* round_ptr,
-                                   const int16_t* quant_ptr,
-                                   const int16_t* quant_shift_ptr,
-                                   tran_low_t* qcoeff_ptr,
-                                   tran_low_t* dqcoeff_ptr,
-                                   const int16_t* dequant_ptr,
-                                   uint16_t* eob_ptr,
-                                   const int16_t* scan,
-                                   const int16_t* iscan,
-                                   int log_scale);
-void av1_highbd_quantize_fp_avx2(const tran_low_t* coeff_ptr,
-                                 intptr_t n_coeffs,
-                                 const int16_t* zbin_ptr,
-                                 const int16_t* round_ptr,
-                                 const int16_t* quant_ptr,
-                                 const int16_t* quant_shift_ptr,
-                                 tran_low_t* qcoeff_ptr,
-                                 tran_low_t* dqcoeff_ptr,
-                                 const int16_t* dequant_ptr,
-                                 uint16_t* eob_ptr,
-                                 const int16_t* scan,
-                                 const int16_t* iscan,
-                                 int log_scale);
-RTCD_EXTERN void (*av1_highbd_quantize_fp)(const tran_low_t* coeff_ptr,
-                                           intptr_t n_coeffs,
-                                           const int16_t* zbin_ptr,
-                                           const int16_t* round_ptr,
-                                           const int16_t* quant_ptr,
-                                           const int16_t* quant_shift_ptr,
-                                           tran_low_t* qcoeff_ptr,
-                                           tran_low_t* dqcoeff_ptr,
-                                           const int16_t* dequant_ptr,
-                                           uint16_t* eob_ptr,
-                                           const int16_t* scan,
-                                           const int16_t* iscan,
-                                           int log_scale);
-
-void av1_highbd_warp_affine_c(const int32_t* mat,
-                              const uint16_t* ref,
-                              int width,
-                              int height,
-                              int stride,
-                              uint16_t* pred,
-                              int p_col,
-                              int p_row,
-                              int p_width,
-                              int p_height,
-                              int p_stride,
-                              int subsampling_x,
-                              int subsampling_y,
-                              int bd,
-                              ConvolveParams* conv_params,
-                              int16_t alpha,
-                              int16_t beta,
-                              int16_t gamma,
-                              int16_t delta);
-void av1_highbd_warp_affine_sse4_1(const int32_t* mat,
-                                   const uint16_t* ref,
-                                   int width,
-                                   int height,
-                                   int stride,
-                                   uint16_t* pred,
-                                   int p_col,
-                                   int p_row,
-                                   int p_width,
-                                   int p_height,
-                                   int p_stride,
-                                   int subsampling_x,
-                                   int subsampling_y,
-                                   int bd,
-                                   ConvolveParams* conv_params,
-                                   int16_t alpha,
-                                   int16_t beta,
-                                   int16_t gamma,
-                                   int16_t delta);
-void av1_highbd_warp_affine_avx2(const int32_t* mat,
-                                 const uint16_t* ref,
-                                 int width,
-                                 int height,
-                                 int stride,
-                                 uint16_t* pred,
-                                 int p_col,
-                                 int p_row,
-                                 int p_width,
-                                 int p_height,
-                                 int p_stride,
-                                 int subsampling_x,
-                                 int subsampling_y,
-                                 int bd,
-                                 ConvolveParams* conv_params,
-                                 int16_t alpha,
-                                 int16_t beta,
-                                 int16_t gamma,
-                                 int16_t delta);
-RTCD_EXTERN void (*av1_highbd_warp_affine)(const int32_t* mat,
-                                           const uint16_t* ref,
-                                           int width,
-                                           int height,
-                                           int stride,
-                                           uint16_t* pred,
-                                           int p_col,
-                                           int p_row,
-                                           int p_width,
-                                           int p_height,
-                                           int p_stride,
-                                           int subsampling_x,
-                                           int subsampling_y,
-                                           int bd,
-                                           ConvolveParams* conv_params,
-                                           int16_t alpha,
-                                           int16_t beta,
-                                           int16_t gamma,
-                                           int16_t delta);
-
-void av1_highbd_wiener_convolve_add_src_c(const uint8_t* src,
-                                          ptrdiff_t src_stride,
-                                          uint8_t* dst,
-                                          ptrdiff_t dst_stride,
-                                          const int16_t* filter_x,
-                                          int x_step_q4,
-                                          const int16_t* filter_y,
-                                          int y_step_q4,
-                                          int w,
-                                          int h,
-                                          const ConvolveParams* conv_params,
-                                          int bd);
-void av1_highbd_wiener_convolve_add_src_ssse3(const uint8_t* src,
-                                              ptrdiff_t src_stride,
-                                              uint8_t* dst,
-                                              ptrdiff_t dst_stride,
-                                              const int16_t* filter_x,
-                                              int x_step_q4,
-                                              const int16_t* filter_y,
-                                              int y_step_q4,
-                                              int w,
-                                              int h,
-                                              const ConvolveParams* conv_params,
-                                              int bd);
-void av1_highbd_wiener_convolve_add_src_avx2(const uint8_t* src,
-                                             ptrdiff_t src_stride,
-                                             uint8_t* dst,
-                                             ptrdiff_t dst_stride,
-                                             const int16_t* filter_x,
-                                             int x_step_q4,
-                                             const int16_t* filter_y,
-                                             int y_step_q4,
-                                             int w,
-                                             int h,
-                                             const ConvolveParams* conv_params,
-                                             int bd);
-RTCD_EXTERN void (*av1_highbd_wiener_convolve_add_src)(
-    const uint8_t* src,
-    ptrdiff_t src_stride,
-    uint8_t* dst,
-    ptrdiff_t dst_stride,
-    const int16_t* filter_x,
-    int x_step_q4,
-    const int16_t* filter_y,
-    int y_step_q4,
-    int w,
-    int h,
-    const ConvolveParams* conv_params,
-    int bd);
-
 void av1_inv_txfm2d_add_16x16_c(const int32_t* input,
                                 uint16_t* output,
                                 int stride,
@@ -2730,56 +1613,6 @@
                                        int diff_stride,
                                        TxfmParam* txfm_param);
 
-int64_t av1_lowbd_pixel_proj_error_c(const uint8_t* src8,
-                                     int width,
-                                     int height,
-                                     int src_stride,
-                                     const uint8_t* dat8,
-                                     int dat_stride,
-                                     int32_t* flt0,
-                                     int flt0_stride,
-                                     int32_t* flt1,
-                                     int flt1_stride,
-                                     int xq[2],
-                                     const sgr_params_type* params);
-int64_t av1_lowbd_pixel_proj_error_sse4_1(const uint8_t* src8,
-                                          int width,
-                                          int height,
-                                          int src_stride,
-                                          const uint8_t* dat8,
-                                          int dat_stride,
-                                          int32_t* flt0,
-                                          int flt0_stride,
-                                          int32_t* flt1,
-                                          int flt1_stride,
-                                          int xq[2],
-                                          const sgr_params_type* params);
-int64_t av1_lowbd_pixel_proj_error_avx2(const uint8_t* src8,
-                                        int width,
-                                        int height,
-                                        int src_stride,
-                                        const uint8_t* dat8,
-                                        int dat_stride,
-                                        int32_t* flt0,
-                                        int flt0_stride,
-                                        int32_t* flt1,
-                                        int flt1_stride,
-                                        int xq[2],
-                                        const sgr_params_type* params);
-RTCD_EXTERN int64_t (*av1_lowbd_pixel_proj_error)(
-    const uint8_t* src8,
-    int width,
-    int height,
-    int src_stride,
-    const uint8_t* dat8,
-    int dat_stride,
-    int32_t* flt0,
-    int flt0_stride,
-    int32_t* flt1,
-    int flt1_stride,
-    int xq[2],
-    const sgr_params_type* params);
-
 void av1_nn_predict_c(const float* input_nodes,
                       const NN_CONFIG* const nn_config,
                       int reduce_prec,
@@ -2981,47 +1814,6 @@
 void av1_round_shift_array_sse4_1(int32_t* arr, int size, int bit);
 RTCD_EXTERN void (*av1_round_shift_array)(int32_t* arr, int size, int bit);
 
-int av1_selfguided_restoration_c(const uint8_t* dgd8,
-                                 int width,
-                                 int height,
-                                 int dgd_stride,
-                                 int32_t* flt0,
-                                 int32_t* flt1,
-                                 int flt_stride,
-                                 int sgr_params_idx,
-                                 int bit_depth,
-                                 int highbd);
-int av1_selfguided_restoration_sse4_1(const uint8_t* dgd8,
-                                      int width,
-                                      int height,
-                                      int dgd_stride,
-                                      int32_t* flt0,
-                                      int32_t* flt1,
-                                      int flt_stride,
-                                      int sgr_params_idx,
-                                      int bit_depth,
-                                      int highbd);
-int av1_selfguided_restoration_avx2(const uint8_t* dgd8,
-                                    int width,
-                                    int height,
-                                    int dgd_stride,
-                                    int32_t* flt0,
-                                    int32_t* flt1,
-                                    int flt_stride,
-                                    int sgr_params_idx,
-                                    int bit_depth,
-                                    int highbd);
-RTCD_EXTERN int (*av1_selfguided_restoration)(const uint8_t* dgd8,
-                                              int width,
-                                              int height,
-                                              int dgd_stride,
-                                              int32_t* flt0,
-                                              int32_t* flt1,
-                                              int flt_stride,
-                                              int sgr_params_idx,
-                                              int bit_depth,
-                                              int highbd);
-
 void av1_txb_init_levels_c(const tran_low_t* const coeff,
                            const int width,
                            const int height,
@@ -3047,79 +1839,6 @@
 void av1_upsample_intra_edge_high_sse4_1(uint16_t* p, int sz, int bd);
 RTCD_EXTERN void (*av1_upsample_intra_edge_high)(uint16_t* p, int sz, int bd);
 
-void av1_warp_affine_c(const int32_t* mat,
-                       const uint8_t* ref,
-                       int width,
-                       int height,
-                       int stride,
-                       uint8_t* pred,
-                       int p_col,
-                       int p_row,
-                       int p_width,
-                       int p_height,
-                       int p_stride,
-                       int subsampling_x,
-                       int subsampling_y,
-                       ConvolveParams* conv_params,
-                       int16_t alpha,
-                       int16_t beta,
-                       int16_t gamma,
-                       int16_t delta);
-void av1_warp_affine_sse4_1(const int32_t* mat,
-                            const uint8_t* ref,
-                            int width,
-                            int height,
-                            int stride,
-                            uint8_t* pred,
-                            int p_col,
-                            int p_row,
-                            int p_width,
-                            int p_height,
-                            int p_stride,
-                            int subsampling_x,
-                            int subsampling_y,
-                            ConvolveParams* conv_params,
-                            int16_t alpha,
-                            int16_t beta,
-                            int16_t gamma,
-                            int16_t delta);
-void av1_warp_affine_avx2(const int32_t* mat,
-                          const uint8_t* ref,
-                          int width,
-                          int height,
-                          int stride,
-                          uint8_t* pred,
-                          int p_col,
-                          int p_row,
-                          int p_width,
-                          int p_height,
-                          int p_stride,
-                          int subsampling_x,
-                          int subsampling_y,
-                          ConvolveParams* conv_params,
-                          int16_t alpha,
-                          int16_t beta,
-                          int16_t gamma,
-                          int16_t delta);
-RTCD_EXTERN void (*av1_warp_affine)(const int32_t* mat,
-                                    const uint8_t* ref,
-                                    int width,
-                                    int height,
-                                    int stride,
-                                    uint8_t* pred,
-                                    int p_col,
-                                    int p_row,
-                                    int p_width,
-                                    int p_height,
-                                    int p_stride,
-                                    int subsampling_x,
-                                    int subsampling_y,
-                                    ConvolveParams* conv_params,
-                                    int16_t alpha,
-                                    int16_t beta,
-                                    int16_t gamma,
-                                    int16_t delta);
-
 void av1_wedge_compute_delta_squares_c(int16_t* d,
                                        const int16_t* a,
                                        const int16_t* b,
@@ -3383,47 +2102,24 @@
                                  int32_t* var,
                                  int coeff_shift);
 
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_420_hbd_c(TX_SIZE tx_size);
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_420_hbd_ssse3(TX_SIZE tx_size);
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_420_hbd_avx2(TX_SIZE tx_size);
-RTCD_EXTERN cfl_subsample_hbd_fn (*cfl_get_luma_subsampling_420_hbd)(
-    TX_SIZE tx_size);
-
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_420_lbd_c(TX_SIZE tx_size);
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_420_lbd_ssse3(TX_SIZE tx_size);
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_420_lbd_avx2(TX_SIZE tx_size);
 RTCD_EXTERN cfl_subsample_lbd_fn (*cfl_get_luma_subsampling_420_lbd)(
     TX_SIZE tx_size);
 
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_422_hbd_c(TX_SIZE tx_size);
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_422_hbd_ssse3(TX_SIZE tx_size);
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_422_hbd_avx2(TX_SIZE tx_size);
-RTCD_EXTERN cfl_subsample_hbd_fn (*cfl_get_luma_subsampling_422_hbd)(
-    TX_SIZE tx_size);
-
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_422_lbd_c(TX_SIZE tx_size);
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_422_lbd_ssse3(TX_SIZE tx_size);
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_422_lbd_avx2(TX_SIZE tx_size);
 RTCD_EXTERN cfl_subsample_lbd_fn (*cfl_get_luma_subsampling_422_lbd)(
     TX_SIZE tx_size);
 
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_444_hbd_c(TX_SIZE tx_size);
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_444_hbd_ssse3(TX_SIZE tx_size);
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_444_hbd_avx2(TX_SIZE tx_size);
-RTCD_EXTERN cfl_subsample_hbd_fn (*cfl_get_luma_subsampling_444_hbd)(
-    TX_SIZE tx_size);
-
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_444_lbd_c(TX_SIZE tx_size);
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_444_lbd_ssse3(TX_SIZE tx_size);
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_444_lbd_avx2(TX_SIZE tx_size);
 RTCD_EXTERN cfl_subsample_lbd_fn (*cfl_get_luma_subsampling_444_lbd)(
     TX_SIZE tx_size);
 
-cfl_predict_hbd_fn cfl_get_predict_hbd_fn_c(TX_SIZE tx_size);
-cfl_predict_hbd_fn cfl_get_predict_hbd_fn_ssse3(TX_SIZE tx_size);
-cfl_predict_hbd_fn cfl_get_predict_hbd_fn_avx2(TX_SIZE tx_size);
-RTCD_EXTERN cfl_predict_hbd_fn (*cfl_get_predict_hbd_fn)(TX_SIZE tx_size);
-
 cfl_predict_lbd_fn cfl_get_predict_lbd_fn_c(TX_SIZE tx_size);
 cfl_predict_lbd_fn cfl_get_predict_lbd_fn_ssse3(TX_SIZE tx_size);
 cfl_predict_lbd_fn cfl_get_predict_lbd_fn_avx2(TX_SIZE tx_size);
@@ -3444,14 +2140,6 @@
 
   (void)flags;
 
-  av1_apply_selfguided_restoration = av1_apply_selfguided_restoration_c;
-  if (flags & HAS_SSE4_1)
-    av1_apply_selfguided_restoration = av1_apply_selfguided_restoration_sse4_1;
-  if (flags & HAS_AVX2)
-    av1_apply_selfguided_restoration = av1_apply_selfguided_restoration_avx2;
-  av1_apply_temporal_filter = av1_apply_temporal_filter_sse2;
-  if (flags & HAS_AVX2)
-    av1_apply_temporal_filter = av1_apply_temporal_filter_avx2;
   av1_block_error = av1_block_error_sse2;
   if (flags & HAS_AVX2)
     av1_block_error = av1_block_error_avx2;
@@ -3478,34 +2166,11 @@
   if (flags & HAS_AVX2)
     av1_build_compound_diffwtd_mask_highbd =
         av1_build_compound_diffwtd_mask_highbd_avx2;
-  av1_calc_frame_error = av1_calc_frame_error_sse2;
-  if (flags & HAS_AVX2)
-    av1_calc_frame_error = av1_calc_frame_error_avx2;
-  av1_calc_proj_params = av1_calc_proj_params_c;
-  if (flags & HAS_SSE4_1)
-    av1_calc_proj_params = av1_calc_proj_params_sse4_1;
-  if (flags & HAS_AVX2)
-    av1_calc_proj_params = av1_calc_proj_params_avx2;
-  av1_calc_proj_params_high_bd = av1_calc_proj_params_high_bd_c;
-  if (flags & HAS_SSE4_1)
-    av1_calc_proj_params_high_bd = av1_calc_proj_params_high_bd_sse4_1;
-  if (flags & HAS_AVX2)
-    av1_calc_proj_params_high_bd = av1_calc_proj_params_high_bd_avx2;
   av1_compute_cross_correlation = av1_compute_cross_correlation_c;
   if (flags & HAS_SSE4_1)
     av1_compute_cross_correlation = av1_compute_cross_correlation_sse4_1;
   if (flags & HAS_AVX2)
     av1_compute_cross_correlation = av1_compute_cross_correlation_avx2;
-  av1_compute_stats = av1_compute_stats_c;
-  if (flags & HAS_SSE4_1)
-    av1_compute_stats = av1_compute_stats_sse4_1;
-  if (flags & HAS_AVX2)
-    av1_compute_stats = av1_compute_stats_avx2;
-  av1_compute_stats_highbd = av1_compute_stats_highbd_c;
-  if (flags & HAS_SSE4_1)
-    av1_compute_stats_highbd = av1_compute_stats_highbd_sse4_1;
-  if (flags & HAS_AVX2)
-    av1_compute_stats_highbd = av1_compute_stats_highbd_avx2;
   av1_convolve_2d_scale = av1_convolve_2d_scale_c;
   if (flags & HAS_SSE4_1)
     av1_convolve_2d_scale = av1_convolve_2d_scale_sse4_1;
@@ -3630,64 +2295,6 @@
     av1_get_horver_correlation_full = av1_get_horver_correlation_full_sse4_1;
   if (flags & HAS_AVX2)
     av1_get_horver_correlation_full = av1_get_horver_correlation_full_avx2;
-  av1_highbd_apply_temporal_filter = av1_highbd_apply_temporal_filter_sse2;
-  if (flags & HAS_AVX2)
-    av1_highbd_apply_temporal_filter = av1_highbd_apply_temporal_filter_avx2;
-  av1_highbd_block_error = av1_highbd_block_error_sse2;
-  if (flags & HAS_AVX2)
-    av1_highbd_block_error = av1_highbd_block_error_avx2;
-  av1_highbd_convolve_2d_scale = av1_highbd_convolve_2d_scale_c;
-  if (flags & HAS_SSE4_1)
-    av1_highbd_convolve_2d_scale = av1_highbd_convolve_2d_scale_sse4_1;
-  av1_highbd_convolve_2d_sr = av1_highbd_convolve_2d_sr_c;
-  if (flags & HAS_SSSE3)
-    av1_highbd_convolve_2d_sr = av1_highbd_convolve_2d_sr_ssse3;
-  if (flags & HAS_AVX2)
-    av1_highbd_convolve_2d_sr = av1_highbd_convolve_2d_sr_avx2;
-  av1_highbd_convolve_horiz_rs = av1_highbd_convolve_horiz_rs_c;
-  if (flags & HAS_SSE4_1)
-    av1_highbd_convolve_horiz_rs = av1_highbd_convolve_horiz_rs_sse4_1;
-  av1_highbd_convolve_x_sr = av1_highbd_convolve_x_sr_c;
-  if (flags & HAS_SSSE3)
-    av1_highbd_convolve_x_sr = av1_highbd_convolve_x_sr_ssse3;
-  if (flags & HAS_AVX2)
-    av1_highbd_convolve_x_sr = av1_highbd_convolve_x_sr_avx2;
-  av1_highbd_convolve_y_sr = av1_highbd_convolve_y_sr_c;
-  if (flags & HAS_SSSE3)
-    av1_highbd_convolve_y_sr = av1_highbd_convolve_y_sr_ssse3;
-  if (flags & HAS_AVX2)
-    av1_highbd_convolve_y_sr = av1_highbd_convolve_y_sr_avx2;
-  av1_highbd_dist_wtd_convolve_2d = av1_highbd_dist_wtd_convolve_2d_c;
-  if (flags & HAS_SSE4_1)
-    av1_highbd_dist_wtd_convolve_2d = av1_highbd_dist_wtd_convolve_2d_sse4_1;
-  if (flags & HAS_AVX2)
-    av1_highbd_dist_wtd_convolve_2d = av1_highbd_dist_wtd_convolve_2d_avx2;
-  av1_highbd_dist_wtd_convolve_2d_copy = av1_highbd_dist_wtd_convolve_2d_copy_c;
-  if (flags & HAS_SSE4_1)
-    av1_highbd_dist_wtd_convolve_2d_copy =
-        av1_highbd_dist_wtd_convolve_2d_copy_sse4_1;
-  if (flags & HAS_AVX2)
-    av1_highbd_dist_wtd_convolve_2d_copy =
-        av1_highbd_dist_wtd_convolve_2d_copy_avx2;
-  av1_highbd_dist_wtd_convolve_x = av1_highbd_dist_wtd_convolve_x_c;
-  if (flags & HAS_SSE4_1)
-    av1_highbd_dist_wtd_convolve_x = av1_highbd_dist_wtd_convolve_x_sse4_1;
-  if (flags & HAS_AVX2)
-    av1_highbd_dist_wtd_convolve_x = av1_highbd_dist_wtd_convolve_x_avx2;
-  av1_highbd_dist_wtd_convolve_y = av1_highbd_dist_wtd_convolve_y_c;
-  if (flags & HAS_SSE4_1)
-    av1_highbd_dist_wtd_convolve_y = av1_highbd_dist_wtd_convolve_y_sse4_1;
-  if (flags & HAS_AVX2)
-    av1_highbd_dist_wtd_convolve_y = av1_highbd_dist_wtd_convolve_y_avx2;
-  av1_highbd_dr_prediction_z1 = av1_highbd_dr_prediction_z1_c;
-  if (flags & HAS_AVX2)
-    av1_highbd_dr_prediction_z1 = av1_highbd_dr_prediction_z1_avx2;
-  av1_highbd_dr_prediction_z2 = av1_highbd_dr_prediction_z2_c;
-  if (flags & HAS_AVX2)
-    av1_highbd_dr_prediction_z2 = av1_highbd_dr_prediction_z2_avx2;
-  av1_highbd_dr_prediction_z3 = av1_highbd_dr_prediction_z3_c;
-  if (flags & HAS_AVX2)
-    av1_highbd_dr_prediction_z3 = av1_highbd_dr_prediction_z3_avx2;
   av1_highbd_inv_txfm_add = av1_highbd_inv_txfm_add_c;
   if (flags & HAS_SSE4_1)
     av1_highbd_inv_txfm_add = av1_highbd_inv_txfm_add_sse4_1;
@@ -3711,28 +2318,6 @@
   av1_highbd_inv_txfm_add_8x8 = av1_highbd_inv_txfm_add_8x8_c;
   if (flags & HAS_SSE4_1)
     av1_highbd_inv_txfm_add_8x8 = av1_highbd_inv_txfm_add_8x8_sse4_1;
-  av1_highbd_pixel_proj_error = av1_highbd_pixel_proj_error_c;
-  if (flags & HAS_SSE4_1)
-    av1_highbd_pixel_proj_error = av1_highbd_pixel_proj_error_sse4_1;
-  if (flags & HAS_AVX2)
-    av1_highbd_pixel_proj_error = av1_highbd_pixel_proj_error_avx2;
-  av1_highbd_quantize_fp = av1_highbd_quantize_fp_c;
-  if (flags & HAS_SSE4_1)
-    av1_highbd_quantize_fp = av1_highbd_quantize_fp_sse4_1;
-  if (flags & HAS_AVX2)
-    av1_highbd_quantize_fp = av1_highbd_quantize_fp_avx2;
-  av1_highbd_warp_affine = av1_highbd_warp_affine_c;
-  if (flags & HAS_SSE4_1)
-    av1_highbd_warp_affine = av1_highbd_warp_affine_sse4_1;
-  if (flags & HAS_AVX2)
-    av1_highbd_warp_affine = av1_highbd_warp_affine_avx2;
-  av1_highbd_wiener_convolve_add_src = av1_highbd_wiener_convolve_add_src_c;
-  if (flags & HAS_SSSE3)
-    av1_highbd_wiener_convolve_add_src =
-        av1_highbd_wiener_convolve_add_src_ssse3;
-  if (flags & HAS_AVX2)
-    av1_highbd_wiener_convolve_add_src =
-        av1_highbd_wiener_convolve_add_src_avx2;
   av1_inv_txfm2d_add_4x4 = av1_inv_txfm2d_add_4x4_c;
   if (flags & HAS_SSE4_1)
     av1_inv_txfm2d_add_4x4 = av1_inv_txfm2d_add_4x4_sse4_1;
@@ -3749,11 +2334,6 @@
     av1_lowbd_fwd_txfm = av1_lowbd_fwd_txfm_sse4_1;
   if (flags & HAS_AVX2)
     av1_lowbd_fwd_txfm = av1_lowbd_fwd_txfm_avx2;
-  av1_lowbd_pixel_proj_error = av1_lowbd_pixel_proj_error_c;
-  if (flags & HAS_SSE4_1)
-    av1_lowbd_pixel_proj_error = av1_lowbd_pixel_proj_error_sse4_1;
-  if (flags & HAS_AVX2)
-    av1_lowbd_pixel_proj_error = av1_lowbd_pixel_proj_error_avx2;
   av1_nn_predict = av1_nn_predict_c;
   if (flags & HAS_SSE3)
     av1_nn_predict = av1_nn_predict_sse3;
@@ -3775,11 +2355,6 @@
   av1_round_shift_array = av1_round_shift_array_c;
   if (flags & HAS_SSE4_1)
     av1_round_shift_array = av1_round_shift_array_sse4_1;
-  av1_selfguided_restoration = av1_selfguided_restoration_c;
-  if (flags & HAS_SSE4_1)
-    av1_selfguided_restoration = av1_selfguided_restoration_sse4_1;
-  if (flags & HAS_AVX2)
-    av1_selfguided_restoration = av1_selfguided_restoration_avx2;
   av1_txb_init_levels = av1_txb_init_levels_c;
   if (flags & HAS_SSE4_1)
     av1_txb_init_levels = av1_txb_init_levels_sse4_1;
@@ -3791,11 +2366,6 @@
   av1_upsample_intra_edge_high = av1_upsample_intra_edge_high_c;
   if (flags & HAS_SSE4_1)
     av1_upsample_intra_edge_high = av1_upsample_intra_edge_high_sse4_1;
-  av1_warp_affine = av1_warp_affine_c;
-  if (flags & HAS_SSE4_1)
-    av1_warp_affine = av1_warp_affine_sse4_1;
-  if (flags & HAS_AVX2)
-    av1_warp_affine = av1_warp_affine_avx2;
   av1_wedge_compute_delta_squares = av1_wedge_compute_delta_squares_sse2;
   if (flags & HAS_AVX2)
     av1_wedge_compute_delta_squares = av1_wedge_compute_delta_squares_avx2;
@@ -3836,41 +2406,21 @@
     cdef_find_dir = cdef_find_dir_sse4_1;
   if (flags & HAS_AVX2)
     cdef_find_dir = cdef_find_dir_avx2;
-  cfl_get_luma_subsampling_420_hbd = cfl_get_luma_subsampling_420_hbd_c;
-  if (flags & HAS_SSSE3)
-    cfl_get_luma_subsampling_420_hbd = cfl_get_luma_subsampling_420_hbd_ssse3;
-  if (flags & HAS_AVX2)
-    cfl_get_luma_subsampling_420_hbd = cfl_get_luma_subsampling_420_hbd_avx2;
   cfl_get_luma_subsampling_420_lbd = cfl_get_luma_subsampling_420_lbd_c;
   if (flags & HAS_SSSE3)
     cfl_get_luma_subsampling_420_lbd = cfl_get_luma_subsampling_420_lbd_ssse3;
   if (flags & HAS_AVX2)
     cfl_get_luma_subsampling_420_lbd = cfl_get_luma_subsampling_420_lbd_avx2;
-  cfl_get_luma_subsampling_422_hbd = cfl_get_luma_subsampling_422_hbd_c;
-  if (flags & HAS_SSSE3)
-    cfl_get_luma_subsampling_422_hbd = cfl_get_luma_subsampling_422_hbd_ssse3;
-  if (flags & HAS_AVX2)
-    cfl_get_luma_subsampling_422_hbd = cfl_get_luma_subsampling_422_hbd_avx2;
   cfl_get_luma_subsampling_422_lbd = cfl_get_luma_subsampling_422_lbd_c;
   if (flags & HAS_SSSE3)
     cfl_get_luma_subsampling_422_lbd = cfl_get_luma_subsampling_422_lbd_ssse3;
   if (flags & HAS_AVX2)
     cfl_get_luma_subsampling_422_lbd = cfl_get_luma_subsampling_422_lbd_avx2;
-  cfl_get_luma_subsampling_444_hbd = cfl_get_luma_subsampling_444_hbd_c;
-  if (flags & HAS_SSSE3)
-    cfl_get_luma_subsampling_444_hbd = cfl_get_luma_subsampling_444_hbd_ssse3;
-  if (flags & HAS_AVX2)
-    cfl_get_luma_subsampling_444_hbd = cfl_get_luma_subsampling_444_hbd_avx2;
   cfl_get_luma_subsampling_444_lbd = cfl_get_luma_subsampling_444_lbd_c;
   if (flags & HAS_SSSE3)
     cfl_get_luma_subsampling_444_lbd = cfl_get_luma_subsampling_444_lbd_ssse3;
   if (flags & HAS_AVX2)
     cfl_get_luma_subsampling_444_lbd = cfl_get_luma_subsampling_444_lbd_avx2;
-  cfl_get_predict_hbd_fn = cfl_get_predict_hbd_fn_c;
-  if (flags & HAS_SSSE3)
-    cfl_get_predict_hbd_fn = cfl_get_predict_hbd_fn_ssse3;
-  if (flags & HAS_AVX2)
-    cfl_get_predict_hbd_fn = cfl_get_predict_hbd_fn_avx2;
   cfl_get_predict_lbd_fn = cfl_get_predict_lbd_fn_c;
   if (flags & HAS_SSSE3)
     cfl_get_predict_lbd_fn = cfl_get_predict_lbd_fn_ssse3;
diff --git a/third_party/libaom/source/config/linux/x64/config/aom_config.asm b/third_party/libaom/source/config/linux/x64/config/aom_config.asm
index 75d9fc7..212b282 100644
--- a/third_party/libaom/source/config/linux/x64/config/aom_config.asm
+++ b/third_party/libaom/source/config/linux/x64/config/aom_config.asm
@@ -7,7 +7,7 @@
 %define CONFIG_ANALYZER 0
 %define CONFIG_AV1_DECODER 1
 %define CONFIG_AV1_ENCODER 1
-%define CONFIG_AV1_HIGHBITDEPTH 1
+%define CONFIG_AV1_HIGHBITDEPTH 0
 %define CONFIG_AV1_TEMPORAL_DENOISING 0
 %define CONFIG_BIG_ENDIAN 0
 %define CONFIG_BITSTREAM_DEBUG 0
@@ -37,7 +37,7 @@
 %define CONFIG_OS_SUPPORT 1
 %define CONFIG_PIC 0
 %define CONFIG_RD_DEBUG 0
-%define CONFIG_REALTIME_ONLY 0
+%define CONFIG_REALTIME_ONLY 1
 %define CONFIG_RUNTIME_CPU_DETECT 1
 %define CONFIG_SHARED 0
 %define CONFIG_SHARP_SETTINGS 0
diff --git a/third_party/libaom/source/config/linux/x64/config/aom_config.c b/third_party/libaom/source/config/linux/x64/config/aom_config.c
index 42c09f1..daa831c 100644
--- a/third_party/libaom/source/config/linux/x64/config/aom_config.c
+++ b/third_party/libaom/source/config/linux/x64/config/aom_config.c
@@ -9,5 +9,5 @@
  * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
  */
 #include "aom/aom_codec.h"
-static const char* const cfg = "cmake ../source/libaom -G \"Unix Makefiles\" -DAOM_TARGET_CPU=x86_64 -DCONFIG_AV1_ENCODER=1 -DCONFIG_LIBYUV=0 -DCONFIG_MAX_DECODE_PROFILE=0 -DCONFIG_NORMAL_TILE_MODE=1 -DCONFIG_SIZE_LIMIT=1 -DDECODE_HEIGHT_LIMIT=16384 -DDECODE_WIDTH_LIMIT=16384";
+static const char* const cfg = "cmake ../source/libaom -G \"Unix Makefiles\" -DAOM_TARGET_CPU=x86_64 -DCONFIG_AV1_ENCODER=1 -DCONFIG_LIBYUV=0 -DCONFIG_MAX_DECODE_PROFILE=0 -DCONFIG_NORMAL_TILE_MODE=1 -DCONFIG_SIZE_LIMIT=1 -DDECODE_HEIGHT_LIMIT=16384 -DDECODE_WIDTH_LIMIT=16384 -DCONFIG_REALTIME_ONLY=1 -DCONFIG_AV1_HIGHBITDEPTH=0";
 const char *aom_codec_build_config(void) {return cfg;}
diff --git a/third_party/libaom/source/config/linux/x64/config/aom_config.h b/third_party/libaom/source/config/linux/x64/config/aom_config.h
index 1cbad06..592d1f7 100644
--- a/third_party/libaom/source/config/linux/x64/config/aom_config.h
+++ b/third_party/libaom/source/config/linux/x64/config/aom_config.h
@@ -19,7 +19,7 @@
 #define CONFIG_ANALYZER 0
 #define CONFIG_AV1_DECODER 1
 #define CONFIG_AV1_ENCODER 1
-#define CONFIG_AV1_HIGHBITDEPTH 1
+#define CONFIG_AV1_HIGHBITDEPTH 0
 #define CONFIG_AV1_TEMPORAL_DENOISING 0
 #define CONFIG_BIG_ENDIAN 0
 #define CONFIG_BITSTREAM_DEBUG 0
@@ -49,7 +49,7 @@
 #define CONFIG_OS_SUPPORT 1
 #define CONFIG_PIC 0
 #define CONFIG_RD_DEBUG 0
-#define CONFIG_REALTIME_ONLY 0
+#define CONFIG_REALTIME_ONLY 1
 #define CONFIG_RUNTIME_CPU_DETECT 1
 #define CONFIG_SHARED 0
 #define CONFIG_SHARP_SETTINGS 0
diff --git a/third_party/libaom/source/config/linux/x64/config/aom_dsp_rtcd.h b/third_party/libaom/source/config/linux/x64/config/aom_dsp_rtcd.h
index df1d282..11188ae4 100644
--- a/third_party/libaom/source/config/linux/x64/config/aom_dsp_rtcd.h
+++ b/third_party/libaom/source/config/linux/x64/config/aom_dsp_rtcd.h
@@ -2911,14548 +2911,6 @@
                               int16_t* coeff);
 #define aom_hadamard_lp_8x8 aom_hadamard_lp_8x8_sse2
 
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x128 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x64 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x16 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x16_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x32 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x32_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x4 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x4_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x64 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x64_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x8 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x8_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x16 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x16_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x32 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x32_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x64 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x64_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x8 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x8_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x16 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x4 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x4_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x8 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x128 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x16 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x16_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x32 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x32_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x64 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x64_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x16 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x16_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x32 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x32_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x4 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x4_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x8 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x8_c
-
-void aom_highbd_10_get16x16var_c(const uint8_t* src_ptr,
-                                 int source_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride,
-                                 unsigned int* sse,
-                                 int* sum);
-#define aom_highbd_10_get16x16var aom_highbd_10_get16x16var_c
-
-void aom_highbd_10_get8x8var_c(const uint8_t* src_ptr,
-                               int source_stride,
-                               const uint8_t* ref_ptr,
-                               int ref_stride,
-                               unsigned int* sse,
-                               int* sum);
-#define aom_highbd_10_get8x8var aom_highbd_10_get8x8var_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance128x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance128x128_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance128x128)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance128x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance128x64_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance128x64)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x16_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance16x16)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x32_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance16x32)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x4_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance16x4)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x64_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance16x64)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x8_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance16x8)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x16_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance32x16)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x32_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance32x32)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x64_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance32x64)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x8_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance32x8)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance4x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance4x16_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance4x16)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance4x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance4x4_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance4x4)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance4x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance4x8_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance4x8)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x128_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance64x128)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x16_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance64x16)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x32_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance64x32)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x64_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance64x64)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x16_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance8x16)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x32_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance8x32)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x4_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance8x4)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x8_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance8x8)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_mse16x16_c(const uint8_t* src_ptr,
-                                      int source_stride,
-                                      const uint8_t* ref_ptr,
-                                      int recon_stride,
-                                      unsigned int* sse);
-unsigned int aom_highbd_10_mse16x16_sse2(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int recon_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_mse16x16 aom_highbd_10_mse16x16_sse2
-
-unsigned int aom_highbd_10_mse16x8_c(const uint8_t* src_ptr,
-                                     int source_stride,
-                                     const uint8_t* ref_ptr,
-                                     int recon_stride,
-                                     unsigned int* sse);
-#define aom_highbd_10_mse16x8 aom_highbd_10_mse16x8_c
-
-unsigned int aom_highbd_10_mse8x16_c(const uint8_t* src_ptr,
-                                     int source_stride,
-                                     const uint8_t* ref_ptr,
-                                     int recon_stride,
-                                     unsigned int* sse);
-#define aom_highbd_10_mse8x16 aom_highbd_10_mse8x16_c
-
-unsigned int aom_highbd_10_mse8x8_c(const uint8_t* src_ptr,
-                                    int source_stride,
-                                    const uint8_t* ref_ptr,
-                                    int recon_stride,
-                                    unsigned int* sse);
-unsigned int aom_highbd_10_mse8x8_sse2(const uint8_t* src_ptr,
-                                       int source_stride,
-                                       const uint8_t* ref_ptr,
-                                       int recon_stride,
-                                       unsigned int* sse);
-#define aom_highbd_10_mse8x8 aom_highbd_10_mse8x8_sse2
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance128x128_c(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            int xoffset,
-                                                            int yoffset,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance128x128 \
-  aom_highbd_10_obmc_sub_pixel_variance128x128_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance128x64_c(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance128x64 \
-  aom_highbd_10_obmc_sub_pixel_variance128x64_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance16x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance16x16 \
-  aom_highbd_10_obmc_sub_pixel_variance16x16_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance16x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance16x32 \
-  aom_highbd_10_obmc_sub_pixel_variance16x32_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance16x4_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance16x4 \
-  aom_highbd_10_obmc_sub_pixel_variance16x4_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance16x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance16x64 \
-  aom_highbd_10_obmc_sub_pixel_variance16x64_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance16x8_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance16x8 \
-  aom_highbd_10_obmc_sub_pixel_variance16x8_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance32x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance32x16 \
-  aom_highbd_10_obmc_sub_pixel_variance32x16_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance32x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance32x32 \
-  aom_highbd_10_obmc_sub_pixel_variance32x32_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance32x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance32x64 \
-  aom_highbd_10_obmc_sub_pixel_variance32x64_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance32x8_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance32x8 \
-  aom_highbd_10_obmc_sub_pixel_variance32x8_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance4x16_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance4x16 \
-  aom_highbd_10_obmc_sub_pixel_variance4x16_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance4x4_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance4x4 \
-  aom_highbd_10_obmc_sub_pixel_variance4x4_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance4x8_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance4x8 \
-  aom_highbd_10_obmc_sub_pixel_variance4x8_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance64x128_c(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance64x128 \
-  aom_highbd_10_obmc_sub_pixel_variance64x128_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance64x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance64x16 \
-  aom_highbd_10_obmc_sub_pixel_variance64x16_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance64x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance64x32 \
-  aom_highbd_10_obmc_sub_pixel_variance64x32_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance64x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance64x64 \
-  aom_highbd_10_obmc_sub_pixel_variance64x64_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance8x16_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance8x16 \
-  aom_highbd_10_obmc_sub_pixel_variance8x16_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance8x32_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance8x32 \
-  aom_highbd_10_obmc_sub_pixel_variance8x32_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance8x4_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance8x4 \
-  aom_highbd_10_obmc_sub_pixel_variance8x4_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance8x8_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance8x8 \
-  aom_highbd_10_obmc_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_10_obmc_variance128x128_c(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance128x128_sse4_1(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance128x128)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance128x64_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance128x64_sse4_1(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance128x64)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance16x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance16x16_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance16x16)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance16x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance16x32_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance16x32)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance16x4_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance16x4_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance16x4)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance16x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance16x64_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance16x64)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance16x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance16x8_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance16x8)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance32x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance32x16_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance32x16)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance32x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance32x32_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance32x32)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance32x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance32x64_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance32x64)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance32x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance32x8_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance32x8)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance4x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance4x16_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance4x16)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance4x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance4x4_sse4_1(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance4x4)(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance4x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance4x8_sse4_1(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance4x8)(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance64x128_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance64x128_sse4_1(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance64x128)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance64x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance64x16_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance64x16)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance64x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance64x32_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance64x32)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance64x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance64x64_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance64x64)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance8x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance8x16_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance8x16)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance8x32_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance8x32_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance8x32)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance8x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance8x4_sse4_1(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance8x4)(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance8x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance8x8_sse4_1(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance8x8)(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance128x128 \
-  aom_highbd_10_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance128x64 \
-  aom_highbd_10_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x16_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance16x16 \
-  aom_highbd_10_sub_pixel_avg_variance16x16_sse2
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x32_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance16x32 \
-  aom_highbd_10_sub_pixel_avg_variance16x32_sse2
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x4_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x4_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance16x4 \
-  aom_highbd_10_sub_pixel_avg_variance16x4_sse2
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x64_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance16x64 \
-  aom_highbd_10_sub_pixel_avg_variance16x64_sse2
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x8_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance16x8 \
-  aom_highbd_10_sub_pixel_avg_variance16x8_sse2
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x16_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance32x16 \
-  aom_highbd_10_sub_pixel_avg_variance32x16_sse2
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x32_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance32x32 \
-  aom_highbd_10_sub_pixel_avg_variance32x32_sse2
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x64_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance32x64 \
-  aom_highbd_10_sub_pixel_avg_variance32x64_sse2
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x8_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x8_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance32x8 \
-  aom_highbd_10_sub_pixel_avg_variance32x8_sse2
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance4x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance4x16 \
-  aom_highbd_10_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance4x4_sse4_1(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-RTCD_EXTERN uint32_t (*aom_highbd_10_sub_pixel_avg_variance4x4)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance4x8 \
-  aom_highbd_10_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance64x128 \
-  aom_highbd_10_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance64x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance64x16_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance64x16 \
-  aom_highbd_10_sub_pixel_avg_variance64x16_sse2
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance64x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance64x32_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance64x32 \
-  aom_highbd_10_sub_pixel_avg_variance64x32_sse2
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance64x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance64x64_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance64x64 \
-  aom_highbd_10_sub_pixel_avg_variance64x64_sse2
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x16_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance8x16 \
-  aom_highbd_10_sub_pixel_avg_variance8x16_sse2
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x32_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x32_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance8x32 \
-  aom_highbd_10_sub_pixel_avg_variance8x32_sse2
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x4_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance8x4 \
-  aom_highbd_10_sub_pixel_avg_variance8x4_sse2
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x8_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance8x8 \
-  aom_highbd_10_sub_pixel_avg_variance8x8_sse2
-
-uint32_t aom_highbd_10_sub_pixel_variance128x128_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance128x128_sse2(const uint8_t* src_ptr,
-                                                      int source_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const uint8_t* ref_ptr,
-                                                      int ref_stride,
-                                                      uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance128x128_avx2(const uint8_t* src_ptr,
-                                                      int source_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const uint8_t* ref_ptr,
-                                                      int ref_stride,
-                                                      uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_10_sub_pixel_variance128x128)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-uint32_t aom_highbd_10_sub_pixel_variance128x64_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance128x64_sse2(const uint8_t* src_ptr,
-                                                     int source_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const uint8_t* ref_ptr,
-                                                     int ref_stride,
-                                                     uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance128x64_avx2(const uint8_t* src_ptr,
-                                                     int source_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const uint8_t* ref_ptr,
-                                                     int ref_stride,
-                                                     uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_10_sub_pixel_variance128x64)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-uint32_t aom_highbd_10_sub_pixel_variance16x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance16x16_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance16x16_avx2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_10_sub_pixel_variance16x16)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-uint32_t aom_highbd_10_sub_pixel_variance16x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance16x32_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance16x32_avx2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_10_sub_pixel_variance16x32)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-uint32_t aom_highbd_10_sub_pixel_variance16x4_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance16x4_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance16x4 \
-  aom_highbd_10_sub_pixel_variance16x4_sse2
-
-uint32_t aom_highbd_10_sub_pixel_variance16x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance16x64_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance16x64 \
-  aom_highbd_10_sub_pixel_variance16x64_sse2
-
-uint32_t aom_highbd_10_sub_pixel_variance16x8_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance16x8_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance16x8_avx2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_10_sub_pixel_variance16x8)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-uint32_t aom_highbd_10_sub_pixel_variance32x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance32x16_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance32x16_avx2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_10_sub_pixel_variance32x16)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-uint32_t aom_highbd_10_sub_pixel_variance32x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance32x32_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance32x32_avx2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_10_sub_pixel_variance32x32)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-uint32_t aom_highbd_10_sub_pixel_variance32x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance32x64_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance32x64_avx2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_10_sub_pixel_variance32x64)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-uint32_t aom_highbd_10_sub_pixel_variance32x8_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance32x8_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance32x8 \
-  aom_highbd_10_sub_pixel_variance32x8_sse2
-
-uint32_t aom_highbd_10_sub_pixel_variance4x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance4x16 \
-  aom_highbd_10_sub_pixel_variance4x16_c
-
-uint32_t aom_highbd_10_sub_pixel_variance4x4_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance4x4_sse4_1(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_10_sub_pixel_variance4x4)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-uint32_t aom_highbd_10_sub_pixel_variance4x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance4x8 \
-  aom_highbd_10_sub_pixel_variance4x8_c
-
-uint32_t aom_highbd_10_sub_pixel_variance64x128_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance64x128_sse2(const uint8_t* src_ptr,
-                                                     int source_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const uint8_t* ref_ptr,
-                                                     int ref_stride,
-                                                     uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance64x128_avx2(const uint8_t* src_ptr,
-                                                     int source_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const uint8_t* ref_ptr,
-                                                     int ref_stride,
-                                                     uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_10_sub_pixel_variance64x128)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-uint32_t aom_highbd_10_sub_pixel_variance64x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance64x16_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance64x16 \
-  aom_highbd_10_sub_pixel_variance64x16_sse2
-
-uint32_t aom_highbd_10_sub_pixel_variance64x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance64x32_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance64x32_avx2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_10_sub_pixel_variance64x32)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-uint32_t aom_highbd_10_sub_pixel_variance64x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance64x64_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance64x64_avx2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_10_sub_pixel_variance64x64)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-uint32_t aom_highbd_10_sub_pixel_variance8x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance8x16_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance8x16_avx2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_10_sub_pixel_variance8x16)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-uint32_t aom_highbd_10_sub_pixel_variance8x32_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance8x32_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance8x32 \
-  aom_highbd_10_sub_pixel_variance8x32_sse2
-
-uint32_t aom_highbd_10_sub_pixel_variance8x4_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance8x4_sse2(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance8x4 \
-  aom_highbd_10_sub_pixel_variance8x4_sse2
-
-uint32_t aom_highbd_10_sub_pixel_variance8x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance8x8_sse2(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance8x8_avx2(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_10_sub_pixel_variance8x8)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-unsigned int aom_highbd_10_variance128x128_c(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-unsigned int aom_highbd_10_variance128x128_sse2(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                unsigned int* sse);
-unsigned int aom_highbd_10_variance128x128_avx2(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_variance128x128)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_variance128x64_c(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-unsigned int aom_highbd_10_variance128x64_sse2(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               unsigned int* sse);
-unsigned int aom_highbd_10_variance128x64_avx2(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_variance128x64)(const uint8_t* src_ptr,
-                                                         int source_stride,
-                                                         const uint8_t* ref_ptr,
-                                                         int ref_stride,
-                                                         unsigned int* sse);
-
-unsigned int aom_highbd_10_variance16x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_10_variance16x16_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-unsigned int aom_highbd_10_variance16x16_avx2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_variance16x16)(const uint8_t* src_ptr,
-                                                        int source_stride,
-                                                        const uint8_t* ref_ptr,
-                                                        int ref_stride,
-                                                        unsigned int* sse);
-
-unsigned int aom_highbd_10_variance16x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_10_variance16x32_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-unsigned int aom_highbd_10_variance16x32_avx2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_variance16x32)(const uint8_t* src_ptr,
-                                                        int source_stride,
-                                                        const uint8_t* ref_ptr,
-                                                        int ref_stride,
-                                                        unsigned int* sse);
-
-unsigned int aom_highbd_10_variance16x4_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_10_variance16x4 aom_highbd_10_variance16x4_c
-
-unsigned int aom_highbd_10_variance16x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           uint32_t* sse);
-unsigned int aom_highbd_10_variance16x64_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-#define aom_highbd_10_variance16x64 aom_highbd_10_variance16x64_sse2
-
-unsigned int aom_highbd_10_variance16x8_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-unsigned int aom_highbd_10_variance16x8_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-unsigned int aom_highbd_10_variance16x8_avx2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_variance16x8)(const uint8_t* src_ptr,
-                                                       int source_stride,
-                                                       const uint8_t* ref_ptr,
-                                                       int ref_stride,
-                                                       unsigned int* sse);
-
-unsigned int aom_highbd_10_variance2x2_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance2x2 aom_highbd_10_variance2x2_c
-
-unsigned int aom_highbd_10_variance2x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance2x4 aom_highbd_10_variance2x4_c
-
-unsigned int aom_highbd_10_variance32x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_10_variance32x16_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-unsigned int aom_highbd_10_variance32x16_avx2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_variance32x16)(const uint8_t* src_ptr,
-                                                        int source_stride,
-                                                        const uint8_t* ref_ptr,
-                                                        int ref_stride,
-                                                        unsigned int* sse);
-
-unsigned int aom_highbd_10_variance32x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_10_variance32x32_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-unsigned int aom_highbd_10_variance32x32_avx2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_variance32x32)(const uint8_t* src_ptr,
-                                                        int source_stride,
-                                                        const uint8_t* ref_ptr,
-                                                        int ref_stride,
-                                                        unsigned int* sse);
-
-unsigned int aom_highbd_10_variance32x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_10_variance32x64_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-unsigned int aom_highbd_10_variance32x64_avx2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_variance32x64)(const uint8_t* src_ptr,
-                                                        int source_stride,
-                                                        const uint8_t* ref_ptr,
-                                                        int ref_stride,
-                                                        unsigned int* sse);
-
-unsigned int aom_highbd_10_variance32x8_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-unsigned int aom_highbd_10_variance32x8_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             uint32_t* sse);
-#define aom_highbd_10_variance32x8 aom_highbd_10_variance32x8_sse2
-
-unsigned int aom_highbd_10_variance4x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_10_variance4x16 aom_highbd_10_variance4x16_c
-
-unsigned int aom_highbd_10_variance4x2_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance4x2 aom_highbd_10_variance4x2_c
-
-unsigned int aom_highbd_10_variance4x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-unsigned int aom_highbd_10_variance4x4_sse4_1(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_variance4x4)(const uint8_t* src_ptr,
-                                                      int source_stride,
-                                                      const uint8_t* ref_ptr,
-                                                      int ref_stride,
-                                                      unsigned int* sse);
-
-unsigned int aom_highbd_10_variance4x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance4x8 aom_highbd_10_variance4x8_c
-
-unsigned int aom_highbd_10_variance64x128_c(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-unsigned int aom_highbd_10_variance64x128_sse2(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               unsigned int* sse);
-unsigned int aom_highbd_10_variance64x128_avx2(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_variance64x128)(const uint8_t* src_ptr,
-                                                         int source_stride,
-                                                         const uint8_t* ref_ptr,
-                                                         int ref_stride,
-                                                         unsigned int* sse);
-
-unsigned int aom_highbd_10_variance64x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           uint32_t* sse);
-unsigned int aom_highbd_10_variance64x16_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-#define aom_highbd_10_variance64x16 aom_highbd_10_variance64x16_sse2
-
-unsigned int aom_highbd_10_variance64x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_10_variance64x32_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-unsigned int aom_highbd_10_variance64x32_avx2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_variance64x32)(const uint8_t* src_ptr,
-                                                        int source_stride,
-                                                        const uint8_t* ref_ptr,
-                                                        int ref_stride,
-                                                        unsigned int* sse);
-
-unsigned int aom_highbd_10_variance64x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_10_variance64x64_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-unsigned int aom_highbd_10_variance64x64_avx2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_variance64x64)(const uint8_t* src_ptr,
-                                                        int source_stride,
-                                                        const uint8_t* ref_ptr,
-                                                        int ref_stride,
-                                                        unsigned int* sse);
-
-unsigned int aom_highbd_10_variance8x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-unsigned int aom_highbd_10_variance8x16_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-unsigned int aom_highbd_10_variance8x16_avx2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_variance8x16)(const uint8_t* src_ptr,
-                                                       int source_stride,
-                                                       const uint8_t* ref_ptr,
-                                                       int ref_stride,
-                                                       unsigned int* sse);
-
-unsigned int aom_highbd_10_variance8x32_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-unsigned int aom_highbd_10_variance8x32_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             uint32_t* sse);
-#define aom_highbd_10_variance8x32 aom_highbd_10_variance8x32_sse2
-
-unsigned int aom_highbd_10_variance8x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance8x4 aom_highbd_10_variance8x4_c
-
-unsigned int aom_highbd_10_variance8x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-unsigned int aom_highbd_10_variance8x8_sse2(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-unsigned int aom_highbd_10_variance8x8_avx2(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_variance8x8)(const uint8_t* src_ptr,
-                                                      int source_stride,
-                                                      const uint8_t* ref_ptr,
-                                                      int ref_stride,
-                                                      unsigned int* sse);
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x128 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x64 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x16 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x16_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x32 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x32_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x4 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x4_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x64 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x64_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x8 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x8_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x16 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x16_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x32 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x32_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x64 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x64_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x8 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x8_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x16 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x4 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x4_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x8 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x128 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x16 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x16_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x32 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x32_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x64 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x64_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x16 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x16_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x32 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x32_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x4 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x4_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x8 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x8_c
-
-void aom_highbd_12_get16x16var_c(const uint8_t* src_ptr,
-                                 int source_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride,
-                                 unsigned int* sse,
-                                 int* sum);
-#define aom_highbd_12_get16x16var aom_highbd_12_get16x16var_c
-
-void aom_highbd_12_get8x8var_c(const uint8_t* src_ptr,
-                               int source_stride,
-                               const uint8_t* ref_ptr,
-                               int ref_stride,
-                               unsigned int* sse,
-                               int* sum);
-#define aom_highbd_12_get8x8var aom_highbd_12_get8x8var_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance128x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance128x128_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance128x128)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance128x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance128x64_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance128x64)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x16_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance16x16)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x32_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance16x32)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x4_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance16x4)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x64_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance16x64)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x8_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance16x8)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x16_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance32x16)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x32_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance32x32)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x64_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance32x64)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x8_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance32x8)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance4x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance4x16_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance4x16)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance4x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance4x4_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance4x4)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance4x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance4x8_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance4x8)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x128_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance64x128)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x16_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance64x16)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x32_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance64x32)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x64_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance64x64)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x16_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance8x16)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x32_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance8x32)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x4_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance8x4)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x8_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance8x8)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_mse16x16_c(const uint8_t* src_ptr,
-                                      int source_stride,
-                                      const uint8_t* ref_ptr,
-                                      int recon_stride,
-                                      unsigned int* sse);
-unsigned int aom_highbd_12_mse16x16_sse2(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int recon_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_mse16x16 aom_highbd_12_mse16x16_sse2
-
-unsigned int aom_highbd_12_mse16x8_c(const uint8_t* src_ptr,
-                                     int source_stride,
-                                     const uint8_t* ref_ptr,
-                                     int recon_stride,
-                                     unsigned int* sse);
-#define aom_highbd_12_mse16x8 aom_highbd_12_mse16x8_c
-
-unsigned int aom_highbd_12_mse8x16_c(const uint8_t* src_ptr,
-                                     int source_stride,
-                                     const uint8_t* ref_ptr,
-                                     int recon_stride,
-                                     unsigned int* sse);
-#define aom_highbd_12_mse8x16 aom_highbd_12_mse8x16_c
-
-unsigned int aom_highbd_12_mse8x8_c(const uint8_t* src_ptr,
-                                    int source_stride,
-                                    const uint8_t* ref_ptr,
-                                    int recon_stride,
-                                    unsigned int* sse);
-unsigned int aom_highbd_12_mse8x8_sse2(const uint8_t* src_ptr,
-                                       int source_stride,
-                                       const uint8_t* ref_ptr,
-                                       int recon_stride,
-                                       unsigned int* sse);
-#define aom_highbd_12_mse8x8 aom_highbd_12_mse8x8_sse2
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance128x128_c(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            int xoffset,
-                                                            int yoffset,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance128x128 \
-  aom_highbd_12_obmc_sub_pixel_variance128x128_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance128x64_c(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance128x64 \
-  aom_highbd_12_obmc_sub_pixel_variance128x64_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance16x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance16x16 \
-  aom_highbd_12_obmc_sub_pixel_variance16x16_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance16x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance16x32 \
-  aom_highbd_12_obmc_sub_pixel_variance16x32_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance16x4_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance16x4 \
-  aom_highbd_12_obmc_sub_pixel_variance16x4_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance16x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance16x64 \
-  aom_highbd_12_obmc_sub_pixel_variance16x64_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance16x8_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance16x8 \
-  aom_highbd_12_obmc_sub_pixel_variance16x8_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance32x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance32x16 \
-  aom_highbd_12_obmc_sub_pixel_variance32x16_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance32x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance32x32 \
-  aom_highbd_12_obmc_sub_pixel_variance32x32_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance32x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance32x64 \
-  aom_highbd_12_obmc_sub_pixel_variance32x64_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance32x8_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance32x8 \
-  aom_highbd_12_obmc_sub_pixel_variance32x8_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance4x16_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance4x16 \
-  aom_highbd_12_obmc_sub_pixel_variance4x16_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance4x4_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance4x4 \
-  aom_highbd_12_obmc_sub_pixel_variance4x4_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance4x8_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance4x8 \
-  aom_highbd_12_obmc_sub_pixel_variance4x8_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance64x128_c(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance64x128 \
-  aom_highbd_12_obmc_sub_pixel_variance64x128_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance64x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance64x16 \
-  aom_highbd_12_obmc_sub_pixel_variance64x16_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance64x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance64x32 \
-  aom_highbd_12_obmc_sub_pixel_variance64x32_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance64x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance64x64 \
-  aom_highbd_12_obmc_sub_pixel_variance64x64_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance8x16_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance8x16 \
-  aom_highbd_12_obmc_sub_pixel_variance8x16_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance8x32_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance8x32 \
-  aom_highbd_12_obmc_sub_pixel_variance8x32_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance8x4_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance8x4 \
-  aom_highbd_12_obmc_sub_pixel_variance8x4_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance8x8_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance8x8 \
-  aom_highbd_12_obmc_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_12_obmc_variance128x128_c(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance128x128_sse4_1(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance128x128)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance128x64_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance128x64_sse4_1(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance128x64)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance16x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance16x16_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance16x16)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance16x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance16x32_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance16x32)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance16x4_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance16x4_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance16x4)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance16x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance16x64_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance16x64)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance16x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance16x8_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance16x8)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance32x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance32x16_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance32x16)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance32x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance32x32_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance32x32)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance32x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance32x64_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance32x64)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance32x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance32x8_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance32x8)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance4x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance4x16_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance4x16)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance4x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance4x4_sse4_1(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance4x4)(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance4x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance4x8_sse4_1(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance4x8)(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance64x128_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance64x128_sse4_1(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance64x128)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance64x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance64x16_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance64x16)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance64x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance64x32_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance64x32)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance64x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance64x64_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance64x64)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance8x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance8x16_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance8x16)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance8x32_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance8x32_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance8x32)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance8x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance8x4_sse4_1(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance8x4)(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance8x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance8x8_sse4_1(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance8x8)(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance128x128 \
-  aom_highbd_12_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance128x64 \
-  aom_highbd_12_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x16_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance16x16 \
-  aom_highbd_12_sub_pixel_avg_variance16x16_sse2
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x32_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance16x32 \
-  aom_highbd_12_sub_pixel_avg_variance16x32_sse2
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x4_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x4_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance16x4 \
-  aom_highbd_12_sub_pixel_avg_variance16x4_sse2
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x64_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance16x64 \
-  aom_highbd_12_sub_pixel_avg_variance16x64_sse2
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x8_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance16x8 \
-  aom_highbd_12_sub_pixel_avg_variance16x8_sse2
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x16_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance32x16 \
-  aom_highbd_12_sub_pixel_avg_variance32x16_sse2
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x32_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance32x32 \
-  aom_highbd_12_sub_pixel_avg_variance32x32_sse2
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x64_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance32x64 \
-  aom_highbd_12_sub_pixel_avg_variance32x64_sse2
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x8_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x8_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance32x8 \
-  aom_highbd_12_sub_pixel_avg_variance32x8_sse2
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance4x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance4x16 \
-  aom_highbd_12_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance4x4_sse4_1(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-RTCD_EXTERN uint32_t (*aom_highbd_12_sub_pixel_avg_variance4x4)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance4x8 \
-  aom_highbd_12_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance64x128 \
-  aom_highbd_12_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance64x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance64x16_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance64x16 \
-  aom_highbd_12_sub_pixel_avg_variance64x16_sse2
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance64x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance64x32_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance64x32 \
-  aom_highbd_12_sub_pixel_avg_variance64x32_sse2
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance64x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance64x64_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance64x64 \
-  aom_highbd_12_sub_pixel_avg_variance64x64_sse2
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x16_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance8x16 \
-  aom_highbd_12_sub_pixel_avg_variance8x16_sse2
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x32_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x32_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance8x32 \
-  aom_highbd_12_sub_pixel_avg_variance8x32_sse2
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x4_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance8x4 \
-  aom_highbd_12_sub_pixel_avg_variance8x4_sse2
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x8_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance8x8 \
-  aom_highbd_12_sub_pixel_avg_variance8x8_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance128x128_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance128x128_sse2(const uint8_t* src_ptr,
-                                                      int source_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const uint8_t* ref_ptr,
-                                                      int ref_stride,
-                                                      uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance128x128 \
-  aom_highbd_12_sub_pixel_variance128x128_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance128x64_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance128x64_sse2(const uint8_t* src_ptr,
-                                                     int source_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const uint8_t* ref_ptr,
-                                                     int ref_stride,
-                                                     uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance128x64 \
-  aom_highbd_12_sub_pixel_variance128x64_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance16x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance16x16_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance16x16 \
-  aom_highbd_12_sub_pixel_variance16x16_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance16x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance16x32_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance16x32 \
-  aom_highbd_12_sub_pixel_variance16x32_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance16x4_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance16x4_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance16x4 \
-  aom_highbd_12_sub_pixel_variance16x4_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance16x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance16x64_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance16x64 \
-  aom_highbd_12_sub_pixel_variance16x64_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance16x8_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance16x8_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance16x8 \
-  aom_highbd_12_sub_pixel_variance16x8_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance32x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance32x16_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance32x16 \
-  aom_highbd_12_sub_pixel_variance32x16_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance32x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance32x32_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance32x32 \
-  aom_highbd_12_sub_pixel_variance32x32_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance32x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance32x64_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance32x64 \
-  aom_highbd_12_sub_pixel_variance32x64_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance32x8_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance32x8_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance32x8 \
-  aom_highbd_12_sub_pixel_variance32x8_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance4x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance4x16 \
-  aom_highbd_12_sub_pixel_variance4x16_c
-
-uint32_t aom_highbd_12_sub_pixel_variance4x4_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance4x4_sse4_1(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_12_sub_pixel_variance4x4)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-uint32_t aom_highbd_12_sub_pixel_variance4x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance4x8 \
-  aom_highbd_12_sub_pixel_variance4x8_c
-
-uint32_t aom_highbd_12_sub_pixel_variance64x128_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance64x128_sse2(const uint8_t* src_ptr,
-                                                     int source_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const uint8_t* ref_ptr,
-                                                     int ref_stride,
-                                                     uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance64x128 \
-  aom_highbd_12_sub_pixel_variance64x128_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance64x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance64x16_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance64x16 \
-  aom_highbd_12_sub_pixel_variance64x16_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance64x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance64x32_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance64x32 \
-  aom_highbd_12_sub_pixel_variance64x32_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance64x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance64x64_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance64x64 \
-  aom_highbd_12_sub_pixel_variance64x64_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance8x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance8x16_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance8x16 \
-  aom_highbd_12_sub_pixel_variance8x16_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance8x32_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance8x32_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance8x32 \
-  aom_highbd_12_sub_pixel_variance8x32_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance8x4_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance8x4_sse2(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance8x4 \
-  aom_highbd_12_sub_pixel_variance8x4_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance8x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance8x8_sse2(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance8x8 \
-  aom_highbd_12_sub_pixel_variance8x8_sse2
-
-unsigned int aom_highbd_12_variance128x128_c(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-unsigned int aom_highbd_12_variance128x128_sse2(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                unsigned int* sse);
-#define aom_highbd_12_variance128x128 aom_highbd_12_variance128x128_sse2
-
-unsigned int aom_highbd_12_variance128x64_c(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-unsigned int aom_highbd_12_variance128x64_sse2(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               unsigned int* sse);
-#define aom_highbd_12_variance128x64 aom_highbd_12_variance128x64_sse2
-
-unsigned int aom_highbd_12_variance16x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_12_variance16x16_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-#define aom_highbd_12_variance16x16 aom_highbd_12_variance16x16_sse2
-
-unsigned int aom_highbd_12_variance16x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_12_variance16x32_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-#define aom_highbd_12_variance16x32 aom_highbd_12_variance16x32_sse2
-
-unsigned int aom_highbd_12_variance16x4_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_12_variance16x4 aom_highbd_12_variance16x4_c
-
-unsigned int aom_highbd_12_variance16x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           uint32_t* sse);
-unsigned int aom_highbd_12_variance16x64_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-#define aom_highbd_12_variance16x64 aom_highbd_12_variance16x64_sse2
-
-unsigned int aom_highbd_12_variance16x8_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-unsigned int aom_highbd_12_variance16x8_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-#define aom_highbd_12_variance16x8 aom_highbd_12_variance16x8_sse2
-
-unsigned int aom_highbd_12_variance2x2_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance2x2 aom_highbd_12_variance2x2_c
-
-unsigned int aom_highbd_12_variance2x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance2x4 aom_highbd_12_variance2x4_c
-
-unsigned int aom_highbd_12_variance32x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_12_variance32x16_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-#define aom_highbd_12_variance32x16 aom_highbd_12_variance32x16_sse2
-
-unsigned int aom_highbd_12_variance32x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_12_variance32x32_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-#define aom_highbd_12_variance32x32 aom_highbd_12_variance32x32_sse2
-
-unsigned int aom_highbd_12_variance32x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_12_variance32x64_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-#define aom_highbd_12_variance32x64 aom_highbd_12_variance32x64_sse2
-
-unsigned int aom_highbd_12_variance32x8_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-unsigned int aom_highbd_12_variance32x8_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             uint32_t* sse);
-#define aom_highbd_12_variance32x8 aom_highbd_12_variance32x8_sse2
-
-unsigned int aom_highbd_12_variance4x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_12_variance4x16 aom_highbd_12_variance4x16_c
-
-unsigned int aom_highbd_12_variance4x2_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance4x2 aom_highbd_12_variance4x2_c
-
-unsigned int aom_highbd_12_variance4x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-unsigned int aom_highbd_12_variance4x4_sse4_1(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_variance4x4)(const uint8_t* src_ptr,
-                                                      int source_stride,
-                                                      const uint8_t* ref_ptr,
-                                                      int ref_stride,
-                                                      unsigned int* sse);
-
-unsigned int aom_highbd_12_variance4x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance4x8 aom_highbd_12_variance4x8_c
-
-unsigned int aom_highbd_12_variance64x128_c(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-unsigned int aom_highbd_12_variance64x128_sse2(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               unsigned int* sse);
-#define aom_highbd_12_variance64x128 aom_highbd_12_variance64x128_sse2
-
-unsigned int aom_highbd_12_variance64x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           uint32_t* sse);
-unsigned int aom_highbd_12_variance64x16_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-#define aom_highbd_12_variance64x16 aom_highbd_12_variance64x16_sse2
-
-unsigned int aom_highbd_12_variance64x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_12_variance64x32_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-#define aom_highbd_12_variance64x32 aom_highbd_12_variance64x32_sse2
-
-unsigned int aom_highbd_12_variance64x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_12_variance64x64_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-#define aom_highbd_12_variance64x64 aom_highbd_12_variance64x64_sse2
-
-unsigned int aom_highbd_12_variance8x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-unsigned int aom_highbd_12_variance8x16_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-#define aom_highbd_12_variance8x16 aom_highbd_12_variance8x16_sse2
-
-unsigned int aom_highbd_12_variance8x32_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-unsigned int aom_highbd_12_variance8x32_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             uint32_t* sse);
-#define aom_highbd_12_variance8x32 aom_highbd_12_variance8x32_sse2
-
-unsigned int aom_highbd_12_variance8x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance8x4 aom_highbd_12_variance8x4_c
-
-unsigned int aom_highbd_12_variance8x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-unsigned int aom_highbd_12_variance8x8_sse2(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-#define aom_highbd_12_variance8x8 aom_highbd_12_variance8x8_sse2
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x128 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x64 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x16 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x16_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x32 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x32_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x4 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x4_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x64 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x64_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x8 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x8_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x16 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x16_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x32 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x32_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x64 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x64_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x8 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x8_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x16 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x4 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x4_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x8 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x128 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x16 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x16_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x32 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x32_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x64 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x64_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x16 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x16_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x32 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x32_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x4 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x4_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x8 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x8_c
-
-void aom_highbd_8_get16x16var_c(const uint8_t* src_ptr,
-                                int source_stride,
-                                const uint8_t* ref_ptr,
-                                int ref_stride,
-                                unsigned int* sse,
-                                int* sum);
-#define aom_highbd_8_get16x16var aom_highbd_8_get16x16var_c
-
-void aom_highbd_8_get8x8var_c(const uint8_t* src_ptr,
-                              int source_stride,
-                              const uint8_t* ref_ptr,
-                              int ref_stride,
-                              unsigned int* sse,
-                              int* sum);
-#define aom_highbd_8_get8x8var aom_highbd_8_get8x8var_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance128x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance128x128_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance128x128)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance128x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance128x64_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance128x64)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x16_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance16x16)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x32_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance16x32)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x4_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance16x4)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x64_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance16x64)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x8_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance16x8)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x16_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance32x16)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x32_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance32x32)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x64_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance32x64)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x8_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance32x8)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance4x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance4x16_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance4x16)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance4x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance4x4_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance4x4)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance4x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance4x8_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance4x8)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x128_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance64x128)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x16_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance64x16)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x32_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance64x32)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x64_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance64x64)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x16_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance8x16)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x32_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance8x32)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x4_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance8x4)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x8_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance8x8)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_mse16x16_c(const uint8_t* src_ptr,
-                                     int source_stride,
-                                     const uint8_t* ref_ptr,
-                                     int recon_stride,
-                                     unsigned int* sse);
-unsigned int aom_highbd_8_mse16x16_sse2(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int recon_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_mse16x16 aom_highbd_8_mse16x16_sse2
-
-unsigned int aom_highbd_8_mse16x8_c(const uint8_t* src_ptr,
-                                    int source_stride,
-                                    const uint8_t* ref_ptr,
-                                    int recon_stride,
-                                    unsigned int* sse);
-#define aom_highbd_8_mse16x8 aom_highbd_8_mse16x8_c
-
-unsigned int aom_highbd_8_mse8x16_c(const uint8_t* src_ptr,
-                                    int source_stride,
-                                    const uint8_t* ref_ptr,
-                                    int recon_stride,
-                                    unsigned int* sse);
-#define aom_highbd_8_mse8x16 aom_highbd_8_mse8x16_c
-
-unsigned int aom_highbd_8_mse8x8_c(const uint8_t* src_ptr,
-                                   int source_stride,
-                                   const uint8_t* ref_ptr,
-                                   int recon_stride,
-                                   unsigned int* sse);
-unsigned int aom_highbd_8_mse8x8_sse2(const uint8_t* src_ptr,
-                                      int source_stride,
-                                      const uint8_t* ref_ptr,
-                                      int recon_stride,
-                                      unsigned int* sse);
-#define aom_highbd_8_mse8x8 aom_highbd_8_mse8x8_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance128x128 \
-  aom_highbd_8_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance128x64 \
-  aom_highbd_8_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x16_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance16x16 \
-  aom_highbd_8_sub_pixel_avg_variance16x16_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x32_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x32_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance16x32 \
-  aom_highbd_8_sub_pixel_avg_variance16x32_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x4_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x4_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance16x4 \
-  aom_highbd_8_sub_pixel_avg_variance16x4_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x64_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x64_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance16x64 \
-  aom_highbd_8_sub_pixel_avg_variance16x64_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x8_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance16x8 \
-  aom_highbd_8_sub_pixel_avg_variance16x8_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x16_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance32x16 \
-  aom_highbd_8_sub_pixel_avg_variance32x16_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x32_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x32_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance32x32 \
-  aom_highbd_8_sub_pixel_avg_variance32x32_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x64_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x64_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance32x64 \
-  aom_highbd_8_sub_pixel_avg_variance32x64_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x8_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance32x8 \
-  aom_highbd_8_sub_pixel_avg_variance32x8_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance4x16_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance4x16 \
-  aom_highbd_8_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse,
-                                                  const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance4x4_sse4_1(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-RTCD_EXTERN uint32_t (*aom_highbd_8_sub_pixel_avg_variance4x4)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse,
-                                                  const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance4x8 \
-  aom_highbd_8_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance64x128 \
-  aom_highbd_8_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance64x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance64x16_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance64x16 \
-  aom_highbd_8_sub_pixel_avg_variance64x16_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance64x32_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance64x32_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance64x32 \
-  aom_highbd_8_sub_pixel_avg_variance64x32_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance64x64_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance64x64_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance64x64 \
-  aom_highbd_8_sub_pixel_avg_variance64x64_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x16_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance8x16 \
-  aom_highbd_8_sub_pixel_avg_variance8x16_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x32_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x32_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance8x32 \
-  aom_highbd_8_sub_pixel_avg_variance8x32_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse,
-                                                  const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x4_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance8x4 \
-  aom_highbd_8_sub_pixel_avg_variance8x4_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse,
-                                                  const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x8_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance8x8 \
-  aom_highbd_8_sub_pixel_avg_variance8x8_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance128x128_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance128x128_sse2(const uint8_t* src_ptr,
-                                                     int source_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const uint8_t* ref_ptr,
-                                                     int ref_stride,
-                                                     uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance128x128 \
-  aom_highbd_8_sub_pixel_variance128x128_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance128x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance128x64_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance128x64 \
-  aom_highbd_8_sub_pixel_variance128x64_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance16x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance16x16_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance16x16 \
-  aom_highbd_8_sub_pixel_variance16x16_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance16x32_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance16x32_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance16x32 \
-  aom_highbd_8_sub_pixel_variance16x32_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance16x4_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance16x4_sse2(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance16x4 \
-  aom_highbd_8_sub_pixel_variance16x4_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance16x64_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance16x64_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance16x64 \
-  aom_highbd_8_sub_pixel_variance16x64_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance16x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance16x8_sse2(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance16x8 \
-  aom_highbd_8_sub_pixel_variance16x8_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance32x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance32x16_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance32x16 \
-  aom_highbd_8_sub_pixel_variance32x16_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance32x32_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance32x32_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance32x32 \
-  aom_highbd_8_sub_pixel_variance32x32_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance32x64_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance32x64_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance32x64 \
-  aom_highbd_8_sub_pixel_variance32x64_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance32x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance32x8_sse2(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance32x8 \
-  aom_highbd_8_sub_pixel_variance32x8_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance4x16_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance4x16 \
-  aom_highbd_8_sub_pixel_variance4x16_c
-
-uint32_t aom_highbd_8_sub_pixel_variance4x4_c(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance4x4_sse4_1(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_8_sub_pixel_variance4x4)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-uint32_t aom_highbd_8_sub_pixel_variance4x8_c(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance4x8 aom_highbd_8_sub_pixel_variance4x8_c
-
-uint32_t aom_highbd_8_sub_pixel_variance64x128_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance64x128_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance64x128 \
-  aom_highbd_8_sub_pixel_variance64x128_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance64x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance64x16_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance64x16 \
-  aom_highbd_8_sub_pixel_variance64x16_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance64x32_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance64x32_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance64x32 \
-  aom_highbd_8_sub_pixel_variance64x32_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance64x64_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance64x64_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance64x64 \
-  aom_highbd_8_sub_pixel_variance64x64_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance8x16_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance8x16_sse2(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance8x16 \
-  aom_highbd_8_sub_pixel_variance8x16_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance8x32_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance8x32_sse2(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance8x32 \
-  aom_highbd_8_sub_pixel_variance8x32_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance8x4_c(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance8x4_sse2(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance8x4 \
-  aom_highbd_8_sub_pixel_variance8x4_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance8x8_c(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance8x8_sse2(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance8x8 \
-  aom_highbd_8_sub_pixel_variance8x8_sse2
-
-unsigned int aom_highbd_8_variance128x128_c(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-unsigned int aom_highbd_8_variance128x128_sse2(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               unsigned int* sse);
-#define aom_highbd_8_variance128x128 aom_highbd_8_variance128x128_sse2
-
-unsigned int aom_highbd_8_variance128x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_8_variance128x64_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-#define aom_highbd_8_variance128x64 aom_highbd_8_variance128x64_sse2
-
-unsigned int aom_highbd_8_variance16x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-unsigned int aom_highbd_8_variance16x16_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-#define aom_highbd_8_variance16x16 aom_highbd_8_variance16x16_sse2
-
-unsigned int aom_highbd_8_variance16x32_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-unsigned int aom_highbd_8_variance16x32_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-#define aom_highbd_8_variance16x32 aom_highbd_8_variance16x32_sse2
-
-unsigned int aom_highbd_8_variance16x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         uint32_t* sse);
-#define aom_highbd_8_variance16x4 aom_highbd_8_variance16x4_c
-
-unsigned int aom_highbd_8_variance16x64_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-unsigned int aom_highbd_8_variance16x64_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             uint32_t* sse);
-#define aom_highbd_8_variance16x64 aom_highbd_8_variance16x64_sse2
-
-unsigned int aom_highbd_8_variance16x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-unsigned int aom_highbd_8_variance16x8_sse2(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-#define aom_highbd_8_variance16x8 aom_highbd_8_variance16x8_sse2
-
-unsigned int aom_highbd_8_variance2x2_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance2x2 aom_highbd_8_variance2x2_c
-
-unsigned int aom_highbd_8_variance2x4_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance2x4 aom_highbd_8_variance2x4_c
-
-unsigned int aom_highbd_8_variance32x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-unsigned int aom_highbd_8_variance32x16_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-#define aom_highbd_8_variance32x16 aom_highbd_8_variance32x16_sse2
-
-unsigned int aom_highbd_8_variance32x32_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-unsigned int aom_highbd_8_variance32x32_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-#define aom_highbd_8_variance32x32 aom_highbd_8_variance32x32_sse2
-
-unsigned int aom_highbd_8_variance32x64_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-unsigned int aom_highbd_8_variance32x64_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-#define aom_highbd_8_variance32x64 aom_highbd_8_variance32x64_sse2
-
-unsigned int aom_highbd_8_variance32x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         uint32_t* sse);
-unsigned int aom_highbd_8_variance32x8_sse2(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            uint32_t* sse);
-#define aom_highbd_8_variance32x8 aom_highbd_8_variance32x8_sse2
-
-unsigned int aom_highbd_8_variance4x16_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         uint32_t* sse);
-#define aom_highbd_8_variance4x16 aom_highbd_8_variance4x16_c
-
-unsigned int aom_highbd_8_variance4x2_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance4x2 aom_highbd_8_variance4x2_c
-
-unsigned int aom_highbd_8_variance4x4_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-unsigned int aom_highbd_8_variance4x4_sse4_1(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_variance4x4)(const uint8_t* src_ptr,
-                                                     int source_stride,
-                                                     const uint8_t* ref_ptr,
-                                                     int ref_stride,
-                                                     unsigned int* sse);
-
-unsigned int aom_highbd_8_variance4x8_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance4x8 aom_highbd_8_variance4x8_c
-
-unsigned int aom_highbd_8_variance64x128_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_8_variance64x128_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-#define aom_highbd_8_variance64x128 aom_highbd_8_variance64x128_sse2
-
-unsigned int aom_highbd_8_variance64x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-unsigned int aom_highbd_8_variance64x16_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             uint32_t* sse);
-#define aom_highbd_8_variance64x16 aom_highbd_8_variance64x16_sse2
-
-unsigned int aom_highbd_8_variance64x32_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-unsigned int aom_highbd_8_variance64x32_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-#define aom_highbd_8_variance64x32 aom_highbd_8_variance64x32_sse2
-
-unsigned int aom_highbd_8_variance64x64_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-unsigned int aom_highbd_8_variance64x64_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-#define aom_highbd_8_variance64x64 aom_highbd_8_variance64x64_sse2
-
-unsigned int aom_highbd_8_variance8x16_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-unsigned int aom_highbd_8_variance8x16_sse2(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-#define aom_highbd_8_variance8x16 aom_highbd_8_variance8x16_sse2
-
-unsigned int aom_highbd_8_variance8x32_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         uint32_t* sse);
-unsigned int aom_highbd_8_variance8x32_sse2(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            uint32_t* sse);
-#define aom_highbd_8_variance8x32 aom_highbd_8_variance8x32_sse2
-
-unsigned int aom_highbd_8_variance8x4_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance8x4 aom_highbd_8_variance8x4_c
-
-unsigned int aom_highbd_8_variance8x8_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-unsigned int aom_highbd_8_variance8x8_sse2(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_8_variance8x8 aom_highbd_8_variance8x8_sse2
-
-unsigned int aom_highbd_avg_4x4_c(const uint8_t*, int p);
-#define aom_highbd_avg_4x4 aom_highbd_avg_4x4_c
-
-unsigned int aom_highbd_avg_8x8_c(const uint8_t*, int p);
-#define aom_highbd_avg_8x8 aom_highbd_avg_8x8_c
-
-void aom_highbd_blend_a64_d16_mask_c(uint8_t* dst,
-                                     uint32_t dst_stride,
-                                     const CONV_BUF_TYPE* src0,
-                                     uint32_t src0_stride,
-                                     const CONV_BUF_TYPE* src1,
-                                     uint32_t src1_stride,
-                                     const uint8_t* mask,
-                                     uint32_t mask_stride,
-                                     int w,
-                                     int h,
-                                     int subw,
-                                     int subh,
-                                     ConvolveParams* conv_params,
-                                     const int bd);
-void aom_highbd_blend_a64_d16_mask_sse4_1(uint8_t* dst,
-                                          uint32_t dst_stride,
-                                          const CONV_BUF_TYPE* src0,
-                                          uint32_t src0_stride,
-                                          const CONV_BUF_TYPE* src1,
-                                          uint32_t src1_stride,
-                                          const uint8_t* mask,
-                                          uint32_t mask_stride,
-                                          int w,
-                                          int h,
-                                          int subw,
-                                          int subh,
-                                          ConvolveParams* conv_params,
-                                          const int bd);
-void aom_highbd_blend_a64_d16_mask_avx2(uint8_t* dst,
-                                        uint32_t dst_stride,
-                                        const CONV_BUF_TYPE* src0,
-                                        uint32_t src0_stride,
-                                        const CONV_BUF_TYPE* src1,
-                                        uint32_t src1_stride,
-                                        const uint8_t* mask,
-                                        uint32_t mask_stride,
-                                        int w,
-                                        int h,
-                                        int subw,
-                                        int subh,
-                                        ConvolveParams* conv_params,
-                                        const int bd);
-RTCD_EXTERN void (*aom_highbd_blend_a64_d16_mask)(uint8_t* dst,
-                                                  uint32_t dst_stride,
-                                                  const CONV_BUF_TYPE* src0,
-                                                  uint32_t src0_stride,
-                                                  const CONV_BUF_TYPE* src1,
-                                                  uint32_t src1_stride,
-                                                  const uint8_t* mask,
-                                                  uint32_t mask_stride,
-                                                  int w,
-                                                  int h,
-                                                  int subw,
-                                                  int subh,
-                                                  ConvolveParams* conv_params,
-                                                  const int bd);
-
-void aom_highbd_blend_a64_hmask_c(uint8_t* dst,
-                                  uint32_t dst_stride,
-                                  const uint8_t* src0,
-                                  uint32_t src0_stride,
-                                  const uint8_t* src1,
-                                  uint32_t src1_stride,
-                                  const uint8_t* mask,
-                                  int w,
-                                  int h,
-                                  int bd);
-void aom_highbd_blend_a64_hmask_sse4_1(uint8_t* dst,
-                                       uint32_t dst_stride,
-                                       const uint8_t* src0,
-                                       uint32_t src0_stride,
-                                       const uint8_t* src1,
-                                       uint32_t src1_stride,
-                                       const uint8_t* mask,
-                                       int w,
-                                       int h,
-                                       int bd);
-RTCD_EXTERN void (*aom_highbd_blend_a64_hmask)(uint8_t* dst,
-                                               uint32_t dst_stride,
-                                               const uint8_t* src0,
-                                               uint32_t src0_stride,
-                                               const uint8_t* src1,
-                                               uint32_t src1_stride,
-                                               const uint8_t* mask,
-                                               int w,
-                                               int h,
-                                               int bd);
-
-void aom_highbd_blend_a64_mask_c(uint8_t* dst,
-                                 uint32_t dst_stride,
-                                 const uint8_t* src0,
-                                 uint32_t src0_stride,
-                                 const uint8_t* src1,
-                                 uint32_t src1_stride,
-                                 const uint8_t* mask,
-                                 uint32_t mask_stride,
-                                 int w,
-                                 int h,
-                                 int subw,
-                                 int subh,
-                                 int bd);
-void aom_highbd_blend_a64_mask_sse4_1(uint8_t* dst,
-                                      uint32_t dst_stride,
-                                      const uint8_t* src0,
-                                      uint32_t src0_stride,
-                                      const uint8_t* src1,
-                                      uint32_t src1_stride,
-                                      const uint8_t* mask,
-                                      uint32_t mask_stride,
-                                      int w,
-                                      int h,
-                                      int subw,
-                                      int subh,
-                                      int bd);
-RTCD_EXTERN void (*aom_highbd_blend_a64_mask)(uint8_t* dst,
-                                              uint32_t dst_stride,
-                                              const uint8_t* src0,
-                                              uint32_t src0_stride,
-                                              const uint8_t* src1,
-                                              uint32_t src1_stride,
-                                              const uint8_t* mask,
-                                              uint32_t mask_stride,
-                                              int w,
-                                              int h,
-                                              int subw,
-                                              int subh,
-                                              int bd);
-
-void aom_highbd_blend_a64_vmask_c(uint8_t* dst,
-                                  uint32_t dst_stride,
-                                  const uint8_t* src0,
-                                  uint32_t src0_stride,
-                                  const uint8_t* src1,
-                                  uint32_t src1_stride,
-                                  const uint8_t* mask,
-                                  int w,
-                                  int h,
-                                  int bd);
-void aom_highbd_blend_a64_vmask_sse4_1(uint8_t* dst,
-                                       uint32_t dst_stride,
-                                       const uint8_t* src0,
-                                       uint32_t src0_stride,
-                                       const uint8_t* src1,
-                                       uint32_t src1_stride,
-                                       const uint8_t* mask,
-                                       int w,
-                                       int h,
-                                       int bd);
-RTCD_EXTERN void (*aom_highbd_blend_a64_vmask)(uint8_t* dst,
-                                               uint32_t dst_stride,
-                                               const uint8_t* src0,
-                                               uint32_t src0_stride,
-                                               const uint8_t* src1,
-                                               uint32_t src1_stride,
-                                               const uint8_t* mask,
-                                               int w,
-                                               int h,
-                                               int bd);
-
-void aom_highbd_comp_avg_pred_c(uint8_t* comp_pred8,
-                                const uint8_t* pred8,
-                                int width,
-                                int height,
-                                const uint8_t* ref8,
-                                int ref_stride);
-#define aom_highbd_comp_avg_pred aom_highbd_comp_avg_pred_c
-
-void aom_highbd_comp_avg_upsampled_pred_c(MACROBLOCKD* xd,
-                                          const struct AV1Common* const cm,
-                                          int mi_row,
-                                          int mi_col,
-                                          const MV* const mv,
-                                          uint8_t* comp_pred8,
-                                          const uint8_t* pred8,
-                                          int width,
-                                          int height,
-                                          int subpel_x_q3,
-                                          int subpel_y_q3,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          int bd,
-                                          int subpel_search);
-void aom_highbd_comp_avg_upsampled_pred_sse2(MACROBLOCKD* xd,
-                                             const struct AV1Common* const cm,
-                                             int mi_row,
-                                             int mi_col,
-                                             const MV* const mv,
-                                             uint8_t* comp_pred8,
-                                             const uint8_t* pred8,
-                                             int width,
-                                             int height,
-                                             int subpel_x_q3,
-                                             int subpel_y_q3,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             int bd,
-                                             int subpel_search);
-#define aom_highbd_comp_avg_upsampled_pred \
-  aom_highbd_comp_avg_upsampled_pred_sse2
-
-void aom_highbd_comp_mask_pred_c(uint8_t* comp_pred,
-                                 const uint8_t* pred8,
-                                 int width,
-                                 int height,
-                                 const uint8_t* ref8,
-                                 int ref_stride,
-                                 const uint8_t* mask,
-                                 int mask_stride,
-                                 int invert_mask);
-void aom_highbd_comp_mask_pred_sse2(uint8_t* comp_pred,
-                                    const uint8_t* pred8,
-                                    int width,
-                                    int height,
-                                    const uint8_t* ref8,
-                                    int ref_stride,
-                                    const uint8_t* mask,
-                                    int mask_stride,
-                                    int invert_mask);
-void aom_highbd_comp_mask_pred_avx2(uint8_t* comp_pred,
-                                    const uint8_t* pred8,
-                                    int width,
-                                    int height,
-                                    const uint8_t* ref8,
-                                    int ref_stride,
-                                    const uint8_t* mask,
-                                    int mask_stride,
-                                    int invert_mask);
-RTCD_EXTERN void (*aom_highbd_comp_mask_pred)(uint8_t* comp_pred,
-                                              const uint8_t* pred8,
-                                              int width,
-                                              int height,
-                                              const uint8_t* ref8,
-                                              int ref_stride,
-                                              const uint8_t* mask,
-                                              int mask_stride,
-                                              int invert_mask);
-
-void aom_highbd_convolve8_horiz_c(const uint8_t* src,
-                                  ptrdiff_t src_stride,
-                                  uint8_t* dst,
-                                  ptrdiff_t dst_stride,
-                                  const int16_t* filter_x,
-                                  int x_step_q4,
-                                  const int16_t* filter_y,
-                                  int y_step_q4,
-                                  int w,
-                                  int h,
-                                  int bd);
-void aom_highbd_convolve8_horiz_sse2(const uint8_t* src,
-                                     ptrdiff_t src_stride,
-                                     uint8_t* dst,
-                                     ptrdiff_t dst_stride,
-                                     const int16_t* filter_x,
-                                     int x_step_q4,
-                                     const int16_t* filter_y,
-                                     int y_step_q4,
-                                     int w,
-                                     int h,
-                                     int bd);
-void aom_highbd_convolve8_horiz_avx2(const uint8_t* src,
-                                     ptrdiff_t src_stride,
-                                     uint8_t* dst,
-                                     ptrdiff_t dst_stride,
-                                     const int16_t* filter_x,
-                                     int x_step_q4,
-                                     const int16_t* filter_y,
-                                     int y_step_q4,
-                                     int w,
-                                     int h,
-                                     int bd);
-RTCD_EXTERN void (*aom_highbd_convolve8_horiz)(const uint8_t* src,
-                                               ptrdiff_t src_stride,
-                                               uint8_t* dst,
-                                               ptrdiff_t dst_stride,
-                                               const int16_t* filter_x,
-                                               int x_step_q4,
-                                               const int16_t* filter_y,
-                                               int y_step_q4,
-                                               int w,
-                                               int h,
-                                               int bd);
-
-void aom_highbd_convolve8_vert_c(const uint8_t* src,
-                                 ptrdiff_t src_stride,
-                                 uint8_t* dst,
-                                 ptrdiff_t dst_stride,
-                                 const int16_t* filter_x,
-                                 int x_step_q4,
-                                 const int16_t* filter_y,
-                                 int y_step_q4,
-                                 int w,
-                                 int h,
-                                 int bd);
-void aom_highbd_convolve8_vert_sse2(const uint8_t* src,
-                                    ptrdiff_t src_stride,
-                                    uint8_t* dst,
-                                    ptrdiff_t dst_stride,
-                                    const int16_t* filter_x,
-                                    int x_step_q4,
-                                    const int16_t* filter_y,
-                                    int y_step_q4,
-                                    int w,
-                                    int h,
-                                    int bd);
-void aom_highbd_convolve8_vert_avx2(const uint8_t* src,
-                                    ptrdiff_t src_stride,
-                                    uint8_t* dst,
-                                    ptrdiff_t dst_stride,
-                                    const int16_t* filter_x,
-                                    int x_step_q4,
-                                    const int16_t* filter_y,
-                                    int y_step_q4,
-                                    int w,
-                                    int h,
-                                    int bd);
-RTCD_EXTERN void (*aom_highbd_convolve8_vert)(const uint8_t* src,
-                                              ptrdiff_t src_stride,
-                                              uint8_t* dst,
-                                              ptrdiff_t dst_stride,
-                                              const int16_t* filter_x,
-                                              int x_step_q4,
-                                              const int16_t* filter_y,
-                                              int y_step_q4,
-                                              int w,
-                                              int h,
-                                              int bd);
-
-void aom_highbd_convolve_copy_c(const uint16_t* src,
-                                ptrdiff_t src_stride,
-                                uint16_t* dst,
-                                ptrdiff_t dst_stride,
-                                int w,
-                                int h);
-void aom_highbd_convolve_copy_sse2(const uint16_t* src,
-                                   ptrdiff_t src_stride,
-                                   uint16_t* dst,
-                                   ptrdiff_t dst_stride,
-                                   int w,
-                                   int h);
-void aom_highbd_convolve_copy_avx2(const uint16_t* src,
-                                   ptrdiff_t src_stride,
-                                   uint16_t* dst,
-                                   ptrdiff_t dst_stride,
-                                   int w,
-                                   int h);
-RTCD_EXTERN void (*aom_highbd_convolve_copy)(const uint16_t* src,
-                                             ptrdiff_t src_stride,
-                                             uint16_t* dst,
-                                             ptrdiff_t dst_stride,
-                                             int w,
-                                             int h);
-
-void aom_highbd_dc_128_predictor_16x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-void aom_highbd_dc_128_predictor_16x16_sse2(uint16_t* dst,
-                                            ptrdiff_t y_stride,
-                                            const uint16_t* above,
-                                            const uint16_t* left,
-                                            int bd);
-#define aom_highbd_dc_128_predictor_16x16 aom_highbd_dc_128_predictor_16x16_sse2
-
-void aom_highbd_dc_128_predictor_16x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-void aom_highbd_dc_128_predictor_16x32_sse2(uint16_t* dst,
-                                            ptrdiff_t y_stride,
-                                            const uint16_t* above,
-                                            const uint16_t* left,
-                                            int bd);
-#define aom_highbd_dc_128_predictor_16x32 aom_highbd_dc_128_predictor_16x32_sse2
-
-void aom_highbd_dc_128_predictor_16x4_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_16x4 aom_highbd_dc_128_predictor_16x4_c
-
-void aom_highbd_dc_128_predictor_16x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_16x64 aom_highbd_dc_128_predictor_16x64_c
-
-void aom_highbd_dc_128_predictor_16x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-void aom_highbd_dc_128_predictor_16x8_sse2(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_dc_128_predictor_16x8 aom_highbd_dc_128_predictor_16x8_sse2
-
-void aom_highbd_dc_128_predictor_2x2_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_128_predictor_2x2 aom_highbd_dc_128_predictor_2x2_c
-
-void aom_highbd_dc_128_predictor_32x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-void aom_highbd_dc_128_predictor_32x16_sse2(uint16_t* dst,
-                                            ptrdiff_t y_stride,
-                                            const uint16_t* above,
-                                            const uint16_t* left,
-                                            int bd);
-#define aom_highbd_dc_128_predictor_32x16 aom_highbd_dc_128_predictor_32x16_sse2
-
-void aom_highbd_dc_128_predictor_32x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-void aom_highbd_dc_128_predictor_32x32_sse2(uint16_t* dst,
-                                            ptrdiff_t y_stride,
-                                            const uint16_t* above,
-                                            const uint16_t* left,
-                                            int bd);
-#define aom_highbd_dc_128_predictor_32x32 aom_highbd_dc_128_predictor_32x32_sse2
-
-void aom_highbd_dc_128_predictor_32x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_32x64 aom_highbd_dc_128_predictor_32x64_c
-
-void aom_highbd_dc_128_predictor_32x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_32x8 aom_highbd_dc_128_predictor_32x8_c
-
-void aom_highbd_dc_128_predictor_4x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_4x16 aom_highbd_dc_128_predictor_4x16_c
-
-void aom_highbd_dc_128_predictor_4x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-void aom_highbd_dc_128_predictor_4x4_sse2(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_128_predictor_4x4 aom_highbd_dc_128_predictor_4x4_sse2
-
-void aom_highbd_dc_128_predictor_4x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-void aom_highbd_dc_128_predictor_4x8_sse2(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_128_predictor_4x8 aom_highbd_dc_128_predictor_4x8_sse2
-
-void aom_highbd_dc_128_predictor_64x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_64x16 aom_highbd_dc_128_predictor_64x16_c
-
-void aom_highbd_dc_128_predictor_64x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_64x32 aom_highbd_dc_128_predictor_64x32_c
-
-void aom_highbd_dc_128_predictor_64x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_64x64 aom_highbd_dc_128_predictor_64x64_c
-
-void aom_highbd_dc_128_predictor_8x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-void aom_highbd_dc_128_predictor_8x16_sse2(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_dc_128_predictor_8x16 aom_highbd_dc_128_predictor_8x16_sse2
-
-void aom_highbd_dc_128_predictor_8x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_8x32 aom_highbd_dc_128_predictor_8x32_c
-
-void aom_highbd_dc_128_predictor_8x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-void aom_highbd_dc_128_predictor_8x4_sse2(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_128_predictor_8x4 aom_highbd_dc_128_predictor_8x4_sse2
-
-void aom_highbd_dc_128_predictor_8x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-void aom_highbd_dc_128_predictor_8x8_sse2(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_128_predictor_8x8 aom_highbd_dc_128_predictor_8x8_sse2
-
-void aom_highbd_dc_left_predictor_16x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-void aom_highbd_dc_left_predictor_16x16_sse2(uint16_t* dst,
-                                             ptrdiff_t y_stride,
-                                             const uint16_t* above,
-                                             const uint16_t* left,
-                                             int bd);
-#define aom_highbd_dc_left_predictor_16x16 \
-  aom_highbd_dc_left_predictor_16x16_sse2
-
-void aom_highbd_dc_left_predictor_16x32_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-void aom_highbd_dc_left_predictor_16x32_sse2(uint16_t* dst,
-                                             ptrdiff_t y_stride,
-                                             const uint16_t* above,
-                                             const uint16_t* left,
-                                             int bd);
-#define aom_highbd_dc_left_predictor_16x32 \
-  aom_highbd_dc_left_predictor_16x32_sse2
-
-void aom_highbd_dc_left_predictor_16x4_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_16x4 aom_highbd_dc_left_predictor_16x4_c
-
-void aom_highbd_dc_left_predictor_16x64_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_16x64 aom_highbd_dc_left_predictor_16x64_c
-
-void aom_highbd_dc_left_predictor_16x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-void aom_highbd_dc_left_predictor_16x8_sse2(uint16_t* dst,
-                                            ptrdiff_t y_stride,
-                                            const uint16_t* above,
-                                            const uint16_t* left,
-                                            int bd);
-#define aom_highbd_dc_left_predictor_16x8 aom_highbd_dc_left_predictor_16x8_sse2
-
-void aom_highbd_dc_left_predictor_2x2_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_left_predictor_2x2 aom_highbd_dc_left_predictor_2x2_c
-
-void aom_highbd_dc_left_predictor_32x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-void aom_highbd_dc_left_predictor_32x16_sse2(uint16_t* dst,
-                                             ptrdiff_t y_stride,
-                                             const uint16_t* above,
-                                             const uint16_t* left,
-                                             int bd);
-#define aom_highbd_dc_left_predictor_32x16 \
-  aom_highbd_dc_left_predictor_32x16_sse2
-
-void aom_highbd_dc_left_predictor_32x32_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-void aom_highbd_dc_left_predictor_32x32_sse2(uint16_t* dst,
-                                             ptrdiff_t y_stride,
-                                             const uint16_t* above,
-                                             const uint16_t* left,
-                                             int bd);
-#define aom_highbd_dc_left_predictor_32x32 \
-  aom_highbd_dc_left_predictor_32x32_sse2
-
-void aom_highbd_dc_left_predictor_32x64_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_32x64 aom_highbd_dc_left_predictor_32x64_c
-
-void aom_highbd_dc_left_predictor_32x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_32x8 aom_highbd_dc_left_predictor_32x8_c
-
-void aom_highbd_dc_left_predictor_4x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_4x16 aom_highbd_dc_left_predictor_4x16_c
-
-void aom_highbd_dc_left_predictor_4x4_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-void aom_highbd_dc_left_predictor_4x4_sse2(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_dc_left_predictor_4x4 aom_highbd_dc_left_predictor_4x4_sse2
-
-void aom_highbd_dc_left_predictor_4x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-void aom_highbd_dc_left_predictor_4x8_sse2(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_dc_left_predictor_4x8 aom_highbd_dc_left_predictor_4x8_sse2
-
-void aom_highbd_dc_left_predictor_64x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_64x16 aom_highbd_dc_left_predictor_64x16_c
-
-void aom_highbd_dc_left_predictor_64x32_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_64x32 aom_highbd_dc_left_predictor_64x32_c
-
-void aom_highbd_dc_left_predictor_64x64_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_64x64 aom_highbd_dc_left_predictor_64x64_c
-
-void aom_highbd_dc_left_predictor_8x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-void aom_highbd_dc_left_predictor_8x16_sse2(uint16_t* dst,
-                                            ptrdiff_t y_stride,
-                                            const uint16_t* above,
-                                            const uint16_t* left,
-                                            int bd);
-#define aom_highbd_dc_left_predictor_8x16 aom_highbd_dc_left_predictor_8x16_sse2
-
-void aom_highbd_dc_left_predictor_8x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_8x32 aom_highbd_dc_left_predictor_8x32_c
-
-void aom_highbd_dc_left_predictor_8x4_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-void aom_highbd_dc_left_predictor_8x4_sse2(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_dc_left_predictor_8x4 aom_highbd_dc_left_predictor_8x4_sse2
-
-void aom_highbd_dc_left_predictor_8x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-void aom_highbd_dc_left_predictor_8x8_sse2(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_dc_left_predictor_8x8 aom_highbd_dc_left_predictor_8x8_sse2
-
-void aom_highbd_dc_predictor_16x16_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-void aom_highbd_dc_predictor_16x16_sse2(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_predictor_16x16 aom_highbd_dc_predictor_16x16_sse2
-
-void aom_highbd_dc_predictor_16x32_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-void aom_highbd_dc_predictor_16x32_sse2(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_predictor_16x32 aom_highbd_dc_predictor_16x32_sse2
-
-void aom_highbd_dc_predictor_16x4_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_16x4 aom_highbd_dc_predictor_16x4_c
-
-void aom_highbd_dc_predictor_16x64_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_16x64 aom_highbd_dc_predictor_16x64_c
-
-void aom_highbd_dc_predictor_16x8_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-void aom_highbd_dc_predictor_16x8_sse2(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_predictor_16x8 aom_highbd_dc_predictor_16x8_sse2
-
-void aom_highbd_dc_predictor_2x2_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_dc_predictor_2x2 aom_highbd_dc_predictor_2x2_c
-
-void aom_highbd_dc_predictor_32x16_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-void aom_highbd_dc_predictor_32x16_sse2(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_predictor_32x16 aom_highbd_dc_predictor_32x16_sse2
-
-void aom_highbd_dc_predictor_32x32_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-void aom_highbd_dc_predictor_32x32_sse2(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_predictor_32x32 aom_highbd_dc_predictor_32x32_sse2
-
-void aom_highbd_dc_predictor_32x64_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_32x64 aom_highbd_dc_predictor_32x64_c
-
-void aom_highbd_dc_predictor_32x8_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_32x8 aom_highbd_dc_predictor_32x8_c
-
-void aom_highbd_dc_predictor_4x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_4x16 aom_highbd_dc_predictor_4x16_c
-
-void aom_highbd_dc_predictor_4x4_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-void aom_highbd_dc_predictor_4x4_sse2(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_dc_predictor_4x4 aom_highbd_dc_predictor_4x4_sse2
-
-void aom_highbd_dc_predictor_4x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-void aom_highbd_dc_predictor_4x8_sse2(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_dc_predictor_4x8 aom_highbd_dc_predictor_4x8_sse2
-
-void aom_highbd_dc_predictor_64x16_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_64x16 aom_highbd_dc_predictor_64x16_c
-
-void aom_highbd_dc_predictor_64x32_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_64x32 aom_highbd_dc_predictor_64x32_c
-
-void aom_highbd_dc_predictor_64x64_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_64x64 aom_highbd_dc_predictor_64x64_c
-
-void aom_highbd_dc_predictor_8x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-void aom_highbd_dc_predictor_8x16_sse2(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_predictor_8x16 aom_highbd_dc_predictor_8x16_sse2
-
-void aom_highbd_dc_predictor_8x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_8x32 aom_highbd_dc_predictor_8x32_c
-
-void aom_highbd_dc_predictor_8x4_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-void aom_highbd_dc_predictor_8x4_sse2(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_dc_predictor_8x4 aom_highbd_dc_predictor_8x4_sse2
-
-void aom_highbd_dc_predictor_8x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-void aom_highbd_dc_predictor_8x8_sse2(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_dc_predictor_8x8 aom_highbd_dc_predictor_8x8_sse2
-
-void aom_highbd_dc_top_predictor_16x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-void aom_highbd_dc_top_predictor_16x16_sse2(uint16_t* dst,
-                                            ptrdiff_t y_stride,
-                                            const uint16_t* above,
-                                            const uint16_t* left,
-                                            int bd);
-#define aom_highbd_dc_top_predictor_16x16 aom_highbd_dc_top_predictor_16x16_sse2
-
-void aom_highbd_dc_top_predictor_16x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-void aom_highbd_dc_top_predictor_16x32_sse2(uint16_t* dst,
-                                            ptrdiff_t y_stride,
-                                            const uint16_t* above,
-                                            const uint16_t* left,
-                                            int bd);
-#define aom_highbd_dc_top_predictor_16x32 aom_highbd_dc_top_predictor_16x32_sse2
-
-void aom_highbd_dc_top_predictor_16x4_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_16x4 aom_highbd_dc_top_predictor_16x4_c
-
-void aom_highbd_dc_top_predictor_16x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_16x64 aom_highbd_dc_top_predictor_16x64_c
-
-void aom_highbd_dc_top_predictor_16x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-void aom_highbd_dc_top_predictor_16x8_sse2(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_dc_top_predictor_16x8 aom_highbd_dc_top_predictor_16x8_sse2
-
-void aom_highbd_dc_top_predictor_2x2_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_top_predictor_2x2 aom_highbd_dc_top_predictor_2x2_c
-
-void aom_highbd_dc_top_predictor_32x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-void aom_highbd_dc_top_predictor_32x16_sse2(uint16_t* dst,
-                                            ptrdiff_t y_stride,
-                                            const uint16_t* above,
-                                            const uint16_t* left,
-                                            int bd);
-#define aom_highbd_dc_top_predictor_32x16 aom_highbd_dc_top_predictor_32x16_sse2
-
-void aom_highbd_dc_top_predictor_32x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-void aom_highbd_dc_top_predictor_32x32_sse2(uint16_t* dst,
-                                            ptrdiff_t y_stride,
-                                            const uint16_t* above,
-                                            const uint16_t* left,
-                                            int bd);
-#define aom_highbd_dc_top_predictor_32x32 aom_highbd_dc_top_predictor_32x32_sse2
-
-void aom_highbd_dc_top_predictor_32x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_32x64 aom_highbd_dc_top_predictor_32x64_c
-
-void aom_highbd_dc_top_predictor_32x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_32x8 aom_highbd_dc_top_predictor_32x8_c
-
-void aom_highbd_dc_top_predictor_4x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_4x16 aom_highbd_dc_top_predictor_4x16_c
-
-void aom_highbd_dc_top_predictor_4x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-void aom_highbd_dc_top_predictor_4x4_sse2(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_top_predictor_4x4 aom_highbd_dc_top_predictor_4x4_sse2
-
-void aom_highbd_dc_top_predictor_4x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-void aom_highbd_dc_top_predictor_4x8_sse2(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_top_predictor_4x8 aom_highbd_dc_top_predictor_4x8_sse2
-
-void aom_highbd_dc_top_predictor_64x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_64x16 aom_highbd_dc_top_predictor_64x16_c
-
-void aom_highbd_dc_top_predictor_64x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_64x32 aom_highbd_dc_top_predictor_64x32_c
-
-void aom_highbd_dc_top_predictor_64x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_64x64 aom_highbd_dc_top_predictor_64x64_c
-
-void aom_highbd_dc_top_predictor_8x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-void aom_highbd_dc_top_predictor_8x16_sse2(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_dc_top_predictor_8x16 aom_highbd_dc_top_predictor_8x16_sse2
-
-void aom_highbd_dc_top_predictor_8x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_8x32 aom_highbd_dc_top_predictor_8x32_c
-
-void aom_highbd_dc_top_predictor_8x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-void aom_highbd_dc_top_predictor_8x4_sse2(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_top_predictor_8x4 aom_highbd_dc_top_predictor_8x4_sse2
-
-void aom_highbd_dc_top_predictor_8x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-void aom_highbd_dc_top_predictor_8x8_sse2(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_top_predictor_8x8 aom_highbd_dc_top_predictor_8x8_sse2
-
-void aom_highbd_dist_wtd_comp_avg_pred_c(uint8_t* comp_pred8,
-                                         const uint8_t* pred8,
-                                         int width,
-                                         int height,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const DIST_WTD_COMP_PARAMS* jcp_param);
-void aom_highbd_dist_wtd_comp_avg_pred_sse2(
-    uint8_t* comp_pred8,
-    const uint8_t* pred8,
-    int width,
-    int height,
-    const uint8_t* ref8,
-    int ref_stride,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_comp_avg_pred aom_highbd_dist_wtd_comp_avg_pred_sse2
-
-void aom_highbd_dist_wtd_comp_avg_upsampled_pred_c(
-    MACROBLOCKD* xd,
-    const struct AV1Common* const cm,
-    int mi_row,
-    int mi_col,
-    const MV* const mv,
-    uint8_t* comp_pred8,
-    const uint8_t* pred8,
-    int width,
-    int height,
-    int subpel_x_q3,
-    int subpel_y_q3,
-    const uint8_t* ref8,
-    int ref_stride,
-    int bd,
-    const DIST_WTD_COMP_PARAMS* jcp_param,
-    int subpel_search);
-void aom_highbd_dist_wtd_comp_avg_upsampled_pred_sse2(
-    MACROBLOCKD* xd,
-    const struct AV1Common* const cm,
-    int mi_row,
-    int mi_col,
-    const MV* const mv,
-    uint8_t* comp_pred8,
-    const uint8_t* pred8,
-    int width,
-    int height,
-    int subpel_x_q3,
-    int subpel_y_q3,
-    const uint8_t* ref8,
-    int ref_stride,
-    int bd,
-    const DIST_WTD_COMP_PARAMS* jcp_param,
-    int subpel_search);
-#define aom_highbd_dist_wtd_comp_avg_upsampled_pred \
-  aom_highbd_dist_wtd_comp_avg_upsampled_pred_sse2
-
-unsigned int aom_highbd_dist_wtd_sad128x128_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad128x128_avg aom_highbd_dist_wtd_sad128x128_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad128x64_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad128x64_avg aom_highbd_dist_wtd_sad128x64_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad16x16_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad16x16_avg aom_highbd_dist_wtd_sad16x16_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad16x32_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad16x32_avg aom_highbd_dist_wtd_sad16x32_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad16x4_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad16x4_avg aom_highbd_dist_wtd_sad16x4_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad16x64_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad16x64_avg aom_highbd_dist_wtd_sad16x64_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad16x8_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad16x8_avg aom_highbd_dist_wtd_sad16x8_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad32x16_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad32x16_avg aom_highbd_dist_wtd_sad32x16_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad32x32_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad32x32_avg aom_highbd_dist_wtd_sad32x32_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad32x64_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad32x64_avg aom_highbd_dist_wtd_sad32x64_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad32x8_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad32x8_avg aom_highbd_dist_wtd_sad32x8_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad4x16_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad4x16_avg aom_highbd_dist_wtd_sad4x16_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad4x4_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad4x4_avg aom_highbd_dist_wtd_sad4x4_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad4x8_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad4x8_avg aom_highbd_dist_wtd_sad4x8_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad64x128_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad64x128_avg aom_highbd_dist_wtd_sad64x128_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad64x16_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad64x16_avg aom_highbd_dist_wtd_sad64x16_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad64x32_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad64x32_avg aom_highbd_dist_wtd_sad64x32_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad64x64_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad64x64_avg aom_highbd_dist_wtd_sad64x64_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad8x16_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad8x16_avg aom_highbd_dist_wtd_sad8x16_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad8x32_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad8x32_avg aom_highbd_dist_wtd_sad8x32_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad8x4_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad8x4_avg aom_highbd_dist_wtd_sad8x4_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad8x8_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad8x8_avg aom_highbd_dist_wtd_sad8x8_avg_c
-
-void aom_highbd_fdct8x8_c(const int16_t* input, tran_low_t* output, int stride);
-void aom_highbd_fdct8x8_sse2(const int16_t* input,
-                             tran_low_t* output,
-                             int stride);
-#define aom_highbd_fdct8x8 aom_highbd_fdct8x8_sse2
-
-void aom_highbd_h_predictor_16x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-void aom_highbd_h_predictor_16x16_sse2(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_h_predictor_16x16 aom_highbd_h_predictor_16x16_sse2
-
-void aom_highbd_h_predictor_16x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-void aom_highbd_h_predictor_16x32_sse2(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_h_predictor_16x32 aom_highbd_h_predictor_16x32_sse2
-
-void aom_highbd_h_predictor_16x4_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_16x4 aom_highbd_h_predictor_16x4_c
-
-void aom_highbd_h_predictor_16x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_16x64 aom_highbd_h_predictor_16x64_c
-
-void aom_highbd_h_predictor_16x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-void aom_highbd_h_predictor_16x8_sse2(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_h_predictor_16x8 aom_highbd_h_predictor_16x8_sse2
-
-void aom_highbd_h_predictor_2x2_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_h_predictor_2x2 aom_highbd_h_predictor_2x2_c
-
-void aom_highbd_h_predictor_32x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-void aom_highbd_h_predictor_32x16_sse2(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_h_predictor_32x16 aom_highbd_h_predictor_32x16_sse2
-
-void aom_highbd_h_predictor_32x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-void aom_highbd_h_predictor_32x32_sse2(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_h_predictor_32x32 aom_highbd_h_predictor_32x32_sse2
-
-void aom_highbd_h_predictor_32x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_32x64 aom_highbd_h_predictor_32x64_c
-
-void aom_highbd_h_predictor_32x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_32x8 aom_highbd_h_predictor_32x8_c
-
-void aom_highbd_h_predictor_4x16_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_4x16 aom_highbd_h_predictor_4x16_c
-
-void aom_highbd_h_predictor_4x4_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-void aom_highbd_h_predictor_4x4_sse2(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_h_predictor_4x4 aom_highbd_h_predictor_4x4_sse2
-
-void aom_highbd_h_predictor_4x8_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-void aom_highbd_h_predictor_4x8_sse2(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_h_predictor_4x8 aom_highbd_h_predictor_4x8_sse2
-
-void aom_highbd_h_predictor_64x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_64x16 aom_highbd_h_predictor_64x16_c
-
-void aom_highbd_h_predictor_64x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_64x32 aom_highbd_h_predictor_64x32_c
-
-void aom_highbd_h_predictor_64x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_64x64 aom_highbd_h_predictor_64x64_c
-
-void aom_highbd_h_predictor_8x16_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-void aom_highbd_h_predictor_8x16_sse2(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_h_predictor_8x16 aom_highbd_h_predictor_8x16_sse2
-
-void aom_highbd_h_predictor_8x32_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_8x32 aom_highbd_h_predictor_8x32_c
-
-void aom_highbd_h_predictor_8x4_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-void aom_highbd_h_predictor_8x4_sse2(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_h_predictor_8x4 aom_highbd_h_predictor_8x4_sse2
-
-void aom_highbd_h_predictor_8x8_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-void aom_highbd_h_predictor_8x8_sse2(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_h_predictor_8x8 aom_highbd_h_predictor_8x8_sse2
-
-void aom_highbd_hadamard_16x16_c(const int16_t* src_diff,
-                                 ptrdiff_t src_stride,
-                                 tran_low_t* coeff);
-void aom_highbd_hadamard_16x16_avx2(const int16_t* src_diff,
-                                    ptrdiff_t src_stride,
-                                    tran_low_t* coeff);
-RTCD_EXTERN void (*aom_highbd_hadamard_16x16)(const int16_t* src_diff,
-                                              ptrdiff_t src_stride,
-                                              tran_low_t* coeff);
-
-void aom_highbd_hadamard_32x32_c(const int16_t* src_diff,
-                                 ptrdiff_t src_stride,
-                                 tran_low_t* coeff);
-void aom_highbd_hadamard_32x32_avx2(const int16_t* src_diff,
-                                    ptrdiff_t src_stride,
-                                    tran_low_t* coeff);
-RTCD_EXTERN void (*aom_highbd_hadamard_32x32)(const int16_t* src_diff,
-                                              ptrdiff_t src_stride,
-                                              tran_low_t* coeff);
-
-void aom_highbd_hadamard_8x8_c(const int16_t* src_diff,
-                               ptrdiff_t src_stride,
-                               tran_low_t* coeff);
-void aom_highbd_hadamard_8x8_avx2(const int16_t* src_diff,
-                                  ptrdiff_t src_stride,
-                                  tran_low_t* coeff);
-RTCD_EXTERN void (*aom_highbd_hadamard_8x8)(const int16_t* src_diff,
-                                            ptrdiff_t src_stride,
-                                            tran_low_t* coeff);
-
-void aom_highbd_lpf_horizontal_14_c(uint16_t* s,
-                                    int pitch,
-                                    const uint8_t* blimit,
-                                    const uint8_t* limit,
-                                    const uint8_t* thresh,
-                                    int bd);
-void aom_highbd_lpf_horizontal_14_sse2(uint16_t* s,
-                                       int pitch,
-                                       const uint8_t* blimit,
-                                       const uint8_t* limit,
-                                       const uint8_t* thresh,
-                                       int bd);
-#define aom_highbd_lpf_horizontal_14 aom_highbd_lpf_horizontal_14_sse2
-
-void aom_highbd_lpf_horizontal_14_dual_c(uint16_t* s,
-                                         int pitch,
-                                         const uint8_t* blimit0,
-                                         const uint8_t* limit0,
-                                         const uint8_t* thresh0,
-                                         const uint8_t* blimit1,
-                                         const uint8_t* limit1,
-                                         const uint8_t* thresh1,
-                                         int bd);
-void aom_highbd_lpf_horizontal_14_dual_sse2(uint16_t* s,
-                                            int pitch,
-                                            const uint8_t* blimit0,
-                                            const uint8_t* limit0,
-                                            const uint8_t* thresh0,
-                                            const uint8_t* blimit1,
-                                            const uint8_t* limit1,
-                                            const uint8_t* thresh1,
-                                            int bd);
-void aom_highbd_lpf_horizontal_14_dual_avx2(uint16_t* s,
-                                            int pitch,
-                                            const uint8_t* blimit0,
-                                            const uint8_t* limit0,
-                                            const uint8_t* thresh0,
-                                            const uint8_t* blimit1,
-                                            const uint8_t* limit1,
-                                            const uint8_t* thresh1,
-                                            int bd);
-RTCD_EXTERN void (*aom_highbd_lpf_horizontal_14_dual)(uint16_t* s,
-                                                      int pitch,
-                                                      const uint8_t* blimit0,
-                                                      const uint8_t* limit0,
-                                                      const uint8_t* thresh0,
-                                                      const uint8_t* blimit1,
-                                                      const uint8_t* limit1,
-                                                      const uint8_t* thresh1,
-                                                      int bd);
-
-void aom_highbd_lpf_horizontal_4_c(uint16_t* s,
-                                   int pitch,
-                                   const uint8_t* blimit,
-                                   const uint8_t* limit,
-                                   const uint8_t* thresh,
-                                   int bd);
-void aom_highbd_lpf_horizontal_4_sse2(uint16_t* s,
-                                      int pitch,
-                                      const uint8_t* blimit,
-                                      const uint8_t* limit,
-                                      const uint8_t* thresh,
-                                      int bd);
-#define aom_highbd_lpf_horizontal_4 aom_highbd_lpf_horizontal_4_sse2
-
-void aom_highbd_lpf_horizontal_4_dual_c(uint16_t* s,
-                                        int pitch,
-                                        const uint8_t* blimit0,
-                                        const uint8_t* limit0,
-                                        const uint8_t* thresh0,
-                                        const uint8_t* blimit1,
-                                        const uint8_t* limit1,
-                                        const uint8_t* thresh1,
-                                        int bd);
-void aom_highbd_lpf_horizontal_4_dual_sse2(uint16_t* s,
-                                           int pitch,
-                                           const uint8_t* blimit0,
-                                           const uint8_t* limit0,
-                                           const uint8_t* thresh0,
-                                           const uint8_t* blimit1,
-                                           const uint8_t* limit1,
-                                           const uint8_t* thresh1,
-                                           int bd);
-void aom_highbd_lpf_horizontal_4_dual_avx2(uint16_t* s,
-                                           int pitch,
-                                           const uint8_t* blimit0,
-                                           const uint8_t* limit0,
-                                           const uint8_t* thresh0,
-                                           const uint8_t* blimit1,
-                                           const uint8_t* limit1,
-                                           const uint8_t* thresh1,
-                                           int bd);
-RTCD_EXTERN void (*aom_highbd_lpf_horizontal_4_dual)(uint16_t* s,
-                                                     int pitch,
-                                                     const uint8_t* blimit0,
-                                                     const uint8_t* limit0,
-                                                     const uint8_t* thresh0,
-                                                     const uint8_t* blimit1,
-                                                     const uint8_t* limit1,
-                                                     const uint8_t* thresh1,
-                                                     int bd);
-
-void aom_highbd_lpf_horizontal_6_c(uint16_t* s,
-                                   int pitch,
-                                   const uint8_t* blimit,
-                                   const uint8_t* limit,
-                                   const uint8_t* thresh,
-                                   int bd);
-void aom_highbd_lpf_horizontal_6_sse2(uint16_t* s,
-                                      int pitch,
-                                      const uint8_t* blimit,
-                                      const uint8_t* limit,
-                                      const uint8_t* thresh,
-                                      int bd);
-#define aom_highbd_lpf_horizontal_6 aom_highbd_lpf_horizontal_6_sse2
-
-void aom_highbd_lpf_horizontal_6_dual_c(uint16_t* s,
-                                        int pitch,
-                                        const uint8_t* blimit0,
-                                        const uint8_t* limit0,
-                                        const uint8_t* thresh0,
-                                        const uint8_t* blimit1,
-                                        const uint8_t* limit1,
-                                        const uint8_t* thresh1,
-                                        int bd);
-void aom_highbd_lpf_horizontal_6_dual_sse2(uint16_t* s,
-                                           int pitch,
-                                           const uint8_t* blimit0,
-                                           const uint8_t* limit0,
-                                           const uint8_t* thresh0,
-                                           const uint8_t* blimit1,
-                                           const uint8_t* limit1,
-                                           const uint8_t* thresh1,
-                                           int bd);
-#define aom_highbd_lpf_horizontal_6_dual aom_highbd_lpf_horizontal_6_dual_sse2
-
-void aom_highbd_lpf_horizontal_8_c(uint16_t* s,
-                                   int pitch,
-                                   const uint8_t* blimit,
-                                   const uint8_t* limit,
-                                   const uint8_t* thresh,
-                                   int bd);
-void aom_highbd_lpf_horizontal_8_sse2(uint16_t* s,
-                                      int pitch,
-                                      const uint8_t* blimit,
-                                      const uint8_t* limit,
-                                      const uint8_t* thresh,
-                                      int bd);
-#define aom_highbd_lpf_horizontal_8 aom_highbd_lpf_horizontal_8_sse2
-
-void aom_highbd_lpf_horizontal_8_dual_c(uint16_t* s,
-                                        int pitch,
-                                        const uint8_t* blimit0,
-                                        const uint8_t* limit0,
-                                        const uint8_t* thresh0,
-                                        const uint8_t* blimit1,
-                                        const uint8_t* limit1,
-                                        const uint8_t* thresh1,
-                                        int bd);
-void aom_highbd_lpf_horizontal_8_dual_sse2(uint16_t* s,
-                                           int pitch,
-                                           const uint8_t* blimit0,
-                                           const uint8_t* limit0,
-                                           const uint8_t* thresh0,
-                                           const uint8_t* blimit1,
-                                           const uint8_t* limit1,
-                                           const uint8_t* thresh1,
-                                           int bd);
-void aom_highbd_lpf_horizontal_8_dual_avx2(uint16_t* s,
-                                           int pitch,
-                                           const uint8_t* blimit0,
-                                           const uint8_t* limit0,
-                                           const uint8_t* thresh0,
-                                           const uint8_t* blimit1,
-                                           const uint8_t* limit1,
-                                           const uint8_t* thresh1,
-                                           int bd);
-RTCD_EXTERN void (*aom_highbd_lpf_horizontal_8_dual)(uint16_t* s,
-                                                     int pitch,
-                                                     const uint8_t* blimit0,
-                                                     const uint8_t* limit0,
-                                                     const uint8_t* thresh0,
-                                                     const uint8_t* blimit1,
-                                                     const uint8_t* limit1,
-                                                     const uint8_t* thresh1,
-                                                     int bd);
-
-void aom_highbd_lpf_vertical_14_c(uint16_t* s,
-                                  int pitch,
-                                  const uint8_t* blimit,
-                                  const uint8_t* limit,
-                                  const uint8_t* thresh,
-                                  int bd);
-void aom_highbd_lpf_vertical_14_sse2(uint16_t* s,
-                                     int pitch,
-                                     const uint8_t* blimit,
-                                     const uint8_t* limit,
-                                     const uint8_t* thresh,
-                                     int bd);
-#define aom_highbd_lpf_vertical_14 aom_highbd_lpf_vertical_14_sse2
-
-void aom_highbd_lpf_vertical_14_dual_c(uint16_t* s,
-                                       int pitch,
-                                       const uint8_t* blimit0,
-                                       const uint8_t* limit0,
-                                       const uint8_t* thresh0,
-                                       const uint8_t* blimit1,
-                                       const uint8_t* limit1,
-                                       const uint8_t* thresh1,
-                                       int bd);
-void aom_highbd_lpf_vertical_14_dual_sse2(uint16_t* s,
-                                          int pitch,
-                                          const uint8_t* blimit0,
-                                          const uint8_t* limit0,
-                                          const uint8_t* thresh0,
-                                          const uint8_t* blimit1,
-                                          const uint8_t* limit1,
-                                          const uint8_t* thresh1,
-                                          int bd);
-void aom_highbd_lpf_vertical_14_dual_avx2(uint16_t* s,
-                                          int pitch,
-                                          const uint8_t* blimit0,
-                                          const uint8_t* limit0,
-                                          const uint8_t* thresh0,
-                                          const uint8_t* blimit1,
-                                          const uint8_t* limit1,
-                                          const uint8_t* thresh1,
-                                          int bd);
-RTCD_EXTERN void (*aom_highbd_lpf_vertical_14_dual)(uint16_t* s,
-                                                    int pitch,
-                                                    const uint8_t* blimit0,
-                                                    const uint8_t* limit0,
-                                                    const uint8_t* thresh0,
-                                                    const uint8_t* blimit1,
-                                                    const uint8_t* limit1,
-                                                    const uint8_t* thresh1,
-                                                    int bd);
-
-void aom_highbd_lpf_vertical_4_c(uint16_t* s,
-                                 int pitch,
-                                 const uint8_t* blimit,
-                                 const uint8_t* limit,
-                                 const uint8_t* thresh,
-                                 int bd);
-void aom_highbd_lpf_vertical_4_sse2(uint16_t* s,
-                                    int pitch,
-                                    const uint8_t* blimit,
-                                    const uint8_t* limit,
-                                    const uint8_t* thresh,
-                                    int bd);
-#define aom_highbd_lpf_vertical_4 aom_highbd_lpf_vertical_4_sse2
-
-void aom_highbd_lpf_vertical_4_dual_c(uint16_t* s,
-                                      int pitch,
-                                      const uint8_t* blimit0,
-                                      const uint8_t* limit0,
-                                      const uint8_t* thresh0,
-                                      const uint8_t* blimit1,
-                                      const uint8_t* limit1,
-                                      const uint8_t* thresh1,
-                                      int bd);
-void aom_highbd_lpf_vertical_4_dual_sse2(uint16_t* s,
-                                         int pitch,
-                                         const uint8_t* blimit0,
-                                         const uint8_t* limit0,
-                                         const uint8_t* thresh0,
-                                         const uint8_t* blimit1,
-                                         const uint8_t* limit1,
-                                         const uint8_t* thresh1,
-                                         int bd);
-void aom_highbd_lpf_vertical_4_dual_avx2(uint16_t* s,
-                                         int pitch,
-                                         const uint8_t* blimit0,
-                                         const uint8_t* limit0,
-                                         const uint8_t* thresh0,
-                                         const uint8_t* blimit1,
-                                         const uint8_t* limit1,
-                                         const uint8_t* thresh1,
-                                         int bd);
-RTCD_EXTERN void (*aom_highbd_lpf_vertical_4_dual)(uint16_t* s,
-                                                   int pitch,
-                                                   const uint8_t* blimit0,
-                                                   const uint8_t* limit0,
-                                                   const uint8_t* thresh0,
-                                                   const uint8_t* blimit1,
-                                                   const uint8_t* limit1,
-                                                   const uint8_t* thresh1,
-                                                   int bd);
-
-void aom_highbd_lpf_vertical_6_c(uint16_t* s,
-                                 int pitch,
-                                 const uint8_t* blimit,
-                                 const uint8_t* limit,
-                                 const uint8_t* thresh,
-                                 int bd);
-void aom_highbd_lpf_vertical_6_sse2(uint16_t* s,
-                                    int pitch,
-                                    const uint8_t* blimit,
-                                    const uint8_t* limit,
-                                    const uint8_t* thresh,
-                                    int bd);
-#define aom_highbd_lpf_vertical_6 aom_highbd_lpf_vertical_6_sse2
-
-void aom_highbd_lpf_vertical_6_dual_c(uint16_t* s,
-                                      int pitch,
-                                      const uint8_t* blimit0,
-                                      const uint8_t* limit0,
-                                      const uint8_t* thresh0,
-                                      const uint8_t* blimit1,
-                                      const uint8_t* limit1,
-                                      const uint8_t* thresh1,
-                                      int bd);
-void aom_highbd_lpf_vertical_6_dual_sse2(uint16_t* s,
-                                         int pitch,
-                                         const uint8_t* blimit0,
-                                         const uint8_t* limit0,
-                                         const uint8_t* thresh0,
-                                         const uint8_t* blimit1,
-                                         const uint8_t* limit1,
-                                         const uint8_t* thresh1,
-                                         int bd);
-#define aom_highbd_lpf_vertical_6_dual aom_highbd_lpf_vertical_6_dual_sse2
-
-void aom_highbd_lpf_vertical_8_c(uint16_t* s,
-                                 int pitch,
-                                 const uint8_t* blimit,
-                                 const uint8_t* limit,
-                                 const uint8_t* thresh,
-                                 int bd);
-void aom_highbd_lpf_vertical_8_sse2(uint16_t* s,
-                                    int pitch,
-                                    const uint8_t* blimit,
-                                    const uint8_t* limit,
-                                    const uint8_t* thresh,
-                                    int bd);
-#define aom_highbd_lpf_vertical_8 aom_highbd_lpf_vertical_8_sse2
-
-void aom_highbd_lpf_vertical_8_dual_c(uint16_t* s,
-                                      int pitch,
-                                      const uint8_t* blimit0,
-                                      const uint8_t* limit0,
-                                      const uint8_t* thresh0,
-                                      const uint8_t* blimit1,
-                                      const uint8_t* limit1,
-                                      const uint8_t* thresh1,
-                                      int bd);
-void aom_highbd_lpf_vertical_8_dual_sse2(uint16_t* s,
-                                         int pitch,
-                                         const uint8_t* blimit0,
-                                         const uint8_t* limit0,
-                                         const uint8_t* thresh0,
-                                         const uint8_t* blimit1,
-                                         const uint8_t* limit1,
-                                         const uint8_t* thresh1,
-                                         int bd);
-void aom_highbd_lpf_vertical_8_dual_avx2(uint16_t* s,
-                                         int pitch,
-                                         const uint8_t* blimit0,
-                                         const uint8_t* limit0,
-                                         const uint8_t* thresh0,
-                                         const uint8_t* blimit1,
-                                         const uint8_t* limit1,
-                                         const uint8_t* thresh1,
-                                         int bd);
-RTCD_EXTERN void (*aom_highbd_lpf_vertical_8_dual)(uint16_t* s,
-                                                   int pitch,
-                                                   const uint8_t* blimit0,
-                                                   const uint8_t* limit0,
-                                                   const uint8_t* thresh0,
-                                                   const uint8_t* blimit1,
-                                                   const uint8_t* limit1,
-                                                   const uint8_t* thresh1,
-                                                   int bd);
-
-unsigned int aom_highbd_masked_sad128x128_c(const uint8_t* src8,
-                                            int src_stride,
-                                            const uint8_t* ref8,
-                                            int ref_stride,
-                                            const uint8_t* second_pred8,
-                                            const uint8_t* msk,
-                                            int msk_stride,
-                                            int invert_mask);
-unsigned int aom_highbd_masked_sad128x128_ssse3(const uint8_t* src8,
-                                                int src_stride,
-                                                const uint8_t* ref8,
-                                                int ref_stride,
-                                                const uint8_t* second_pred8,
-                                                const uint8_t* msk,
-                                                int msk_stride,
-                                                int invert_mask);
-unsigned int aom_highbd_masked_sad128x128_avx2(const uint8_t* src8,
-                                               int src_stride,
-                                               const uint8_t* ref8,
-                                               int ref_stride,
-                                               const uint8_t* second_pred8,
-                                               const uint8_t* msk,
-                                               int msk_stride,
-                                               int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad128x128)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad128x64_c(const uint8_t* src8,
-                                           int src_stride,
-                                           const uint8_t* ref8,
-                                           int ref_stride,
-                                           const uint8_t* second_pred8,
-                                           const uint8_t* msk,
-                                           int msk_stride,
-                                           int invert_mask);
-unsigned int aom_highbd_masked_sad128x64_ssse3(const uint8_t* src8,
-                                               int src_stride,
-                                               const uint8_t* ref8,
-                                               int ref_stride,
-                                               const uint8_t* second_pred8,
-                                               const uint8_t* msk,
-                                               int msk_stride,
-                                               int invert_mask);
-unsigned int aom_highbd_masked_sad128x64_avx2(const uint8_t* src8,
-                                              int src_stride,
-                                              const uint8_t* ref8,
-                                              int ref_stride,
-                                              const uint8_t* second_pred8,
-                                              const uint8_t* msk,
-                                              int msk_stride,
-                                              int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad128x64)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad16x16_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-unsigned int aom_highbd_masked_sad16x16_ssse3(const uint8_t* src8,
-                                              int src_stride,
-                                              const uint8_t* ref8,
-                                              int ref_stride,
-                                              const uint8_t* second_pred8,
-                                              const uint8_t* msk,
-                                              int msk_stride,
-                                              int invert_mask);
-unsigned int aom_highbd_masked_sad16x16_avx2(const uint8_t* src8,
-                                             int src_stride,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             const uint8_t* second_pred8,
-                                             const uint8_t* msk,
-                                             int msk_stride,
-                                             int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad16x16)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad16x32_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-unsigned int aom_highbd_masked_sad16x32_ssse3(const uint8_t* src8,
-                                              int src_stride,
-                                              const uint8_t* ref8,
-                                              int ref_stride,
-                                              const uint8_t* second_pred8,
-                                              const uint8_t* msk,
-                                              int msk_stride,
-                                              int invert_mask);
-unsigned int aom_highbd_masked_sad16x32_avx2(const uint8_t* src8,
-                                             int src_stride,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             const uint8_t* second_pred8,
-                                             const uint8_t* msk,
-                                             int msk_stride,
-                                             int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad16x32)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad16x4_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-unsigned int aom_highbd_masked_sad16x4_ssse3(const uint8_t* src8,
-                                             int src_stride,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             const uint8_t* second_pred8,
-                                             const uint8_t* msk,
-                                             int msk_stride,
-                                             int invert_mask);
-unsigned int aom_highbd_masked_sad16x4_avx2(const uint8_t* src8,
-                                            int src_stride,
-                                            const uint8_t* ref8,
-                                            int ref_stride,
-                                            const uint8_t* second_pred8,
-                                            const uint8_t* msk,
-                                            int msk_stride,
-                                            int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad16x4)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad16x64_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-unsigned int aom_highbd_masked_sad16x64_ssse3(const uint8_t* src8,
-                                              int src_stride,
-                                              const uint8_t* ref8,
-                                              int ref_stride,
-                                              const uint8_t* second_pred8,
-                                              const uint8_t* msk,
-                                              int msk_stride,
-                                              int invert_mask);
-unsigned int aom_highbd_masked_sad16x64_avx2(const uint8_t* src8,
-                                             int src_stride,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             const uint8_t* second_pred8,
-                                             const uint8_t* msk,
-                                             int msk_stride,
-                                             int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad16x64)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad16x8_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-unsigned int aom_highbd_masked_sad16x8_ssse3(const uint8_t* src8,
-                                             int src_stride,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             const uint8_t* second_pred8,
-                                             const uint8_t* msk,
-                                             int msk_stride,
-                                             int invert_mask);
-unsigned int aom_highbd_masked_sad16x8_avx2(const uint8_t* src8,
-                                            int src_stride,
-                                            const uint8_t* ref8,
-                                            int ref_stride,
-                                            const uint8_t* second_pred8,
-                                            const uint8_t* msk,
-                                            int msk_stride,
-                                            int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad16x8)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad32x16_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-unsigned int aom_highbd_masked_sad32x16_ssse3(const uint8_t* src8,
-                                              int src_stride,
-                                              const uint8_t* ref8,
-                                              int ref_stride,
-                                              const uint8_t* second_pred8,
-                                              const uint8_t* msk,
-                                              int msk_stride,
-                                              int invert_mask);
-unsigned int aom_highbd_masked_sad32x16_avx2(const uint8_t* src8,
-                                             int src_stride,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             const uint8_t* second_pred8,
-                                             const uint8_t* msk,
-                                             int msk_stride,
-                                             int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad32x16)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad32x32_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-unsigned int aom_highbd_masked_sad32x32_ssse3(const uint8_t* src8,
-                                              int src_stride,
-                                              const uint8_t* ref8,
-                                              int ref_stride,
-                                              const uint8_t* second_pred8,
-                                              const uint8_t* msk,
-                                              int msk_stride,
-                                              int invert_mask);
-unsigned int aom_highbd_masked_sad32x32_avx2(const uint8_t* src8,
-                                             int src_stride,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             const uint8_t* second_pred8,
-                                             const uint8_t* msk,
-                                             int msk_stride,
-                                             int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad32x32)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad32x64_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-unsigned int aom_highbd_masked_sad32x64_ssse3(const uint8_t* src8,
-                                              int src_stride,
-                                              const uint8_t* ref8,
-                                              int ref_stride,
-                                              const uint8_t* second_pred8,
-                                              const uint8_t* msk,
-                                              int msk_stride,
-                                              int invert_mask);
-unsigned int aom_highbd_masked_sad32x64_avx2(const uint8_t* src8,
-                                             int src_stride,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             const uint8_t* second_pred8,
-                                             const uint8_t* msk,
-                                             int msk_stride,
-                                             int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad32x64)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad32x8_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-unsigned int aom_highbd_masked_sad32x8_ssse3(const uint8_t* src8,
-                                             int src_stride,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             const uint8_t* second_pred8,
-                                             const uint8_t* msk,
-                                             int msk_stride,
-                                             int invert_mask);
-unsigned int aom_highbd_masked_sad32x8_avx2(const uint8_t* src8,
-                                            int src_stride,
-                                            const uint8_t* ref8,
-                                            int ref_stride,
-                                            const uint8_t* second_pred8,
-                                            const uint8_t* msk,
-                                            int msk_stride,
-                                            int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad32x8)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad4x16_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-unsigned int aom_highbd_masked_sad4x16_ssse3(const uint8_t* src8,
-                                             int src_stride,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             const uint8_t* second_pred8,
-                                             const uint8_t* msk,
-                                             int msk_stride,
-                                             int invert_mask);
-unsigned int aom_highbd_masked_sad4x16_avx2(const uint8_t* src8,
-                                            int src_stride,
-                                            const uint8_t* ref8,
-                                            int ref_stride,
-                                            const uint8_t* second_pred8,
-                                            const uint8_t* msk,
-                                            int msk_stride,
-                                            int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad4x16)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad4x4_c(const uint8_t* src8,
-                                        int src_stride,
-                                        const uint8_t* ref8,
-                                        int ref_stride,
-                                        const uint8_t* second_pred8,
-                                        const uint8_t* msk,
-                                        int msk_stride,
-                                        int invert_mask);
-unsigned int aom_highbd_masked_sad4x4_ssse3(const uint8_t* src8,
-                                            int src_stride,
-                                            const uint8_t* ref8,
-                                            int ref_stride,
-                                            const uint8_t* second_pred8,
-                                            const uint8_t* msk,
-                                            int msk_stride,
-                                            int invert_mask);
-unsigned int aom_highbd_masked_sad4x4_avx2(const uint8_t* src8,
-                                           int src_stride,
-                                           const uint8_t* ref8,
-                                           int ref_stride,
-                                           const uint8_t* second_pred8,
-                                           const uint8_t* msk,
-                                           int msk_stride,
-                                           int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad4x4)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad4x8_c(const uint8_t* src8,
-                                        int src_stride,
-                                        const uint8_t* ref8,
-                                        int ref_stride,
-                                        const uint8_t* second_pred8,
-                                        const uint8_t* msk,
-                                        int msk_stride,
-                                        int invert_mask);
-unsigned int aom_highbd_masked_sad4x8_ssse3(const uint8_t* src8,
-                                            int src_stride,
-                                            const uint8_t* ref8,
-                                            int ref_stride,
-                                            const uint8_t* second_pred8,
-                                            const uint8_t* msk,
-                                            int msk_stride,
-                                            int invert_mask);
-unsigned int aom_highbd_masked_sad4x8_avx2(const uint8_t* src8,
-                                           int src_stride,
-                                           const uint8_t* ref8,
-                                           int ref_stride,
-                                           const uint8_t* second_pred8,
-                                           const uint8_t* msk,
-                                           int msk_stride,
-                                           int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad4x8)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad64x128_c(const uint8_t* src8,
-                                           int src_stride,
-                                           const uint8_t* ref8,
-                                           int ref_stride,
-                                           const uint8_t* second_pred8,
-                                           const uint8_t* msk,
-                                           int msk_stride,
-                                           int invert_mask);
-unsigned int aom_highbd_masked_sad64x128_ssse3(const uint8_t* src8,
-                                               int src_stride,
-                                               const uint8_t* ref8,
-                                               int ref_stride,
-                                               const uint8_t* second_pred8,
-                                               const uint8_t* msk,
-                                               int msk_stride,
-                                               int invert_mask);
-unsigned int aom_highbd_masked_sad64x128_avx2(const uint8_t* src8,
-                                              int src_stride,
-                                              const uint8_t* ref8,
-                                              int ref_stride,
-                                              const uint8_t* second_pred8,
-                                              const uint8_t* msk,
-                                              int msk_stride,
-                                              int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad64x128)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad64x16_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-unsigned int aom_highbd_masked_sad64x16_ssse3(const uint8_t* src8,
-                                              int src_stride,
-                                              const uint8_t* ref8,
-                                              int ref_stride,
-                                              const uint8_t* second_pred8,
-                                              const uint8_t* msk,
-                                              int msk_stride,
-                                              int invert_mask);
-unsigned int aom_highbd_masked_sad64x16_avx2(const uint8_t* src8,
-                                             int src_stride,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             const uint8_t* second_pred8,
-                                             const uint8_t* msk,
-                                             int msk_stride,
-                                             int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad64x16)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad64x32_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-unsigned int aom_highbd_masked_sad64x32_ssse3(const uint8_t* src8,
-                                              int src_stride,
-                                              const uint8_t* ref8,
-                                              int ref_stride,
-                                              const uint8_t* second_pred8,
-                                              const uint8_t* msk,
-                                              int msk_stride,
-                                              int invert_mask);
-unsigned int aom_highbd_masked_sad64x32_avx2(const uint8_t* src8,
-                                             int src_stride,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             const uint8_t* second_pred8,
-                                             const uint8_t* msk,
-                                             int msk_stride,
-                                             int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad64x32)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad64x64_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-unsigned int aom_highbd_masked_sad64x64_ssse3(const uint8_t* src8,
-                                              int src_stride,
-                                              const uint8_t* ref8,
-                                              int ref_stride,
-                                              const uint8_t* second_pred8,
-                                              const uint8_t* msk,
-                                              int msk_stride,
-                                              int invert_mask);
-unsigned int aom_highbd_masked_sad64x64_avx2(const uint8_t* src8,
-                                             int src_stride,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             const uint8_t* second_pred8,
-                                             const uint8_t* msk,
-                                             int msk_stride,
-                                             int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad64x64)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad8x16_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-unsigned int aom_highbd_masked_sad8x16_ssse3(const uint8_t* src8,
-                                             int src_stride,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             const uint8_t* second_pred8,
-                                             const uint8_t* msk,
-                                             int msk_stride,
-                                             int invert_mask);
-unsigned int aom_highbd_masked_sad8x16_avx2(const uint8_t* src8,
-                                            int src_stride,
-                                            const uint8_t* ref8,
-                                            int ref_stride,
-                                            const uint8_t* second_pred8,
-                                            const uint8_t* msk,
-                                            int msk_stride,
-                                            int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad8x16)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad8x32_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-unsigned int aom_highbd_masked_sad8x32_ssse3(const uint8_t* src8,
-                                             int src_stride,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             const uint8_t* second_pred8,
-                                             const uint8_t* msk,
-                                             int msk_stride,
-                                             int invert_mask);
-unsigned int aom_highbd_masked_sad8x32_avx2(const uint8_t* src8,
-                                            int src_stride,
-                                            const uint8_t* ref8,
-                                            int ref_stride,
-                                            const uint8_t* second_pred8,
-                                            const uint8_t* msk,
-                                            int msk_stride,
-                                            int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad8x32)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad8x4_c(const uint8_t* src8,
-                                        int src_stride,
-                                        const uint8_t* ref8,
-                                        int ref_stride,
-                                        const uint8_t* second_pred8,
-                                        const uint8_t* msk,
-                                        int msk_stride,
-                                        int invert_mask);
-unsigned int aom_highbd_masked_sad8x4_ssse3(const uint8_t* src8,
-                                            int src_stride,
-                                            const uint8_t* ref8,
-                                            int ref_stride,
-                                            const uint8_t* second_pred8,
-                                            const uint8_t* msk,
-                                            int msk_stride,
-                                            int invert_mask);
-unsigned int aom_highbd_masked_sad8x4_avx2(const uint8_t* src8,
-                                           int src_stride,
-                                           const uint8_t* ref8,
-                                           int ref_stride,
-                                           const uint8_t* second_pred8,
-                                           const uint8_t* msk,
-                                           int msk_stride,
-                                           int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad8x4)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad8x8_c(const uint8_t* src8,
-                                        int src_stride,
-                                        const uint8_t* ref8,
-                                        int ref_stride,
-                                        const uint8_t* second_pred8,
-                                        const uint8_t* msk,
-                                        int msk_stride,
-                                        int invert_mask);
-unsigned int aom_highbd_masked_sad8x8_ssse3(const uint8_t* src8,
-                                            int src_stride,
-                                            const uint8_t* ref8,
-                                            int ref_stride,
-                                            const uint8_t* second_pred8,
-                                            const uint8_t* msk,
-                                            int msk_stride,
-                                            int invert_mask);
-unsigned int aom_highbd_masked_sad8x8_avx2(const uint8_t* src8,
-                                           int src_stride,
-                                           const uint8_t* ref8,
-                                           int ref_stride,
-                                           const uint8_t* second_pred8,
-                                           const uint8_t* msk,
-                                           int msk_stride,
-                                           int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad8x8)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-void aom_highbd_minmax_8x8_c(const uint8_t* s,
-                             int p,
-                             const uint8_t* d,
-                             int dp,
-                             int* min,
-                             int* max);
-#define aom_highbd_minmax_8x8 aom_highbd_minmax_8x8_c
-
-unsigned int aom_highbd_obmc_sad128x128_c(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask);
-unsigned int aom_highbd_obmc_sad128x128_sse4_1(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask);
-unsigned int aom_highbd_obmc_sad128x128_avx2(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad128x128)(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad128x64_c(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask);
-unsigned int aom_highbd_obmc_sad128x64_sse4_1(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask);
-unsigned int aom_highbd_obmc_sad128x64_avx2(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad128x64)(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad16x16_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-unsigned int aom_highbd_obmc_sad16x16_sse4_1(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-unsigned int aom_highbd_obmc_sad16x16_avx2(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad16x16)(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad16x32_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-unsigned int aom_highbd_obmc_sad16x32_sse4_1(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-unsigned int aom_highbd_obmc_sad16x32_avx2(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad16x32)(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad16x4_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-unsigned int aom_highbd_obmc_sad16x4_sse4_1(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask);
-unsigned int aom_highbd_obmc_sad16x4_avx2(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad16x4)(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad16x64_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-unsigned int aom_highbd_obmc_sad16x64_sse4_1(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-unsigned int aom_highbd_obmc_sad16x64_avx2(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad16x64)(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad16x8_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-unsigned int aom_highbd_obmc_sad16x8_sse4_1(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask);
-unsigned int aom_highbd_obmc_sad16x8_avx2(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad16x8)(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad32x16_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-unsigned int aom_highbd_obmc_sad32x16_sse4_1(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-unsigned int aom_highbd_obmc_sad32x16_avx2(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad32x16)(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad32x32_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-unsigned int aom_highbd_obmc_sad32x32_sse4_1(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-unsigned int aom_highbd_obmc_sad32x32_avx2(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad32x32)(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad32x64_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-unsigned int aom_highbd_obmc_sad32x64_sse4_1(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-unsigned int aom_highbd_obmc_sad32x64_avx2(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad32x64)(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad32x8_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-unsigned int aom_highbd_obmc_sad32x8_sse4_1(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask);
-unsigned int aom_highbd_obmc_sad32x8_avx2(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad32x8)(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad4x16_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-unsigned int aom_highbd_obmc_sad4x16_sse4_1(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask);
-unsigned int aom_highbd_obmc_sad4x16_avx2(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad4x16)(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad4x4_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-unsigned int aom_highbd_obmc_sad4x4_sse4_1(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask);
-unsigned int aom_highbd_obmc_sad4x4_avx2(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad4x4)(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad4x8_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-unsigned int aom_highbd_obmc_sad4x8_sse4_1(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask);
-unsigned int aom_highbd_obmc_sad4x8_avx2(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad4x8)(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad64x128_c(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask);
-unsigned int aom_highbd_obmc_sad64x128_sse4_1(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask);
-unsigned int aom_highbd_obmc_sad64x128_avx2(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad64x128)(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad64x16_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-unsigned int aom_highbd_obmc_sad64x16_sse4_1(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-unsigned int aom_highbd_obmc_sad64x16_avx2(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad64x16)(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad64x32_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-unsigned int aom_highbd_obmc_sad64x32_sse4_1(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-unsigned int aom_highbd_obmc_sad64x32_avx2(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad64x32)(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad64x64_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-unsigned int aom_highbd_obmc_sad64x64_sse4_1(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-unsigned int aom_highbd_obmc_sad64x64_avx2(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad64x64)(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad8x16_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-unsigned int aom_highbd_obmc_sad8x16_sse4_1(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask);
-unsigned int aom_highbd_obmc_sad8x16_avx2(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad8x16)(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad8x32_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-unsigned int aom_highbd_obmc_sad8x32_sse4_1(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask);
-unsigned int aom_highbd_obmc_sad8x32_avx2(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad8x32)(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad8x4_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-unsigned int aom_highbd_obmc_sad8x4_sse4_1(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask);
-unsigned int aom_highbd_obmc_sad8x4_avx2(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad8x4)(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad8x8_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-unsigned int aom_highbd_obmc_sad8x8_sse4_1(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask);
-unsigned int aom_highbd_obmc_sad8x8_avx2(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad8x8)(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sub_pixel_variance128x128_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance128x128 \
-  aom_highbd_obmc_sub_pixel_variance128x128_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance128x64_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance128x64 \
-  aom_highbd_obmc_sub_pixel_variance128x64_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance16x16_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance16x16 \
-  aom_highbd_obmc_sub_pixel_variance16x16_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance16x32_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance16x32 \
-  aom_highbd_obmc_sub_pixel_variance16x32_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance16x4_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance16x4 \
-  aom_highbd_obmc_sub_pixel_variance16x4_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance16x64_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance16x64 \
-  aom_highbd_obmc_sub_pixel_variance16x64_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance16x8_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance16x8 \
-  aom_highbd_obmc_sub_pixel_variance16x8_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance32x16_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance32x16 \
-  aom_highbd_obmc_sub_pixel_variance32x16_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance32x32_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance32x32 \
-  aom_highbd_obmc_sub_pixel_variance32x32_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance32x64_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance32x64 \
-  aom_highbd_obmc_sub_pixel_variance32x64_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance32x8_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance32x8 \
-  aom_highbd_obmc_sub_pixel_variance32x8_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance4x16_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance4x16 \
-  aom_highbd_obmc_sub_pixel_variance4x16_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance4x4_c(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance4x4 \
-  aom_highbd_obmc_sub_pixel_variance4x4_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance4x8_c(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance4x8 \
-  aom_highbd_obmc_sub_pixel_variance4x8_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance64x128_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance64x128 \
-  aom_highbd_obmc_sub_pixel_variance64x128_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance64x16_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance64x16 \
-  aom_highbd_obmc_sub_pixel_variance64x16_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance64x32_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance64x32 \
-  aom_highbd_obmc_sub_pixel_variance64x32_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance64x64_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance64x64 \
-  aom_highbd_obmc_sub_pixel_variance64x64_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance8x16_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance8x16 \
-  aom_highbd_obmc_sub_pixel_variance8x16_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance8x32_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance8x32 \
-  aom_highbd_obmc_sub_pixel_variance8x32_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance8x4_c(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance8x4 \
-  aom_highbd_obmc_sub_pixel_variance8x4_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance8x8_c(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance8x8 \
-  aom_highbd_obmc_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_obmc_variance128x128_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_highbd_obmc_variance128x128_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance128x128)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance128x64_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-unsigned int aom_highbd_obmc_variance128x64_sse4_1(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance128x64)(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance16x16_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-unsigned int aom_highbd_obmc_variance16x16_sse4_1(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance16x16)(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance16x32_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-unsigned int aom_highbd_obmc_variance16x32_sse4_1(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance16x32)(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance16x4_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-unsigned int aom_highbd_obmc_variance16x4_sse4_1(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance16x4)(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance16x64_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-unsigned int aom_highbd_obmc_variance16x64_sse4_1(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance16x64)(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance16x8_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-unsigned int aom_highbd_obmc_variance16x8_sse4_1(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance16x8)(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance32x16_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-unsigned int aom_highbd_obmc_variance32x16_sse4_1(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance32x16)(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance32x32_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-unsigned int aom_highbd_obmc_variance32x32_sse4_1(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance32x32)(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance32x64_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-unsigned int aom_highbd_obmc_variance32x64_sse4_1(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance32x64)(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance32x8_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-unsigned int aom_highbd_obmc_variance32x8_sse4_1(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance32x8)(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance4x16_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-unsigned int aom_highbd_obmc_variance4x16_sse4_1(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance4x16)(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance4x4_c(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-unsigned int aom_highbd_obmc_variance4x4_sse4_1(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance4x4)(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance4x8_c(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-unsigned int aom_highbd_obmc_variance4x8_sse4_1(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance4x8)(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance64x128_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-unsigned int aom_highbd_obmc_variance64x128_sse4_1(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance64x128)(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance64x16_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-unsigned int aom_highbd_obmc_variance64x16_sse4_1(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance64x16)(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance64x32_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-unsigned int aom_highbd_obmc_variance64x32_sse4_1(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance64x32)(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance64x64_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-unsigned int aom_highbd_obmc_variance64x64_sse4_1(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance64x64)(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance8x16_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-unsigned int aom_highbd_obmc_variance8x16_sse4_1(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance8x16)(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance8x32_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-unsigned int aom_highbd_obmc_variance8x32_sse4_1(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance8x32)(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance8x4_c(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-unsigned int aom_highbd_obmc_variance8x4_sse4_1(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance8x4)(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance8x8_c(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-unsigned int aom_highbd_obmc_variance8x8_sse4_1(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance8x8)(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-
-void aom_highbd_paeth_predictor_16x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_16x16 aom_highbd_paeth_predictor_16x16_c
-
-void aom_highbd_paeth_predictor_16x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_16x32 aom_highbd_paeth_predictor_16x32_c
-
-void aom_highbd_paeth_predictor_16x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_16x4 aom_highbd_paeth_predictor_16x4_c
-
-void aom_highbd_paeth_predictor_16x64_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_16x64 aom_highbd_paeth_predictor_16x64_c
-
-void aom_highbd_paeth_predictor_16x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_16x8 aom_highbd_paeth_predictor_16x8_c
-
-void aom_highbd_paeth_predictor_2x2_c(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_paeth_predictor_2x2 aom_highbd_paeth_predictor_2x2_c
-
-void aom_highbd_paeth_predictor_32x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_32x16 aom_highbd_paeth_predictor_32x16_c
-
-void aom_highbd_paeth_predictor_32x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_32x32 aom_highbd_paeth_predictor_32x32_c
-
-void aom_highbd_paeth_predictor_32x64_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_32x64 aom_highbd_paeth_predictor_32x64_c
-
-void aom_highbd_paeth_predictor_32x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_32x8 aom_highbd_paeth_predictor_32x8_c
-
-void aom_highbd_paeth_predictor_4x16_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_4x16 aom_highbd_paeth_predictor_4x16_c
-
-void aom_highbd_paeth_predictor_4x4_c(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_paeth_predictor_4x4 aom_highbd_paeth_predictor_4x4_c
-
-void aom_highbd_paeth_predictor_4x8_c(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_paeth_predictor_4x8 aom_highbd_paeth_predictor_4x8_c
-
-void aom_highbd_paeth_predictor_64x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_64x16 aom_highbd_paeth_predictor_64x16_c
-
-void aom_highbd_paeth_predictor_64x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_64x32 aom_highbd_paeth_predictor_64x32_c
-
-void aom_highbd_paeth_predictor_64x64_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_64x64 aom_highbd_paeth_predictor_64x64_c
-
-void aom_highbd_paeth_predictor_8x16_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_8x16 aom_highbd_paeth_predictor_8x16_c
-
-void aom_highbd_paeth_predictor_8x32_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_8x32 aom_highbd_paeth_predictor_8x32_c
-
-void aom_highbd_paeth_predictor_8x4_c(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_paeth_predictor_8x4 aom_highbd_paeth_predictor_8x4_c
-
-void aom_highbd_paeth_predictor_8x8_c(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_paeth_predictor_8x8 aom_highbd_paeth_predictor_8x8_c
-
-void aom_highbd_quantize_b_c(const tran_low_t* coeff_ptr,
-                             intptr_t n_coeffs,
-                             const int16_t* zbin_ptr,
-                             const int16_t* round_ptr,
-                             const int16_t* quant_ptr,
-                             const int16_t* quant_shift_ptr,
-                             tran_low_t* qcoeff_ptr,
-                             tran_low_t* dqcoeff_ptr,
-                             const int16_t* dequant_ptr,
-                             uint16_t* eob_ptr,
-                             const int16_t* scan,
-                             const int16_t* iscan);
-void aom_highbd_quantize_b_sse2(const tran_low_t* coeff_ptr,
-                                intptr_t n_coeffs,
-                                const int16_t* zbin_ptr,
-                                const int16_t* round_ptr,
-                                const int16_t* quant_ptr,
-                                const int16_t* quant_shift_ptr,
-                                tran_low_t* qcoeff_ptr,
-                                tran_low_t* dqcoeff_ptr,
-                                const int16_t* dequant_ptr,
-                                uint16_t* eob_ptr,
-                                const int16_t* scan,
-                                const int16_t* iscan);
-void aom_highbd_quantize_b_avx2(const tran_low_t* coeff_ptr,
-                                intptr_t n_coeffs,
-                                const int16_t* zbin_ptr,
-                                const int16_t* round_ptr,
-                                const int16_t* quant_ptr,
-                                const int16_t* quant_shift_ptr,
-                                tran_low_t* qcoeff_ptr,
-                                tran_low_t* dqcoeff_ptr,
-                                const int16_t* dequant_ptr,
-                                uint16_t* eob_ptr,
-                                const int16_t* scan,
-                                const int16_t* iscan);
-RTCD_EXTERN void (*aom_highbd_quantize_b)(const tran_low_t* coeff_ptr,
-                                          intptr_t n_coeffs,
-                                          const int16_t* zbin_ptr,
-                                          const int16_t* round_ptr,
-                                          const int16_t* quant_ptr,
-                                          const int16_t* quant_shift_ptr,
-                                          tran_low_t* qcoeff_ptr,
-                                          tran_low_t* dqcoeff_ptr,
-                                          const int16_t* dequant_ptr,
-                                          uint16_t* eob_ptr,
-                                          const int16_t* scan,
-                                          const int16_t* iscan);
-
-void aom_highbd_quantize_b_32x32_c(const tran_low_t* coeff_ptr,
-                                   intptr_t n_coeffs,
-                                   const int16_t* zbin_ptr,
-                                   const int16_t* round_ptr,
-                                   const int16_t* quant_ptr,
-                                   const int16_t* quant_shift_ptr,
-                                   tran_low_t* qcoeff_ptr,
-                                   tran_low_t* dqcoeff_ptr,
-                                   const int16_t* dequant_ptr,
-                                   uint16_t* eob_ptr,
-                                   const int16_t* scan,
-                                   const int16_t* iscan);
-void aom_highbd_quantize_b_32x32_sse2(const tran_low_t* coeff_ptr,
-                                      intptr_t n_coeffs,
-                                      const int16_t* zbin_ptr,
-                                      const int16_t* round_ptr,
-                                      const int16_t* quant_ptr,
-                                      const int16_t* quant_shift_ptr,
-                                      tran_low_t* qcoeff_ptr,
-                                      tran_low_t* dqcoeff_ptr,
-                                      const int16_t* dequant_ptr,
-                                      uint16_t* eob_ptr,
-                                      const int16_t* scan,
-                                      const int16_t* iscan);
-#define aom_highbd_quantize_b_32x32 aom_highbd_quantize_b_32x32_sse2
-
-void aom_highbd_quantize_b_32x32_adaptive_c(const tran_low_t* coeff_ptr,
-                                            intptr_t n_coeffs,
-                                            const int16_t* zbin_ptr,
-                                            const int16_t* round_ptr,
-                                            const int16_t* quant_ptr,
-                                            const int16_t* quant_shift_ptr,
-                                            tran_low_t* qcoeff_ptr,
-                                            tran_low_t* dqcoeff_ptr,
-                                            const int16_t* dequant_ptr,
-                                            uint16_t* eob_ptr,
-                                            const int16_t* scan,
-                                            const int16_t* iscan);
-void aom_highbd_quantize_b_32x32_adaptive_sse2(const tran_low_t* coeff_ptr,
-                                               intptr_t n_coeffs,
-                                               const int16_t* zbin_ptr,
-                                               const int16_t* round_ptr,
-                                               const int16_t* quant_ptr,
-                                               const int16_t* quant_shift_ptr,
-                                               tran_low_t* qcoeff_ptr,
-                                               tran_low_t* dqcoeff_ptr,
-                                               const int16_t* dequant_ptr,
-                                               uint16_t* eob_ptr,
-                                               const int16_t* scan,
-                                               const int16_t* iscan);
-void aom_highbd_quantize_b_32x32_adaptive_avx2(const tran_low_t* coeff_ptr,
-                                               intptr_t n_coeffs,
-                                               const int16_t* zbin_ptr,
-                                               const int16_t* round_ptr,
-                                               const int16_t* quant_ptr,
-                                               const int16_t* quant_shift_ptr,
-                                               tran_low_t* qcoeff_ptr,
-                                               tran_low_t* dqcoeff_ptr,
-                                               const int16_t* dequant_ptr,
-                                               uint16_t* eob_ptr,
-                                               const int16_t* scan,
-                                               const int16_t* iscan);
-RTCD_EXTERN void (*aom_highbd_quantize_b_32x32_adaptive)(
-    const tran_low_t* coeff_ptr,
-    intptr_t n_coeffs,
-    const int16_t* zbin_ptr,
-    const int16_t* round_ptr,
-    const int16_t* quant_ptr,
-    const int16_t* quant_shift_ptr,
-    tran_low_t* qcoeff_ptr,
-    tran_low_t* dqcoeff_ptr,
-    const int16_t* dequant_ptr,
-    uint16_t* eob_ptr,
-    const int16_t* scan,
-    const int16_t* iscan);
-
-void aom_highbd_quantize_b_64x64_c(const tran_low_t* coeff_ptr,
-                                   intptr_t n_coeffs,
-                                   const int16_t* zbin_ptr,
-                                   const int16_t* round_ptr,
-                                   const int16_t* quant_ptr,
-                                   const int16_t* quant_shift_ptr,
-                                   tran_low_t* qcoeff_ptr,
-                                   tran_low_t* dqcoeff_ptr,
-                                   const int16_t* dequant_ptr,
-                                   uint16_t* eob_ptr,
-                                   const int16_t* scan,
-                                   const int16_t* iscan);
-void aom_highbd_quantize_b_64x64_sse2(const tran_low_t* coeff_ptr,
-                                      intptr_t n_coeffs,
-                                      const int16_t* zbin_ptr,
-                                      const int16_t* round_ptr,
-                                      const int16_t* quant_ptr,
-                                      const int16_t* quant_shift_ptr,
-                                      tran_low_t* qcoeff_ptr,
-                                      tran_low_t* dqcoeff_ptr,
-                                      const int16_t* dequant_ptr,
-                                      uint16_t* eob_ptr,
-                                      const int16_t* scan,
-                                      const int16_t* iscan);
-#define aom_highbd_quantize_b_64x64 aom_highbd_quantize_b_64x64_sse2
-
-void aom_highbd_quantize_b_64x64_adaptive_c(const tran_low_t* coeff_ptr,
-                                            intptr_t n_coeffs,
-                                            const int16_t* zbin_ptr,
-                                            const int16_t* round_ptr,
-                                            const int16_t* quant_ptr,
-                                            const int16_t* quant_shift_ptr,
-                                            tran_low_t* qcoeff_ptr,
-                                            tran_low_t* dqcoeff_ptr,
-                                            const int16_t* dequant_ptr,
-                                            uint16_t* eob_ptr,
-                                            const int16_t* scan,
-                                            const int16_t* iscan);
-void aom_highbd_quantize_b_64x64_adaptive_sse2(const tran_low_t* coeff_ptr,
-                                               intptr_t n_coeffs,
-                                               const int16_t* zbin_ptr,
-                                               const int16_t* round_ptr,
-                                               const int16_t* quant_ptr,
-                                               const int16_t* quant_shift_ptr,
-                                               tran_low_t* qcoeff_ptr,
-                                               tran_low_t* dqcoeff_ptr,
-                                               const int16_t* dequant_ptr,
-                                               uint16_t* eob_ptr,
-                                               const int16_t* scan,
-                                               const int16_t* iscan);
-#define aom_highbd_quantize_b_64x64_adaptive \
-  aom_highbd_quantize_b_64x64_adaptive_sse2
-
-void aom_highbd_quantize_b_adaptive_c(const tran_low_t* coeff_ptr,
-                                      intptr_t n_coeffs,
-                                      const int16_t* zbin_ptr,
-                                      const int16_t* round_ptr,
-                                      const int16_t* quant_ptr,
-                                      const int16_t* quant_shift_ptr,
-                                      tran_low_t* qcoeff_ptr,
-                                      tran_low_t* dqcoeff_ptr,
-                                      const int16_t* dequant_ptr,
-                                      uint16_t* eob_ptr,
-                                      const int16_t* scan,
-                                      const int16_t* iscan);
-void aom_highbd_quantize_b_adaptive_sse2(const tran_low_t* coeff_ptr,
-                                         intptr_t n_coeffs,
-                                         const int16_t* zbin_ptr,
-                                         const int16_t* round_ptr,
-                                         const int16_t* quant_ptr,
-                                         const int16_t* quant_shift_ptr,
-                                         tran_low_t* qcoeff_ptr,
-                                         tran_low_t* dqcoeff_ptr,
-                                         const int16_t* dequant_ptr,
-                                         uint16_t* eob_ptr,
-                                         const int16_t* scan,
-                                         const int16_t* iscan);
-void aom_highbd_quantize_b_adaptive_avx2(const tran_low_t* coeff_ptr,
-                                         intptr_t n_coeffs,
-                                         const int16_t* zbin_ptr,
-                                         const int16_t* round_ptr,
-                                         const int16_t* quant_ptr,
-                                         const int16_t* quant_shift_ptr,
-                                         tran_low_t* qcoeff_ptr,
-                                         tran_low_t* dqcoeff_ptr,
-                                         const int16_t* dequant_ptr,
-                                         uint16_t* eob_ptr,
-                                         const int16_t* scan,
-                                         const int16_t* iscan);
-RTCD_EXTERN void (*aom_highbd_quantize_b_adaptive)(
-    const tran_low_t* coeff_ptr,
-    intptr_t n_coeffs,
-    const int16_t* zbin_ptr,
-    const int16_t* round_ptr,
-    const int16_t* quant_ptr,
-    const int16_t* quant_shift_ptr,
-    tran_low_t* qcoeff_ptr,
-    tran_low_t* dqcoeff_ptr,
-    const int16_t* dequant_ptr,
-    uint16_t* eob_ptr,
-    const int16_t* scan,
-    const int16_t* iscan);
-
-unsigned int aom_highbd_sad128x128_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride);
-unsigned int aom_highbd_sad128x128_avx2(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad128x128)(const uint8_t* src_ptr,
-                                                  int src_stride,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride);
-
-unsigned int aom_highbd_sad128x128_avg_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         const uint8_t* second_pred);
-unsigned int aom_highbd_sad128x128_avg_avx2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            const uint8_t* second_pred);
-RTCD_EXTERN unsigned int (*aom_highbd_sad128x128_avg)(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred);
-
-void aom_highbd_sad128x128x4d_c(const uint8_t* src_ptr,
-                                int src_stride,
-                                const uint8_t* const ref_ptr[],
-                                int ref_stride,
-                                uint32_t* sad_array);
-void aom_highbd_sad128x128x4d_avx2(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad128x128x4d)(const uint8_t* src_ptr,
-                                             int src_stride,
-                                             const uint8_t* const ref_ptr[],
-                                             int ref_stride,
-                                             uint32_t* sad_array);
-
-unsigned int aom_highbd_sad128x64_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* ref_ptr,
-                                    int ref_stride);
-unsigned int aom_highbd_sad128x64_avx2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad128x64)(const uint8_t* src_ptr,
-                                                 int src_stride,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride);
-
-unsigned int aom_highbd_sad128x64_avg_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        const uint8_t* second_pred);
-unsigned int aom_highbd_sad128x64_avg_avx2(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           const uint8_t* second_pred);
-RTCD_EXTERN unsigned int (*aom_highbd_sad128x64_avg)(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred);
-
-void aom_highbd_sad128x64x4d_c(const uint8_t* src_ptr,
-                               int src_stride,
-                               const uint8_t* const ref_ptr[],
-                               int ref_stride,
-                               uint32_t* sad_array);
-void aom_highbd_sad128x64x4d_avx2(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* const ref_ptr[],
-                                  int ref_stride,
-                                  uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad128x64x4d)(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* const ref_ptr[],
-                                            int ref_stride,
-                                            uint32_t* sad_array);
-
-unsigned int aom_highbd_sad16x16_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-unsigned int aom_highbd_sad16x16_sse2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-unsigned int aom_highbd_sad16x16_avx2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad16x16)(const uint8_t* src_ptr,
-                                                int src_stride,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride);
-
-unsigned int aom_highbd_sad16x16_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-unsigned int aom_highbd_sad16x16_avg_sse2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-unsigned int aom_highbd_sad16x16_avg_avx2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-RTCD_EXTERN unsigned int (*aom_highbd_sad16x16_avg)(const uint8_t* src_ptr,
-                                                    int src_stride,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    const uint8_t* second_pred);
-
-void aom_highbd_sad16x16x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-void aom_highbd_sad16x16x4d_sse2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-void aom_highbd_sad16x16x4d_avx2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad16x16x4d)(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* const ref_ptr[],
-                                           int ref_stride,
-                                           uint32_t* sad_array);
-
-unsigned int aom_highbd_sad16x32_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-unsigned int aom_highbd_sad16x32_sse2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-unsigned int aom_highbd_sad16x32_avx2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad16x32)(const uint8_t* src_ptr,
-                                                int src_stride,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride);
-
-unsigned int aom_highbd_sad16x32_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-unsigned int aom_highbd_sad16x32_avg_sse2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-unsigned int aom_highbd_sad16x32_avg_avx2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-RTCD_EXTERN unsigned int (*aom_highbd_sad16x32_avg)(const uint8_t* src_ptr,
-                                                    int src_stride,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    const uint8_t* second_pred);
-
-void aom_highbd_sad16x32x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-void aom_highbd_sad16x32x4d_sse2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-void aom_highbd_sad16x32x4d_avx2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad16x32x4d)(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* const ref_ptr[],
-                                           int ref_stride,
-                                           uint32_t* sad_array);
-
-unsigned int aom_highbd_sad16x4_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-unsigned int aom_highbd_sad16x4_sse2(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride);
-unsigned int aom_highbd_sad16x4_avx2(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad16x4)(const uint8_t* src_ptr,
-                                               int src_stride,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride);
-
-unsigned int aom_highbd_sad16x4_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-unsigned int aom_highbd_sad16x4_avg_sse2(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         const uint8_t* second_pred);
-unsigned int aom_highbd_sad16x4_avg_avx2(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         const uint8_t* second_pred);
-RTCD_EXTERN unsigned int (*aom_highbd_sad16x4_avg)(const uint8_t* src_ptr,
-                                                   int src_stride,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   const uint8_t* second_pred);
-
-void aom_highbd_sad16x4x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-void aom_highbd_sad16x4x4d_sse2(const uint8_t* src_ptr,
-                                int src_stride,
-                                const uint8_t* const ref_ptr[],
-                                int ref_stride,
-                                uint32_t* sad_array);
-void aom_highbd_sad16x4x4d_avx2(const uint8_t* src_ptr,
-                                int src_stride,
-                                const uint8_t* const ref_ptr[],
-                                int ref_stride,
-                                uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad16x4x4d)(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* const ref_ptr[],
-                                          int ref_stride,
-                                          uint32_t* sad_array);
-
-unsigned int aom_highbd_sad16x64_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-unsigned int aom_highbd_sad16x64_sse2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-unsigned int aom_highbd_sad16x64_avx2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad16x64)(const uint8_t* src_ptr,
-                                                int src_stride,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride);
-
-unsigned int aom_highbd_sad16x64_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-unsigned int aom_highbd_sad16x64_avg_sse2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-unsigned int aom_highbd_sad16x64_avg_avx2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-RTCD_EXTERN unsigned int (*aom_highbd_sad16x64_avg)(const uint8_t* src_ptr,
-                                                    int src_stride,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    const uint8_t* second_pred);
-
-void aom_highbd_sad16x64x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-void aom_highbd_sad16x64x4d_sse2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-void aom_highbd_sad16x64x4d_avx2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad16x64x4d)(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* const ref_ptr[],
-                                           int ref_stride,
-                                           uint32_t* sad_array);
-
-unsigned int aom_highbd_sad16x8_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-unsigned int aom_highbd_sad16x8_sse2(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride);
-unsigned int aom_highbd_sad16x8_avx2(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad16x8)(const uint8_t* src_ptr,
-                                               int src_stride,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride);
-
-unsigned int aom_highbd_sad16x8_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-unsigned int aom_highbd_sad16x8_avg_sse2(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         const uint8_t* second_pred);
-unsigned int aom_highbd_sad16x8_avg_avx2(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         const uint8_t* second_pred);
-RTCD_EXTERN unsigned int (*aom_highbd_sad16x8_avg)(const uint8_t* src_ptr,
-                                                   int src_stride,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   const uint8_t* second_pred);
-
-void aom_highbd_sad16x8x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-void aom_highbd_sad16x8x4d_sse2(const uint8_t* src_ptr,
-                                int src_stride,
-                                const uint8_t* const ref_ptr[],
-                                int ref_stride,
-                                uint32_t* sad_array);
-void aom_highbd_sad16x8x4d_avx2(const uint8_t* src_ptr,
-                                int src_stride,
-                                const uint8_t* const ref_ptr[],
-                                int ref_stride,
-                                uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad16x8x4d)(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* const ref_ptr[],
-                                          int ref_stride,
-                                          uint32_t* sad_array);
-
-unsigned int aom_highbd_sad32x16_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-unsigned int aom_highbd_sad32x16_sse2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-unsigned int aom_highbd_sad32x16_avx2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad32x16)(const uint8_t* src_ptr,
-                                                int src_stride,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride);
-
-unsigned int aom_highbd_sad32x16_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-unsigned int aom_highbd_sad32x16_avg_sse2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-unsigned int aom_highbd_sad32x16_avg_avx2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-RTCD_EXTERN unsigned int (*aom_highbd_sad32x16_avg)(const uint8_t* src_ptr,
-                                                    int src_stride,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    const uint8_t* second_pred);
-
-void aom_highbd_sad32x16x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-void aom_highbd_sad32x16x4d_sse2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-void aom_highbd_sad32x16x4d_avx2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad32x16x4d)(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* const ref_ptr[],
-                                           int ref_stride,
-                                           uint32_t* sad_array);
-
-unsigned int aom_highbd_sad32x32_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-unsigned int aom_highbd_sad32x32_sse2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-unsigned int aom_highbd_sad32x32_avx2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad32x32)(const uint8_t* src_ptr,
-                                                int src_stride,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride);
-
-unsigned int aom_highbd_sad32x32_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-unsigned int aom_highbd_sad32x32_avg_sse2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-unsigned int aom_highbd_sad32x32_avg_avx2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-RTCD_EXTERN unsigned int (*aom_highbd_sad32x32_avg)(const uint8_t* src_ptr,
-                                                    int src_stride,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    const uint8_t* second_pred);
-
-void aom_highbd_sad32x32x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-void aom_highbd_sad32x32x4d_sse2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-void aom_highbd_sad32x32x4d_avx2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad32x32x4d)(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* const ref_ptr[],
-                                           int ref_stride,
-                                           uint32_t* sad_array);
-
-unsigned int aom_highbd_sad32x64_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-unsigned int aom_highbd_sad32x64_sse2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-unsigned int aom_highbd_sad32x64_avx2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad32x64)(const uint8_t* src_ptr,
-                                                int src_stride,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride);
-
-unsigned int aom_highbd_sad32x64_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-unsigned int aom_highbd_sad32x64_avg_sse2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-unsigned int aom_highbd_sad32x64_avg_avx2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-RTCD_EXTERN unsigned int (*aom_highbd_sad32x64_avg)(const uint8_t* src_ptr,
-                                                    int src_stride,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    const uint8_t* second_pred);
-
-void aom_highbd_sad32x64x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-void aom_highbd_sad32x64x4d_sse2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-void aom_highbd_sad32x64x4d_avx2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad32x64x4d)(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* const ref_ptr[],
-                                           int ref_stride,
-                                           uint32_t* sad_array);
-
-unsigned int aom_highbd_sad32x8_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-unsigned int aom_highbd_sad32x8_sse2(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride);
-unsigned int aom_highbd_sad32x8_avx2(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad32x8)(const uint8_t* src_ptr,
-                                               int src_stride,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride);
-
-unsigned int aom_highbd_sad32x8_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-unsigned int aom_highbd_sad32x8_avg_sse2(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         const uint8_t* second_pred);
-unsigned int aom_highbd_sad32x8_avg_avx2(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         const uint8_t* second_pred);
-RTCD_EXTERN unsigned int (*aom_highbd_sad32x8_avg)(const uint8_t* src_ptr,
-                                                   int src_stride,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   const uint8_t* second_pred);
-
-void aom_highbd_sad32x8x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-void aom_highbd_sad32x8x4d_sse2(const uint8_t* src_ptr,
-                                int src_stride,
-                                const uint8_t* const ref_ptr[],
-                                int ref_stride,
-                                uint32_t* sad_array);
-void aom_highbd_sad32x8x4d_avx2(const uint8_t* src_ptr,
-                                int src_stride,
-                                const uint8_t* const ref_ptr[],
-                                int ref_stride,
-                                uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad32x8x4d)(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* const ref_ptr[],
-                                          int ref_stride,
-                                          uint32_t* sad_array);
-
-unsigned int aom_highbd_sad4x16_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-unsigned int aom_highbd_sad4x16_sse2(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride);
-#define aom_highbd_sad4x16 aom_highbd_sad4x16_sse2
-
-unsigned int aom_highbd_sad4x16_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-unsigned int aom_highbd_sad4x16_avg_sse2(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         const uint8_t* second_pred);
-#define aom_highbd_sad4x16_avg aom_highbd_sad4x16_avg_sse2
-
-void aom_highbd_sad4x16x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-void aom_highbd_sad4x16x4d_sse2(const uint8_t* src_ptr,
-                                int src_stride,
-                                const uint8_t* const ref_ptr[],
-                                int ref_stride,
-                                uint32_t* sad_array);
-#define aom_highbd_sad4x16x4d aom_highbd_sad4x16x4d_sse2
-
-unsigned int aom_highbd_sad4x4_c(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride);
-unsigned int aom_highbd_sad4x4_sse2(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* ref_ptr,
-                                    int ref_stride);
-#define aom_highbd_sad4x4 aom_highbd_sad4x4_sse2
-
-unsigned int aom_highbd_sad4x4_avg_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride,
-                                     const uint8_t* second_pred);
-unsigned int aom_highbd_sad4x4_avg_sse2(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        const uint8_t* second_pred);
-#define aom_highbd_sad4x4_avg aom_highbd_sad4x4_avg_sse2
-
-void aom_highbd_sad4x4x4d_c(const uint8_t* src_ptr,
-                            int src_stride,
-                            const uint8_t* const ref_ptr[],
-                            int ref_stride,
-                            uint32_t* sad_array);
-void aom_highbd_sad4x4x4d_sse2(const uint8_t* src_ptr,
-                               int src_stride,
-                               const uint8_t* const ref_ptr[],
-                               int ref_stride,
-                               uint32_t* sad_array);
-#define aom_highbd_sad4x4x4d aom_highbd_sad4x4x4d_sse2
-
-unsigned int aom_highbd_sad4x8_c(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride);
-unsigned int aom_highbd_sad4x8_sse2(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* ref_ptr,
-                                    int ref_stride);
-#define aom_highbd_sad4x8 aom_highbd_sad4x8_sse2
-
-unsigned int aom_highbd_sad4x8_avg_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride,
-                                     const uint8_t* second_pred);
-unsigned int aom_highbd_sad4x8_avg_sse2(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        const uint8_t* second_pred);
-#define aom_highbd_sad4x8_avg aom_highbd_sad4x8_avg_sse2
-
-void aom_highbd_sad4x8x4d_c(const uint8_t* src_ptr,
-                            int src_stride,
-                            const uint8_t* const ref_ptr[],
-                            int ref_stride,
-                            uint32_t* sad_array);
-void aom_highbd_sad4x8x4d_sse2(const uint8_t* src_ptr,
-                               int src_stride,
-                               const uint8_t* const ref_ptr[],
-                               int ref_stride,
-                               uint32_t* sad_array);
-#define aom_highbd_sad4x8x4d aom_highbd_sad4x8x4d_sse2
-
-unsigned int aom_highbd_sad64x128_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* ref_ptr,
-                                    int ref_stride);
-unsigned int aom_highbd_sad64x128_avx2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad64x128)(const uint8_t* src_ptr,
-                                                 int src_stride,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride);
-
-unsigned int aom_highbd_sad64x128_avg_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        const uint8_t* second_pred);
-unsigned int aom_highbd_sad64x128_avg_avx2(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           const uint8_t* second_pred);
-RTCD_EXTERN unsigned int (*aom_highbd_sad64x128_avg)(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred);
-
-void aom_highbd_sad64x128x4d_c(const uint8_t* src_ptr,
-                               int src_stride,
-                               const uint8_t* const ref_ptr[],
-                               int ref_stride,
-                               uint32_t* sad_array);
-void aom_highbd_sad64x128x4d_avx2(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* const ref_ptr[],
-                                  int ref_stride,
-                                  uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad64x128x4d)(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* const ref_ptr[],
-                                            int ref_stride,
-                                            uint32_t* sad_array);
-
-unsigned int aom_highbd_sad64x16_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-unsigned int aom_highbd_sad64x16_sse2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-unsigned int aom_highbd_sad64x16_avx2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad64x16)(const uint8_t* src_ptr,
-                                                int src_stride,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride);
-
-unsigned int aom_highbd_sad64x16_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-unsigned int aom_highbd_sad64x16_avg_sse2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-unsigned int aom_highbd_sad64x16_avg_avx2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-RTCD_EXTERN unsigned int (*aom_highbd_sad64x16_avg)(const uint8_t* src_ptr,
-                                                    int src_stride,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    const uint8_t* second_pred);
-
-void aom_highbd_sad64x16x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-void aom_highbd_sad64x16x4d_sse2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-void aom_highbd_sad64x16x4d_avx2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad64x16x4d)(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* const ref_ptr[],
-                                           int ref_stride,
-                                           uint32_t* sad_array);
-
-unsigned int aom_highbd_sad64x32_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-unsigned int aom_highbd_sad64x32_sse2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-unsigned int aom_highbd_sad64x32_avx2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad64x32)(const uint8_t* src_ptr,
-                                                int src_stride,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride);
-
-unsigned int aom_highbd_sad64x32_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-unsigned int aom_highbd_sad64x32_avg_sse2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-unsigned int aom_highbd_sad64x32_avg_avx2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-RTCD_EXTERN unsigned int (*aom_highbd_sad64x32_avg)(const uint8_t* src_ptr,
-                                                    int src_stride,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    const uint8_t* second_pred);
-
-void aom_highbd_sad64x32x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-void aom_highbd_sad64x32x4d_sse2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-void aom_highbd_sad64x32x4d_avx2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad64x32x4d)(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* const ref_ptr[],
-                                           int ref_stride,
-                                           uint32_t* sad_array);
-
-unsigned int aom_highbd_sad64x64_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-unsigned int aom_highbd_sad64x64_sse2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-unsigned int aom_highbd_sad64x64_avx2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad64x64)(const uint8_t* src_ptr,
-                                                int src_stride,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride);
-
-unsigned int aom_highbd_sad64x64_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-unsigned int aom_highbd_sad64x64_avg_sse2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-unsigned int aom_highbd_sad64x64_avg_avx2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-RTCD_EXTERN unsigned int (*aom_highbd_sad64x64_avg)(const uint8_t* src_ptr,
-                                                    int src_stride,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    const uint8_t* second_pred);
-
-void aom_highbd_sad64x64x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-void aom_highbd_sad64x64x4d_sse2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-void aom_highbd_sad64x64x4d_avx2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad64x64x4d)(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* const ref_ptr[],
-                                           int ref_stride,
-                                           uint32_t* sad_array);
-
-unsigned int aom_highbd_sad8x16_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-unsigned int aom_highbd_sad8x16_sse2(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride);
-#define aom_highbd_sad8x16 aom_highbd_sad8x16_sse2
-
-unsigned int aom_highbd_sad8x16_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-unsigned int aom_highbd_sad8x16_avg_sse2(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         const uint8_t* second_pred);
-#define aom_highbd_sad8x16_avg aom_highbd_sad8x16_avg_sse2
-
-void aom_highbd_sad8x16x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-void aom_highbd_sad8x16x4d_sse2(const uint8_t* src_ptr,
-                                int src_stride,
-                                const uint8_t* const ref_ptr[],
-                                int ref_stride,
-                                uint32_t* sad_array);
-#define aom_highbd_sad8x16x4d aom_highbd_sad8x16x4d_sse2
-
-unsigned int aom_highbd_sad8x32_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-unsigned int aom_highbd_sad8x32_sse2(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride);
-#define aom_highbd_sad8x32 aom_highbd_sad8x32_sse2
-
-unsigned int aom_highbd_sad8x32_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-unsigned int aom_highbd_sad8x32_avg_sse2(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         const uint8_t* second_pred);
-#define aom_highbd_sad8x32_avg aom_highbd_sad8x32_avg_sse2
-
-void aom_highbd_sad8x32x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-void aom_highbd_sad8x32x4d_sse2(const uint8_t* src_ptr,
-                                int src_stride,
-                                const uint8_t* const ref_ptr[],
-                                int ref_stride,
-                                uint32_t* sad_array);
-#define aom_highbd_sad8x32x4d aom_highbd_sad8x32x4d_sse2
-
-unsigned int aom_highbd_sad8x4_c(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride);
-unsigned int aom_highbd_sad8x4_sse2(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* ref_ptr,
-                                    int ref_stride);
-#define aom_highbd_sad8x4 aom_highbd_sad8x4_sse2
-
-unsigned int aom_highbd_sad8x4_avg_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride,
-                                     const uint8_t* second_pred);
-unsigned int aom_highbd_sad8x4_avg_sse2(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        const uint8_t* second_pred);
-#define aom_highbd_sad8x4_avg aom_highbd_sad8x4_avg_sse2
-
-void aom_highbd_sad8x4x4d_c(const uint8_t* src_ptr,
-                            int src_stride,
-                            const uint8_t* const ref_ptr[],
-                            int ref_stride,
-                            uint32_t* sad_array);
-void aom_highbd_sad8x4x4d_sse2(const uint8_t* src_ptr,
-                               int src_stride,
-                               const uint8_t* const ref_ptr[],
-                               int ref_stride,
-                               uint32_t* sad_array);
-#define aom_highbd_sad8x4x4d aom_highbd_sad8x4x4d_sse2
-
-unsigned int aom_highbd_sad8x8_c(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride);
-unsigned int aom_highbd_sad8x8_sse2(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* ref_ptr,
-                                    int ref_stride);
-#define aom_highbd_sad8x8 aom_highbd_sad8x8_sse2
-
-unsigned int aom_highbd_sad8x8_avg_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride,
-                                     const uint8_t* second_pred);
-unsigned int aom_highbd_sad8x8_avg_sse2(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        const uint8_t* second_pred);
-#define aom_highbd_sad8x8_avg aom_highbd_sad8x8_avg_sse2
-
-void aom_highbd_sad8x8x4d_c(const uint8_t* src_ptr,
-                            int src_stride,
-                            const uint8_t* const ref_ptr[],
-                            int ref_stride,
-                            uint32_t* sad_array);
-void aom_highbd_sad8x8x4d_sse2(const uint8_t* src_ptr,
-                               int src_stride,
-                               const uint8_t* const ref_ptr[],
-                               int ref_stride,
-                               uint32_t* sad_array);
-#define aom_highbd_sad8x8x4d aom_highbd_sad8x8x4d_sse2
-
-unsigned int aom_highbd_sad_skip_128x128_c(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride);
-unsigned int aom_highbd_sad_skip_128x128_avx2(const uint8_t* src_ptr,
-                                              int src_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad_skip_128x128)(const uint8_t* src_ptr,
-                                                        int src_stride,
-                                                        const uint8_t* ref_ptr,
-                                                        int ref_stride);
-
-void aom_highbd_sad_skip_128x128x4d_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* const ref_ptr[],
-                                      int ref_stride,
-                                      uint32_t* sad_array);
-void aom_highbd_sad_skip_128x128x4d_avx2(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* const ref_ptr[],
-                                         int ref_stride,
-                                         uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad_skip_128x128x4d)(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* const ref_ptr[],
-    int ref_stride,
-    uint32_t* sad_array);
-
-unsigned int aom_highbd_sad_skip_128x64_c(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride);
-unsigned int aom_highbd_sad_skip_128x64_avx2(const uint8_t* src_ptr,
-                                             int src_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad_skip_128x64)(const uint8_t* src_ptr,
-                                                       int src_stride,
-                                                       const uint8_t* ref_ptr,
-                                                       int ref_stride);
-
-void aom_highbd_sad_skip_128x64x4d_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* const ref_ptr[],
-                                     int ref_stride,
-                                     uint32_t* sad_array);
-void aom_highbd_sad_skip_128x64x4d_avx2(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* const ref_ptr[],
-                                        int ref_stride,
-                                        uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad_skip_128x64x4d)(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* const ref_ptr[],
-    int ref_stride,
-    uint32_t* sad_array);
-
-unsigned int aom_highbd_sad_skip_16x16_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-unsigned int aom_highbd_sad_skip_16x16_sse2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-unsigned int aom_highbd_sad_skip_16x16_avx2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad_skip_16x16)(const uint8_t* src_ptr,
-                                                      int src_stride,
-                                                      const uint8_t* ref_ptr,
-                                                      int ref_stride);
-
-void aom_highbd_sad_skip_16x16x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-void aom_highbd_sad_skip_16x16x4d_sse2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-void aom_highbd_sad_skip_16x16x4d_avx2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad_skip_16x16x4d)(const uint8_t* src_ptr,
-                                                 int src_stride,
-                                                 const uint8_t* const ref_ptr[],
-                                                 int ref_stride,
-                                                 uint32_t* sad_array);
-
-unsigned int aom_highbd_sad_skip_16x32_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-unsigned int aom_highbd_sad_skip_16x32_sse2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-unsigned int aom_highbd_sad_skip_16x32_avx2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad_skip_16x32)(const uint8_t* src_ptr,
-                                                      int src_stride,
-                                                      const uint8_t* ref_ptr,
-                                                      int ref_stride);
-
-void aom_highbd_sad_skip_16x32x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-void aom_highbd_sad_skip_16x32x4d_sse2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-void aom_highbd_sad_skip_16x32x4d_avx2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad_skip_16x32x4d)(const uint8_t* src_ptr,
-                                                 int src_stride,
-                                                 const uint8_t* const ref_ptr[],
-                                                 int ref_stride,
-                                                 uint32_t* sad_array);
-
-unsigned int aom_highbd_sad_skip_16x4_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-#define aom_highbd_sad_skip_16x4 aom_highbd_sad_skip_16x4_c
-
-void aom_highbd_sad_skip_16x4x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-#define aom_highbd_sad_skip_16x4x4d aom_highbd_sad_skip_16x4x4d_c
-
-unsigned int aom_highbd_sad_skip_16x64_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-unsigned int aom_highbd_sad_skip_16x64_sse2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-unsigned int aom_highbd_sad_skip_16x64_avx2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad_skip_16x64)(const uint8_t* src_ptr,
-                                                      int src_stride,
-                                                      const uint8_t* ref_ptr,
-                                                      int ref_stride);
-
-void aom_highbd_sad_skip_16x64x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-void aom_highbd_sad_skip_16x64x4d_sse2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-void aom_highbd_sad_skip_16x64x4d_avx2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad_skip_16x64x4d)(const uint8_t* src_ptr,
-                                                 int src_stride,
-                                                 const uint8_t* const ref_ptr[],
-                                                 int ref_stride,
-                                                 uint32_t* sad_array);
-
-unsigned int aom_highbd_sad_skip_16x8_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-unsigned int aom_highbd_sad_skip_16x8_sse2(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride);
-unsigned int aom_highbd_sad_skip_16x8_avx2(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad_skip_16x8)(const uint8_t* src_ptr,
-                                                     int src_stride,
-                                                     const uint8_t* ref_ptr,
-                                                     int ref_stride);
-
-void aom_highbd_sad_skip_16x8x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-void aom_highbd_sad_skip_16x8x4d_sse2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* const ref_ptr[],
-                                      int ref_stride,
-                                      uint32_t* sad_array);
-void aom_highbd_sad_skip_16x8x4d_avx2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* const ref_ptr[],
-                                      int ref_stride,
-                                      uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad_skip_16x8x4d)(const uint8_t* src_ptr,
-                                                int src_stride,
-                                                const uint8_t* const ref_ptr[],
-                                                int ref_stride,
-                                                uint32_t* sad_array);
-
-unsigned int aom_highbd_sad_skip_32x16_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-unsigned int aom_highbd_sad_skip_32x16_sse2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-unsigned int aom_highbd_sad_skip_32x16_avx2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad_skip_32x16)(const uint8_t* src_ptr,
-                                                      int src_stride,
-                                                      const uint8_t* ref_ptr,
-                                                      int ref_stride);
-
-void aom_highbd_sad_skip_32x16x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-void aom_highbd_sad_skip_32x16x4d_sse2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-void aom_highbd_sad_skip_32x16x4d_avx2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad_skip_32x16x4d)(const uint8_t* src_ptr,
-                                                 int src_stride,
-                                                 const uint8_t* const ref_ptr[],
-                                                 int ref_stride,
-                                                 uint32_t* sad_array);
-
-unsigned int aom_highbd_sad_skip_32x32_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-unsigned int aom_highbd_sad_skip_32x32_sse2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-unsigned int aom_highbd_sad_skip_32x32_avx2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad_skip_32x32)(const uint8_t* src_ptr,
-                                                      int src_stride,
-                                                      const uint8_t* ref_ptr,
-                                                      int ref_stride);
-
-void aom_highbd_sad_skip_32x32x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-void aom_highbd_sad_skip_32x32x4d_sse2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-void aom_highbd_sad_skip_32x32x4d_avx2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad_skip_32x32x4d)(const uint8_t* src_ptr,
-                                                 int src_stride,
-                                                 const uint8_t* const ref_ptr[],
-                                                 int ref_stride,
-                                                 uint32_t* sad_array);
-
-unsigned int aom_highbd_sad_skip_32x64_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-unsigned int aom_highbd_sad_skip_32x64_sse2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-unsigned int aom_highbd_sad_skip_32x64_avx2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad_skip_32x64)(const uint8_t* src_ptr,
-                                                      int src_stride,
-                                                      const uint8_t* ref_ptr,
-                                                      int ref_stride);
-
-void aom_highbd_sad_skip_32x64x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-void aom_highbd_sad_skip_32x64x4d_sse2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-void aom_highbd_sad_skip_32x64x4d_avx2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad_skip_32x64x4d)(const uint8_t* src_ptr,
-                                                 int src_stride,
-                                                 const uint8_t* const ref_ptr[],
-                                                 int ref_stride,
-                                                 uint32_t* sad_array);
-
-unsigned int aom_highbd_sad_skip_32x8_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-unsigned int aom_highbd_sad_skip_32x8_sse2(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride);
-unsigned int aom_highbd_sad_skip_32x8_avx2(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad_skip_32x8)(const uint8_t* src_ptr,
-                                                     int src_stride,
-                                                     const uint8_t* ref_ptr,
-                                                     int ref_stride);
-
-void aom_highbd_sad_skip_32x8x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-void aom_highbd_sad_skip_32x8x4d_sse2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* const ref_ptr[],
-                                      int ref_stride,
-                                      uint32_t* sad_array);
-void aom_highbd_sad_skip_32x8x4d_avx2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* const ref_ptr[],
-                                      int ref_stride,
-                                      uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad_skip_32x8x4d)(const uint8_t* src_ptr,
-                                                int src_stride,
-                                                const uint8_t* const ref_ptr[],
-                                                int ref_stride,
-                                                uint32_t* sad_array);
-
-unsigned int aom_highbd_sad_skip_4x16_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-unsigned int aom_highbd_sad_skip_4x16_sse2(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride);
-#define aom_highbd_sad_skip_4x16 aom_highbd_sad_skip_4x16_sse2
-
-void aom_highbd_sad_skip_4x16x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-void aom_highbd_sad_skip_4x16x4d_sse2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* const ref_ptr[],
-                                      int ref_stride,
-                                      uint32_t* sad_array);
-#define aom_highbd_sad_skip_4x16x4d aom_highbd_sad_skip_4x16x4d_sse2
-
-unsigned int aom_highbd_sad_skip_4x4_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride);
-#define aom_highbd_sad_skip_4x4 aom_highbd_sad_skip_4x4_c
-
-void aom_highbd_sad_skip_4x4x4d_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* const ref_ptr[],
-                                  int ref_stride,
-                                  uint32_t* sad_array);
-#define aom_highbd_sad_skip_4x4x4d aom_highbd_sad_skip_4x4x4d_c
-
-unsigned int aom_highbd_sad_skip_4x8_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride);
-unsigned int aom_highbd_sad_skip_4x8_sse2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride);
-#define aom_highbd_sad_skip_4x8 aom_highbd_sad_skip_4x8_sse2
-
-void aom_highbd_sad_skip_4x8x4d_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* const ref_ptr[],
-                                  int ref_stride,
-                                  uint32_t* sad_array);
-void aom_highbd_sad_skip_4x8x4d_sse2(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* const ref_ptr[],
-                                     int ref_stride,
-                                     uint32_t* sad_array);
-#define aom_highbd_sad_skip_4x8x4d aom_highbd_sad_skip_4x8x4d_sse2
-
-unsigned int aom_highbd_sad_skip_64x128_c(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride);
-unsigned int aom_highbd_sad_skip_64x128_avx2(const uint8_t* src_ptr,
-                                             int src_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad_skip_64x128)(const uint8_t* src_ptr,
-                                                       int src_stride,
-                                                       const uint8_t* ref_ptr,
-                                                       int ref_stride);
-
-void aom_highbd_sad_skip_64x128x4d_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* const ref_ptr[],
-                                     int ref_stride,
-                                     uint32_t* sad_array);
-void aom_highbd_sad_skip_64x128x4d_avx2(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* const ref_ptr[],
-                                        int ref_stride,
-                                        uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad_skip_64x128x4d)(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* const ref_ptr[],
-    int ref_stride,
-    uint32_t* sad_array);
-
-unsigned int aom_highbd_sad_skip_64x16_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-unsigned int aom_highbd_sad_skip_64x16_sse2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-unsigned int aom_highbd_sad_skip_64x16_avx2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad_skip_64x16)(const uint8_t* src_ptr,
-                                                      int src_stride,
-                                                      const uint8_t* ref_ptr,
-                                                      int ref_stride);
-
-void aom_highbd_sad_skip_64x16x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-void aom_highbd_sad_skip_64x16x4d_sse2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-void aom_highbd_sad_skip_64x16x4d_avx2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad_skip_64x16x4d)(const uint8_t* src_ptr,
-                                                 int src_stride,
-                                                 const uint8_t* const ref_ptr[],
-                                                 int ref_stride,
-                                                 uint32_t* sad_array);
-
-unsigned int aom_highbd_sad_skip_64x32_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-unsigned int aom_highbd_sad_skip_64x32_sse2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-unsigned int aom_highbd_sad_skip_64x32_avx2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad_skip_64x32)(const uint8_t* src_ptr,
-                                                      int src_stride,
-                                                      const uint8_t* ref_ptr,
-                                                      int ref_stride);
-
-void aom_highbd_sad_skip_64x32x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-void aom_highbd_sad_skip_64x32x4d_sse2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-void aom_highbd_sad_skip_64x32x4d_avx2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad_skip_64x32x4d)(const uint8_t* src_ptr,
-                                                 int src_stride,
-                                                 const uint8_t* const ref_ptr[],
-                                                 int ref_stride,
-                                                 uint32_t* sad_array);
-
-unsigned int aom_highbd_sad_skip_64x64_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-unsigned int aom_highbd_sad_skip_64x64_sse2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-unsigned int aom_highbd_sad_skip_64x64_avx2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad_skip_64x64)(const uint8_t* src_ptr,
-                                                      int src_stride,
-                                                      const uint8_t* ref_ptr,
-                                                      int ref_stride);
-
-void aom_highbd_sad_skip_64x64x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-void aom_highbd_sad_skip_64x64x4d_sse2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-void aom_highbd_sad_skip_64x64x4d_avx2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad_skip_64x64x4d)(const uint8_t* src_ptr,
-                                                 int src_stride,
-                                                 const uint8_t* const ref_ptr[],
-                                                 int ref_stride,
-                                                 uint32_t* sad_array);
-
-unsigned int aom_highbd_sad_skip_8x16_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-unsigned int aom_highbd_sad_skip_8x16_sse2(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride);
-#define aom_highbd_sad_skip_8x16 aom_highbd_sad_skip_8x16_sse2
-
-void aom_highbd_sad_skip_8x16x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-void aom_highbd_sad_skip_8x16x4d_sse2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* const ref_ptr[],
-                                      int ref_stride,
-                                      uint32_t* sad_array);
-#define aom_highbd_sad_skip_8x16x4d aom_highbd_sad_skip_8x16x4d_sse2
-
-unsigned int aom_highbd_sad_skip_8x32_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-unsigned int aom_highbd_sad_skip_8x32_sse2(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride);
-#define aom_highbd_sad_skip_8x32 aom_highbd_sad_skip_8x32_sse2
-
-void aom_highbd_sad_skip_8x32x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-void aom_highbd_sad_skip_8x32x4d_sse2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* const ref_ptr[],
-                                      int ref_stride,
-                                      uint32_t* sad_array);
-#define aom_highbd_sad_skip_8x32x4d aom_highbd_sad_skip_8x32x4d_sse2
-
-unsigned int aom_highbd_sad_skip_8x4_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride);
-#define aom_highbd_sad_skip_8x4 aom_highbd_sad_skip_8x4_c
-
-void aom_highbd_sad_skip_8x4x4d_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* const ref_ptr[],
-                                  int ref_stride,
-                                  uint32_t* sad_array);
-#define aom_highbd_sad_skip_8x4x4d aom_highbd_sad_skip_8x4x4d_c
-
-unsigned int aom_highbd_sad_skip_8x8_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride);
-unsigned int aom_highbd_sad_skip_8x8_sse2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride);
-#define aom_highbd_sad_skip_8x8 aom_highbd_sad_skip_8x8_sse2
-
-void aom_highbd_sad_skip_8x8x4d_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* const ref_ptr[],
-                                  int ref_stride,
-                                  uint32_t* sad_array);
-void aom_highbd_sad_skip_8x8x4d_sse2(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* const ref_ptr[],
-                                     int ref_stride,
-                                     uint32_t* sad_array);
-#define aom_highbd_sad_skip_8x8x4d aom_highbd_sad_skip_8x8x4d_sse2
-
-void aom_highbd_smooth_h_predictor_16x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_16x16 \
-  aom_highbd_smooth_h_predictor_16x16_c
-
-void aom_highbd_smooth_h_predictor_16x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_16x32 \
-  aom_highbd_smooth_h_predictor_16x32_c
-
-void aom_highbd_smooth_h_predictor_16x4_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_16x4 aom_highbd_smooth_h_predictor_16x4_c
-
-void aom_highbd_smooth_h_predictor_16x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_16x64 \
-  aom_highbd_smooth_h_predictor_16x64_c
-
-void aom_highbd_smooth_h_predictor_16x8_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_16x8 aom_highbd_smooth_h_predictor_16x8_c
-
-void aom_highbd_smooth_h_predictor_2x2_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_h_predictor_2x2 aom_highbd_smooth_h_predictor_2x2_c
-
-void aom_highbd_smooth_h_predictor_32x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_32x16 \
-  aom_highbd_smooth_h_predictor_32x16_c
-
-void aom_highbd_smooth_h_predictor_32x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_32x32 \
-  aom_highbd_smooth_h_predictor_32x32_c
-
-void aom_highbd_smooth_h_predictor_32x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_32x64 \
-  aom_highbd_smooth_h_predictor_32x64_c
-
-void aom_highbd_smooth_h_predictor_32x8_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_32x8 aom_highbd_smooth_h_predictor_32x8_c
-
-void aom_highbd_smooth_h_predictor_4x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_4x16 aom_highbd_smooth_h_predictor_4x16_c
-
-void aom_highbd_smooth_h_predictor_4x4_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_h_predictor_4x4 aom_highbd_smooth_h_predictor_4x4_c
-
-void aom_highbd_smooth_h_predictor_4x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_h_predictor_4x8 aom_highbd_smooth_h_predictor_4x8_c
-
-void aom_highbd_smooth_h_predictor_64x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_64x16 \
-  aom_highbd_smooth_h_predictor_64x16_c
-
-void aom_highbd_smooth_h_predictor_64x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_64x32 \
-  aom_highbd_smooth_h_predictor_64x32_c
-
-void aom_highbd_smooth_h_predictor_64x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_64x64 \
-  aom_highbd_smooth_h_predictor_64x64_c
-
-void aom_highbd_smooth_h_predictor_8x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_8x16 aom_highbd_smooth_h_predictor_8x16_c
-
-void aom_highbd_smooth_h_predictor_8x32_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_8x32 aom_highbd_smooth_h_predictor_8x32_c
-
-void aom_highbd_smooth_h_predictor_8x4_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_h_predictor_8x4 aom_highbd_smooth_h_predictor_8x4_c
-
-void aom_highbd_smooth_h_predictor_8x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_h_predictor_8x8 aom_highbd_smooth_h_predictor_8x8_c
-
-void aom_highbd_smooth_predictor_16x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_16x16 aom_highbd_smooth_predictor_16x16_c
-
-void aom_highbd_smooth_predictor_16x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_16x32 aom_highbd_smooth_predictor_16x32_c
-
-void aom_highbd_smooth_predictor_16x4_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_16x4 aom_highbd_smooth_predictor_16x4_c
-
-void aom_highbd_smooth_predictor_16x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_16x64 aom_highbd_smooth_predictor_16x64_c
-
-void aom_highbd_smooth_predictor_16x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_16x8 aom_highbd_smooth_predictor_16x8_c
-
-void aom_highbd_smooth_predictor_2x2_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_smooth_predictor_2x2 aom_highbd_smooth_predictor_2x2_c
-
-void aom_highbd_smooth_predictor_32x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_32x16 aom_highbd_smooth_predictor_32x16_c
-
-void aom_highbd_smooth_predictor_32x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_32x32 aom_highbd_smooth_predictor_32x32_c
-
-void aom_highbd_smooth_predictor_32x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_32x64 aom_highbd_smooth_predictor_32x64_c
-
-void aom_highbd_smooth_predictor_32x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_32x8 aom_highbd_smooth_predictor_32x8_c
-
-void aom_highbd_smooth_predictor_4x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_4x16 aom_highbd_smooth_predictor_4x16_c
-
-void aom_highbd_smooth_predictor_4x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_smooth_predictor_4x4 aom_highbd_smooth_predictor_4x4_c
-
-void aom_highbd_smooth_predictor_4x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_smooth_predictor_4x8 aom_highbd_smooth_predictor_4x8_c
-
-void aom_highbd_smooth_predictor_64x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_64x16 aom_highbd_smooth_predictor_64x16_c
-
-void aom_highbd_smooth_predictor_64x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_64x32 aom_highbd_smooth_predictor_64x32_c
-
-void aom_highbd_smooth_predictor_64x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_64x64 aom_highbd_smooth_predictor_64x64_c
-
-void aom_highbd_smooth_predictor_8x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_8x16 aom_highbd_smooth_predictor_8x16_c
-
-void aom_highbd_smooth_predictor_8x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_8x32 aom_highbd_smooth_predictor_8x32_c
-
-void aom_highbd_smooth_predictor_8x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_smooth_predictor_8x4 aom_highbd_smooth_predictor_8x4_c
-
-void aom_highbd_smooth_predictor_8x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_smooth_predictor_8x8 aom_highbd_smooth_predictor_8x8_c
-
-void aom_highbd_smooth_v_predictor_16x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_16x16 \
-  aom_highbd_smooth_v_predictor_16x16_c
-
-void aom_highbd_smooth_v_predictor_16x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_16x32 \
-  aom_highbd_smooth_v_predictor_16x32_c
-
-void aom_highbd_smooth_v_predictor_16x4_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_16x4 aom_highbd_smooth_v_predictor_16x4_c
-
-void aom_highbd_smooth_v_predictor_16x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_16x64 \
-  aom_highbd_smooth_v_predictor_16x64_c
-
-void aom_highbd_smooth_v_predictor_16x8_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_16x8 aom_highbd_smooth_v_predictor_16x8_c
-
-void aom_highbd_smooth_v_predictor_2x2_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_v_predictor_2x2 aom_highbd_smooth_v_predictor_2x2_c
-
-void aom_highbd_smooth_v_predictor_32x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_32x16 \
-  aom_highbd_smooth_v_predictor_32x16_c
-
-void aom_highbd_smooth_v_predictor_32x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_32x32 \
-  aom_highbd_smooth_v_predictor_32x32_c
-
-void aom_highbd_smooth_v_predictor_32x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_32x64 \
-  aom_highbd_smooth_v_predictor_32x64_c
-
-void aom_highbd_smooth_v_predictor_32x8_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_32x8 aom_highbd_smooth_v_predictor_32x8_c
-
-void aom_highbd_smooth_v_predictor_4x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_4x16 aom_highbd_smooth_v_predictor_4x16_c
-
-void aom_highbd_smooth_v_predictor_4x4_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_v_predictor_4x4 aom_highbd_smooth_v_predictor_4x4_c
-
-void aom_highbd_smooth_v_predictor_4x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_v_predictor_4x8 aom_highbd_smooth_v_predictor_4x8_c
-
-void aom_highbd_smooth_v_predictor_64x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_64x16 \
-  aom_highbd_smooth_v_predictor_64x16_c
-
-void aom_highbd_smooth_v_predictor_64x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_64x32 \
-  aom_highbd_smooth_v_predictor_64x32_c
-
-void aom_highbd_smooth_v_predictor_64x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_64x64 \
-  aom_highbd_smooth_v_predictor_64x64_c
-
-void aom_highbd_smooth_v_predictor_8x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_8x16 aom_highbd_smooth_v_predictor_8x16_c
-
-void aom_highbd_smooth_v_predictor_8x32_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_8x32 aom_highbd_smooth_v_predictor_8x32_c
-
-void aom_highbd_smooth_v_predictor_8x4_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_v_predictor_8x4 aom_highbd_smooth_v_predictor_8x4_c
-
-void aom_highbd_smooth_v_predictor_8x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_v_predictor_8x8 aom_highbd_smooth_v_predictor_8x8_c
-
-int64_t aom_highbd_sse_c(const uint8_t* a8,
-                         int a_stride,
-                         const uint8_t* b8,
-                         int b_stride,
-                         int width,
-                         int height);
-int64_t aom_highbd_sse_sse4_1(const uint8_t* a8,
-                              int a_stride,
-                              const uint8_t* b8,
-                              int b_stride,
-                              int width,
-                              int height);
-int64_t aom_highbd_sse_avx2(const uint8_t* a8,
-                            int a_stride,
-                            const uint8_t* b8,
-                            int b_stride,
-                            int width,
-                            int height);
-RTCD_EXTERN int64_t (*aom_highbd_sse)(const uint8_t* a8,
-                                      int a_stride,
-                                      const uint8_t* b8,
-                                      int b_stride,
-                                      int width,
-                                      int height);
-
-void aom_highbd_subtract_block_c(int rows,
-                                 int cols,
-                                 int16_t* diff_ptr,
-                                 ptrdiff_t diff_stride,
-                                 const uint8_t* src_ptr,
-                                 ptrdiff_t src_stride,
-                                 const uint8_t* pred_ptr,
-                                 ptrdiff_t pred_stride,
-                                 int bd);
-void aom_highbd_subtract_block_sse2(int rows,
-                                    int cols,
-                                    int16_t* diff_ptr,
-                                    ptrdiff_t diff_stride,
-                                    const uint8_t* src_ptr,
-                                    ptrdiff_t src_stride,
-                                    const uint8_t* pred_ptr,
-                                    ptrdiff_t pred_stride,
-                                    int bd);
-#define aom_highbd_subtract_block aom_highbd_subtract_block_sse2
-
-void aom_highbd_upsampled_pred_c(MACROBLOCKD* xd,
-                                 const struct AV1Common* const cm,
-                                 int mi_row,
-                                 int mi_col,
-                                 const MV* const mv,
-                                 uint8_t* comp_pred8,
-                                 int width,
-                                 int height,
-                                 int subpel_x_q3,
-                                 int subpel_y_q3,
-                                 const uint8_t* ref8,
-                                 int ref_stride,
-                                 int bd,
-                                 int subpel_search);
-void aom_highbd_upsampled_pred_sse2(MACROBLOCKD* xd,
-                                    const struct AV1Common* const cm,
-                                    int mi_row,
-                                    int mi_col,
-                                    const MV* const mv,
-                                    uint8_t* comp_pred8,
-                                    int width,
-                                    int height,
-                                    int subpel_x_q3,
-                                    int subpel_y_q3,
-                                    const uint8_t* ref8,
-                                    int ref_stride,
-                                    int bd,
-                                    int subpel_search);
-#define aom_highbd_upsampled_pred aom_highbd_upsampled_pred_sse2
-
-void aom_highbd_v_predictor_16x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-void aom_highbd_v_predictor_16x16_sse2(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_v_predictor_16x16 aom_highbd_v_predictor_16x16_sse2
-
-void aom_highbd_v_predictor_16x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-void aom_highbd_v_predictor_16x32_sse2(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_v_predictor_16x32 aom_highbd_v_predictor_16x32_sse2
-
-void aom_highbd_v_predictor_16x4_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_16x4 aom_highbd_v_predictor_16x4_c
-
-void aom_highbd_v_predictor_16x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_16x64 aom_highbd_v_predictor_16x64_c
-
-void aom_highbd_v_predictor_16x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-void aom_highbd_v_predictor_16x8_sse2(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_v_predictor_16x8 aom_highbd_v_predictor_16x8_sse2
-
-void aom_highbd_v_predictor_2x2_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_v_predictor_2x2 aom_highbd_v_predictor_2x2_c
-
-void aom_highbd_v_predictor_32x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-void aom_highbd_v_predictor_32x16_sse2(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_v_predictor_32x16 aom_highbd_v_predictor_32x16_sse2
-
-void aom_highbd_v_predictor_32x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-void aom_highbd_v_predictor_32x32_sse2(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_v_predictor_32x32 aom_highbd_v_predictor_32x32_sse2
-
-void aom_highbd_v_predictor_32x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_32x64 aom_highbd_v_predictor_32x64_c
-
-void aom_highbd_v_predictor_32x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_32x8 aom_highbd_v_predictor_32x8_c
-
-void aom_highbd_v_predictor_4x16_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_4x16 aom_highbd_v_predictor_4x16_c
-
-void aom_highbd_v_predictor_4x4_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-void aom_highbd_v_predictor_4x4_sse2(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_v_predictor_4x4 aom_highbd_v_predictor_4x4_sse2
-
-void aom_highbd_v_predictor_4x8_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-void aom_highbd_v_predictor_4x8_sse2(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_v_predictor_4x8 aom_highbd_v_predictor_4x8_sse2
-
-void aom_highbd_v_predictor_64x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_64x16 aom_highbd_v_predictor_64x16_c
-
-void aom_highbd_v_predictor_64x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_64x32 aom_highbd_v_predictor_64x32_c
-
-void aom_highbd_v_predictor_64x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_64x64 aom_highbd_v_predictor_64x64_c
-
-void aom_highbd_v_predictor_8x16_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-void aom_highbd_v_predictor_8x16_sse2(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_v_predictor_8x16 aom_highbd_v_predictor_8x16_sse2
-
-void aom_highbd_v_predictor_8x32_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_8x32 aom_highbd_v_predictor_8x32_c
-
-void aom_highbd_v_predictor_8x4_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-void aom_highbd_v_predictor_8x4_sse2(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_v_predictor_8x4 aom_highbd_v_predictor_8x4_sse2
-
-void aom_highbd_v_predictor_8x8_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-void aom_highbd_v_predictor_8x8_sse2(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_v_predictor_8x8 aom_highbd_v_predictor_8x8_sse2
-
 void aom_ifft16x16_float_c(const float* input, float* temp, float* output);
 void aom_ifft16x16_float_sse2(const float* input, float* temp, float* output);
 void aom_ifft16x16_float_avx2(const float* input, float* temp, float* output);
@@ -20008,1363 +5466,6 @@
                                           int w,
                                           int h);
 
-uint64_t aom_mse_wxh_16bit_highbd_c(uint16_t* dst,
-                                    int dstride,
-                                    uint16_t* src,
-                                    int sstride,
-                                    int w,
-                                    int h);
-uint64_t aom_mse_wxh_16bit_highbd_sse2(uint16_t* dst,
-                                       int dstride,
-                                       uint16_t* src,
-                                       int sstride,
-                                       int w,
-                                       int h);
-uint64_t aom_mse_wxh_16bit_highbd_avx2(uint16_t* dst,
-                                       int dstride,
-                                       uint16_t* src,
-                                       int sstride,
-                                       int w,
-                                       int h);
-RTCD_EXTERN uint64_t (*aom_mse_wxh_16bit_highbd)(uint16_t* dst,
-                                                 int dstride,
-                                                 uint16_t* src,
-                                                 int sstride,
-                                                 int w,
-                                                 int h);
-
-unsigned int aom_obmc_sad128x128_c(const uint8_t* pre,
-                                   int pre_stride,
-                                   const int32_t* wsrc,
-                                   const int32_t* mask);
-unsigned int aom_obmc_sad128x128_sse4_1(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-unsigned int aom_obmc_sad128x128_avx2(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad128x128)(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask);
-
-unsigned int aom_obmc_sad128x64_c(const uint8_t* pre,
-                                  int pre_stride,
-                                  const int32_t* wsrc,
-                                  const int32_t* mask);
-unsigned int aom_obmc_sad128x64_sse4_1(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-unsigned int aom_obmc_sad128x64_avx2(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad128x64)(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask);
-
-unsigned int aom_obmc_sad16x16_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-unsigned int aom_obmc_sad16x16_sse4_1(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-unsigned int aom_obmc_sad16x16_avx2(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad16x16)(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask);
-
-unsigned int aom_obmc_sad16x32_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-unsigned int aom_obmc_sad16x32_sse4_1(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-unsigned int aom_obmc_sad16x32_avx2(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad16x32)(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask);
-
-unsigned int aom_obmc_sad16x4_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-unsigned int aom_obmc_sad16x4_sse4_1(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask);
-unsigned int aom_obmc_sad16x4_avx2(const uint8_t* pre,
-                                   int pre_stride,
-                                   const int32_t* wsrc,
-                                   const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad16x4)(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-
-unsigned int aom_obmc_sad16x64_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-unsigned int aom_obmc_sad16x64_sse4_1(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-unsigned int aom_obmc_sad16x64_avx2(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad16x64)(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask);
-
-unsigned int aom_obmc_sad16x8_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-unsigned int aom_obmc_sad16x8_sse4_1(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask);
-unsigned int aom_obmc_sad16x8_avx2(const uint8_t* pre,
-                                   int pre_stride,
-                                   const int32_t* wsrc,
-                                   const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad16x8)(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-
-unsigned int aom_obmc_sad32x16_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-unsigned int aom_obmc_sad32x16_sse4_1(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-unsigned int aom_obmc_sad32x16_avx2(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad32x16)(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask);
-
-unsigned int aom_obmc_sad32x32_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-unsigned int aom_obmc_sad32x32_sse4_1(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-unsigned int aom_obmc_sad32x32_avx2(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad32x32)(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask);
-
-unsigned int aom_obmc_sad32x64_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-unsigned int aom_obmc_sad32x64_sse4_1(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-unsigned int aom_obmc_sad32x64_avx2(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad32x64)(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask);
-
-unsigned int aom_obmc_sad32x8_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-unsigned int aom_obmc_sad32x8_sse4_1(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask);
-unsigned int aom_obmc_sad32x8_avx2(const uint8_t* pre,
-                                   int pre_stride,
-                                   const int32_t* wsrc,
-                                   const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad32x8)(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-
-unsigned int aom_obmc_sad4x16_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-unsigned int aom_obmc_sad4x16_sse4_1(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask);
-unsigned int aom_obmc_sad4x16_avx2(const uint8_t* pre,
-                                   int pre_stride,
-                                   const int32_t* wsrc,
-                                   const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad4x16)(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-
-unsigned int aom_obmc_sad4x4_c(const uint8_t* pre,
-                               int pre_stride,
-                               const int32_t* wsrc,
-                               const int32_t* mask);
-unsigned int aom_obmc_sad4x4_sse4_1(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask);
-unsigned int aom_obmc_sad4x4_avx2(const uint8_t* pre,
-                                  int pre_stride,
-                                  const int32_t* wsrc,
-                                  const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad4x4)(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask);
-
-unsigned int aom_obmc_sad4x8_c(const uint8_t* pre,
-                               int pre_stride,
-                               const int32_t* wsrc,
-                               const int32_t* mask);
-unsigned int aom_obmc_sad4x8_sse4_1(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask);
-unsigned int aom_obmc_sad4x8_avx2(const uint8_t* pre,
-                                  int pre_stride,
-                                  const int32_t* wsrc,
-                                  const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad4x8)(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask);
-
-unsigned int aom_obmc_sad64x128_c(const uint8_t* pre,
-                                  int pre_stride,
-                                  const int32_t* wsrc,
-                                  const int32_t* mask);
-unsigned int aom_obmc_sad64x128_sse4_1(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-unsigned int aom_obmc_sad64x128_avx2(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad64x128)(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask);
-
-unsigned int aom_obmc_sad64x16_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-unsigned int aom_obmc_sad64x16_sse4_1(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-unsigned int aom_obmc_sad64x16_avx2(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad64x16)(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask);
-
-unsigned int aom_obmc_sad64x32_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-unsigned int aom_obmc_sad64x32_sse4_1(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-unsigned int aom_obmc_sad64x32_avx2(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad64x32)(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask);
-
-unsigned int aom_obmc_sad64x64_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-unsigned int aom_obmc_sad64x64_sse4_1(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-unsigned int aom_obmc_sad64x64_avx2(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad64x64)(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask);
-
-unsigned int aom_obmc_sad8x16_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-unsigned int aom_obmc_sad8x16_sse4_1(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask);
-unsigned int aom_obmc_sad8x16_avx2(const uint8_t* pre,
-                                   int pre_stride,
-                                   const int32_t* wsrc,
-                                   const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad8x16)(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-
-unsigned int aom_obmc_sad8x32_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-unsigned int aom_obmc_sad8x32_sse4_1(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask);
-unsigned int aom_obmc_sad8x32_avx2(const uint8_t* pre,
-                                   int pre_stride,
-                                   const int32_t* wsrc,
-                                   const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad8x32)(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-
-unsigned int aom_obmc_sad8x4_c(const uint8_t* pre,
-                               int pre_stride,
-                               const int32_t* wsrc,
-                               const int32_t* mask);
-unsigned int aom_obmc_sad8x4_sse4_1(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask);
-unsigned int aom_obmc_sad8x4_avx2(const uint8_t* pre,
-                                  int pre_stride,
-                                  const int32_t* wsrc,
-                                  const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad8x4)(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask);
-
-unsigned int aom_obmc_sad8x8_c(const uint8_t* pre,
-                               int pre_stride,
-                               const int32_t* wsrc,
-                               const int32_t* mask);
-unsigned int aom_obmc_sad8x8_sse4_1(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask);
-unsigned int aom_obmc_sad8x8_avx2(const uint8_t* pre,
-                                  int pre_stride,
-                                  const int32_t* wsrc,
-                                  const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad8x8)(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask);
-
-unsigned int aom_obmc_sub_pixel_variance128x128_c(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance128x128_sse4_1(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance128x128)(
-    const uint8_t* pre,
-    int pre_stride,
-    int xoffset,
-    int yoffset,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance128x64_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance128x64_sse4_1(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance128x64)(
-    const uint8_t* pre,
-    int pre_stride,
-    int xoffset,
-    int yoffset,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance16x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance16x16_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance16x16)(
-    const uint8_t* pre,
-    int pre_stride,
-    int xoffset,
-    int yoffset,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance16x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance16x32_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance16x32)(
-    const uint8_t* pre,
-    int pre_stride,
-    int xoffset,
-    int yoffset,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance16x4_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance16x4_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance16x4)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            int xoffset,
-                                                            int yoffset,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance16x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance16x64_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance16x64)(
-    const uint8_t* pre,
-    int pre_stride,
-    int xoffset,
-    int yoffset,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance16x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance16x8_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance16x8)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            int xoffset,
-                                                            int yoffset,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance32x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance32x16_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance32x16)(
-    const uint8_t* pre,
-    int pre_stride,
-    int xoffset,
-    int yoffset,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance32x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance32x32_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance32x32)(
-    const uint8_t* pre,
-    int pre_stride,
-    int xoffset,
-    int yoffset,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance32x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance32x64_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance32x64)(
-    const uint8_t* pre,
-    int pre_stride,
-    int xoffset,
-    int yoffset,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance32x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance32x8_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance32x8)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            int xoffset,
-                                                            int yoffset,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance4x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance4x16_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance4x16)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            int xoffset,
-                                                            int yoffset,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance4x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance4x4_sse4_1(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance4x4)(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance4x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance4x8_sse4_1(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance4x8)(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance64x128_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance64x128_sse4_1(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance64x128)(
-    const uint8_t* pre,
-    int pre_stride,
-    int xoffset,
-    int yoffset,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance64x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance64x16_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance64x16)(
-    const uint8_t* pre,
-    int pre_stride,
-    int xoffset,
-    int yoffset,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance64x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance64x32_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance64x32)(
-    const uint8_t* pre,
-    int pre_stride,
-    int xoffset,
-    int yoffset,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance64x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance64x64_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance64x64)(
-    const uint8_t* pre,
-    int pre_stride,
-    int xoffset,
-    int yoffset,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance8x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance8x16_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance8x16)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            int xoffset,
-                                                            int yoffset,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance8x32_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance8x32_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance8x32)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            int xoffset,
-                                                            int yoffset,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance8x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance8x4_sse4_1(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance8x4)(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance8x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance8x8_sse4_1(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance8x8)(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-
-unsigned int aom_obmc_variance128x128_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask,
-                                        unsigned int* sse);
-unsigned int aom_obmc_variance128x128_sse4_1(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-unsigned int aom_obmc_variance128x128_avx2(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance128x128)(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-
-unsigned int aom_obmc_variance128x64_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask,
-                                       unsigned int* sse);
-unsigned int aom_obmc_variance128x64_sse4_1(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-unsigned int aom_obmc_variance128x64_avx2(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask,
-                                          unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance128x64)(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-
-unsigned int aom_obmc_variance16x16_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-unsigned int aom_obmc_variance16x16_sse4_1(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-unsigned int aom_obmc_variance16x16_avx2(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask,
-                                         unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance16x16)(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-
-unsigned int aom_obmc_variance16x32_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-unsigned int aom_obmc_variance16x32_sse4_1(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-unsigned int aom_obmc_variance16x32_avx2(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask,
-                                         unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance16x32)(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-
-unsigned int aom_obmc_variance16x4_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-unsigned int aom_obmc_variance16x4_sse4_1(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask,
-                                          unsigned int* sse);
-unsigned int aom_obmc_variance16x4_avx2(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask,
-                                        unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance16x4)(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-
-unsigned int aom_obmc_variance16x64_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-unsigned int aom_obmc_variance16x64_sse4_1(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-unsigned int aom_obmc_variance16x64_avx2(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask,
-                                         unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance16x64)(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-
-unsigned int aom_obmc_variance16x8_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-unsigned int aom_obmc_variance16x8_sse4_1(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask,
-                                          unsigned int* sse);
-unsigned int aom_obmc_variance16x8_avx2(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask,
-                                        unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance16x8)(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-
-unsigned int aom_obmc_variance32x16_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-unsigned int aom_obmc_variance32x16_sse4_1(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-unsigned int aom_obmc_variance32x16_avx2(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask,
-                                         unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance32x16)(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-
-unsigned int aom_obmc_variance32x32_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-unsigned int aom_obmc_variance32x32_sse4_1(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-unsigned int aom_obmc_variance32x32_avx2(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask,
-                                         unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance32x32)(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-
-unsigned int aom_obmc_variance32x64_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-unsigned int aom_obmc_variance32x64_sse4_1(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-unsigned int aom_obmc_variance32x64_avx2(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask,
-                                         unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance32x64)(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-
-unsigned int aom_obmc_variance32x8_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-unsigned int aom_obmc_variance32x8_sse4_1(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask,
-                                          unsigned int* sse);
-unsigned int aom_obmc_variance32x8_avx2(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask,
-                                        unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance32x8)(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-
-unsigned int aom_obmc_variance4x16_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-unsigned int aom_obmc_variance4x16_sse4_1(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask,
-                                          unsigned int* sse);
-unsigned int aom_obmc_variance4x16_avx2(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask,
-                                        unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance4x16)(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-
-unsigned int aom_obmc_variance4x4_c(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask,
-                                    unsigned int* sse);
-unsigned int aom_obmc_variance4x4_sse4_1(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask,
-                                         unsigned int* sse);
-unsigned int aom_obmc_variance4x4_avx2(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask,
-                                       unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance4x4)(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-
-unsigned int aom_obmc_variance4x8_c(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask,
-                                    unsigned int* sse);
-unsigned int aom_obmc_variance4x8_sse4_1(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask,
-                                         unsigned int* sse);
-unsigned int aom_obmc_variance4x8_avx2(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask,
-                                       unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance4x8)(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-
-unsigned int aom_obmc_variance64x128_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask,
-                                       unsigned int* sse);
-unsigned int aom_obmc_variance64x128_sse4_1(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-unsigned int aom_obmc_variance64x128_avx2(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask,
-                                          unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance64x128)(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-
-unsigned int aom_obmc_variance64x16_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-unsigned int aom_obmc_variance64x16_sse4_1(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-unsigned int aom_obmc_variance64x16_avx2(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask,
-                                         unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance64x16)(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-
-unsigned int aom_obmc_variance64x32_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-unsigned int aom_obmc_variance64x32_sse4_1(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-unsigned int aom_obmc_variance64x32_avx2(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask,
-                                         unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance64x32)(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-
-unsigned int aom_obmc_variance64x64_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-unsigned int aom_obmc_variance64x64_sse4_1(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-unsigned int aom_obmc_variance64x64_avx2(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask,
-                                         unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance64x64)(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-
-unsigned int aom_obmc_variance8x16_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-unsigned int aom_obmc_variance8x16_sse4_1(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask,
-                                          unsigned int* sse);
-unsigned int aom_obmc_variance8x16_avx2(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask,
-                                        unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance8x16)(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-
-unsigned int aom_obmc_variance8x32_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-unsigned int aom_obmc_variance8x32_sse4_1(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask,
-                                          unsigned int* sse);
-unsigned int aom_obmc_variance8x32_avx2(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask,
-                                        unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance8x32)(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-
-unsigned int aom_obmc_variance8x4_c(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask,
-                                    unsigned int* sse);
-unsigned int aom_obmc_variance8x4_sse4_1(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask,
-                                         unsigned int* sse);
-unsigned int aom_obmc_variance8x4_avx2(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask,
-                                       unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance8x4)(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-
-unsigned int aom_obmc_variance8x8_c(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask,
-                                    unsigned int* sse);
-unsigned int aom_obmc_variance8x8_sse4_1(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask,
-                                         unsigned int* sse);
-unsigned int aom_obmc_variance8x8_avx2(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask,
-                                       unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance8x8)(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-
 void aom_paeth_predictor_16x16_c(uint8_t* dst,
                                  ptrdiff_t y_stride,
                                  const uint8_t* above,
@@ -27346,1188 +11447,6 @@
   aom_hadamard_lp_16x16 = aom_hadamard_lp_16x16_c;
   if (flags & HAS_AVX2)
     aom_hadamard_lp_16x16 = aom_hadamard_lp_16x16_avx2;
-  aom_highbd_10_masked_sub_pixel_variance128x128 =
-      aom_highbd_10_masked_sub_pixel_variance128x128_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance128x128 =
-        aom_highbd_10_masked_sub_pixel_variance128x128_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance128x64 =
-      aom_highbd_10_masked_sub_pixel_variance128x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance128x64 =
-        aom_highbd_10_masked_sub_pixel_variance128x64_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance16x16 =
-      aom_highbd_10_masked_sub_pixel_variance16x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance16x16 =
-        aom_highbd_10_masked_sub_pixel_variance16x16_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance16x32 =
-      aom_highbd_10_masked_sub_pixel_variance16x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance16x32 =
-        aom_highbd_10_masked_sub_pixel_variance16x32_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance16x4 =
-      aom_highbd_10_masked_sub_pixel_variance16x4_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance16x4 =
-        aom_highbd_10_masked_sub_pixel_variance16x4_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance16x64 =
-      aom_highbd_10_masked_sub_pixel_variance16x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance16x64 =
-        aom_highbd_10_masked_sub_pixel_variance16x64_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance16x8 =
-      aom_highbd_10_masked_sub_pixel_variance16x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance16x8 =
-        aom_highbd_10_masked_sub_pixel_variance16x8_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance32x16 =
-      aom_highbd_10_masked_sub_pixel_variance32x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance32x16 =
-        aom_highbd_10_masked_sub_pixel_variance32x16_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance32x32 =
-      aom_highbd_10_masked_sub_pixel_variance32x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance32x32 =
-        aom_highbd_10_masked_sub_pixel_variance32x32_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance32x64 =
-      aom_highbd_10_masked_sub_pixel_variance32x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance32x64 =
-        aom_highbd_10_masked_sub_pixel_variance32x64_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance32x8 =
-      aom_highbd_10_masked_sub_pixel_variance32x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance32x8 =
-        aom_highbd_10_masked_sub_pixel_variance32x8_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance4x16 =
-      aom_highbd_10_masked_sub_pixel_variance4x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance4x16 =
-        aom_highbd_10_masked_sub_pixel_variance4x16_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance4x4 =
-      aom_highbd_10_masked_sub_pixel_variance4x4_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance4x4 =
-        aom_highbd_10_masked_sub_pixel_variance4x4_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance4x8 =
-      aom_highbd_10_masked_sub_pixel_variance4x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance4x8 =
-        aom_highbd_10_masked_sub_pixel_variance4x8_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance64x128 =
-      aom_highbd_10_masked_sub_pixel_variance64x128_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance64x128 =
-        aom_highbd_10_masked_sub_pixel_variance64x128_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance64x16 =
-      aom_highbd_10_masked_sub_pixel_variance64x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance64x16 =
-        aom_highbd_10_masked_sub_pixel_variance64x16_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance64x32 =
-      aom_highbd_10_masked_sub_pixel_variance64x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance64x32 =
-        aom_highbd_10_masked_sub_pixel_variance64x32_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance64x64 =
-      aom_highbd_10_masked_sub_pixel_variance64x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance64x64 =
-        aom_highbd_10_masked_sub_pixel_variance64x64_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance8x16 =
-      aom_highbd_10_masked_sub_pixel_variance8x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance8x16 =
-        aom_highbd_10_masked_sub_pixel_variance8x16_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance8x32 =
-      aom_highbd_10_masked_sub_pixel_variance8x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance8x32 =
-        aom_highbd_10_masked_sub_pixel_variance8x32_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance8x4 =
-      aom_highbd_10_masked_sub_pixel_variance8x4_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance8x4 =
-        aom_highbd_10_masked_sub_pixel_variance8x4_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance8x8 =
-      aom_highbd_10_masked_sub_pixel_variance8x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance8x8 =
-        aom_highbd_10_masked_sub_pixel_variance8x8_ssse3;
-  aom_highbd_10_obmc_variance128x128 = aom_highbd_10_obmc_variance128x128_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance128x128 =
-        aom_highbd_10_obmc_variance128x128_sse4_1;
-  aom_highbd_10_obmc_variance128x64 = aom_highbd_10_obmc_variance128x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance128x64 =
-        aom_highbd_10_obmc_variance128x64_sse4_1;
-  aom_highbd_10_obmc_variance16x16 = aom_highbd_10_obmc_variance16x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance16x16 = aom_highbd_10_obmc_variance16x16_sse4_1;
-  aom_highbd_10_obmc_variance16x32 = aom_highbd_10_obmc_variance16x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance16x32 = aom_highbd_10_obmc_variance16x32_sse4_1;
-  aom_highbd_10_obmc_variance16x4 = aom_highbd_10_obmc_variance16x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance16x4 = aom_highbd_10_obmc_variance16x4_sse4_1;
-  aom_highbd_10_obmc_variance16x64 = aom_highbd_10_obmc_variance16x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance16x64 = aom_highbd_10_obmc_variance16x64_sse4_1;
-  aom_highbd_10_obmc_variance16x8 = aom_highbd_10_obmc_variance16x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance16x8 = aom_highbd_10_obmc_variance16x8_sse4_1;
-  aom_highbd_10_obmc_variance32x16 = aom_highbd_10_obmc_variance32x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance32x16 = aom_highbd_10_obmc_variance32x16_sse4_1;
-  aom_highbd_10_obmc_variance32x32 = aom_highbd_10_obmc_variance32x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance32x32 = aom_highbd_10_obmc_variance32x32_sse4_1;
-  aom_highbd_10_obmc_variance32x64 = aom_highbd_10_obmc_variance32x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance32x64 = aom_highbd_10_obmc_variance32x64_sse4_1;
-  aom_highbd_10_obmc_variance32x8 = aom_highbd_10_obmc_variance32x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance32x8 = aom_highbd_10_obmc_variance32x8_sse4_1;
-  aom_highbd_10_obmc_variance4x16 = aom_highbd_10_obmc_variance4x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance4x16 = aom_highbd_10_obmc_variance4x16_sse4_1;
-  aom_highbd_10_obmc_variance4x4 = aom_highbd_10_obmc_variance4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance4x4 = aom_highbd_10_obmc_variance4x4_sse4_1;
-  aom_highbd_10_obmc_variance4x8 = aom_highbd_10_obmc_variance4x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance4x8 = aom_highbd_10_obmc_variance4x8_sse4_1;
-  aom_highbd_10_obmc_variance64x128 = aom_highbd_10_obmc_variance64x128_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance64x128 =
-        aom_highbd_10_obmc_variance64x128_sse4_1;
-  aom_highbd_10_obmc_variance64x16 = aom_highbd_10_obmc_variance64x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance64x16 = aom_highbd_10_obmc_variance64x16_sse4_1;
-  aom_highbd_10_obmc_variance64x32 = aom_highbd_10_obmc_variance64x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance64x32 = aom_highbd_10_obmc_variance64x32_sse4_1;
-  aom_highbd_10_obmc_variance64x64 = aom_highbd_10_obmc_variance64x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance64x64 = aom_highbd_10_obmc_variance64x64_sse4_1;
-  aom_highbd_10_obmc_variance8x16 = aom_highbd_10_obmc_variance8x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance8x16 = aom_highbd_10_obmc_variance8x16_sse4_1;
-  aom_highbd_10_obmc_variance8x32 = aom_highbd_10_obmc_variance8x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance8x32 = aom_highbd_10_obmc_variance8x32_sse4_1;
-  aom_highbd_10_obmc_variance8x4 = aom_highbd_10_obmc_variance8x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance8x4 = aom_highbd_10_obmc_variance8x4_sse4_1;
-  aom_highbd_10_obmc_variance8x8 = aom_highbd_10_obmc_variance8x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance8x8 = aom_highbd_10_obmc_variance8x8_sse4_1;
-  aom_highbd_10_sub_pixel_avg_variance4x4 =
-      aom_highbd_10_sub_pixel_avg_variance4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_sub_pixel_avg_variance4x4 =
-        aom_highbd_10_sub_pixel_avg_variance4x4_sse4_1;
-  aom_highbd_10_sub_pixel_variance128x128 =
-      aom_highbd_10_sub_pixel_variance128x128_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_sub_pixel_variance128x128 =
-        aom_highbd_10_sub_pixel_variance128x128_avx2;
-  aom_highbd_10_sub_pixel_variance128x64 =
-      aom_highbd_10_sub_pixel_variance128x64_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_sub_pixel_variance128x64 =
-        aom_highbd_10_sub_pixel_variance128x64_avx2;
-  aom_highbd_10_sub_pixel_variance16x16 =
-      aom_highbd_10_sub_pixel_variance16x16_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_sub_pixel_variance16x16 =
-        aom_highbd_10_sub_pixel_variance16x16_avx2;
-  aom_highbd_10_sub_pixel_variance16x32 =
-      aom_highbd_10_sub_pixel_variance16x32_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_sub_pixel_variance16x32 =
-        aom_highbd_10_sub_pixel_variance16x32_avx2;
-  aom_highbd_10_sub_pixel_variance16x8 =
-      aom_highbd_10_sub_pixel_variance16x8_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_sub_pixel_variance16x8 =
-        aom_highbd_10_sub_pixel_variance16x8_avx2;
-  aom_highbd_10_sub_pixel_variance32x16 =
-      aom_highbd_10_sub_pixel_variance32x16_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_sub_pixel_variance32x16 =
-        aom_highbd_10_sub_pixel_variance32x16_avx2;
-  aom_highbd_10_sub_pixel_variance32x32 =
-      aom_highbd_10_sub_pixel_variance32x32_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_sub_pixel_variance32x32 =
-        aom_highbd_10_sub_pixel_variance32x32_avx2;
-  aom_highbd_10_sub_pixel_variance32x64 =
-      aom_highbd_10_sub_pixel_variance32x64_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_sub_pixel_variance32x64 =
-        aom_highbd_10_sub_pixel_variance32x64_avx2;
-  aom_highbd_10_sub_pixel_variance4x4 = aom_highbd_10_sub_pixel_variance4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_sub_pixel_variance4x4 =
-        aom_highbd_10_sub_pixel_variance4x4_sse4_1;
-  aom_highbd_10_sub_pixel_variance64x128 =
-      aom_highbd_10_sub_pixel_variance64x128_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_sub_pixel_variance64x128 =
-        aom_highbd_10_sub_pixel_variance64x128_avx2;
-  aom_highbd_10_sub_pixel_variance64x32 =
-      aom_highbd_10_sub_pixel_variance64x32_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_sub_pixel_variance64x32 =
-        aom_highbd_10_sub_pixel_variance64x32_avx2;
-  aom_highbd_10_sub_pixel_variance64x64 =
-      aom_highbd_10_sub_pixel_variance64x64_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_sub_pixel_variance64x64 =
-        aom_highbd_10_sub_pixel_variance64x64_avx2;
-  aom_highbd_10_sub_pixel_variance8x16 =
-      aom_highbd_10_sub_pixel_variance8x16_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_sub_pixel_variance8x16 =
-        aom_highbd_10_sub_pixel_variance8x16_avx2;
-  aom_highbd_10_sub_pixel_variance8x8 =
-      aom_highbd_10_sub_pixel_variance8x8_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_sub_pixel_variance8x8 =
-        aom_highbd_10_sub_pixel_variance8x8_avx2;
-  aom_highbd_10_variance128x128 = aom_highbd_10_variance128x128_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_variance128x128 = aom_highbd_10_variance128x128_avx2;
-  aom_highbd_10_variance128x64 = aom_highbd_10_variance128x64_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_variance128x64 = aom_highbd_10_variance128x64_avx2;
-  aom_highbd_10_variance16x16 = aom_highbd_10_variance16x16_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_variance16x16 = aom_highbd_10_variance16x16_avx2;
-  aom_highbd_10_variance16x32 = aom_highbd_10_variance16x32_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_variance16x32 = aom_highbd_10_variance16x32_avx2;
-  aom_highbd_10_variance16x8 = aom_highbd_10_variance16x8_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_variance16x8 = aom_highbd_10_variance16x8_avx2;
-  aom_highbd_10_variance32x16 = aom_highbd_10_variance32x16_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_variance32x16 = aom_highbd_10_variance32x16_avx2;
-  aom_highbd_10_variance32x32 = aom_highbd_10_variance32x32_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_variance32x32 = aom_highbd_10_variance32x32_avx2;
-  aom_highbd_10_variance32x64 = aom_highbd_10_variance32x64_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_variance32x64 = aom_highbd_10_variance32x64_avx2;
-  aom_highbd_10_variance4x4 = aom_highbd_10_variance4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_variance4x4 = aom_highbd_10_variance4x4_sse4_1;
-  aom_highbd_10_variance64x128 = aom_highbd_10_variance64x128_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_variance64x128 = aom_highbd_10_variance64x128_avx2;
-  aom_highbd_10_variance64x32 = aom_highbd_10_variance64x32_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_variance64x32 = aom_highbd_10_variance64x32_avx2;
-  aom_highbd_10_variance64x64 = aom_highbd_10_variance64x64_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_variance64x64 = aom_highbd_10_variance64x64_avx2;
-  aom_highbd_10_variance8x16 = aom_highbd_10_variance8x16_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_variance8x16 = aom_highbd_10_variance8x16_avx2;
-  aom_highbd_10_variance8x8 = aom_highbd_10_variance8x8_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_variance8x8 = aom_highbd_10_variance8x8_avx2;
-  aom_highbd_12_masked_sub_pixel_variance128x128 =
-      aom_highbd_12_masked_sub_pixel_variance128x128_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance128x128 =
-        aom_highbd_12_masked_sub_pixel_variance128x128_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance128x64 =
-      aom_highbd_12_masked_sub_pixel_variance128x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance128x64 =
-        aom_highbd_12_masked_sub_pixel_variance128x64_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance16x16 =
-      aom_highbd_12_masked_sub_pixel_variance16x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance16x16 =
-        aom_highbd_12_masked_sub_pixel_variance16x16_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance16x32 =
-      aom_highbd_12_masked_sub_pixel_variance16x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance16x32 =
-        aom_highbd_12_masked_sub_pixel_variance16x32_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance16x4 =
-      aom_highbd_12_masked_sub_pixel_variance16x4_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance16x4 =
-        aom_highbd_12_masked_sub_pixel_variance16x4_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance16x64 =
-      aom_highbd_12_masked_sub_pixel_variance16x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance16x64 =
-        aom_highbd_12_masked_sub_pixel_variance16x64_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance16x8 =
-      aom_highbd_12_masked_sub_pixel_variance16x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance16x8 =
-        aom_highbd_12_masked_sub_pixel_variance16x8_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance32x16 =
-      aom_highbd_12_masked_sub_pixel_variance32x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance32x16 =
-        aom_highbd_12_masked_sub_pixel_variance32x16_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance32x32 =
-      aom_highbd_12_masked_sub_pixel_variance32x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance32x32 =
-        aom_highbd_12_masked_sub_pixel_variance32x32_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance32x64 =
-      aom_highbd_12_masked_sub_pixel_variance32x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance32x64 =
-        aom_highbd_12_masked_sub_pixel_variance32x64_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance32x8 =
-      aom_highbd_12_masked_sub_pixel_variance32x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance32x8 =
-        aom_highbd_12_masked_sub_pixel_variance32x8_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance4x16 =
-      aom_highbd_12_masked_sub_pixel_variance4x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance4x16 =
-        aom_highbd_12_masked_sub_pixel_variance4x16_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance4x4 =
-      aom_highbd_12_masked_sub_pixel_variance4x4_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance4x4 =
-        aom_highbd_12_masked_sub_pixel_variance4x4_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance4x8 =
-      aom_highbd_12_masked_sub_pixel_variance4x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance4x8 =
-        aom_highbd_12_masked_sub_pixel_variance4x8_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance64x128 =
-      aom_highbd_12_masked_sub_pixel_variance64x128_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance64x128 =
-        aom_highbd_12_masked_sub_pixel_variance64x128_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance64x16 =
-      aom_highbd_12_masked_sub_pixel_variance64x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance64x16 =
-        aom_highbd_12_masked_sub_pixel_variance64x16_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance64x32 =
-      aom_highbd_12_masked_sub_pixel_variance64x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance64x32 =
-        aom_highbd_12_masked_sub_pixel_variance64x32_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance64x64 =
-      aom_highbd_12_masked_sub_pixel_variance64x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance64x64 =
-        aom_highbd_12_masked_sub_pixel_variance64x64_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance8x16 =
-      aom_highbd_12_masked_sub_pixel_variance8x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance8x16 =
-        aom_highbd_12_masked_sub_pixel_variance8x16_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance8x32 =
-      aom_highbd_12_masked_sub_pixel_variance8x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance8x32 =
-        aom_highbd_12_masked_sub_pixel_variance8x32_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance8x4 =
-      aom_highbd_12_masked_sub_pixel_variance8x4_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance8x4 =
-        aom_highbd_12_masked_sub_pixel_variance8x4_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance8x8 =
-      aom_highbd_12_masked_sub_pixel_variance8x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance8x8 =
-        aom_highbd_12_masked_sub_pixel_variance8x8_ssse3;
-  aom_highbd_12_obmc_variance128x128 = aom_highbd_12_obmc_variance128x128_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance128x128 =
-        aom_highbd_12_obmc_variance128x128_sse4_1;
-  aom_highbd_12_obmc_variance128x64 = aom_highbd_12_obmc_variance128x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance128x64 =
-        aom_highbd_12_obmc_variance128x64_sse4_1;
-  aom_highbd_12_obmc_variance16x16 = aom_highbd_12_obmc_variance16x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance16x16 = aom_highbd_12_obmc_variance16x16_sse4_1;
-  aom_highbd_12_obmc_variance16x32 = aom_highbd_12_obmc_variance16x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance16x32 = aom_highbd_12_obmc_variance16x32_sse4_1;
-  aom_highbd_12_obmc_variance16x4 = aom_highbd_12_obmc_variance16x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance16x4 = aom_highbd_12_obmc_variance16x4_sse4_1;
-  aom_highbd_12_obmc_variance16x64 = aom_highbd_12_obmc_variance16x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance16x64 = aom_highbd_12_obmc_variance16x64_sse4_1;
-  aom_highbd_12_obmc_variance16x8 = aom_highbd_12_obmc_variance16x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance16x8 = aom_highbd_12_obmc_variance16x8_sse4_1;
-  aom_highbd_12_obmc_variance32x16 = aom_highbd_12_obmc_variance32x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance32x16 = aom_highbd_12_obmc_variance32x16_sse4_1;
-  aom_highbd_12_obmc_variance32x32 = aom_highbd_12_obmc_variance32x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance32x32 = aom_highbd_12_obmc_variance32x32_sse4_1;
-  aom_highbd_12_obmc_variance32x64 = aom_highbd_12_obmc_variance32x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance32x64 = aom_highbd_12_obmc_variance32x64_sse4_1;
-  aom_highbd_12_obmc_variance32x8 = aom_highbd_12_obmc_variance32x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance32x8 = aom_highbd_12_obmc_variance32x8_sse4_1;
-  aom_highbd_12_obmc_variance4x16 = aom_highbd_12_obmc_variance4x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance4x16 = aom_highbd_12_obmc_variance4x16_sse4_1;
-  aom_highbd_12_obmc_variance4x4 = aom_highbd_12_obmc_variance4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance4x4 = aom_highbd_12_obmc_variance4x4_sse4_1;
-  aom_highbd_12_obmc_variance4x8 = aom_highbd_12_obmc_variance4x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance4x8 = aom_highbd_12_obmc_variance4x8_sse4_1;
-  aom_highbd_12_obmc_variance64x128 = aom_highbd_12_obmc_variance64x128_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance64x128 =
-        aom_highbd_12_obmc_variance64x128_sse4_1;
-  aom_highbd_12_obmc_variance64x16 = aom_highbd_12_obmc_variance64x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance64x16 = aom_highbd_12_obmc_variance64x16_sse4_1;
-  aom_highbd_12_obmc_variance64x32 = aom_highbd_12_obmc_variance64x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance64x32 = aom_highbd_12_obmc_variance64x32_sse4_1;
-  aom_highbd_12_obmc_variance64x64 = aom_highbd_12_obmc_variance64x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance64x64 = aom_highbd_12_obmc_variance64x64_sse4_1;
-  aom_highbd_12_obmc_variance8x16 = aom_highbd_12_obmc_variance8x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance8x16 = aom_highbd_12_obmc_variance8x16_sse4_1;
-  aom_highbd_12_obmc_variance8x32 = aom_highbd_12_obmc_variance8x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance8x32 = aom_highbd_12_obmc_variance8x32_sse4_1;
-  aom_highbd_12_obmc_variance8x4 = aom_highbd_12_obmc_variance8x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance8x4 = aom_highbd_12_obmc_variance8x4_sse4_1;
-  aom_highbd_12_obmc_variance8x8 = aom_highbd_12_obmc_variance8x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance8x8 = aom_highbd_12_obmc_variance8x8_sse4_1;
-  aom_highbd_12_sub_pixel_avg_variance4x4 =
-      aom_highbd_12_sub_pixel_avg_variance4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_sub_pixel_avg_variance4x4 =
-        aom_highbd_12_sub_pixel_avg_variance4x4_sse4_1;
-  aom_highbd_12_sub_pixel_variance4x4 = aom_highbd_12_sub_pixel_variance4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_sub_pixel_variance4x4 =
-        aom_highbd_12_sub_pixel_variance4x4_sse4_1;
-  aom_highbd_12_variance4x4 = aom_highbd_12_variance4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_variance4x4 = aom_highbd_12_variance4x4_sse4_1;
-  aom_highbd_8_masked_sub_pixel_variance128x128 =
-      aom_highbd_8_masked_sub_pixel_variance128x128_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance128x128 =
-        aom_highbd_8_masked_sub_pixel_variance128x128_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance128x64 =
-      aom_highbd_8_masked_sub_pixel_variance128x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance128x64 =
-        aom_highbd_8_masked_sub_pixel_variance128x64_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance16x16 =
-      aom_highbd_8_masked_sub_pixel_variance16x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance16x16 =
-        aom_highbd_8_masked_sub_pixel_variance16x16_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance16x32 =
-      aom_highbd_8_masked_sub_pixel_variance16x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance16x32 =
-        aom_highbd_8_masked_sub_pixel_variance16x32_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance16x4 =
-      aom_highbd_8_masked_sub_pixel_variance16x4_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance16x4 =
-        aom_highbd_8_masked_sub_pixel_variance16x4_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance16x64 =
-      aom_highbd_8_masked_sub_pixel_variance16x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance16x64 =
-        aom_highbd_8_masked_sub_pixel_variance16x64_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance16x8 =
-      aom_highbd_8_masked_sub_pixel_variance16x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance16x8 =
-        aom_highbd_8_masked_sub_pixel_variance16x8_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance32x16 =
-      aom_highbd_8_masked_sub_pixel_variance32x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance32x16 =
-        aom_highbd_8_masked_sub_pixel_variance32x16_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance32x32 =
-      aom_highbd_8_masked_sub_pixel_variance32x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance32x32 =
-        aom_highbd_8_masked_sub_pixel_variance32x32_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance32x64 =
-      aom_highbd_8_masked_sub_pixel_variance32x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance32x64 =
-        aom_highbd_8_masked_sub_pixel_variance32x64_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance32x8 =
-      aom_highbd_8_masked_sub_pixel_variance32x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance32x8 =
-        aom_highbd_8_masked_sub_pixel_variance32x8_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance4x16 =
-      aom_highbd_8_masked_sub_pixel_variance4x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance4x16 =
-        aom_highbd_8_masked_sub_pixel_variance4x16_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance4x4 =
-      aom_highbd_8_masked_sub_pixel_variance4x4_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance4x4 =
-        aom_highbd_8_masked_sub_pixel_variance4x4_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance4x8 =
-      aom_highbd_8_masked_sub_pixel_variance4x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance4x8 =
-        aom_highbd_8_masked_sub_pixel_variance4x8_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance64x128 =
-      aom_highbd_8_masked_sub_pixel_variance64x128_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance64x128 =
-        aom_highbd_8_masked_sub_pixel_variance64x128_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance64x16 =
-      aom_highbd_8_masked_sub_pixel_variance64x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance64x16 =
-        aom_highbd_8_masked_sub_pixel_variance64x16_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance64x32 =
-      aom_highbd_8_masked_sub_pixel_variance64x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance64x32 =
-        aom_highbd_8_masked_sub_pixel_variance64x32_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance64x64 =
-      aom_highbd_8_masked_sub_pixel_variance64x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance64x64 =
-        aom_highbd_8_masked_sub_pixel_variance64x64_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance8x16 =
-      aom_highbd_8_masked_sub_pixel_variance8x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance8x16 =
-        aom_highbd_8_masked_sub_pixel_variance8x16_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance8x32 =
-      aom_highbd_8_masked_sub_pixel_variance8x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance8x32 =
-        aom_highbd_8_masked_sub_pixel_variance8x32_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance8x4 =
-      aom_highbd_8_masked_sub_pixel_variance8x4_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance8x4 =
-        aom_highbd_8_masked_sub_pixel_variance8x4_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance8x8 =
-      aom_highbd_8_masked_sub_pixel_variance8x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance8x8 =
-        aom_highbd_8_masked_sub_pixel_variance8x8_ssse3;
-  aom_highbd_8_sub_pixel_avg_variance4x4 =
-      aom_highbd_8_sub_pixel_avg_variance4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_8_sub_pixel_avg_variance4x4 =
-        aom_highbd_8_sub_pixel_avg_variance4x4_sse4_1;
-  aom_highbd_8_sub_pixel_variance4x4 = aom_highbd_8_sub_pixel_variance4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_8_sub_pixel_variance4x4 =
-        aom_highbd_8_sub_pixel_variance4x4_sse4_1;
-  aom_highbd_8_variance4x4 = aom_highbd_8_variance4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_8_variance4x4 = aom_highbd_8_variance4x4_sse4_1;
-  aom_highbd_blend_a64_d16_mask = aom_highbd_blend_a64_d16_mask_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_blend_a64_d16_mask = aom_highbd_blend_a64_d16_mask_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_blend_a64_d16_mask = aom_highbd_blend_a64_d16_mask_avx2;
-  aom_highbd_blend_a64_hmask = aom_highbd_blend_a64_hmask_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_blend_a64_hmask = aom_highbd_blend_a64_hmask_sse4_1;
-  aom_highbd_blend_a64_mask = aom_highbd_blend_a64_mask_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_blend_a64_mask = aom_highbd_blend_a64_mask_sse4_1;
-  aom_highbd_blend_a64_vmask = aom_highbd_blend_a64_vmask_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_blend_a64_vmask = aom_highbd_blend_a64_vmask_sse4_1;
-  aom_highbd_comp_mask_pred = aom_highbd_comp_mask_pred_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_comp_mask_pred = aom_highbd_comp_mask_pred_avx2;
-  aom_highbd_convolve8_horiz = aom_highbd_convolve8_horiz_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_convolve8_horiz = aom_highbd_convolve8_horiz_avx2;
-  aom_highbd_convolve8_vert = aom_highbd_convolve8_vert_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_convolve8_vert = aom_highbd_convolve8_vert_avx2;
-  aom_highbd_convolve_copy = aom_highbd_convolve_copy_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_convolve_copy = aom_highbd_convolve_copy_avx2;
-  aom_highbd_hadamard_16x16 = aom_highbd_hadamard_16x16_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_hadamard_16x16 = aom_highbd_hadamard_16x16_avx2;
-  aom_highbd_hadamard_32x32 = aom_highbd_hadamard_32x32_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_hadamard_32x32 = aom_highbd_hadamard_32x32_avx2;
-  aom_highbd_hadamard_8x8 = aom_highbd_hadamard_8x8_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_hadamard_8x8 = aom_highbd_hadamard_8x8_avx2;
-  aom_highbd_lpf_horizontal_14_dual = aom_highbd_lpf_horizontal_14_dual_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_lpf_horizontal_14_dual = aom_highbd_lpf_horizontal_14_dual_avx2;
-  aom_highbd_lpf_horizontal_4_dual = aom_highbd_lpf_horizontal_4_dual_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_lpf_horizontal_4_dual = aom_highbd_lpf_horizontal_4_dual_avx2;
-  aom_highbd_lpf_horizontal_8_dual = aom_highbd_lpf_horizontal_8_dual_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_lpf_horizontal_8_dual = aom_highbd_lpf_horizontal_8_dual_avx2;
-  aom_highbd_lpf_vertical_14_dual = aom_highbd_lpf_vertical_14_dual_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_lpf_vertical_14_dual = aom_highbd_lpf_vertical_14_dual_avx2;
-  aom_highbd_lpf_vertical_4_dual = aom_highbd_lpf_vertical_4_dual_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_lpf_vertical_4_dual = aom_highbd_lpf_vertical_4_dual_avx2;
-  aom_highbd_lpf_vertical_8_dual = aom_highbd_lpf_vertical_8_dual_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_lpf_vertical_8_dual = aom_highbd_lpf_vertical_8_dual_avx2;
-  aom_highbd_masked_sad128x128 = aom_highbd_masked_sad128x128_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad128x128 = aom_highbd_masked_sad128x128_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad128x128 = aom_highbd_masked_sad128x128_avx2;
-  aom_highbd_masked_sad128x64 = aom_highbd_masked_sad128x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad128x64 = aom_highbd_masked_sad128x64_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad128x64 = aom_highbd_masked_sad128x64_avx2;
-  aom_highbd_masked_sad16x16 = aom_highbd_masked_sad16x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad16x16 = aom_highbd_masked_sad16x16_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad16x16 = aom_highbd_masked_sad16x16_avx2;
-  aom_highbd_masked_sad16x32 = aom_highbd_masked_sad16x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad16x32 = aom_highbd_masked_sad16x32_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad16x32 = aom_highbd_masked_sad16x32_avx2;
-  aom_highbd_masked_sad16x4 = aom_highbd_masked_sad16x4_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad16x4 = aom_highbd_masked_sad16x4_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad16x4 = aom_highbd_masked_sad16x4_avx2;
-  aom_highbd_masked_sad16x64 = aom_highbd_masked_sad16x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad16x64 = aom_highbd_masked_sad16x64_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad16x64 = aom_highbd_masked_sad16x64_avx2;
-  aom_highbd_masked_sad16x8 = aom_highbd_masked_sad16x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad16x8 = aom_highbd_masked_sad16x8_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad16x8 = aom_highbd_masked_sad16x8_avx2;
-  aom_highbd_masked_sad32x16 = aom_highbd_masked_sad32x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad32x16 = aom_highbd_masked_sad32x16_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad32x16 = aom_highbd_masked_sad32x16_avx2;
-  aom_highbd_masked_sad32x32 = aom_highbd_masked_sad32x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad32x32 = aom_highbd_masked_sad32x32_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad32x32 = aom_highbd_masked_sad32x32_avx2;
-  aom_highbd_masked_sad32x64 = aom_highbd_masked_sad32x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad32x64 = aom_highbd_masked_sad32x64_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad32x64 = aom_highbd_masked_sad32x64_avx2;
-  aom_highbd_masked_sad32x8 = aom_highbd_masked_sad32x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad32x8 = aom_highbd_masked_sad32x8_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad32x8 = aom_highbd_masked_sad32x8_avx2;
-  aom_highbd_masked_sad4x16 = aom_highbd_masked_sad4x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad4x16 = aom_highbd_masked_sad4x16_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad4x16 = aom_highbd_masked_sad4x16_avx2;
-  aom_highbd_masked_sad4x4 = aom_highbd_masked_sad4x4_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad4x4 = aom_highbd_masked_sad4x4_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad4x4 = aom_highbd_masked_sad4x4_avx2;
-  aom_highbd_masked_sad4x8 = aom_highbd_masked_sad4x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad4x8 = aom_highbd_masked_sad4x8_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad4x8 = aom_highbd_masked_sad4x8_avx2;
-  aom_highbd_masked_sad64x128 = aom_highbd_masked_sad64x128_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad64x128 = aom_highbd_masked_sad64x128_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad64x128 = aom_highbd_masked_sad64x128_avx2;
-  aom_highbd_masked_sad64x16 = aom_highbd_masked_sad64x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad64x16 = aom_highbd_masked_sad64x16_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad64x16 = aom_highbd_masked_sad64x16_avx2;
-  aom_highbd_masked_sad64x32 = aom_highbd_masked_sad64x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad64x32 = aom_highbd_masked_sad64x32_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad64x32 = aom_highbd_masked_sad64x32_avx2;
-  aom_highbd_masked_sad64x64 = aom_highbd_masked_sad64x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad64x64 = aom_highbd_masked_sad64x64_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad64x64 = aom_highbd_masked_sad64x64_avx2;
-  aom_highbd_masked_sad8x16 = aom_highbd_masked_sad8x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad8x16 = aom_highbd_masked_sad8x16_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad8x16 = aom_highbd_masked_sad8x16_avx2;
-  aom_highbd_masked_sad8x32 = aom_highbd_masked_sad8x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad8x32 = aom_highbd_masked_sad8x32_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad8x32 = aom_highbd_masked_sad8x32_avx2;
-  aom_highbd_masked_sad8x4 = aom_highbd_masked_sad8x4_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad8x4 = aom_highbd_masked_sad8x4_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad8x4 = aom_highbd_masked_sad8x4_avx2;
-  aom_highbd_masked_sad8x8 = aom_highbd_masked_sad8x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad8x8 = aom_highbd_masked_sad8x8_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad8x8 = aom_highbd_masked_sad8x8_avx2;
-  aom_highbd_obmc_sad128x128 = aom_highbd_obmc_sad128x128_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad128x128 = aom_highbd_obmc_sad128x128_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad128x128 = aom_highbd_obmc_sad128x128_avx2;
-  aom_highbd_obmc_sad128x64 = aom_highbd_obmc_sad128x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad128x64 = aom_highbd_obmc_sad128x64_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad128x64 = aom_highbd_obmc_sad128x64_avx2;
-  aom_highbd_obmc_sad16x16 = aom_highbd_obmc_sad16x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad16x16 = aom_highbd_obmc_sad16x16_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad16x16 = aom_highbd_obmc_sad16x16_avx2;
-  aom_highbd_obmc_sad16x32 = aom_highbd_obmc_sad16x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad16x32 = aom_highbd_obmc_sad16x32_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad16x32 = aom_highbd_obmc_sad16x32_avx2;
-  aom_highbd_obmc_sad16x4 = aom_highbd_obmc_sad16x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad16x4 = aom_highbd_obmc_sad16x4_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad16x4 = aom_highbd_obmc_sad16x4_avx2;
-  aom_highbd_obmc_sad16x64 = aom_highbd_obmc_sad16x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad16x64 = aom_highbd_obmc_sad16x64_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad16x64 = aom_highbd_obmc_sad16x64_avx2;
-  aom_highbd_obmc_sad16x8 = aom_highbd_obmc_sad16x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad16x8 = aom_highbd_obmc_sad16x8_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad16x8 = aom_highbd_obmc_sad16x8_avx2;
-  aom_highbd_obmc_sad32x16 = aom_highbd_obmc_sad32x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad32x16 = aom_highbd_obmc_sad32x16_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad32x16 = aom_highbd_obmc_sad32x16_avx2;
-  aom_highbd_obmc_sad32x32 = aom_highbd_obmc_sad32x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad32x32 = aom_highbd_obmc_sad32x32_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad32x32 = aom_highbd_obmc_sad32x32_avx2;
-  aom_highbd_obmc_sad32x64 = aom_highbd_obmc_sad32x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad32x64 = aom_highbd_obmc_sad32x64_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad32x64 = aom_highbd_obmc_sad32x64_avx2;
-  aom_highbd_obmc_sad32x8 = aom_highbd_obmc_sad32x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad32x8 = aom_highbd_obmc_sad32x8_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad32x8 = aom_highbd_obmc_sad32x8_avx2;
-  aom_highbd_obmc_sad4x16 = aom_highbd_obmc_sad4x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad4x16 = aom_highbd_obmc_sad4x16_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad4x16 = aom_highbd_obmc_sad4x16_avx2;
-  aom_highbd_obmc_sad4x4 = aom_highbd_obmc_sad4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad4x4 = aom_highbd_obmc_sad4x4_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad4x4 = aom_highbd_obmc_sad4x4_avx2;
-  aom_highbd_obmc_sad4x8 = aom_highbd_obmc_sad4x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad4x8 = aom_highbd_obmc_sad4x8_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad4x8 = aom_highbd_obmc_sad4x8_avx2;
-  aom_highbd_obmc_sad64x128 = aom_highbd_obmc_sad64x128_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad64x128 = aom_highbd_obmc_sad64x128_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad64x128 = aom_highbd_obmc_sad64x128_avx2;
-  aom_highbd_obmc_sad64x16 = aom_highbd_obmc_sad64x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad64x16 = aom_highbd_obmc_sad64x16_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad64x16 = aom_highbd_obmc_sad64x16_avx2;
-  aom_highbd_obmc_sad64x32 = aom_highbd_obmc_sad64x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad64x32 = aom_highbd_obmc_sad64x32_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad64x32 = aom_highbd_obmc_sad64x32_avx2;
-  aom_highbd_obmc_sad64x64 = aom_highbd_obmc_sad64x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad64x64 = aom_highbd_obmc_sad64x64_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad64x64 = aom_highbd_obmc_sad64x64_avx2;
-  aom_highbd_obmc_sad8x16 = aom_highbd_obmc_sad8x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad8x16 = aom_highbd_obmc_sad8x16_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad8x16 = aom_highbd_obmc_sad8x16_avx2;
-  aom_highbd_obmc_sad8x32 = aom_highbd_obmc_sad8x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad8x32 = aom_highbd_obmc_sad8x32_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad8x32 = aom_highbd_obmc_sad8x32_avx2;
-  aom_highbd_obmc_sad8x4 = aom_highbd_obmc_sad8x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad8x4 = aom_highbd_obmc_sad8x4_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad8x4 = aom_highbd_obmc_sad8x4_avx2;
-  aom_highbd_obmc_sad8x8 = aom_highbd_obmc_sad8x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad8x8 = aom_highbd_obmc_sad8x8_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad8x8 = aom_highbd_obmc_sad8x8_avx2;
-  aom_highbd_obmc_variance128x128 = aom_highbd_obmc_variance128x128_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance128x128 = aom_highbd_obmc_variance128x128_sse4_1;
-  aom_highbd_obmc_variance128x64 = aom_highbd_obmc_variance128x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance128x64 = aom_highbd_obmc_variance128x64_sse4_1;
-  aom_highbd_obmc_variance16x16 = aom_highbd_obmc_variance16x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance16x16 = aom_highbd_obmc_variance16x16_sse4_1;
-  aom_highbd_obmc_variance16x32 = aom_highbd_obmc_variance16x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance16x32 = aom_highbd_obmc_variance16x32_sse4_1;
-  aom_highbd_obmc_variance16x4 = aom_highbd_obmc_variance16x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance16x4 = aom_highbd_obmc_variance16x4_sse4_1;
-  aom_highbd_obmc_variance16x64 = aom_highbd_obmc_variance16x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance16x64 = aom_highbd_obmc_variance16x64_sse4_1;
-  aom_highbd_obmc_variance16x8 = aom_highbd_obmc_variance16x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance16x8 = aom_highbd_obmc_variance16x8_sse4_1;
-  aom_highbd_obmc_variance32x16 = aom_highbd_obmc_variance32x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance32x16 = aom_highbd_obmc_variance32x16_sse4_1;
-  aom_highbd_obmc_variance32x32 = aom_highbd_obmc_variance32x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance32x32 = aom_highbd_obmc_variance32x32_sse4_1;
-  aom_highbd_obmc_variance32x64 = aom_highbd_obmc_variance32x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance32x64 = aom_highbd_obmc_variance32x64_sse4_1;
-  aom_highbd_obmc_variance32x8 = aom_highbd_obmc_variance32x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance32x8 = aom_highbd_obmc_variance32x8_sse4_1;
-  aom_highbd_obmc_variance4x16 = aom_highbd_obmc_variance4x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance4x16 = aom_highbd_obmc_variance4x16_sse4_1;
-  aom_highbd_obmc_variance4x4 = aom_highbd_obmc_variance4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance4x4 = aom_highbd_obmc_variance4x4_sse4_1;
-  aom_highbd_obmc_variance4x8 = aom_highbd_obmc_variance4x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance4x8 = aom_highbd_obmc_variance4x8_sse4_1;
-  aom_highbd_obmc_variance64x128 = aom_highbd_obmc_variance64x128_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance64x128 = aom_highbd_obmc_variance64x128_sse4_1;
-  aom_highbd_obmc_variance64x16 = aom_highbd_obmc_variance64x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance64x16 = aom_highbd_obmc_variance64x16_sse4_1;
-  aom_highbd_obmc_variance64x32 = aom_highbd_obmc_variance64x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance64x32 = aom_highbd_obmc_variance64x32_sse4_1;
-  aom_highbd_obmc_variance64x64 = aom_highbd_obmc_variance64x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance64x64 = aom_highbd_obmc_variance64x64_sse4_1;
-  aom_highbd_obmc_variance8x16 = aom_highbd_obmc_variance8x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance8x16 = aom_highbd_obmc_variance8x16_sse4_1;
-  aom_highbd_obmc_variance8x32 = aom_highbd_obmc_variance8x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance8x32 = aom_highbd_obmc_variance8x32_sse4_1;
-  aom_highbd_obmc_variance8x4 = aom_highbd_obmc_variance8x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance8x4 = aom_highbd_obmc_variance8x4_sse4_1;
-  aom_highbd_obmc_variance8x8 = aom_highbd_obmc_variance8x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance8x8 = aom_highbd_obmc_variance8x8_sse4_1;
-  aom_highbd_quantize_b = aom_highbd_quantize_b_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_quantize_b = aom_highbd_quantize_b_avx2;
-  aom_highbd_quantize_b_32x32_adaptive =
-      aom_highbd_quantize_b_32x32_adaptive_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_quantize_b_32x32_adaptive =
-        aom_highbd_quantize_b_32x32_adaptive_avx2;
-  aom_highbd_quantize_b_adaptive = aom_highbd_quantize_b_adaptive_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_quantize_b_adaptive = aom_highbd_quantize_b_adaptive_avx2;
-  aom_highbd_sad128x128 = aom_highbd_sad128x128_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad128x128 = aom_highbd_sad128x128_avx2;
-  aom_highbd_sad128x128_avg = aom_highbd_sad128x128_avg_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad128x128_avg = aom_highbd_sad128x128_avg_avx2;
-  aom_highbd_sad128x128x4d = aom_highbd_sad128x128x4d_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad128x128x4d = aom_highbd_sad128x128x4d_avx2;
-  aom_highbd_sad128x64 = aom_highbd_sad128x64_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad128x64 = aom_highbd_sad128x64_avx2;
-  aom_highbd_sad128x64_avg = aom_highbd_sad128x64_avg_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad128x64_avg = aom_highbd_sad128x64_avg_avx2;
-  aom_highbd_sad128x64x4d = aom_highbd_sad128x64x4d_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad128x64x4d = aom_highbd_sad128x64x4d_avx2;
-  aom_highbd_sad16x16 = aom_highbd_sad16x16_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad16x16 = aom_highbd_sad16x16_avx2;
-  aom_highbd_sad16x16_avg = aom_highbd_sad16x16_avg_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad16x16_avg = aom_highbd_sad16x16_avg_avx2;
-  aom_highbd_sad16x16x4d = aom_highbd_sad16x16x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad16x16x4d = aom_highbd_sad16x16x4d_avx2;
-  aom_highbd_sad16x32 = aom_highbd_sad16x32_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad16x32 = aom_highbd_sad16x32_avx2;
-  aom_highbd_sad16x32_avg = aom_highbd_sad16x32_avg_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad16x32_avg = aom_highbd_sad16x32_avg_avx2;
-  aom_highbd_sad16x32x4d = aom_highbd_sad16x32x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad16x32x4d = aom_highbd_sad16x32x4d_avx2;
-  aom_highbd_sad16x4 = aom_highbd_sad16x4_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad16x4 = aom_highbd_sad16x4_avx2;
-  aom_highbd_sad16x4_avg = aom_highbd_sad16x4_avg_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad16x4_avg = aom_highbd_sad16x4_avg_avx2;
-  aom_highbd_sad16x4x4d = aom_highbd_sad16x4x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad16x4x4d = aom_highbd_sad16x4x4d_avx2;
-  aom_highbd_sad16x64 = aom_highbd_sad16x64_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad16x64 = aom_highbd_sad16x64_avx2;
-  aom_highbd_sad16x64_avg = aom_highbd_sad16x64_avg_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad16x64_avg = aom_highbd_sad16x64_avg_avx2;
-  aom_highbd_sad16x64x4d = aom_highbd_sad16x64x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad16x64x4d = aom_highbd_sad16x64x4d_avx2;
-  aom_highbd_sad16x8 = aom_highbd_sad16x8_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad16x8 = aom_highbd_sad16x8_avx2;
-  aom_highbd_sad16x8_avg = aom_highbd_sad16x8_avg_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad16x8_avg = aom_highbd_sad16x8_avg_avx2;
-  aom_highbd_sad16x8x4d = aom_highbd_sad16x8x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad16x8x4d = aom_highbd_sad16x8x4d_avx2;
-  aom_highbd_sad32x16 = aom_highbd_sad32x16_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad32x16 = aom_highbd_sad32x16_avx2;
-  aom_highbd_sad32x16_avg = aom_highbd_sad32x16_avg_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad32x16_avg = aom_highbd_sad32x16_avg_avx2;
-  aom_highbd_sad32x16x4d = aom_highbd_sad32x16x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad32x16x4d = aom_highbd_sad32x16x4d_avx2;
-  aom_highbd_sad32x32 = aom_highbd_sad32x32_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad32x32 = aom_highbd_sad32x32_avx2;
-  aom_highbd_sad32x32_avg = aom_highbd_sad32x32_avg_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad32x32_avg = aom_highbd_sad32x32_avg_avx2;
-  aom_highbd_sad32x32x4d = aom_highbd_sad32x32x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad32x32x4d = aom_highbd_sad32x32x4d_avx2;
-  aom_highbd_sad32x64 = aom_highbd_sad32x64_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad32x64 = aom_highbd_sad32x64_avx2;
-  aom_highbd_sad32x64_avg = aom_highbd_sad32x64_avg_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad32x64_avg = aom_highbd_sad32x64_avg_avx2;
-  aom_highbd_sad32x64x4d = aom_highbd_sad32x64x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad32x64x4d = aom_highbd_sad32x64x4d_avx2;
-  aom_highbd_sad32x8 = aom_highbd_sad32x8_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad32x8 = aom_highbd_sad32x8_avx2;
-  aom_highbd_sad32x8_avg = aom_highbd_sad32x8_avg_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad32x8_avg = aom_highbd_sad32x8_avg_avx2;
-  aom_highbd_sad32x8x4d = aom_highbd_sad32x8x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad32x8x4d = aom_highbd_sad32x8x4d_avx2;
-  aom_highbd_sad64x128 = aom_highbd_sad64x128_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad64x128 = aom_highbd_sad64x128_avx2;
-  aom_highbd_sad64x128_avg = aom_highbd_sad64x128_avg_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad64x128_avg = aom_highbd_sad64x128_avg_avx2;
-  aom_highbd_sad64x128x4d = aom_highbd_sad64x128x4d_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad64x128x4d = aom_highbd_sad64x128x4d_avx2;
-  aom_highbd_sad64x16 = aom_highbd_sad64x16_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad64x16 = aom_highbd_sad64x16_avx2;
-  aom_highbd_sad64x16_avg = aom_highbd_sad64x16_avg_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad64x16_avg = aom_highbd_sad64x16_avg_avx2;
-  aom_highbd_sad64x16x4d = aom_highbd_sad64x16x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad64x16x4d = aom_highbd_sad64x16x4d_avx2;
-  aom_highbd_sad64x32 = aom_highbd_sad64x32_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad64x32 = aom_highbd_sad64x32_avx2;
-  aom_highbd_sad64x32_avg = aom_highbd_sad64x32_avg_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad64x32_avg = aom_highbd_sad64x32_avg_avx2;
-  aom_highbd_sad64x32x4d = aom_highbd_sad64x32x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad64x32x4d = aom_highbd_sad64x32x4d_avx2;
-  aom_highbd_sad64x64 = aom_highbd_sad64x64_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad64x64 = aom_highbd_sad64x64_avx2;
-  aom_highbd_sad64x64_avg = aom_highbd_sad64x64_avg_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad64x64_avg = aom_highbd_sad64x64_avg_avx2;
-  aom_highbd_sad64x64x4d = aom_highbd_sad64x64x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad64x64x4d = aom_highbd_sad64x64x4d_avx2;
-  aom_highbd_sad_skip_128x128 = aom_highbd_sad_skip_128x128_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_128x128 = aom_highbd_sad_skip_128x128_avx2;
-  aom_highbd_sad_skip_128x128x4d = aom_highbd_sad_skip_128x128x4d_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_128x128x4d = aom_highbd_sad_skip_128x128x4d_avx2;
-  aom_highbd_sad_skip_128x64 = aom_highbd_sad_skip_128x64_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_128x64 = aom_highbd_sad_skip_128x64_avx2;
-  aom_highbd_sad_skip_128x64x4d = aom_highbd_sad_skip_128x64x4d_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_128x64x4d = aom_highbd_sad_skip_128x64x4d_avx2;
-  aom_highbd_sad_skip_16x16 = aom_highbd_sad_skip_16x16_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_16x16 = aom_highbd_sad_skip_16x16_avx2;
-  aom_highbd_sad_skip_16x16x4d = aom_highbd_sad_skip_16x16x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_16x16x4d = aom_highbd_sad_skip_16x16x4d_avx2;
-  aom_highbd_sad_skip_16x32 = aom_highbd_sad_skip_16x32_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_16x32 = aom_highbd_sad_skip_16x32_avx2;
-  aom_highbd_sad_skip_16x32x4d = aom_highbd_sad_skip_16x32x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_16x32x4d = aom_highbd_sad_skip_16x32x4d_avx2;
-  aom_highbd_sad_skip_16x64 = aom_highbd_sad_skip_16x64_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_16x64 = aom_highbd_sad_skip_16x64_avx2;
-  aom_highbd_sad_skip_16x64x4d = aom_highbd_sad_skip_16x64x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_16x64x4d = aom_highbd_sad_skip_16x64x4d_avx2;
-  aom_highbd_sad_skip_16x8 = aom_highbd_sad_skip_16x8_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_16x8 = aom_highbd_sad_skip_16x8_avx2;
-  aom_highbd_sad_skip_16x8x4d = aom_highbd_sad_skip_16x8x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_16x8x4d = aom_highbd_sad_skip_16x8x4d_avx2;
-  aom_highbd_sad_skip_32x16 = aom_highbd_sad_skip_32x16_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_32x16 = aom_highbd_sad_skip_32x16_avx2;
-  aom_highbd_sad_skip_32x16x4d = aom_highbd_sad_skip_32x16x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_32x16x4d = aom_highbd_sad_skip_32x16x4d_avx2;
-  aom_highbd_sad_skip_32x32 = aom_highbd_sad_skip_32x32_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_32x32 = aom_highbd_sad_skip_32x32_avx2;
-  aom_highbd_sad_skip_32x32x4d = aom_highbd_sad_skip_32x32x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_32x32x4d = aom_highbd_sad_skip_32x32x4d_avx2;
-  aom_highbd_sad_skip_32x64 = aom_highbd_sad_skip_32x64_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_32x64 = aom_highbd_sad_skip_32x64_avx2;
-  aom_highbd_sad_skip_32x64x4d = aom_highbd_sad_skip_32x64x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_32x64x4d = aom_highbd_sad_skip_32x64x4d_avx2;
-  aom_highbd_sad_skip_32x8 = aom_highbd_sad_skip_32x8_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_32x8 = aom_highbd_sad_skip_32x8_avx2;
-  aom_highbd_sad_skip_32x8x4d = aom_highbd_sad_skip_32x8x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_32x8x4d = aom_highbd_sad_skip_32x8x4d_avx2;
-  aom_highbd_sad_skip_64x128 = aom_highbd_sad_skip_64x128_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_64x128 = aom_highbd_sad_skip_64x128_avx2;
-  aom_highbd_sad_skip_64x128x4d = aom_highbd_sad_skip_64x128x4d_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_64x128x4d = aom_highbd_sad_skip_64x128x4d_avx2;
-  aom_highbd_sad_skip_64x16 = aom_highbd_sad_skip_64x16_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_64x16 = aom_highbd_sad_skip_64x16_avx2;
-  aom_highbd_sad_skip_64x16x4d = aom_highbd_sad_skip_64x16x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_64x16x4d = aom_highbd_sad_skip_64x16x4d_avx2;
-  aom_highbd_sad_skip_64x32 = aom_highbd_sad_skip_64x32_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_64x32 = aom_highbd_sad_skip_64x32_avx2;
-  aom_highbd_sad_skip_64x32x4d = aom_highbd_sad_skip_64x32x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_64x32x4d = aom_highbd_sad_skip_64x32x4d_avx2;
-  aom_highbd_sad_skip_64x64 = aom_highbd_sad_skip_64x64_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_64x64 = aom_highbd_sad_skip_64x64_avx2;
-  aom_highbd_sad_skip_64x64x4d = aom_highbd_sad_skip_64x64x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_64x64x4d = aom_highbd_sad_skip_64x64x4d_avx2;
-  aom_highbd_sse = aom_highbd_sse_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_sse = aom_highbd_sse_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_sse = aom_highbd_sse_avx2;
   aom_ifft16x16_float = aom_ifft16x16_float_sse2;
   if (flags & HAS_AVX2)
     aom_ifft16x16_float = aom_ifft16x16_float_avx2;
@@ -28802,298 +11721,6 @@
   aom_mse_wxh_16bit = aom_mse_wxh_16bit_sse2;
   if (flags & HAS_AVX2)
     aom_mse_wxh_16bit = aom_mse_wxh_16bit_avx2;
-  aom_mse_wxh_16bit_highbd = aom_mse_wxh_16bit_highbd_sse2;
-  if (flags & HAS_AVX2)
-    aom_mse_wxh_16bit_highbd = aom_mse_wxh_16bit_highbd_avx2;
-  aom_obmc_sad128x128 = aom_obmc_sad128x128_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad128x128 = aom_obmc_sad128x128_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad128x128 = aom_obmc_sad128x128_avx2;
-  aom_obmc_sad128x64 = aom_obmc_sad128x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad128x64 = aom_obmc_sad128x64_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad128x64 = aom_obmc_sad128x64_avx2;
-  aom_obmc_sad16x16 = aom_obmc_sad16x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad16x16 = aom_obmc_sad16x16_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad16x16 = aom_obmc_sad16x16_avx2;
-  aom_obmc_sad16x32 = aom_obmc_sad16x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad16x32 = aom_obmc_sad16x32_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad16x32 = aom_obmc_sad16x32_avx2;
-  aom_obmc_sad16x4 = aom_obmc_sad16x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad16x4 = aom_obmc_sad16x4_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad16x4 = aom_obmc_sad16x4_avx2;
-  aom_obmc_sad16x64 = aom_obmc_sad16x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad16x64 = aom_obmc_sad16x64_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad16x64 = aom_obmc_sad16x64_avx2;
-  aom_obmc_sad16x8 = aom_obmc_sad16x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad16x8 = aom_obmc_sad16x8_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad16x8 = aom_obmc_sad16x8_avx2;
-  aom_obmc_sad32x16 = aom_obmc_sad32x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad32x16 = aom_obmc_sad32x16_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad32x16 = aom_obmc_sad32x16_avx2;
-  aom_obmc_sad32x32 = aom_obmc_sad32x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad32x32 = aom_obmc_sad32x32_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad32x32 = aom_obmc_sad32x32_avx2;
-  aom_obmc_sad32x64 = aom_obmc_sad32x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad32x64 = aom_obmc_sad32x64_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad32x64 = aom_obmc_sad32x64_avx2;
-  aom_obmc_sad32x8 = aom_obmc_sad32x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad32x8 = aom_obmc_sad32x8_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad32x8 = aom_obmc_sad32x8_avx2;
-  aom_obmc_sad4x16 = aom_obmc_sad4x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad4x16 = aom_obmc_sad4x16_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad4x16 = aom_obmc_sad4x16_avx2;
-  aom_obmc_sad4x4 = aom_obmc_sad4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad4x4 = aom_obmc_sad4x4_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad4x4 = aom_obmc_sad4x4_avx2;
-  aom_obmc_sad4x8 = aom_obmc_sad4x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad4x8 = aom_obmc_sad4x8_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad4x8 = aom_obmc_sad4x8_avx2;
-  aom_obmc_sad64x128 = aom_obmc_sad64x128_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad64x128 = aom_obmc_sad64x128_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad64x128 = aom_obmc_sad64x128_avx2;
-  aom_obmc_sad64x16 = aom_obmc_sad64x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad64x16 = aom_obmc_sad64x16_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad64x16 = aom_obmc_sad64x16_avx2;
-  aom_obmc_sad64x32 = aom_obmc_sad64x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad64x32 = aom_obmc_sad64x32_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad64x32 = aom_obmc_sad64x32_avx2;
-  aom_obmc_sad64x64 = aom_obmc_sad64x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad64x64 = aom_obmc_sad64x64_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad64x64 = aom_obmc_sad64x64_avx2;
-  aom_obmc_sad8x16 = aom_obmc_sad8x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad8x16 = aom_obmc_sad8x16_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad8x16 = aom_obmc_sad8x16_avx2;
-  aom_obmc_sad8x32 = aom_obmc_sad8x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad8x32 = aom_obmc_sad8x32_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad8x32 = aom_obmc_sad8x32_avx2;
-  aom_obmc_sad8x4 = aom_obmc_sad8x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad8x4 = aom_obmc_sad8x4_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad8x4 = aom_obmc_sad8x4_avx2;
-  aom_obmc_sad8x8 = aom_obmc_sad8x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad8x8 = aom_obmc_sad8x8_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad8x8 = aom_obmc_sad8x8_avx2;
-  aom_obmc_sub_pixel_variance128x128 = aom_obmc_sub_pixel_variance128x128_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance128x128 =
-        aom_obmc_sub_pixel_variance128x128_sse4_1;
-  aom_obmc_sub_pixel_variance128x64 = aom_obmc_sub_pixel_variance128x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance128x64 =
-        aom_obmc_sub_pixel_variance128x64_sse4_1;
-  aom_obmc_sub_pixel_variance16x16 = aom_obmc_sub_pixel_variance16x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance16x16 = aom_obmc_sub_pixel_variance16x16_sse4_1;
-  aom_obmc_sub_pixel_variance16x32 = aom_obmc_sub_pixel_variance16x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance16x32 = aom_obmc_sub_pixel_variance16x32_sse4_1;
-  aom_obmc_sub_pixel_variance16x4 = aom_obmc_sub_pixel_variance16x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance16x4 = aom_obmc_sub_pixel_variance16x4_sse4_1;
-  aom_obmc_sub_pixel_variance16x64 = aom_obmc_sub_pixel_variance16x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance16x64 = aom_obmc_sub_pixel_variance16x64_sse4_1;
-  aom_obmc_sub_pixel_variance16x8 = aom_obmc_sub_pixel_variance16x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance16x8 = aom_obmc_sub_pixel_variance16x8_sse4_1;
-  aom_obmc_sub_pixel_variance32x16 = aom_obmc_sub_pixel_variance32x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance32x16 = aom_obmc_sub_pixel_variance32x16_sse4_1;
-  aom_obmc_sub_pixel_variance32x32 = aom_obmc_sub_pixel_variance32x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance32x32 = aom_obmc_sub_pixel_variance32x32_sse4_1;
-  aom_obmc_sub_pixel_variance32x64 = aom_obmc_sub_pixel_variance32x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance32x64 = aom_obmc_sub_pixel_variance32x64_sse4_1;
-  aom_obmc_sub_pixel_variance32x8 = aom_obmc_sub_pixel_variance32x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance32x8 = aom_obmc_sub_pixel_variance32x8_sse4_1;
-  aom_obmc_sub_pixel_variance4x16 = aom_obmc_sub_pixel_variance4x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance4x16 = aom_obmc_sub_pixel_variance4x16_sse4_1;
-  aom_obmc_sub_pixel_variance4x4 = aom_obmc_sub_pixel_variance4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance4x4 = aom_obmc_sub_pixel_variance4x4_sse4_1;
-  aom_obmc_sub_pixel_variance4x8 = aom_obmc_sub_pixel_variance4x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance4x8 = aom_obmc_sub_pixel_variance4x8_sse4_1;
-  aom_obmc_sub_pixel_variance64x128 = aom_obmc_sub_pixel_variance64x128_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance64x128 =
-        aom_obmc_sub_pixel_variance64x128_sse4_1;
-  aom_obmc_sub_pixel_variance64x16 = aom_obmc_sub_pixel_variance64x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance64x16 = aom_obmc_sub_pixel_variance64x16_sse4_1;
-  aom_obmc_sub_pixel_variance64x32 = aom_obmc_sub_pixel_variance64x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance64x32 = aom_obmc_sub_pixel_variance64x32_sse4_1;
-  aom_obmc_sub_pixel_variance64x64 = aom_obmc_sub_pixel_variance64x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance64x64 = aom_obmc_sub_pixel_variance64x64_sse4_1;
-  aom_obmc_sub_pixel_variance8x16 = aom_obmc_sub_pixel_variance8x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance8x16 = aom_obmc_sub_pixel_variance8x16_sse4_1;
-  aom_obmc_sub_pixel_variance8x32 = aom_obmc_sub_pixel_variance8x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance8x32 = aom_obmc_sub_pixel_variance8x32_sse4_1;
-  aom_obmc_sub_pixel_variance8x4 = aom_obmc_sub_pixel_variance8x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance8x4 = aom_obmc_sub_pixel_variance8x4_sse4_1;
-  aom_obmc_sub_pixel_variance8x8 = aom_obmc_sub_pixel_variance8x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance8x8 = aom_obmc_sub_pixel_variance8x8_sse4_1;
-  aom_obmc_variance128x128 = aom_obmc_variance128x128_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance128x128 = aom_obmc_variance128x128_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance128x128 = aom_obmc_variance128x128_avx2;
-  aom_obmc_variance128x64 = aom_obmc_variance128x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance128x64 = aom_obmc_variance128x64_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance128x64 = aom_obmc_variance128x64_avx2;
-  aom_obmc_variance16x16 = aom_obmc_variance16x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance16x16 = aom_obmc_variance16x16_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance16x16 = aom_obmc_variance16x16_avx2;
-  aom_obmc_variance16x32 = aom_obmc_variance16x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance16x32 = aom_obmc_variance16x32_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance16x32 = aom_obmc_variance16x32_avx2;
-  aom_obmc_variance16x4 = aom_obmc_variance16x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance16x4 = aom_obmc_variance16x4_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance16x4 = aom_obmc_variance16x4_avx2;
-  aom_obmc_variance16x64 = aom_obmc_variance16x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance16x64 = aom_obmc_variance16x64_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance16x64 = aom_obmc_variance16x64_avx2;
-  aom_obmc_variance16x8 = aom_obmc_variance16x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance16x8 = aom_obmc_variance16x8_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance16x8 = aom_obmc_variance16x8_avx2;
-  aom_obmc_variance32x16 = aom_obmc_variance32x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance32x16 = aom_obmc_variance32x16_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance32x16 = aom_obmc_variance32x16_avx2;
-  aom_obmc_variance32x32 = aom_obmc_variance32x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance32x32 = aom_obmc_variance32x32_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance32x32 = aom_obmc_variance32x32_avx2;
-  aom_obmc_variance32x64 = aom_obmc_variance32x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance32x64 = aom_obmc_variance32x64_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance32x64 = aom_obmc_variance32x64_avx2;
-  aom_obmc_variance32x8 = aom_obmc_variance32x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance32x8 = aom_obmc_variance32x8_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance32x8 = aom_obmc_variance32x8_avx2;
-  aom_obmc_variance4x16 = aom_obmc_variance4x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance4x16 = aom_obmc_variance4x16_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance4x16 = aom_obmc_variance4x16_avx2;
-  aom_obmc_variance4x4 = aom_obmc_variance4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance4x4 = aom_obmc_variance4x4_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance4x4 = aom_obmc_variance4x4_avx2;
-  aom_obmc_variance4x8 = aom_obmc_variance4x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance4x8 = aom_obmc_variance4x8_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance4x8 = aom_obmc_variance4x8_avx2;
-  aom_obmc_variance64x128 = aom_obmc_variance64x128_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance64x128 = aom_obmc_variance64x128_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance64x128 = aom_obmc_variance64x128_avx2;
-  aom_obmc_variance64x16 = aom_obmc_variance64x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance64x16 = aom_obmc_variance64x16_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance64x16 = aom_obmc_variance64x16_avx2;
-  aom_obmc_variance64x32 = aom_obmc_variance64x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance64x32 = aom_obmc_variance64x32_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance64x32 = aom_obmc_variance64x32_avx2;
-  aom_obmc_variance64x64 = aom_obmc_variance64x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance64x64 = aom_obmc_variance64x64_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance64x64 = aom_obmc_variance64x64_avx2;
-  aom_obmc_variance8x16 = aom_obmc_variance8x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance8x16 = aom_obmc_variance8x16_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance8x16 = aom_obmc_variance8x16_avx2;
-  aom_obmc_variance8x32 = aom_obmc_variance8x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance8x32 = aom_obmc_variance8x32_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance8x32 = aom_obmc_variance8x32_avx2;
-  aom_obmc_variance8x4 = aom_obmc_variance8x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance8x4 = aom_obmc_variance8x4_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance8x4 = aom_obmc_variance8x4_avx2;
-  aom_obmc_variance8x8 = aom_obmc_variance8x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance8x8 = aom_obmc_variance8x8_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance8x8 = aom_obmc_variance8x8_avx2;
   aom_paeth_predictor_16x16 = aom_paeth_predictor_16x16_c;
   if (flags & HAS_SSSE3)
     aom_paeth_predictor_16x16 = aom_paeth_predictor_16x16_ssse3;
diff --git a/third_party/libaom/source/config/linux/x64/config/av1_rtcd.h b/third_party/libaom/source/config/linux/x64/config/av1_rtcd.h
index 647f0ed..e29d732 100644
--- a/third_party/libaom/source/config/linux/x64/config/av1_rtcd.h
+++ b/third_party/libaom/source/config/linux/x64/config/av1_rtcd.h
@@ -99,109 +99,6 @@
                              const int log_scale);
 #define aom_quantize_b_helper aom_quantize_b_helper_c
 
-void av1_apply_selfguided_restoration_c(const uint8_t* dat,
-                                        int width,
-                                        int height,
-                                        int stride,
-                                        int eps,
-                                        const int* xqd,
-                                        uint8_t* dst,
-                                        int dst_stride,
-                                        int32_t* tmpbuf,
-                                        int bit_depth,
-                                        int highbd);
-void av1_apply_selfguided_restoration_sse4_1(const uint8_t* dat,
-                                             int width,
-                                             int height,
-                                             int stride,
-                                             int eps,
-                                             const int* xqd,
-                                             uint8_t* dst,
-                                             int dst_stride,
-                                             int32_t* tmpbuf,
-                                             int bit_depth,
-                                             int highbd);
-void av1_apply_selfguided_restoration_avx2(const uint8_t* dat,
-                                           int width,
-                                           int height,
-                                           int stride,
-                                           int eps,
-                                           const int* xqd,
-                                           uint8_t* dst,
-                                           int dst_stride,
-                                           int32_t* tmpbuf,
-                                           int bit_depth,
-                                           int highbd);
-RTCD_EXTERN void (*av1_apply_selfguided_restoration)(const uint8_t* dat,
-                                                     int width,
-                                                     int height,
-                                                     int stride,
-                                                     int eps,
-                                                     const int* xqd,
-                                                     uint8_t* dst,
-                                                     int dst_stride,
-                                                     int32_t* tmpbuf,
-                                                     int bit_depth,
-                                                     int highbd);
-
-void av1_apply_temporal_filter_c(const struct yv12_buffer_config* ref_frame,
-                                 const struct macroblockd* mbd,
-                                 const BLOCK_SIZE block_size,
-                                 const int mb_row,
-                                 const int mb_col,
-                                 const int num_planes,
-                                 const double* noise_levels,
-                                 const MV* subblock_mvs,
-                                 const int* subblock_mses,
-                                 const int q_factor,
-                                 const int filter_strength,
-                                 const uint8_t* pred,
-                                 uint32_t* accum,
-                                 uint16_t* count);
-void av1_apply_temporal_filter_sse2(const struct yv12_buffer_config* ref_frame,
-                                    const struct macroblockd* mbd,
-                                    const BLOCK_SIZE block_size,
-                                    const int mb_row,
-                                    const int mb_col,
-                                    const int num_planes,
-                                    const double* noise_levels,
-                                    const MV* subblock_mvs,
-                                    const int* subblock_mses,
-                                    const int q_factor,
-                                    const int filter_strength,
-                                    const uint8_t* pred,
-                                    uint32_t* accum,
-                                    uint16_t* count);
-void av1_apply_temporal_filter_avx2(const struct yv12_buffer_config* ref_frame,
-                                    const struct macroblockd* mbd,
-                                    const BLOCK_SIZE block_size,
-                                    const int mb_row,
-                                    const int mb_col,
-                                    const int num_planes,
-                                    const double* noise_levels,
-                                    const MV* subblock_mvs,
-                                    const int* subblock_mses,
-                                    const int q_factor,
-                                    const int filter_strength,
-                                    const uint8_t* pred,
-                                    uint32_t* accum,
-                                    uint16_t* count);
-RTCD_EXTERN void (*av1_apply_temporal_filter)(
-    const struct yv12_buffer_config* ref_frame,
-    const struct macroblockd* mbd,
-    const BLOCK_SIZE block_size,
-    const int mb_row,
-    const int mb_col,
-    const int num_planes,
-    const double* noise_levels,
-    const MV* subblock_mvs,
-    const int* subblock_mses,
-    const int q_factor,
-    const int filter_strength,
-    const uint8_t* pred,
-    uint32_t* accum,
-    uint16_t* count);
-
 int64_t av1_block_error_c(const tran_low_t* coeff,
                           const tran_low_t* dqcoeff,
                           intptr_t block_size,
@@ -342,137 +239,6 @@
     int w,
     int bd);
 
-int64_t av1_calc_frame_error_c(const uint8_t* const ref,
-                               int stride,
-                               const uint8_t* const dst,
-                               int p_width,
-                               int p_height,
-                               int p_stride);
-int64_t av1_calc_frame_error_sse2(const uint8_t* const ref,
-                                  int stride,
-                                  const uint8_t* const dst,
-                                  int p_width,
-                                  int p_height,
-                                  int p_stride);
-int64_t av1_calc_frame_error_avx2(const uint8_t* const ref,
-                                  int stride,
-                                  const uint8_t* const dst,
-                                  int p_width,
-                                  int p_height,
-                                  int p_stride);
-RTCD_EXTERN int64_t (*av1_calc_frame_error)(const uint8_t* const ref,
-                                            int stride,
-                                            const uint8_t* const dst,
-                                            int p_width,
-                                            int p_height,
-                                            int p_stride);
-
-void av1_calc_proj_params_c(const uint8_t* src8,
-                            int width,
-                            int height,
-                            int src_stride,
-                            const uint8_t* dat8,
-                            int dat_stride,
-                            int32_t* flt0,
-                            int flt0_stride,
-                            int32_t* flt1,
-                            int flt1_stride,
-                            int64_t H[2][2],
-                            int64_t C[2],
-                            const sgr_params_type* params);
-void av1_calc_proj_params_sse4_1(const uint8_t* src8,
-                                 int width,
-                                 int height,
-                                 int src_stride,
-                                 const uint8_t* dat8,
-                                 int dat_stride,
-                                 int32_t* flt0,
-                                 int flt0_stride,
-                                 int32_t* flt1,
-                                 int flt1_stride,
-                                 int64_t H[2][2],
-                                 int64_t C[2],
-                                 const sgr_params_type* params);
-void av1_calc_proj_params_avx2(const uint8_t* src8,
-                               int width,
-                               int height,
-                               int src_stride,
-                               const uint8_t* dat8,
-                               int dat_stride,
-                               int32_t* flt0,
-                               int flt0_stride,
-                               int32_t* flt1,
-                               int flt1_stride,
-                               int64_t H[2][2],
-                               int64_t C[2],
-                               const sgr_params_type* params);
-RTCD_EXTERN void (*av1_calc_proj_params)(const uint8_t* src8,
-                                         int width,
-                                         int height,
-                                         int src_stride,
-                                         const uint8_t* dat8,
-                                         int dat_stride,
-                                         int32_t* flt0,
-                                         int flt0_stride,
-                                         int32_t* flt1,
-                                         int flt1_stride,
-                                         int64_t H[2][2],
-                                         int64_t C[2],
-                                         const sgr_params_type* params);
-
-void av1_calc_proj_params_high_bd_c(const uint8_t* src8,
-                                    int width,
-                                    int height,
-                                    int src_stride,
-                                    const uint8_t* dat8,
-                                    int dat_stride,
-                                    int32_t* flt0,
-                                    int flt0_stride,
-                                    int32_t* flt1,
-                                    int flt1_stride,
-                                    int64_t H[2][2],
-                                    int64_t C[2],
-                                    const sgr_params_type* params);
-void av1_calc_proj_params_high_bd_sse4_1(const uint8_t* src8,
-                                         int width,
-                                         int height,
-                                         int src_stride,
-                                         const uint8_t* dat8,
-                                         int dat_stride,
-                                         int32_t* flt0,
-                                         int flt0_stride,
-                                         int32_t* flt1,
-                                         int flt1_stride,
-                                         int64_t H[2][2],
-                                         int64_t C[2],
-                                         const sgr_params_type* params);
-void av1_calc_proj_params_high_bd_avx2(const uint8_t* src8,
-                                       int width,
-                                       int height,
-                                       int src_stride,
-                                       const uint8_t* dat8,
-                                       int dat_stride,
-                                       int32_t* flt0,
-                                       int flt0_stride,
-                                       int32_t* flt1,
-                                       int flt1_stride,
-                                       int64_t H[2][2],
-                                       int64_t C[2],
-                                       const sgr_params_type* params);
-RTCD_EXTERN void (*av1_calc_proj_params_high_bd)(const uint8_t* src8,
-                                                 int width,
-                                                 int height,
-                                                 int src_stride,
-                                                 const uint8_t* dat8,
-                                                 int dat_stride,
-                                                 int32_t* flt0,
-                                                 int flt0_stride,
-                                                 int32_t* flt1,
-                                                 int flt1_stride,
-                                                 int64_t H[2][2],
-                                                 int64_t C[2],
-                                                 const sgr_params_type* params);
-
 void av1_cnn_activate_c(float** input,
                         int channels,
                         int width,
@@ -562,100 +328,6 @@
                                                     int x2,
                                                     int y2);
 
-void av1_compute_stats_c(int wiener_win,
-                         const uint8_t* dgd8,
-                         const uint8_t* src8,
-                         int h_start,
-                         int h_end,
-                         int v_start,
-                         int v_end,
-                         int dgd_stride,
-                         int src_stride,
-                         int64_t* M,
-                         int64_t* H);
-void av1_compute_stats_sse4_1(int wiener_win,
-                              const uint8_t* dgd8,
-                              const uint8_t* src8,
-                              int h_start,
-                              int h_end,
-                              int v_start,
-                              int v_end,
-                              int dgd_stride,
-                              int src_stride,
-                              int64_t* M,
-                              int64_t* H);
-void av1_compute_stats_avx2(int wiener_win,
-                            const uint8_t* dgd8,
-                            const uint8_t* src8,
-                            int h_start,
-                            int h_end,
-                            int v_start,
-                            int v_end,
-                            int dgd_stride,
-                            int src_stride,
-                            int64_t* M,
-                            int64_t* H);
-RTCD_EXTERN void (*av1_compute_stats)(int wiener_win,
-                                      const uint8_t* dgd8,
-                                      const uint8_t* src8,
-                                      int h_start,
-                                      int h_end,
-                                      int v_start,
-                                      int v_end,
-                                      int dgd_stride,
-                                      int src_stride,
-                                      int64_t* M,
-                                      int64_t* H);
-
-void av1_compute_stats_highbd_c(int wiener_win,
-                                const uint8_t* dgd8,
-                                const uint8_t* src8,
-                                int h_start,
-                                int h_end,
-                                int v_start,
-                                int v_end,
-                                int dgd_stride,
-                                int src_stride,
-                                int64_t* M,
-                                int64_t* H,
-                                aom_bit_depth_t bit_depth);
-void av1_compute_stats_highbd_sse4_1(int wiener_win,
-                                     const uint8_t* dgd8,
-                                     const uint8_t* src8,
-                                     int h_start,
-                                     int h_end,
-                                     int v_start,
-                                     int v_end,
-                                     int dgd_stride,
-                                     int src_stride,
-                                     int64_t* M,
-                                     int64_t* H,
-                                     aom_bit_depth_t bit_depth);
-void av1_compute_stats_highbd_avx2(int wiener_win,
-                                   const uint8_t* dgd8,
-                                   const uint8_t* src8,
-                                   int h_start,
-                                   int h_end,
-                                   int v_start,
-                                   int v_end,
-                                   int dgd_stride,
-                                   int src_stride,
-                                   int64_t* M,
-                                   int64_t* H,
-                                   aom_bit_depth_t bit_depth);
-RTCD_EXTERN void (*av1_compute_stats_highbd)(int wiener_win,
-                                             const uint8_t* dgd8,
-                                             const uint8_t* src8,
-                                             int h_start,
-                                             int h_end,
-                                             int v_start,
-                                             int v_end,
-                                             int dgd_stride,
-                                             int src_stride,
-                                             int64_t* M,
-                                             int64_t* H,
-                                             aom_bit_depth_t bit_depth);
-
 void av1_convolve_2d_scale_c(const uint8_t* src,
                              int src_stride,
                              uint8_t* dst,
@@ -1505,88 +1177,6 @@
                                   int8_t* const coeff_contexts);
 #define av1_get_nz_map_contexts av1_get_nz_map_contexts_sse2
 
-void av1_highbd_apply_temporal_filter_c(
-    const struct yv12_buffer_config* ref_frame,
-    const struct macroblockd* mbd,
-    const BLOCK_SIZE block_size,
-    const int mb_row,
-    const int mb_col,
-    const int num_planes,
-    const double* noise_levels,
-    const MV* subblock_mvs,
-    const int* subblock_mses,
-    const int q_factor,
-    const int filter_strength,
-    const uint8_t* pred,
-    uint32_t* accum,
-    uint16_t* count);
-void av1_highbd_apply_temporal_filter_sse2(
-    const struct yv12_buffer_config* ref_frame,
-    const struct macroblockd* mbd,
-    const BLOCK_SIZE block_size,
-    const int mb_row,
-    const int mb_col,
-    const int num_planes,
-    const double* noise_levels,
-    const MV* subblock_mvs,
-    const int* subblock_mses,
-    const int q_factor,
-    const int filter_strength,
-    const uint8_t* pred,
-    uint32_t* accum,
-    uint16_t* count);
-void av1_highbd_apply_temporal_filter_avx2(
-    const struct yv12_buffer_config* ref_frame,
-    const struct macroblockd* mbd,
-    const BLOCK_SIZE block_size,
-    const int mb_row,
-    const int mb_col,
-    const int num_planes,
-    const double* noise_levels,
-    const MV* subblock_mvs,
-    const int* subblock_mses,
-    const int q_factor,
-    const int filter_strength,
-    const uint8_t* pred,
-    uint32_t* accum,
-    uint16_t* count);
-RTCD_EXTERN void (*av1_highbd_apply_temporal_filter)(
-    const struct yv12_buffer_config* ref_frame,
-    const struct macroblockd* mbd,
-    const BLOCK_SIZE block_size,
-    const int mb_row,
-    const int mb_col,
-    const int num_planes,
-    const double* noise_levels,
-    const MV* subblock_mvs,
-    const int* subblock_mses,
-    const int q_factor,
-    const int filter_strength,
-    const uint8_t* pred,
-    uint32_t* accum,
-    uint16_t* count);
-
-int64_t av1_highbd_block_error_c(const tran_low_t* coeff,
-                                 const tran_low_t* dqcoeff,
-                                 intptr_t block_size,
-                                 int64_t* ssz,
-                                 int bd);
-int64_t av1_highbd_block_error_sse2(const tran_low_t* coeff,
-                                    const tran_low_t* dqcoeff,
-                                    intptr_t block_size,
-                                    int64_t* ssz,
-                                    int bd);
-int64_t av1_highbd_block_error_avx2(const tran_low_t* coeff,
-                                    const tran_low_t* dqcoeff,
-                                    intptr_t block_size,
-                                    int64_t* ssz,
-                                    int bd);
-RTCD_EXTERN int64_t (*av1_highbd_block_error)(const tran_low_t* coeff,
-                                              const tran_low_t* dqcoeff,
-                                              intptr_t block_size,
-                                              int64_t* ssz,
-                                              int bd);
-
 void av1_highbd_convolve8_c(const uint8_t* src,
                             ptrdiff_t src_stride,
                             uint8_t* dst,
@@ -1659,101 +1249,6 @@
                                     int bps);
 #define av1_highbd_convolve8_vert av1_highbd_convolve8_vert_sse2
 
-void av1_highbd_convolve_2d_scale_c(const uint16_t* src,
-                                    int src_stride,
-                                    uint16_t* dst,
-                                    int dst_stride,
-                                    int w,
-                                    int h,
-                                    const InterpFilterParams* filter_params_x,
-                                    const InterpFilterParams* filter_params_y,
-                                    const int subpel_x_qn,
-                                    const int x_step_qn,
-                                    const int subpel_y_qn,
-                                    const int y_step_qn,
-                                    ConvolveParams* conv_params,
-                                    int bd);
-void av1_highbd_convolve_2d_scale_sse4_1(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_x,
-    const InterpFilterParams* filter_params_y,
-    const int subpel_x_qn,
-    const int x_step_qn,
-    const int subpel_y_qn,
-    const int y_step_qn,
-    ConvolveParams* conv_params,
-    int bd);
-RTCD_EXTERN void (*av1_highbd_convolve_2d_scale)(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_x,
-    const InterpFilterParams* filter_params_y,
-    const int subpel_x_qn,
-    const int x_step_qn,
-    const int subpel_y_qn,
-    const int y_step_qn,
-    ConvolveParams* conv_params,
-    int bd);
-
-void av1_highbd_convolve_2d_sr_c(const uint16_t* src,
-                                 int src_stride,
-                                 uint16_t* dst,
-                                 int dst_stride,
-                                 int w,
-                                 int h,
-                                 const InterpFilterParams* filter_params_x,
-                                 const InterpFilterParams* filter_params_y,
-                                 const int subpel_x_qn,
-                                 const int subpel_y_qn,
-                                 ConvolveParams* conv_params,
-                                 int bd);
-void av1_highbd_convolve_2d_sr_ssse3(const uint16_t* src,
-                                     int src_stride,
-                                     uint16_t* dst,
-                                     int dst_stride,
-                                     int w,
-                                     int h,
-                                     const InterpFilterParams* filter_params_x,
-                                     const InterpFilterParams* filter_params_y,
-                                     const int subpel_x_qn,
-                                     const int subpel_y_qn,
-                                     ConvolveParams* conv_params,
-                                     int bd);
-void av1_highbd_convolve_2d_sr_avx2(const uint16_t* src,
-                                    int src_stride,
-                                    uint16_t* dst,
-                                    int dst_stride,
-                                    int w,
-                                    int h,
-                                    const InterpFilterParams* filter_params_x,
-                                    const InterpFilterParams* filter_params_y,
-                                    const int subpel_x_qn,
-                                    const int subpel_y_qn,
-                                    ConvolveParams* conv_params,
-                                    int bd);
-RTCD_EXTERN void (*av1_highbd_convolve_2d_sr)(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_x,
-    const InterpFilterParams* filter_params_y,
-    const int subpel_x_qn,
-    const int subpel_y_qn,
-    ConvolveParams* conv_params,
-    int bd);
-
 void av1_highbd_convolve_avg_c(const uint8_t* src,
                                ptrdiff_t src_stride,
                                uint8_t* dst,
@@ -1780,388 +1275,6 @@
                                 int bps);
 #define av1_highbd_convolve_copy av1_highbd_convolve_copy_c
 
-void av1_highbd_convolve_horiz_rs_c(const uint16_t* src,
-                                    int src_stride,
-                                    uint16_t* dst,
-                                    int dst_stride,
-                                    int w,
-                                    int h,
-                                    const int16_t* x_filters,
-                                    int x0_qn,
-                                    int x_step_qn,
-                                    int bd);
-void av1_highbd_convolve_horiz_rs_sse4_1(const uint16_t* src,
-                                         int src_stride,
-                                         uint16_t* dst,
-                                         int dst_stride,
-                                         int w,
-                                         int h,
-                                         const int16_t* x_filters,
-                                         int x0_qn,
-                                         int x_step_qn,
-                                         int bd);
-RTCD_EXTERN void (*av1_highbd_convolve_horiz_rs)(const uint16_t* src,
-                                                 int src_stride,
-                                                 uint16_t* dst,
-                                                 int dst_stride,
-                                                 int w,
-                                                 int h,
-                                                 const int16_t* x_filters,
-                                                 int x0_qn,
-                                                 int x_step_qn,
-                                                 int bd);
-
-void av1_highbd_convolve_x_sr_c(const uint16_t* src,
-                                int src_stride,
-                                uint16_t* dst,
-                                int dst_stride,
-                                int w,
-                                int h,
-                                const InterpFilterParams* filter_params_x,
-                                const int subpel_x_qn,
-                                ConvolveParams* conv_params,
-                                int bd);
-void av1_highbd_convolve_x_sr_ssse3(const uint16_t* src,
-                                    int src_stride,
-                                    uint16_t* dst,
-                                    int dst_stride,
-                                    int w,
-                                    int h,
-                                    const InterpFilterParams* filter_params_x,
-                                    const int subpel_x_qn,
-                                    ConvolveParams* conv_params,
-                                    int bd);
-void av1_highbd_convolve_x_sr_avx2(const uint16_t* src,
-                                   int src_stride,
-                                   uint16_t* dst,
-                                   int dst_stride,
-                                   int w,
-                                   int h,
-                                   const InterpFilterParams* filter_params_x,
-                                   const int subpel_x_qn,
-                                   ConvolveParams* conv_params,
-                                   int bd);
-RTCD_EXTERN void (*av1_highbd_convolve_x_sr)(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_x,
-    const int subpel_x_qn,
-    ConvolveParams* conv_params,
-    int bd);
-
-void av1_highbd_convolve_y_sr_c(const uint16_t* src,
-                                int src_stride,
-                                uint16_t* dst,
-                                int dst_stride,
-                                int w,
-                                int h,
-                                const InterpFilterParams* filter_params_y,
-                                const int subpel_y_qn,
-                                int bd);
-void av1_highbd_convolve_y_sr_ssse3(const uint16_t* src,
-                                    int src_stride,
-                                    uint16_t* dst,
-                                    int dst_stride,
-                                    int w,
-                                    int h,
-                                    const InterpFilterParams* filter_params_y,
-                                    const int subpel_y_qn,
-                                    int bd);
-void av1_highbd_convolve_y_sr_avx2(const uint16_t* src,
-                                   int src_stride,
-                                   uint16_t* dst,
-                                   int dst_stride,
-                                   int w,
-                                   int h,
-                                   const InterpFilterParams* filter_params_y,
-                                   const int subpel_y_qn,
-                                   int bd);
-RTCD_EXTERN void (*av1_highbd_convolve_y_sr)(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_y,
-    const int subpel_y_qn,
-    int bd);
-
-void av1_highbd_dist_wtd_convolve_2d_c(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_x,
-    const InterpFilterParams* filter_params_y,
-    const int subpel_x_qn,
-    const int subpel_y_qn,
-    ConvolveParams* conv_params,
-    int bd);
-void av1_highbd_dist_wtd_convolve_2d_sse4_1(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_x,
-    const InterpFilterParams* filter_params_y,
-    const int subpel_x_qn,
-    const int subpel_y_qn,
-    ConvolveParams* conv_params,
-    int bd);
-void av1_highbd_dist_wtd_convolve_2d_avx2(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_x,
-    const InterpFilterParams* filter_params_y,
-    const int subpel_x_qn,
-    const int subpel_y_qn,
-    ConvolveParams* conv_params,
-    int bd);
-RTCD_EXTERN void (*av1_highbd_dist_wtd_convolve_2d)(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_x,
-    const InterpFilterParams* filter_params_y,
-    const int subpel_x_qn,
-    const int subpel_y_qn,
-    ConvolveParams* conv_params,
-    int bd);
-
-void av1_highbd_dist_wtd_convolve_2d_copy_c(const uint16_t* src,
-                                            int src_stride,
-                                            uint16_t* dst,
-                                            int dst_stride,
-                                            int w,
-                                            int h,
-                                            ConvolveParams* conv_params,
-                                            int bd);
-void av1_highbd_dist_wtd_convolve_2d_copy_sse4_1(const uint16_t* src,
-                                                 int src_stride,
-                                                 uint16_t* dst,
-                                                 int dst_stride,
-                                                 int w,
-                                                 int h,
-                                                 ConvolveParams* conv_params,
-                                                 int bd);
-void av1_highbd_dist_wtd_convolve_2d_copy_avx2(const uint16_t* src,
-                                               int src_stride,
-                                               uint16_t* dst,
-                                               int dst_stride,
-                                               int w,
-                                               int h,
-                                               ConvolveParams* conv_params,
-                                               int bd);
-RTCD_EXTERN void (*av1_highbd_dist_wtd_convolve_2d_copy)(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    ConvolveParams* conv_params,
-    int bd);
-
-void av1_highbd_dist_wtd_convolve_x_c(const uint16_t* src,
-                                      int src_stride,
-                                      uint16_t* dst,
-                                      int dst_stride,
-                                      int w,
-                                      int h,
-                                      const InterpFilterParams* filter_params_x,
-                                      const int subpel_x_qn,
-                                      ConvolveParams* conv_params,
-                                      int bd);
-void av1_highbd_dist_wtd_convolve_x_sse4_1(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_x,
-    const int subpel_x_qn,
-    ConvolveParams* conv_params,
-    int bd);
-void av1_highbd_dist_wtd_convolve_x_avx2(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_x,
-    const int subpel_x_qn,
-    ConvolveParams* conv_params,
-    int bd);
-RTCD_EXTERN void (*av1_highbd_dist_wtd_convolve_x)(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_x,
-    const int subpel_x_qn,
-    ConvolveParams* conv_params,
-    int bd);
-
-void av1_highbd_dist_wtd_convolve_y_c(const uint16_t* src,
-                                      int src_stride,
-                                      uint16_t* dst,
-                                      int dst_stride,
-                                      int w,
-                                      int h,
-                                      const InterpFilterParams* filter_params_y,
-                                      const int subpel_y_qn,
-                                      ConvolveParams* conv_params,
-                                      int bd);
-void av1_highbd_dist_wtd_convolve_y_sse4_1(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_y,
-    const int subpel_y_qn,
-    ConvolveParams* conv_params,
-    int bd);
-void av1_highbd_dist_wtd_convolve_y_avx2(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_y,
-    const int subpel_y_qn,
-    ConvolveParams* conv_params,
-    int bd);
-RTCD_EXTERN void (*av1_highbd_dist_wtd_convolve_y)(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_y,
-    const int subpel_y_qn,
-    ConvolveParams* conv_params,
-    int bd);
-
-void av1_highbd_dr_prediction_z1_c(uint16_t* dst,
-                                   ptrdiff_t stride,
-                                   int bw,
-                                   int bh,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int upsample_above,
-                                   int dx,
-                                   int dy,
-                                   int bd);
-void av1_highbd_dr_prediction_z1_avx2(uint16_t* dst,
-                                      ptrdiff_t stride,
-                                      int bw,
-                                      int bh,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int upsample_above,
-                                      int dx,
-                                      int dy,
-                                      int bd);
-RTCD_EXTERN void (*av1_highbd_dr_prediction_z1)(uint16_t* dst,
-                                                ptrdiff_t stride,
-                                                int bw,
-                                                int bh,
-                                                const uint16_t* above,
-                                                const uint16_t* left,
-                                                int upsample_above,
-                                                int dx,
-                                                int dy,
-                                                int bd);
-
-void av1_highbd_dr_prediction_z2_c(uint16_t* dst,
-                                   ptrdiff_t stride,
-                                   int bw,
-                                   int bh,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int upsample_above,
-                                   int upsample_left,
-                                   int dx,
-                                   int dy,
-                                   int bd);
-void av1_highbd_dr_prediction_z2_avx2(uint16_t* dst,
-                                      ptrdiff_t stride,
-                                      int bw,
-                                      int bh,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int upsample_above,
-                                      int upsample_left,
-                                      int dx,
-                                      int dy,
-                                      int bd);
-RTCD_EXTERN void (*av1_highbd_dr_prediction_z2)(uint16_t* dst,
-                                                ptrdiff_t stride,
-                                                int bw,
-                                                int bh,
-                                                const uint16_t* above,
-                                                const uint16_t* left,
-                                                int upsample_above,
-                                                int upsample_left,
-                                                int dx,
-                                                int dy,
-                                                int bd);
-
-void av1_highbd_dr_prediction_z3_c(uint16_t* dst,
-                                   ptrdiff_t stride,
-                                   int bw,
-                                   int bh,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int upsample_left,
-                                   int dx,
-                                   int dy,
-                                   int bd);
-void av1_highbd_dr_prediction_z3_avx2(uint16_t* dst,
-                                      ptrdiff_t stride,
-                                      int bw,
-                                      int bh,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int upsample_left,
-                                      int dx,
-                                      int dy,
-                                      int bd);
-RTCD_EXTERN void (*av1_highbd_dr_prediction_z3)(uint16_t* dst,
-                                                ptrdiff_t stride,
-                                                int bw,
-                                                int bh,
-                                                const uint16_t* above,
-                                                const uint16_t* left,
-                                                int upsample_left,
-                                                int dx,
-                                                int dy,
-                                                int bd);
-
 void av1_highbd_fwht4x4_c(const int16_t* input, tran_low_t* output, int stride);
 #define av1_highbd_fwht4x4 av1_highbd_fwht4x4_c
 
@@ -2344,236 +1457,6 @@
                                 int bd);
 #define av1_highbd_iwht4x4_1_add av1_highbd_iwht4x4_1_add_c
 
-int64_t av1_highbd_pixel_proj_error_c(const uint8_t* src8,
-                                      int width,
-                                      int height,
-                                      int src_stride,
-                                      const uint8_t* dat8,
-                                      int dat_stride,
-                                      int32_t* flt0,
-                                      int flt0_stride,
-                                      int32_t* flt1,
-                                      int flt1_stride,
-                                      int xq[2],
-                                      const sgr_params_type* params);
-int64_t av1_highbd_pixel_proj_error_sse4_1(const uint8_t* src8,
-                                           int width,
-                                           int height,
-                                           int src_stride,
-                                           const uint8_t* dat8,
-                                           int dat_stride,
-                                           int32_t* flt0,
-                                           int flt0_stride,
-                                           int32_t* flt1,
-                                           int flt1_stride,
-                                           int xq[2],
-                                           const sgr_params_type* params);
-int64_t av1_highbd_pixel_proj_error_avx2(const uint8_t* src8,
-                                         int width,
-                                         int height,
-                                         int src_stride,
-                                         const uint8_t* dat8,
-                                         int dat_stride,
-                                         int32_t* flt0,
-                                         int flt0_stride,
-                                         int32_t* flt1,
-                                         int flt1_stride,
-                                         int xq[2],
-                                         const sgr_params_type* params);
-RTCD_EXTERN int64_t (*av1_highbd_pixel_proj_error)(
-    const uint8_t* src8,
-    int width,
-    int height,
-    int src_stride,
-    const uint8_t* dat8,
-    int dat_stride,
-    int32_t* flt0,
-    int flt0_stride,
-    int32_t* flt1,
-    int flt1_stride,
-    int xq[2],
-    const sgr_params_type* params);
-
-void av1_highbd_quantize_fp_c(const tran_low_t* coeff_ptr,
-                              intptr_t n_coeffs,
-                              const int16_t* zbin_ptr,
-                              const int16_t* round_ptr,
-                              const int16_t* quant_ptr,
-                              const int16_t* quant_shift_ptr,
-                              tran_low_t* qcoeff_ptr,
-                              tran_low_t* dqcoeff_ptr,
-                              const int16_t* dequant_ptr,
-                              uint16_t* eob_ptr,
-                              const int16_t* scan,
-                              const int16_t* iscan,
-                              int log_scale);
-void av1_highbd_quantize_fp_sse4_1(const tran_low_t* coeff_ptr,
-                                   intptr_t n_coeffs,
-                                   const int16_t* zbin_ptr,
-                                   const int16_t* round_ptr,
-                                   const int16_t* quant_ptr,
-                                   const int16_t* quant_shift_ptr,
-                                   tran_low_t* qcoeff_ptr,
-                                   tran_low_t* dqcoeff_ptr,
-                                   const int16_t* dequant_ptr,
-                                   uint16_t* eob_ptr,
-                                   const int16_t* scan,
-                                   const int16_t* iscan,
-                                   int log_scale);
-void av1_highbd_quantize_fp_avx2(const tran_low_t* coeff_ptr,
-                                 intptr_t n_coeffs,
-                                 const int16_t* zbin_ptr,
-                                 const int16_t* round_ptr,
-                                 const int16_t* quant_ptr,
-                                 const int16_t* quant_shift_ptr,
-                                 tran_low_t* qcoeff_ptr,
-                                 tran_low_t* dqcoeff_ptr,
-                                 const int16_t* dequant_ptr,
-                                 uint16_t* eob_ptr,
-                                 const int16_t* scan,
-                                 const int16_t* iscan,
-                                 int log_scale);
-RTCD_EXTERN void (*av1_highbd_quantize_fp)(const tran_low_t* coeff_ptr,
-                                           intptr_t n_coeffs,
-                                           const int16_t* zbin_ptr,
-                                           const int16_t* round_ptr,
-                                           const int16_t* quant_ptr,
-                                           const int16_t* quant_shift_ptr,
-                                           tran_low_t* qcoeff_ptr,
-                                           tran_low_t* dqcoeff_ptr,
-                                           const int16_t* dequant_ptr,
-                                           uint16_t* eob_ptr,
-                                           const int16_t* scan,
-                                           const int16_t* iscan,
-                                           int log_scale);
-
-void av1_highbd_warp_affine_c(const int32_t* mat,
-                              const uint16_t* ref,
-                              int width,
-                              int height,
-                              int stride,
-                              uint16_t* pred,
-                              int p_col,
-                              int p_row,
-                              int p_width,
-                              int p_height,
-                              int p_stride,
-                              int subsampling_x,
-                              int subsampling_y,
-                              int bd,
-                              ConvolveParams* conv_params,
-                              int16_t alpha,
-                              int16_t beta,
-                              int16_t gamma,
-                              int16_t delta);
-void av1_highbd_warp_affine_sse4_1(const int32_t* mat,
-                                   const uint16_t* ref,
-                                   int width,
-                                   int height,
-                                   int stride,
-                                   uint16_t* pred,
-                                   int p_col,
-                                   int p_row,
-                                   int p_width,
-                                   int p_height,
-                                   int p_stride,
-                                   int subsampling_x,
-                                   int subsampling_y,
-                                   int bd,
-                                   ConvolveParams* conv_params,
-                                   int16_t alpha,
-                                   int16_t beta,
-                                   int16_t gamma,
-                                   int16_t delta);
-void av1_highbd_warp_affine_avx2(const int32_t* mat,
-                                 const uint16_t* ref,
-                                 int width,
-                                 int height,
-                                 int stride,
-                                 uint16_t* pred,
-                                 int p_col,
-                                 int p_row,
-                                 int p_width,
-                                 int p_height,
-                                 int p_stride,
-                                 int subsampling_x,
-                                 int subsampling_y,
-                                 int bd,
-                                 ConvolveParams* conv_params,
-                                 int16_t alpha,
-                                 int16_t beta,
-                                 int16_t gamma,
-                                 int16_t delta);
-RTCD_EXTERN void (*av1_highbd_warp_affine)(const int32_t* mat,
-                                           const uint16_t* ref,
-                                           int width,
-                                           int height,
-                                           int stride,
-                                           uint16_t* pred,
-                                           int p_col,
-                                           int p_row,
-                                           int p_width,
-                                           int p_height,
-                                           int p_stride,
-                                           int subsampling_x,
-                                           int subsampling_y,
-                                           int bd,
-                                           ConvolveParams* conv_params,
-                                           int16_t alpha,
-                                           int16_t beta,
-                                           int16_t gamma,
-                                           int16_t delta);
-
-void av1_highbd_wiener_convolve_add_src_c(const uint8_t* src,
-                                          ptrdiff_t src_stride,
-                                          uint8_t* dst,
-                                          ptrdiff_t dst_stride,
-                                          const int16_t* filter_x,
-                                          int x_step_q4,
-                                          const int16_t* filter_y,
-                                          int y_step_q4,
-                                          int w,
-                                          int h,
-                                          const ConvolveParams* conv_params,
-                                          int bd);
-void av1_highbd_wiener_convolve_add_src_ssse3(const uint8_t* src,
-                                              ptrdiff_t src_stride,
-                                              uint8_t* dst,
-                                              ptrdiff_t dst_stride,
-                                              const int16_t* filter_x,
-                                              int x_step_q4,
-                                              const int16_t* filter_y,
-                                              int y_step_q4,
-                                              int w,
-                                              int h,
-                                              const ConvolveParams* conv_params,
-                                              int bd);
-void av1_highbd_wiener_convolve_add_src_avx2(const uint8_t* src,
-                                             ptrdiff_t src_stride,
-                                             uint8_t* dst,
-                                             ptrdiff_t dst_stride,
-                                             const int16_t* filter_x,
-                                             int x_step_q4,
-                                             const int16_t* filter_y,
-                                             int y_step_q4,
-                                             int w,
-                                             int h,
-                                             const ConvolveParams* conv_params,
-                                             int bd);
-RTCD_EXTERN void (*av1_highbd_wiener_convolve_add_src)(
-    const uint8_t* src,
-    ptrdiff_t src_stride,
-    uint8_t* dst,
-    ptrdiff_t dst_stride,
-    const int16_t* filter_x,
-    int x_step_q4,
-    const int16_t* filter_y,
-    int y_step_q4,
-    int w,
-    int h,
-    const ConvolveParams* conv_params,
-    int bd);
-
 void av1_inv_txfm2d_add_16x16_c(const int32_t* input,
                                 uint16_t* output,
                                 int stride,
@@ -2763,56 +1646,6 @@
                                        int diff_stride,
                                        TxfmParam* txfm_param);
 
-int64_t av1_lowbd_pixel_proj_error_c(const uint8_t* src8,
-                                     int width,
-                                     int height,
-                                     int src_stride,
-                                     const uint8_t* dat8,
-                                     int dat_stride,
-                                     int32_t* flt0,
-                                     int flt0_stride,
-                                     int32_t* flt1,
-                                     int flt1_stride,
-                                     int xq[2],
-                                     const sgr_params_type* params);
-int64_t av1_lowbd_pixel_proj_error_sse4_1(const uint8_t* src8,
-                                          int width,
-                                          int height,
-                                          int src_stride,
-                                          const uint8_t* dat8,
-                                          int dat_stride,
-                                          int32_t* flt0,
-                                          int flt0_stride,
-                                          int32_t* flt1,
-                                          int flt1_stride,
-                                          int xq[2],
-                                          const sgr_params_type* params);
-int64_t av1_lowbd_pixel_proj_error_avx2(const uint8_t* src8,
-                                        int width,
-                                        int height,
-                                        int src_stride,
-                                        const uint8_t* dat8,
-                                        int dat_stride,
-                                        int32_t* flt0,
-                                        int flt0_stride,
-                                        int32_t* flt1,
-                                        int flt1_stride,
-                                        int xq[2],
-                                        const sgr_params_type* params);
-RTCD_EXTERN int64_t (*av1_lowbd_pixel_proj_error)(
-    const uint8_t* src8,
-    int width,
-    int height,
-    int src_stride,
-    const uint8_t* dat8,
-    int dat_stride,
-    int32_t* flt0,
-    int flt0_stride,
-    int32_t* flt1,
-    int flt1_stride,
-    int xq[2],
-    const sgr_params_type* params);
-
 void av1_nn_predict_c(const float* input_nodes,
                       const NN_CONFIG* const nn_config,
                       int reduce_prec,
@@ -3014,47 +1847,6 @@
 void av1_round_shift_array_sse4_1(int32_t* arr, int size, int bit);
 RTCD_EXTERN void (*av1_round_shift_array)(int32_t* arr, int size, int bit);
 
-int av1_selfguided_restoration_c(const uint8_t* dgd8,
-                                 int width,
-                                 int height,
-                                 int dgd_stride,
-                                 int32_t* flt0,
-                                 int32_t* flt1,
-                                 int flt_stride,
-                                 int sgr_params_idx,
-                                 int bit_depth,
-                                 int highbd);
-int av1_selfguided_restoration_sse4_1(const uint8_t* dgd8,
-                                      int width,
-                                      int height,
-                                      int dgd_stride,
-                                      int32_t* flt0,
-                                      int32_t* flt1,
-                                      int flt_stride,
-                                      int sgr_params_idx,
-                                      int bit_depth,
-                                      int highbd);
-int av1_selfguided_restoration_avx2(const uint8_t* dgd8,
-                                    int width,
-                                    int height,
-                                    int dgd_stride,
-                                    int32_t* flt0,
-                                    int32_t* flt1,
-                                    int flt_stride,
-                                    int sgr_params_idx,
-                                    int bit_depth,
-                                    int highbd);
-RTCD_EXTERN int (*av1_selfguided_restoration)(const uint8_t* dgd8,
-                                              int width,
-                                              int height,
-                                              int dgd_stride,
-                                              int32_t* flt0,
-                                              int32_t* flt1,
-                                              int flt_stride,
-                                              int sgr_params_idx,
-                                              int bit_depth,
-                                              int highbd);
-
 void av1_txb_init_levels_c(const tran_low_t* const coeff,
                            const int width,
                            const int height,
@@ -3080,79 +1872,6 @@
 void av1_upsample_intra_edge_high_sse4_1(uint16_t* p, int sz, int bd);
 RTCD_EXTERN void (*av1_upsample_intra_edge_high)(uint16_t* p, int sz, int bd);
 
-void av1_warp_affine_c(const int32_t* mat,
-                       const uint8_t* ref,
-                       int width,
-                       int height,
-                       int stride,
-                       uint8_t* pred,
-                       int p_col,
-                       int p_row,
-                       int p_width,
-                       int p_height,
-                       int p_stride,
-                       int subsampling_x,
-                       int subsampling_y,
-                       ConvolveParams* conv_params,
-                       int16_t alpha,
-                       int16_t beta,
-                       int16_t gamma,
-                       int16_t delta);
-void av1_warp_affine_sse4_1(const int32_t* mat,
-                            const uint8_t* ref,
-                            int width,
-                            int height,
-                            int stride,
-                            uint8_t* pred,
-                            int p_col,
-                            int p_row,
-                            int p_width,
-                            int p_height,
-                            int p_stride,
-                            int subsampling_x,
-                            int subsampling_y,
-                            ConvolveParams* conv_params,
-                            int16_t alpha,
-                            int16_t beta,
-                            int16_t gamma,
-                            int16_t delta);
-void av1_warp_affine_avx2(const int32_t* mat,
-                          const uint8_t* ref,
-                          int width,
-                          int height,
-                          int stride,
-                          uint8_t* pred,
-                          int p_col,
-                          int p_row,
-                          int p_width,
-                          int p_height,
-                          int p_stride,
-                          int subsampling_x,
-                          int subsampling_y,
-                          ConvolveParams* conv_params,
-                          int16_t alpha,
-                          int16_t beta,
-                          int16_t gamma,
-                          int16_t delta);
-RTCD_EXTERN void (*av1_warp_affine)(const int32_t* mat,
-                                    const uint8_t* ref,
-                                    int width,
-                                    int height,
-                                    int stride,
-                                    uint8_t* pred,
-                                    int p_col,
-                                    int p_row,
-                                    int p_width,
-                                    int p_height,
-                                    int p_stride,
-                                    int subsampling_x,
-                                    int subsampling_y,
-                                    ConvolveParams* conv_params,
-                                    int16_t alpha,
-                                    int16_t beta,
-                                    int16_t gamma,
-                                    int16_t delta);
-
 void av1_wedge_compute_delta_squares_c(int16_t* d,
                                        const int16_t* a,
                                        const int16_t* b,
@@ -3416,47 +2135,24 @@
                                  int32_t* var,
                                  int coeff_shift);
 
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_420_hbd_c(TX_SIZE tx_size);
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_420_hbd_ssse3(TX_SIZE tx_size);
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_420_hbd_avx2(TX_SIZE tx_size);
-RTCD_EXTERN cfl_subsample_hbd_fn (*cfl_get_luma_subsampling_420_hbd)(
-    TX_SIZE tx_size);
-
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_420_lbd_c(TX_SIZE tx_size);
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_420_lbd_ssse3(TX_SIZE tx_size);
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_420_lbd_avx2(TX_SIZE tx_size);
 RTCD_EXTERN cfl_subsample_lbd_fn (*cfl_get_luma_subsampling_420_lbd)(
     TX_SIZE tx_size);
 
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_422_hbd_c(TX_SIZE tx_size);
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_422_hbd_ssse3(TX_SIZE tx_size);
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_422_hbd_avx2(TX_SIZE tx_size);
-RTCD_EXTERN cfl_subsample_hbd_fn (*cfl_get_luma_subsampling_422_hbd)(
-    TX_SIZE tx_size);
-
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_422_lbd_c(TX_SIZE tx_size);
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_422_lbd_ssse3(TX_SIZE tx_size);
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_422_lbd_avx2(TX_SIZE tx_size);
 RTCD_EXTERN cfl_subsample_lbd_fn (*cfl_get_luma_subsampling_422_lbd)(
     TX_SIZE tx_size);
 
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_444_hbd_c(TX_SIZE tx_size);
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_444_hbd_ssse3(TX_SIZE tx_size);
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_444_hbd_avx2(TX_SIZE tx_size);
-RTCD_EXTERN cfl_subsample_hbd_fn (*cfl_get_luma_subsampling_444_hbd)(
-    TX_SIZE tx_size);
-
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_444_lbd_c(TX_SIZE tx_size);
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_444_lbd_ssse3(TX_SIZE tx_size);
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_444_lbd_avx2(TX_SIZE tx_size);
 RTCD_EXTERN cfl_subsample_lbd_fn (*cfl_get_luma_subsampling_444_lbd)(
     TX_SIZE tx_size);
 
-cfl_predict_hbd_fn cfl_get_predict_hbd_fn_c(TX_SIZE tx_size);
-cfl_predict_hbd_fn cfl_get_predict_hbd_fn_ssse3(TX_SIZE tx_size);
-cfl_predict_hbd_fn cfl_get_predict_hbd_fn_avx2(TX_SIZE tx_size);
-RTCD_EXTERN cfl_predict_hbd_fn (*cfl_get_predict_hbd_fn)(TX_SIZE tx_size);
-
 cfl_predict_lbd_fn cfl_get_predict_lbd_fn_c(TX_SIZE tx_size);
 cfl_predict_lbd_fn cfl_get_predict_lbd_fn_ssse3(TX_SIZE tx_size);
 cfl_predict_lbd_fn cfl_get_predict_lbd_fn_avx2(TX_SIZE tx_size);
@@ -3477,14 +2173,6 @@
 
   (void)flags;
 
-  av1_apply_selfguided_restoration = av1_apply_selfguided_restoration_c;
-  if (flags & HAS_SSE4_1)
-    av1_apply_selfguided_restoration = av1_apply_selfguided_restoration_sse4_1;
-  if (flags & HAS_AVX2)
-    av1_apply_selfguided_restoration = av1_apply_selfguided_restoration_avx2;
-  av1_apply_temporal_filter = av1_apply_temporal_filter_sse2;
-  if (flags & HAS_AVX2)
-    av1_apply_temporal_filter = av1_apply_temporal_filter_avx2;
   av1_block_error = av1_block_error_sse2;
   if (flags & HAS_AVX2)
     av1_block_error = av1_block_error_avx2;
@@ -3511,34 +2199,11 @@
   if (flags & HAS_AVX2)
     av1_build_compound_diffwtd_mask_highbd =
         av1_build_compound_diffwtd_mask_highbd_avx2;
-  av1_calc_frame_error = av1_calc_frame_error_sse2;
-  if (flags & HAS_AVX2)
-    av1_calc_frame_error = av1_calc_frame_error_avx2;
-  av1_calc_proj_params = av1_calc_proj_params_c;
-  if (flags & HAS_SSE4_1)
-    av1_calc_proj_params = av1_calc_proj_params_sse4_1;
-  if (flags & HAS_AVX2)
-    av1_calc_proj_params = av1_calc_proj_params_avx2;
-  av1_calc_proj_params_high_bd = av1_calc_proj_params_high_bd_c;
-  if (flags & HAS_SSE4_1)
-    av1_calc_proj_params_high_bd = av1_calc_proj_params_high_bd_sse4_1;
-  if (flags & HAS_AVX2)
-    av1_calc_proj_params_high_bd = av1_calc_proj_params_high_bd_avx2;
   av1_compute_cross_correlation = av1_compute_cross_correlation_c;
   if (flags & HAS_SSE4_1)
     av1_compute_cross_correlation = av1_compute_cross_correlation_sse4_1;
   if (flags & HAS_AVX2)
     av1_compute_cross_correlation = av1_compute_cross_correlation_avx2;
-  av1_compute_stats = av1_compute_stats_c;
-  if (flags & HAS_SSE4_1)
-    av1_compute_stats = av1_compute_stats_sse4_1;
-  if (flags & HAS_AVX2)
-    av1_compute_stats = av1_compute_stats_avx2;
-  av1_compute_stats_highbd = av1_compute_stats_highbd_c;
-  if (flags & HAS_SSE4_1)
-    av1_compute_stats_highbd = av1_compute_stats_highbd_sse4_1;
-  if (flags & HAS_AVX2)
-    av1_compute_stats_highbd = av1_compute_stats_highbd_avx2;
   av1_convolve_2d_scale = av1_convolve_2d_scale_c;
   if (flags & HAS_SSE4_1)
     av1_convolve_2d_scale = av1_convolve_2d_scale_sse4_1;
@@ -3663,64 +2328,6 @@
     av1_get_horver_correlation_full = av1_get_horver_correlation_full_sse4_1;
   if (flags & HAS_AVX2)
     av1_get_horver_correlation_full = av1_get_horver_correlation_full_avx2;
-  av1_highbd_apply_temporal_filter = av1_highbd_apply_temporal_filter_sse2;
-  if (flags & HAS_AVX2)
-    av1_highbd_apply_temporal_filter = av1_highbd_apply_temporal_filter_avx2;
-  av1_highbd_block_error = av1_highbd_block_error_sse2;
-  if (flags & HAS_AVX2)
-    av1_highbd_block_error = av1_highbd_block_error_avx2;
-  av1_highbd_convolve_2d_scale = av1_highbd_convolve_2d_scale_c;
-  if (flags & HAS_SSE4_1)
-    av1_highbd_convolve_2d_scale = av1_highbd_convolve_2d_scale_sse4_1;
-  av1_highbd_convolve_2d_sr = av1_highbd_convolve_2d_sr_c;
-  if (flags & HAS_SSSE3)
-    av1_highbd_convolve_2d_sr = av1_highbd_convolve_2d_sr_ssse3;
-  if (flags & HAS_AVX2)
-    av1_highbd_convolve_2d_sr = av1_highbd_convolve_2d_sr_avx2;
-  av1_highbd_convolve_horiz_rs = av1_highbd_convolve_horiz_rs_c;
-  if (flags & HAS_SSE4_1)
-    av1_highbd_convolve_horiz_rs = av1_highbd_convolve_horiz_rs_sse4_1;
-  av1_highbd_convolve_x_sr = av1_highbd_convolve_x_sr_c;
-  if (flags & HAS_SSSE3)
-    av1_highbd_convolve_x_sr = av1_highbd_convolve_x_sr_ssse3;
-  if (flags & HAS_AVX2)
-    av1_highbd_convolve_x_sr = av1_highbd_convolve_x_sr_avx2;
-  av1_highbd_convolve_y_sr = av1_highbd_convolve_y_sr_c;
-  if (flags & HAS_SSSE3)
-    av1_highbd_convolve_y_sr = av1_highbd_convolve_y_sr_ssse3;
-  if (flags & HAS_AVX2)
-    av1_highbd_convolve_y_sr = av1_highbd_convolve_y_sr_avx2;
-  av1_highbd_dist_wtd_convolve_2d = av1_highbd_dist_wtd_convolve_2d_c;
-  if (flags & HAS_SSE4_1)
-    av1_highbd_dist_wtd_convolve_2d = av1_highbd_dist_wtd_convolve_2d_sse4_1;
-  if (flags & HAS_AVX2)
-    av1_highbd_dist_wtd_convolve_2d = av1_highbd_dist_wtd_convolve_2d_avx2;
-  av1_highbd_dist_wtd_convolve_2d_copy = av1_highbd_dist_wtd_convolve_2d_copy_c;
-  if (flags & HAS_SSE4_1)
-    av1_highbd_dist_wtd_convolve_2d_copy =
-        av1_highbd_dist_wtd_convolve_2d_copy_sse4_1;
-  if (flags & HAS_AVX2)
-    av1_highbd_dist_wtd_convolve_2d_copy =
-        av1_highbd_dist_wtd_convolve_2d_copy_avx2;
-  av1_highbd_dist_wtd_convolve_x = av1_highbd_dist_wtd_convolve_x_c;
-  if (flags & HAS_SSE4_1)
-    av1_highbd_dist_wtd_convolve_x = av1_highbd_dist_wtd_convolve_x_sse4_1;
-  if (flags & HAS_AVX2)
-    av1_highbd_dist_wtd_convolve_x = av1_highbd_dist_wtd_convolve_x_avx2;
-  av1_highbd_dist_wtd_convolve_y = av1_highbd_dist_wtd_convolve_y_c;
-  if (flags & HAS_SSE4_1)
-    av1_highbd_dist_wtd_convolve_y = av1_highbd_dist_wtd_convolve_y_sse4_1;
-  if (flags & HAS_AVX2)
-    av1_highbd_dist_wtd_convolve_y = av1_highbd_dist_wtd_convolve_y_avx2;
-  av1_highbd_dr_prediction_z1 = av1_highbd_dr_prediction_z1_c;
-  if (flags & HAS_AVX2)
-    av1_highbd_dr_prediction_z1 = av1_highbd_dr_prediction_z1_avx2;
-  av1_highbd_dr_prediction_z2 = av1_highbd_dr_prediction_z2_c;
-  if (flags & HAS_AVX2)
-    av1_highbd_dr_prediction_z2 = av1_highbd_dr_prediction_z2_avx2;
-  av1_highbd_dr_prediction_z3 = av1_highbd_dr_prediction_z3_c;
-  if (flags & HAS_AVX2)
-    av1_highbd_dr_prediction_z3 = av1_highbd_dr_prediction_z3_avx2;
   av1_highbd_inv_txfm_add = av1_highbd_inv_txfm_add_c;
   if (flags & HAS_SSE4_1)
     av1_highbd_inv_txfm_add = av1_highbd_inv_txfm_add_sse4_1;
@@ -3744,28 +2351,6 @@
   av1_highbd_inv_txfm_add_8x8 = av1_highbd_inv_txfm_add_8x8_c;
   if (flags & HAS_SSE4_1)
     av1_highbd_inv_txfm_add_8x8 = av1_highbd_inv_txfm_add_8x8_sse4_1;
-  av1_highbd_pixel_proj_error = av1_highbd_pixel_proj_error_c;
-  if (flags & HAS_SSE4_1)
-    av1_highbd_pixel_proj_error = av1_highbd_pixel_proj_error_sse4_1;
-  if (flags & HAS_AVX2)
-    av1_highbd_pixel_proj_error = av1_highbd_pixel_proj_error_avx2;
-  av1_highbd_quantize_fp = av1_highbd_quantize_fp_c;
-  if (flags & HAS_SSE4_1)
-    av1_highbd_quantize_fp = av1_highbd_quantize_fp_sse4_1;
-  if (flags & HAS_AVX2)
-    av1_highbd_quantize_fp = av1_highbd_quantize_fp_avx2;
-  av1_highbd_warp_affine = av1_highbd_warp_affine_c;
-  if (flags & HAS_SSE4_1)
-    av1_highbd_warp_affine = av1_highbd_warp_affine_sse4_1;
-  if (flags & HAS_AVX2)
-    av1_highbd_warp_affine = av1_highbd_warp_affine_avx2;
-  av1_highbd_wiener_convolve_add_src = av1_highbd_wiener_convolve_add_src_c;
-  if (flags & HAS_SSSE3)
-    av1_highbd_wiener_convolve_add_src =
-        av1_highbd_wiener_convolve_add_src_ssse3;
-  if (flags & HAS_AVX2)
-    av1_highbd_wiener_convolve_add_src =
-        av1_highbd_wiener_convolve_add_src_avx2;
   av1_inv_txfm2d_add_4x4 = av1_inv_txfm2d_add_4x4_c;
   if (flags & HAS_SSE4_1)
     av1_inv_txfm2d_add_4x4 = av1_inv_txfm2d_add_4x4_sse4_1;
@@ -3782,11 +2367,6 @@
     av1_lowbd_fwd_txfm = av1_lowbd_fwd_txfm_sse4_1;
   if (flags & HAS_AVX2)
     av1_lowbd_fwd_txfm = av1_lowbd_fwd_txfm_avx2;
-  av1_lowbd_pixel_proj_error = av1_lowbd_pixel_proj_error_c;
-  if (flags & HAS_SSE4_1)
-    av1_lowbd_pixel_proj_error = av1_lowbd_pixel_proj_error_sse4_1;
-  if (flags & HAS_AVX2)
-    av1_lowbd_pixel_proj_error = av1_lowbd_pixel_proj_error_avx2;
   av1_nn_predict = av1_nn_predict_c;
   if (flags & HAS_SSE3)
     av1_nn_predict = av1_nn_predict_sse3;
@@ -3808,11 +2388,6 @@
   av1_round_shift_array = av1_round_shift_array_c;
   if (flags & HAS_SSE4_1)
     av1_round_shift_array = av1_round_shift_array_sse4_1;
-  av1_selfguided_restoration = av1_selfguided_restoration_c;
-  if (flags & HAS_SSE4_1)
-    av1_selfguided_restoration = av1_selfguided_restoration_sse4_1;
-  if (flags & HAS_AVX2)
-    av1_selfguided_restoration = av1_selfguided_restoration_avx2;
   av1_txb_init_levels = av1_txb_init_levels_c;
   if (flags & HAS_SSE4_1)
     av1_txb_init_levels = av1_txb_init_levels_sse4_1;
@@ -3824,11 +2399,6 @@
   av1_upsample_intra_edge_high = av1_upsample_intra_edge_high_c;
   if (flags & HAS_SSE4_1)
     av1_upsample_intra_edge_high = av1_upsample_intra_edge_high_sse4_1;
-  av1_warp_affine = av1_warp_affine_c;
-  if (flags & HAS_SSE4_1)
-    av1_warp_affine = av1_warp_affine_sse4_1;
-  if (flags & HAS_AVX2)
-    av1_warp_affine = av1_warp_affine_avx2;
   av1_wedge_compute_delta_squares = av1_wedge_compute_delta_squares_sse2;
   if (flags & HAS_AVX2)
     av1_wedge_compute_delta_squares = av1_wedge_compute_delta_squares_avx2;
@@ -3869,41 +2439,21 @@
     cdef_find_dir = cdef_find_dir_sse4_1;
   if (flags & HAS_AVX2)
     cdef_find_dir = cdef_find_dir_avx2;
-  cfl_get_luma_subsampling_420_hbd = cfl_get_luma_subsampling_420_hbd_c;
-  if (flags & HAS_SSSE3)
-    cfl_get_luma_subsampling_420_hbd = cfl_get_luma_subsampling_420_hbd_ssse3;
-  if (flags & HAS_AVX2)
-    cfl_get_luma_subsampling_420_hbd = cfl_get_luma_subsampling_420_hbd_avx2;
   cfl_get_luma_subsampling_420_lbd = cfl_get_luma_subsampling_420_lbd_c;
   if (flags & HAS_SSSE3)
     cfl_get_luma_subsampling_420_lbd = cfl_get_luma_subsampling_420_lbd_ssse3;
   if (flags & HAS_AVX2)
     cfl_get_luma_subsampling_420_lbd = cfl_get_luma_subsampling_420_lbd_avx2;
-  cfl_get_luma_subsampling_422_hbd = cfl_get_luma_subsampling_422_hbd_c;
-  if (flags & HAS_SSSE3)
-    cfl_get_luma_subsampling_422_hbd = cfl_get_luma_subsampling_422_hbd_ssse3;
-  if (flags & HAS_AVX2)
-    cfl_get_luma_subsampling_422_hbd = cfl_get_luma_subsampling_422_hbd_avx2;
   cfl_get_luma_subsampling_422_lbd = cfl_get_luma_subsampling_422_lbd_c;
   if (flags & HAS_SSSE3)
     cfl_get_luma_subsampling_422_lbd = cfl_get_luma_subsampling_422_lbd_ssse3;
   if (flags & HAS_AVX2)
     cfl_get_luma_subsampling_422_lbd = cfl_get_luma_subsampling_422_lbd_avx2;
-  cfl_get_luma_subsampling_444_hbd = cfl_get_luma_subsampling_444_hbd_c;
-  if (flags & HAS_SSSE3)
-    cfl_get_luma_subsampling_444_hbd = cfl_get_luma_subsampling_444_hbd_ssse3;
-  if (flags & HAS_AVX2)
-    cfl_get_luma_subsampling_444_hbd = cfl_get_luma_subsampling_444_hbd_avx2;
   cfl_get_luma_subsampling_444_lbd = cfl_get_luma_subsampling_444_lbd_c;
   if (flags & HAS_SSSE3)
     cfl_get_luma_subsampling_444_lbd = cfl_get_luma_subsampling_444_lbd_ssse3;
   if (flags & HAS_AVX2)
     cfl_get_luma_subsampling_444_lbd = cfl_get_luma_subsampling_444_lbd_avx2;
-  cfl_get_predict_hbd_fn = cfl_get_predict_hbd_fn_c;
-  if (flags & HAS_SSSE3)
-    cfl_get_predict_hbd_fn = cfl_get_predict_hbd_fn_ssse3;
-  if (flags & HAS_AVX2)
-    cfl_get_predict_hbd_fn = cfl_get_predict_hbd_fn_avx2;
   cfl_get_predict_lbd_fn = cfl_get_predict_lbd_fn_c;
   if (flags & HAS_SSSE3)
     cfl_get_predict_lbd_fn = cfl_get_predict_lbd_fn_ssse3;
diff --git a/third_party/libaom/source/config/win/arm64/config/aom_config.asm b/third_party/libaom/source/config/win/arm64/config/aom_config.asm
index c803d9fe..8fbd732d 100644
--- a/third_party/libaom/source/config/win/arm64/config/aom_config.asm
+++ b/third_party/libaom/source/config/win/arm64/config/aom_config.asm
@@ -17,7 +17,7 @@
 CONFIG_ANALYZER equ 0
 CONFIG_AV1_DECODER equ 1
 CONFIG_AV1_ENCODER equ 1
-CONFIG_AV1_HIGHBITDEPTH equ 1
+CONFIG_AV1_HIGHBITDEPTH equ 0
 CONFIG_AV1_TEMPORAL_DENOISING equ 0
 CONFIG_BIG_ENDIAN equ 0
 CONFIG_BITSTREAM_DEBUG equ 0
@@ -47,7 +47,7 @@
 CONFIG_OS_SUPPORT equ 1
 CONFIG_PIC equ 0
 CONFIG_RD_DEBUG equ 0
-CONFIG_REALTIME_ONLY equ 0
+CONFIG_REALTIME_ONLY equ 1
 CONFIG_RUNTIME_CPU_DETECT equ 0
 CONFIG_SHARED equ 0
 CONFIG_SHARP_SETTINGS equ 0
diff --git a/third_party/libaom/source/config/win/arm64/config/aom_config.c b/third_party/libaom/source/config/win/arm64/config/aom_config.c
index 86d097e..dfaa428 100644
--- a/third_party/libaom/source/config/win/arm64/config/aom_config.c
+++ b/third_party/libaom/source/config/win/arm64/config/aom_config.c
@@ -9,5 +9,5 @@
  * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
  */
 #include "aom/aom_codec.h"
-static const char* const cfg = "cmake ../source/libaom -G \"Unix Makefiles\" -DCMAKE_TOOLCHAIN_FILE=\"../source/libaom/build/cmake/toolchains/arm64-linux-gcc.cmake\" -DCONFIG_AV1_ENCODER=1 -DCONFIG_LIBYUV=0 -DCONFIG_MAX_DECODE_PROFILE=0 -DCONFIG_NORMAL_TILE_MODE=1 -DCONFIG_SIZE_LIMIT=1 -DDECODE_HEIGHT_LIMIT=16384 -DDECODE_WIDTH_LIMIT=16384";
+static const char* const cfg = "cmake ../source/libaom -G \"Unix Makefiles\" -DCMAKE_TOOLCHAIN_FILE=\"../source/libaom/build/cmake/toolchains/arm64-linux-gcc.cmake\" -DCONFIG_AV1_ENCODER=1 -DCONFIG_LIBYUV=0 -DCONFIG_MAX_DECODE_PROFILE=0 -DCONFIG_NORMAL_TILE_MODE=1 -DCONFIG_SIZE_LIMIT=1 -DDECODE_HEIGHT_LIMIT=16384 -DDECODE_WIDTH_LIMIT=16384 -DCONFIG_REALTIME_ONLY=1 -DCONFIG_AV1_HIGHBITDEPTH=0";
 const char *aom_codec_build_config(void) {return cfg;}
diff --git a/third_party/libaom/source/config/win/arm64/config/aom_config.h b/third_party/libaom/source/config/win/arm64/config/aom_config.h
index a57675a..c5a0784 100644
--- a/third_party/libaom/source/config/win/arm64/config/aom_config.h
+++ b/third_party/libaom/source/config/win/arm64/config/aom_config.h
@@ -19,7 +19,7 @@
 #define CONFIG_ANALYZER 0
 #define CONFIG_AV1_DECODER 1
 #define CONFIG_AV1_ENCODER 1
-#define CONFIG_AV1_HIGHBITDEPTH 1
+#define CONFIG_AV1_HIGHBITDEPTH 0
 #define CONFIG_AV1_TEMPORAL_DENOISING 0
 #define CONFIG_BIG_ENDIAN 0
 #define CONFIG_BITSTREAM_DEBUG 0
@@ -49,7 +49,7 @@
 #define CONFIG_OS_SUPPORT 1
 #define CONFIG_PIC 0
 #define CONFIG_RD_DEBUG 0
-#define CONFIG_REALTIME_ONLY 0
+#define CONFIG_REALTIME_ONLY 1
 #define CONFIG_RUNTIME_CPU_DETECT 0
 #define CONFIG_SHARED 0
 #define CONFIG_SHARP_SETTINGS 0
diff --git a/third_party/libaom/source/config/win/arm64/config/aom_dsp_rtcd.h b/third_party/libaom/source/config/win/arm64/config/aom_dsp_rtcd.h
index 5bf7631..5bc4d69e 100644
--- a/third_party/libaom/source/config/win/arm64/config/aom_dsp_rtcd.h
+++ b/third_party/libaom/source/config/win/arm64/config/aom_dsp_rtcd.h
@@ -1474,8226 +1474,6 @@
                               int16_t* coeff);
 #define aom_hadamard_lp_8x8 aom_hadamard_lp_8x8_neon
 
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x128 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x64 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x16 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x16_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x32 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x32_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x4 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x4_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x64 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x64_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x8 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x8_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x16 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x16_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x32 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x32_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x64 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x64_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x8 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x8_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x16 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x4 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x4_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x8 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x128 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x16 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x16_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x32 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x32_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x64 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x64_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x16 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x16_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x32 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x32_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x4 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x4_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x8 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x8_c
-
-void aom_highbd_10_get16x16var_c(const uint8_t* src_ptr,
-                                 int source_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride,
-                                 unsigned int* sse,
-                                 int* sum);
-#define aom_highbd_10_get16x16var aom_highbd_10_get16x16var_c
-
-void aom_highbd_10_get8x8var_c(const uint8_t* src_ptr,
-                               int source_stride,
-                               const uint8_t* ref_ptr,
-                               int ref_stride,
-                               unsigned int* sse,
-                               int* sum);
-#define aom_highbd_10_get8x8var aom_highbd_10_get8x8var_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance128x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance128x128 \
-  aom_highbd_10_masked_sub_pixel_variance128x128_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance128x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance128x64 \
-  aom_highbd_10_masked_sub_pixel_variance128x64_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance16x16 \
-  aom_highbd_10_masked_sub_pixel_variance16x16_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance16x32 \
-  aom_highbd_10_masked_sub_pixel_variance16x32_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance16x4 \
-  aom_highbd_10_masked_sub_pixel_variance16x4_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance16x64 \
-  aom_highbd_10_masked_sub_pixel_variance16x64_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance16x8 \
-  aom_highbd_10_masked_sub_pixel_variance16x8_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance32x16 \
-  aom_highbd_10_masked_sub_pixel_variance32x16_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance32x32 \
-  aom_highbd_10_masked_sub_pixel_variance32x32_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance32x64 \
-  aom_highbd_10_masked_sub_pixel_variance32x64_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance32x8 \
-  aom_highbd_10_masked_sub_pixel_variance32x8_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance4x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance4x16 \
-  aom_highbd_10_masked_sub_pixel_variance4x16_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance4x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance4x4 \
-  aom_highbd_10_masked_sub_pixel_variance4x4_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance4x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance4x8 \
-  aom_highbd_10_masked_sub_pixel_variance4x8_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance64x128 \
-  aom_highbd_10_masked_sub_pixel_variance64x128_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance64x16 \
-  aom_highbd_10_masked_sub_pixel_variance64x16_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance64x32 \
-  aom_highbd_10_masked_sub_pixel_variance64x32_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance64x64 \
-  aom_highbd_10_masked_sub_pixel_variance64x64_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance8x16 \
-  aom_highbd_10_masked_sub_pixel_variance8x16_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance8x32 \
-  aom_highbd_10_masked_sub_pixel_variance8x32_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance8x4 \
-  aom_highbd_10_masked_sub_pixel_variance8x4_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_10_masked_sub_pixel_variance8x8 \
-  aom_highbd_10_masked_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_10_mse16x16_c(const uint8_t* src_ptr,
-                                      int source_stride,
-                                      const uint8_t* ref_ptr,
-                                      int recon_stride,
-                                      unsigned int* sse);
-#define aom_highbd_10_mse16x16 aom_highbd_10_mse16x16_c
-
-unsigned int aom_highbd_10_mse16x8_c(const uint8_t* src_ptr,
-                                     int source_stride,
-                                     const uint8_t* ref_ptr,
-                                     int recon_stride,
-                                     unsigned int* sse);
-#define aom_highbd_10_mse16x8 aom_highbd_10_mse16x8_c
-
-unsigned int aom_highbd_10_mse8x16_c(const uint8_t* src_ptr,
-                                     int source_stride,
-                                     const uint8_t* ref_ptr,
-                                     int recon_stride,
-                                     unsigned int* sse);
-#define aom_highbd_10_mse8x16 aom_highbd_10_mse8x16_c
-
-unsigned int aom_highbd_10_mse8x8_c(const uint8_t* src_ptr,
-                                    int source_stride,
-                                    const uint8_t* ref_ptr,
-                                    int recon_stride,
-                                    unsigned int* sse);
-#define aom_highbd_10_mse8x8 aom_highbd_10_mse8x8_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance128x128_c(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            int xoffset,
-                                                            int yoffset,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance128x128 \
-  aom_highbd_10_obmc_sub_pixel_variance128x128_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance128x64_c(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance128x64 \
-  aom_highbd_10_obmc_sub_pixel_variance128x64_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance16x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance16x16 \
-  aom_highbd_10_obmc_sub_pixel_variance16x16_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance16x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance16x32 \
-  aom_highbd_10_obmc_sub_pixel_variance16x32_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance16x4_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance16x4 \
-  aom_highbd_10_obmc_sub_pixel_variance16x4_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance16x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance16x64 \
-  aom_highbd_10_obmc_sub_pixel_variance16x64_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance16x8_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance16x8 \
-  aom_highbd_10_obmc_sub_pixel_variance16x8_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance32x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance32x16 \
-  aom_highbd_10_obmc_sub_pixel_variance32x16_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance32x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance32x32 \
-  aom_highbd_10_obmc_sub_pixel_variance32x32_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance32x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance32x64 \
-  aom_highbd_10_obmc_sub_pixel_variance32x64_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance32x8_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance32x8 \
-  aom_highbd_10_obmc_sub_pixel_variance32x8_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance4x16_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance4x16 \
-  aom_highbd_10_obmc_sub_pixel_variance4x16_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance4x4_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance4x4 \
-  aom_highbd_10_obmc_sub_pixel_variance4x4_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance4x8_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance4x8 \
-  aom_highbd_10_obmc_sub_pixel_variance4x8_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance64x128_c(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance64x128 \
-  aom_highbd_10_obmc_sub_pixel_variance64x128_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance64x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance64x16 \
-  aom_highbd_10_obmc_sub_pixel_variance64x16_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance64x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance64x32 \
-  aom_highbd_10_obmc_sub_pixel_variance64x32_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance64x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance64x64 \
-  aom_highbd_10_obmc_sub_pixel_variance64x64_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance8x16_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance8x16 \
-  aom_highbd_10_obmc_sub_pixel_variance8x16_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance8x32_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance8x32 \
-  aom_highbd_10_obmc_sub_pixel_variance8x32_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance8x4_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance8x4 \
-  aom_highbd_10_obmc_sub_pixel_variance8x4_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance8x8_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance8x8 \
-  aom_highbd_10_obmc_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_10_obmc_variance128x128_c(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-#define aom_highbd_10_obmc_variance128x128 aom_highbd_10_obmc_variance128x128_c
-
-unsigned int aom_highbd_10_obmc_variance128x64_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-#define aom_highbd_10_obmc_variance128x64 aom_highbd_10_obmc_variance128x64_c
-
-unsigned int aom_highbd_10_obmc_variance16x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance16x16 aom_highbd_10_obmc_variance16x16_c
-
-unsigned int aom_highbd_10_obmc_variance16x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance16x32 aom_highbd_10_obmc_variance16x32_c
-
-unsigned int aom_highbd_10_obmc_variance16x4_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_10_obmc_variance16x4 aom_highbd_10_obmc_variance16x4_c
-
-unsigned int aom_highbd_10_obmc_variance16x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance16x64 aom_highbd_10_obmc_variance16x64_c
-
-unsigned int aom_highbd_10_obmc_variance16x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_10_obmc_variance16x8 aom_highbd_10_obmc_variance16x8_c
-
-unsigned int aom_highbd_10_obmc_variance32x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance32x16 aom_highbd_10_obmc_variance32x16_c
-
-unsigned int aom_highbd_10_obmc_variance32x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance32x32 aom_highbd_10_obmc_variance32x32_c
-
-unsigned int aom_highbd_10_obmc_variance32x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance32x64 aom_highbd_10_obmc_variance32x64_c
-
-unsigned int aom_highbd_10_obmc_variance32x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_10_obmc_variance32x8 aom_highbd_10_obmc_variance32x8_c
-
-unsigned int aom_highbd_10_obmc_variance4x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_10_obmc_variance4x16 aom_highbd_10_obmc_variance4x16_c
-
-unsigned int aom_highbd_10_obmc_variance4x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_10_obmc_variance4x4 aom_highbd_10_obmc_variance4x4_c
-
-unsigned int aom_highbd_10_obmc_variance4x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_10_obmc_variance4x8 aom_highbd_10_obmc_variance4x8_c
-
-unsigned int aom_highbd_10_obmc_variance64x128_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-#define aom_highbd_10_obmc_variance64x128 aom_highbd_10_obmc_variance64x128_c
-
-unsigned int aom_highbd_10_obmc_variance64x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance64x16 aom_highbd_10_obmc_variance64x16_c
-
-unsigned int aom_highbd_10_obmc_variance64x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance64x32 aom_highbd_10_obmc_variance64x32_c
-
-unsigned int aom_highbd_10_obmc_variance64x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_10_obmc_variance64x64 aom_highbd_10_obmc_variance64x64_c
-
-unsigned int aom_highbd_10_obmc_variance8x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_10_obmc_variance8x16 aom_highbd_10_obmc_variance8x16_c
-
-unsigned int aom_highbd_10_obmc_variance8x32_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_10_obmc_variance8x32 aom_highbd_10_obmc_variance8x32_c
-
-unsigned int aom_highbd_10_obmc_variance8x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_10_obmc_variance8x4 aom_highbd_10_obmc_variance8x4_c
-
-unsigned int aom_highbd_10_obmc_variance8x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_10_obmc_variance8x8 aom_highbd_10_obmc_variance8x8_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance128x128 \
-  aom_highbd_10_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance128x64 \
-  aom_highbd_10_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance16x16 \
-  aom_highbd_10_sub_pixel_avg_variance16x16_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance16x32 \
-  aom_highbd_10_sub_pixel_avg_variance16x32_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x4_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance16x4 \
-  aom_highbd_10_sub_pixel_avg_variance16x4_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance16x64 \
-  aom_highbd_10_sub_pixel_avg_variance16x64_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance16x8 \
-  aom_highbd_10_sub_pixel_avg_variance16x8_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance32x16 \
-  aom_highbd_10_sub_pixel_avg_variance32x16_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance32x32 \
-  aom_highbd_10_sub_pixel_avg_variance32x32_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance32x64 \
-  aom_highbd_10_sub_pixel_avg_variance32x64_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x8_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance32x8 \
-  aom_highbd_10_sub_pixel_avg_variance32x8_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance4x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance4x16 \
-  aom_highbd_10_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance4x4 \
-  aom_highbd_10_sub_pixel_avg_variance4x4_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance4x8 \
-  aom_highbd_10_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance64x128 \
-  aom_highbd_10_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance64x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance64x16 \
-  aom_highbd_10_sub_pixel_avg_variance64x16_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance64x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance64x32 \
-  aom_highbd_10_sub_pixel_avg_variance64x32_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance64x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance64x64 \
-  aom_highbd_10_sub_pixel_avg_variance64x64_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance8x16 \
-  aom_highbd_10_sub_pixel_avg_variance8x16_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x32_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance8x32 \
-  aom_highbd_10_sub_pixel_avg_variance8x32_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance8x4 \
-  aom_highbd_10_sub_pixel_avg_variance8x4_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance8x8 \
-  aom_highbd_10_sub_pixel_avg_variance8x8_c
-
-uint32_t aom_highbd_10_sub_pixel_variance128x128_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance128x128 \
-  aom_highbd_10_sub_pixel_variance128x128_c
-
-uint32_t aom_highbd_10_sub_pixel_variance128x64_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance128x64 \
-  aom_highbd_10_sub_pixel_variance128x64_c
-
-uint32_t aom_highbd_10_sub_pixel_variance16x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance16x16 \
-  aom_highbd_10_sub_pixel_variance16x16_c
-
-uint32_t aom_highbd_10_sub_pixel_variance16x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance16x32 \
-  aom_highbd_10_sub_pixel_variance16x32_c
-
-uint32_t aom_highbd_10_sub_pixel_variance16x4_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance16x4 \
-  aom_highbd_10_sub_pixel_variance16x4_c
-
-uint32_t aom_highbd_10_sub_pixel_variance16x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance16x64 \
-  aom_highbd_10_sub_pixel_variance16x64_c
-
-uint32_t aom_highbd_10_sub_pixel_variance16x8_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance16x8 \
-  aom_highbd_10_sub_pixel_variance16x8_c
-
-uint32_t aom_highbd_10_sub_pixel_variance32x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance32x16 \
-  aom_highbd_10_sub_pixel_variance32x16_c
-
-uint32_t aom_highbd_10_sub_pixel_variance32x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance32x32 \
-  aom_highbd_10_sub_pixel_variance32x32_c
-
-uint32_t aom_highbd_10_sub_pixel_variance32x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance32x64 \
-  aom_highbd_10_sub_pixel_variance32x64_c
-
-uint32_t aom_highbd_10_sub_pixel_variance32x8_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance32x8 \
-  aom_highbd_10_sub_pixel_variance32x8_c
-
-uint32_t aom_highbd_10_sub_pixel_variance4x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance4x16 \
-  aom_highbd_10_sub_pixel_variance4x16_c
-
-uint32_t aom_highbd_10_sub_pixel_variance4x4_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance4x4 \
-  aom_highbd_10_sub_pixel_variance4x4_c
-
-uint32_t aom_highbd_10_sub_pixel_variance4x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance4x8 \
-  aom_highbd_10_sub_pixel_variance4x8_c
-
-uint32_t aom_highbd_10_sub_pixel_variance64x128_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance64x128 \
-  aom_highbd_10_sub_pixel_variance64x128_c
-
-uint32_t aom_highbd_10_sub_pixel_variance64x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance64x16 \
-  aom_highbd_10_sub_pixel_variance64x16_c
-
-uint32_t aom_highbd_10_sub_pixel_variance64x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance64x32 \
-  aom_highbd_10_sub_pixel_variance64x32_c
-
-uint32_t aom_highbd_10_sub_pixel_variance64x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance64x64 \
-  aom_highbd_10_sub_pixel_variance64x64_c
-
-uint32_t aom_highbd_10_sub_pixel_variance8x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance8x16 \
-  aom_highbd_10_sub_pixel_variance8x16_c
-
-uint32_t aom_highbd_10_sub_pixel_variance8x32_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance8x32 \
-  aom_highbd_10_sub_pixel_variance8x32_c
-
-uint32_t aom_highbd_10_sub_pixel_variance8x4_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance8x4 \
-  aom_highbd_10_sub_pixel_variance8x4_c
-
-uint32_t aom_highbd_10_sub_pixel_variance8x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance8x8 \
-  aom_highbd_10_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_10_variance128x128_c(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-#define aom_highbd_10_variance128x128 aom_highbd_10_variance128x128_c
-
-unsigned int aom_highbd_10_variance128x64_c(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-#define aom_highbd_10_variance128x64 aom_highbd_10_variance128x64_c
-
-unsigned int aom_highbd_10_variance16x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_10_variance16x16 aom_highbd_10_variance16x16_c
-
-unsigned int aom_highbd_10_variance16x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_10_variance16x32 aom_highbd_10_variance16x32_c
-
-unsigned int aom_highbd_10_variance16x4_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_10_variance16x4 aom_highbd_10_variance16x4_c
-
-unsigned int aom_highbd_10_variance16x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           uint32_t* sse);
-#define aom_highbd_10_variance16x64 aom_highbd_10_variance16x64_c
-
-unsigned int aom_highbd_10_variance16x8_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_10_variance16x8 aom_highbd_10_variance16x8_c
-
-unsigned int aom_highbd_10_variance2x2_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance2x2 aom_highbd_10_variance2x2_c
-
-unsigned int aom_highbd_10_variance2x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance2x4 aom_highbd_10_variance2x4_c
-
-unsigned int aom_highbd_10_variance32x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_10_variance32x16 aom_highbd_10_variance32x16_c
-
-unsigned int aom_highbd_10_variance32x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_10_variance32x32 aom_highbd_10_variance32x32_c
-
-unsigned int aom_highbd_10_variance32x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_10_variance32x64 aom_highbd_10_variance32x64_c
-
-unsigned int aom_highbd_10_variance32x8_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_10_variance32x8 aom_highbd_10_variance32x8_c
-
-unsigned int aom_highbd_10_variance4x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_10_variance4x16 aom_highbd_10_variance4x16_c
-
-unsigned int aom_highbd_10_variance4x2_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance4x2 aom_highbd_10_variance4x2_c
-
-unsigned int aom_highbd_10_variance4x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance4x4 aom_highbd_10_variance4x4_c
-
-unsigned int aom_highbd_10_variance4x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance4x8 aom_highbd_10_variance4x8_c
-
-unsigned int aom_highbd_10_variance64x128_c(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-#define aom_highbd_10_variance64x128 aom_highbd_10_variance64x128_c
-
-unsigned int aom_highbd_10_variance64x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           uint32_t* sse);
-#define aom_highbd_10_variance64x16 aom_highbd_10_variance64x16_c
-
-unsigned int aom_highbd_10_variance64x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_10_variance64x32 aom_highbd_10_variance64x32_c
-
-unsigned int aom_highbd_10_variance64x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_10_variance64x64 aom_highbd_10_variance64x64_c
-
-unsigned int aom_highbd_10_variance8x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_10_variance8x16 aom_highbd_10_variance8x16_c
-
-unsigned int aom_highbd_10_variance8x32_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_10_variance8x32 aom_highbd_10_variance8x32_c
-
-unsigned int aom_highbd_10_variance8x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance8x4 aom_highbd_10_variance8x4_c
-
-unsigned int aom_highbd_10_variance8x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance8x8 aom_highbd_10_variance8x8_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x128 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x64 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x16 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x16_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x32 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x32_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x4 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x4_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x64 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x64_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x8 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x8_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x16 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x16_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x32 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x32_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x64 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x64_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x8 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x8_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x16 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x4 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x4_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x8 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x128 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x16 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x16_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x32 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x32_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x64 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x64_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x16 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x16_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x32 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x32_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x4 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x4_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x8 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x8_c
-
-void aom_highbd_12_get16x16var_c(const uint8_t* src_ptr,
-                                 int source_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride,
-                                 unsigned int* sse,
-                                 int* sum);
-#define aom_highbd_12_get16x16var aom_highbd_12_get16x16var_c
-
-void aom_highbd_12_get8x8var_c(const uint8_t* src_ptr,
-                               int source_stride,
-                               const uint8_t* ref_ptr,
-                               int ref_stride,
-                               unsigned int* sse,
-                               int* sum);
-#define aom_highbd_12_get8x8var aom_highbd_12_get8x8var_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance128x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance128x128 \
-  aom_highbd_12_masked_sub_pixel_variance128x128_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance128x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance128x64 \
-  aom_highbd_12_masked_sub_pixel_variance128x64_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance16x16 \
-  aom_highbd_12_masked_sub_pixel_variance16x16_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance16x32 \
-  aom_highbd_12_masked_sub_pixel_variance16x32_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance16x4 \
-  aom_highbd_12_masked_sub_pixel_variance16x4_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance16x64 \
-  aom_highbd_12_masked_sub_pixel_variance16x64_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance16x8 \
-  aom_highbd_12_masked_sub_pixel_variance16x8_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance32x16 \
-  aom_highbd_12_masked_sub_pixel_variance32x16_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance32x32 \
-  aom_highbd_12_masked_sub_pixel_variance32x32_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance32x64 \
-  aom_highbd_12_masked_sub_pixel_variance32x64_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance32x8 \
-  aom_highbd_12_masked_sub_pixel_variance32x8_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance4x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance4x16 \
-  aom_highbd_12_masked_sub_pixel_variance4x16_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance4x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance4x4 \
-  aom_highbd_12_masked_sub_pixel_variance4x4_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance4x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance4x8 \
-  aom_highbd_12_masked_sub_pixel_variance4x8_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance64x128 \
-  aom_highbd_12_masked_sub_pixel_variance64x128_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance64x16 \
-  aom_highbd_12_masked_sub_pixel_variance64x16_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance64x32 \
-  aom_highbd_12_masked_sub_pixel_variance64x32_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance64x64 \
-  aom_highbd_12_masked_sub_pixel_variance64x64_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance8x16 \
-  aom_highbd_12_masked_sub_pixel_variance8x16_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance8x32 \
-  aom_highbd_12_masked_sub_pixel_variance8x32_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance8x4 \
-  aom_highbd_12_masked_sub_pixel_variance8x4_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_12_masked_sub_pixel_variance8x8 \
-  aom_highbd_12_masked_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_12_mse16x16_c(const uint8_t* src_ptr,
-                                      int source_stride,
-                                      const uint8_t* ref_ptr,
-                                      int recon_stride,
-                                      unsigned int* sse);
-#define aom_highbd_12_mse16x16 aom_highbd_12_mse16x16_c
-
-unsigned int aom_highbd_12_mse16x8_c(const uint8_t* src_ptr,
-                                     int source_stride,
-                                     const uint8_t* ref_ptr,
-                                     int recon_stride,
-                                     unsigned int* sse);
-#define aom_highbd_12_mse16x8 aom_highbd_12_mse16x8_c
-
-unsigned int aom_highbd_12_mse8x16_c(const uint8_t* src_ptr,
-                                     int source_stride,
-                                     const uint8_t* ref_ptr,
-                                     int recon_stride,
-                                     unsigned int* sse);
-#define aom_highbd_12_mse8x16 aom_highbd_12_mse8x16_c
-
-unsigned int aom_highbd_12_mse8x8_c(const uint8_t* src_ptr,
-                                    int source_stride,
-                                    const uint8_t* ref_ptr,
-                                    int recon_stride,
-                                    unsigned int* sse);
-#define aom_highbd_12_mse8x8 aom_highbd_12_mse8x8_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance128x128_c(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            int xoffset,
-                                                            int yoffset,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance128x128 \
-  aom_highbd_12_obmc_sub_pixel_variance128x128_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance128x64_c(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance128x64 \
-  aom_highbd_12_obmc_sub_pixel_variance128x64_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance16x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance16x16 \
-  aom_highbd_12_obmc_sub_pixel_variance16x16_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance16x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance16x32 \
-  aom_highbd_12_obmc_sub_pixel_variance16x32_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance16x4_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance16x4 \
-  aom_highbd_12_obmc_sub_pixel_variance16x4_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance16x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance16x64 \
-  aom_highbd_12_obmc_sub_pixel_variance16x64_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance16x8_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance16x8 \
-  aom_highbd_12_obmc_sub_pixel_variance16x8_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance32x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance32x16 \
-  aom_highbd_12_obmc_sub_pixel_variance32x16_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance32x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance32x32 \
-  aom_highbd_12_obmc_sub_pixel_variance32x32_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance32x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance32x64 \
-  aom_highbd_12_obmc_sub_pixel_variance32x64_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance32x8_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance32x8 \
-  aom_highbd_12_obmc_sub_pixel_variance32x8_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance4x16_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance4x16 \
-  aom_highbd_12_obmc_sub_pixel_variance4x16_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance4x4_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance4x4 \
-  aom_highbd_12_obmc_sub_pixel_variance4x4_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance4x8_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance4x8 \
-  aom_highbd_12_obmc_sub_pixel_variance4x8_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance64x128_c(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance64x128 \
-  aom_highbd_12_obmc_sub_pixel_variance64x128_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance64x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance64x16 \
-  aom_highbd_12_obmc_sub_pixel_variance64x16_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance64x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance64x32 \
-  aom_highbd_12_obmc_sub_pixel_variance64x32_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance64x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance64x64 \
-  aom_highbd_12_obmc_sub_pixel_variance64x64_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance8x16_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance8x16 \
-  aom_highbd_12_obmc_sub_pixel_variance8x16_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance8x32_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance8x32 \
-  aom_highbd_12_obmc_sub_pixel_variance8x32_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance8x4_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance8x4 \
-  aom_highbd_12_obmc_sub_pixel_variance8x4_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance8x8_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance8x8 \
-  aom_highbd_12_obmc_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_12_obmc_variance128x128_c(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-#define aom_highbd_12_obmc_variance128x128 aom_highbd_12_obmc_variance128x128_c
-
-unsigned int aom_highbd_12_obmc_variance128x64_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-#define aom_highbd_12_obmc_variance128x64 aom_highbd_12_obmc_variance128x64_c
-
-unsigned int aom_highbd_12_obmc_variance16x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance16x16 aom_highbd_12_obmc_variance16x16_c
-
-unsigned int aom_highbd_12_obmc_variance16x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance16x32 aom_highbd_12_obmc_variance16x32_c
-
-unsigned int aom_highbd_12_obmc_variance16x4_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_12_obmc_variance16x4 aom_highbd_12_obmc_variance16x4_c
-
-unsigned int aom_highbd_12_obmc_variance16x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance16x64 aom_highbd_12_obmc_variance16x64_c
-
-unsigned int aom_highbd_12_obmc_variance16x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_12_obmc_variance16x8 aom_highbd_12_obmc_variance16x8_c
-
-unsigned int aom_highbd_12_obmc_variance32x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance32x16 aom_highbd_12_obmc_variance32x16_c
-
-unsigned int aom_highbd_12_obmc_variance32x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance32x32 aom_highbd_12_obmc_variance32x32_c
-
-unsigned int aom_highbd_12_obmc_variance32x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance32x64 aom_highbd_12_obmc_variance32x64_c
-
-unsigned int aom_highbd_12_obmc_variance32x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_12_obmc_variance32x8 aom_highbd_12_obmc_variance32x8_c
-
-unsigned int aom_highbd_12_obmc_variance4x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_12_obmc_variance4x16 aom_highbd_12_obmc_variance4x16_c
-
-unsigned int aom_highbd_12_obmc_variance4x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_12_obmc_variance4x4 aom_highbd_12_obmc_variance4x4_c
-
-unsigned int aom_highbd_12_obmc_variance4x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_12_obmc_variance4x8 aom_highbd_12_obmc_variance4x8_c
-
-unsigned int aom_highbd_12_obmc_variance64x128_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-#define aom_highbd_12_obmc_variance64x128 aom_highbd_12_obmc_variance64x128_c
-
-unsigned int aom_highbd_12_obmc_variance64x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance64x16 aom_highbd_12_obmc_variance64x16_c
-
-unsigned int aom_highbd_12_obmc_variance64x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance64x32 aom_highbd_12_obmc_variance64x32_c
-
-unsigned int aom_highbd_12_obmc_variance64x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_highbd_12_obmc_variance64x64 aom_highbd_12_obmc_variance64x64_c
-
-unsigned int aom_highbd_12_obmc_variance8x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_12_obmc_variance8x16 aom_highbd_12_obmc_variance8x16_c
-
-unsigned int aom_highbd_12_obmc_variance8x32_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_12_obmc_variance8x32 aom_highbd_12_obmc_variance8x32_c
-
-unsigned int aom_highbd_12_obmc_variance8x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_12_obmc_variance8x4 aom_highbd_12_obmc_variance8x4_c
-
-unsigned int aom_highbd_12_obmc_variance8x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_12_obmc_variance8x8 aom_highbd_12_obmc_variance8x8_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance128x128 \
-  aom_highbd_12_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance128x64 \
-  aom_highbd_12_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance16x16 \
-  aom_highbd_12_sub_pixel_avg_variance16x16_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance16x32 \
-  aom_highbd_12_sub_pixel_avg_variance16x32_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x4_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance16x4 \
-  aom_highbd_12_sub_pixel_avg_variance16x4_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance16x64 \
-  aom_highbd_12_sub_pixel_avg_variance16x64_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance16x8 \
-  aom_highbd_12_sub_pixel_avg_variance16x8_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance32x16 \
-  aom_highbd_12_sub_pixel_avg_variance32x16_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance32x32 \
-  aom_highbd_12_sub_pixel_avg_variance32x32_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance32x64 \
-  aom_highbd_12_sub_pixel_avg_variance32x64_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x8_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance32x8 \
-  aom_highbd_12_sub_pixel_avg_variance32x8_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance4x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance4x16 \
-  aom_highbd_12_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance4x4 \
-  aom_highbd_12_sub_pixel_avg_variance4x4_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance4x8 \
-  aom_highbd_12_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance64x128 \
-  aom_highbd_12_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance64x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance64x16 \
-  aom_highbd_12_sub_pixel_avg_variance64x16_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance64x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance64x32 \
-  aom_highbd_12_sub_pixel_avg_variance64x32_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance64x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance64x64 \
-  aom_highbd_12_sub_pixel_avg_variance64x64_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance8x16 \
-  aom_highbd_12_sub_pixel_avg_variance8x16_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x32_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance8x32 \
-  aom_highbd_12_sub_pixel_avg_variance8x32_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance8x4 \
-  aom_highbd_12_sub_pixel_avg_variance8x4_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance8x8 \
-  aom_highbd_12_sub_pixel_avg_variance8x8_c
-
-uint32_t aom_highbd_12_sub_pixel_variance128x128_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance128x128 \
-  aom_highbd_12_sub_pixel_variance128x128_c
-
-uint32_t aom_highbd_12_sub_pixel_variance128x64_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance128x64 \
-  aom_highbd_12_sub_pixel_variance128x64_c
-
-uint32_t aom_highbd_12_sub_pixel_variance16x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance16x16 \
-  aom_highbd_12_sub_pixel_variance16x16_c
-
-uint32_t aom_highbd_12_sub_pixel_variance16x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance16x32 \
-  aom_highbd_12_sub_pixel_variance16x32_c
-
-uint32_t aom_highbd_12_sub_pixel_variance16x4_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance16x4 \
-  aom_highbd_12_sub_pixel_variance16x4_c
-
-uint32_t aom_highbd_12_sub_pixel_variance16x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance16x64 \
-  aom_highbd_12_sub_pixel_variance16x64_c
-
-uint32_t aom_highbd_12_sub_pixel_variance16x8_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance16x8 \
-  aom_highbd_12_sub_pixel_variance16x8_c
-
-uint32_t aom_highbd_12_sub_pixel_variance32x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance32x16 \
-  aom_highbd_12_sub_pixel_variance32x16_c
-
-uint32_t aom_highbd_12_sub_pixel_variance32x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance32x32 \
-  aom_highbd_12_sub_pixel_variance32x32_c
-
-uint32_t aom_highbd_12_sub_pixel_variance32x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance32x64 \
-  aom_highbd_12_sub_pixel_variance32x64_c
-
-uint32_t aom_highbd_12_sub_pixel_variance32x8_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance32x8 \
-  aom_highbd_12_sub_pixel_variance32x8_c
-
-uint32_t aom_highbd_12_sub_pixel_variance4x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance4x16 \
-  aom_highbd_12_sub_pixel_variance4x16_c
-
-uint32_t aom_highbd_12_sub_pixel_variance4x4_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance4x4 \
-  aom_highbd_12_sub_pixel_variance4x4_c
-
-uint32_t aom_highbd_12_sub_pixel_variance4x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance4x8 \
-  aom_highbd_12_sub_pixel_variance4x8_c
-
-uint32_t aom_highbd_12_sub_pixel_variance64x128_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance64x128 \
-  aom_highbd_12_sub_pixel_variance64x128_c
-
-uint32_t aom_highbd_12_sub_pixel_variance64x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance64x16 \
-  aom_highbd_12_sub_pixel_variance64x16_c
-
-uint32_t aom_highbd_12_sub_pixel_variance64x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance64x32 \
-  aom_highbd_12_sub_pixel_variance64x32_c
-
-uint32_t aom_highbd_12_sub_pixel_variance64x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance64x64 \
-  aom_highbd_12_sub_pixel_variance64x64_c
-
-uint32_t aom_highbd_12_sub_pixel_variance8x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance8x16 \
-  aom_highbd_12_sub_pixel_variance8x16_c
-
-uint32_t aom_highbd_12_sub_pixel_variance8x32_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance8x32 \
-  aom_highbd_12_sub_pixel_variance8x32_c
-
-uint32_t aom_highbd_12_sub_pixel_variance8x4_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance8x4 \
-  aom_highbd_12_sub_pixel_variance8x4_c
-
-uint32_t aom_highbd_12_sub_pixel_variance8x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance8x8 \
-  aom_highbd_12_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_12_variance128x128_c(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-#define aom_highbd_12_variance128x128 aom_highbd_12_variance128x128_c
-
-unsigned int aom_highbd_12_variance128x64_c(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-#define aom_highbd_12_variance128x64 aom_highbd_12_variance128x64_c
-
-unsigned int aom_highbd_12_variance16x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_12_variance16x16 aom_highbd_12_variance16x16_c
-
-unsigned int aom_highbd_12_variance16x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_12_variance16x32 aom_highbd_12_variance16x32_c
-
-unsigned int aom_highbd_12_variance16x4_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_12_variance16x4 aom_highbd_12_variance16x4_c
-
-unsigned int aom_highbd_12_variance16x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           uint32_t* sse);
-#define aom_highbd_12_variance16x64 aom_highbd_12_variance16x64_c
-
-unsigned int aom_highbd_12_variance16x8_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_12_variance16x8 aom_highbd_12_variance16x8_c
-
-unsigned int aom_highbd_12_variance2x2_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance2x2 aom_highbd_12_variance2x2_c
-
-unsigned int aom_highbd_12_variance2x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance2x4 aom_highbd_12_variance2x4_c
-
-unsigned int aom_highbd_12_variance32x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_12_variance32x16 aom_highbd_12_variance32x16_c
-
-unsigned int aom_highbd_12_variance32x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_12_variance32x32 aom_highbd_12_variance32x32_c
-
-unsigned int aom_highbd_12_variance32x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_12_variance32x64 aom_highbd_12_variance32x64_c
-
-unsigned int aom_highbd_12_variance32x8_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_12_variance32x8 aom_highbd_12_variance32x8_c
-
-unsigned int aom_highbd_12_variance4x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_12_variance4x16 aom_highbd_12_variance4x16_c
-
-unsigned int aom_highbd_12_variance4x2_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance4x2 aom_highbd_12_variance4x2_c
-
-unsigned int aom_highbd_12_variance4x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance4x4 aom_highbd_12_variance4x4_c
-
-unsigned int aom_highbd_12_variance4x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance4x8 aom_highbd_12_variance4x8_c
-
-unsigned int aom_highbd_12_variance64x128_c(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-#define aom_highbd_12_variance64x128 aom_highbd_12_variance64x128_c
-
-unsigned int aom_highbd_12_variance64x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           uint32_t* sse);
-#define aom_highbd_12_variance64x16 aom_highbd_12_variance64x16_c
-
-unsigned int aom_highbd_12_variance64x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_12_variance64x32 aom_highbd_12_variance64x32_c
-
-unsigned int aom_highbd_12_variance64x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_12_variance64x64 aom_highbd_12_variance64x64_c
-
-unsigned int aom_highbd_12_variance8x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_12_variance8x16 aom_highbd_12_variance8x16_c
-
-unsigned int aom_highbd_12_variance8x32_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_12_variance8x32 aom_highbd_12_variance8x32_c
-
-unsigned int aom_highbd_12_variance8x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance8x4 aom_highbd_12_variance8x4_c
-
-unsigned int aom_highbd_12_variance8x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance8x8 aom_highbd_12_variance8x8_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x128 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x64 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x16 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x16_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x32 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x32_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x4 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x4_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x64 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x64_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x8 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x8_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x16 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x16_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x32 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x32_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x64 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x64_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x8 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x8_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x16 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x4 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x4_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x8 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x128 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x16 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x16_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x32 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x32_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x64 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x64_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x16 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x16_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x32 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x32_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x4 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x4_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x8 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x8_c
-
-void aom_highbd_8_get16x16var_c(const uint8_t* src_ptr,
-                                int source_stride,
-                                const uint8_t* ref_ptr,
-                                int ref_stride,
-                                unsigned int* sse,
-                                int* sum);
-#define aom_highbd_8_get16x16var aom_highbd_8_get16x16var_c
-
-void aom_highbd_8_get8x8var_c(const uint8_t* src_ptr,
-                              int source_stride,
-                              const uint8_t* ref_ptr,
-                              int ref_stride,
-                              unsigned int* sse,
-                              int* sum);
-#define aom_highbd_8_get8x8var aom_highbd_8_get8x8var_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance128x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance128x128 \
-  aom_highbd_8_masked_sub_pixel_variance128x128_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance128x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance128x64 \
-  aom_highbd_8_masked_sub_pixel_variance128x64_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance16x16 \
-  aom_highbd_8_masked_sub_pixel_variance16x16_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance16x32 \
-  aom_highbd_8_masked_sub_pixel_variance16x32_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance16x4 \
-  aom_highbd_8_masked_sub_pixel_variance16x4_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance16x64 \
-  aom_highbd_8_masked_sub_pixel_variance16x64_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance16x8 \
-  aom_highbd_8_masked_sub_pixel_variance16x8_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance32x16 \
-  aom_highbd_8_masked_sub_pixel_variance32x16_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance32x32 \
-  aom_highbd_8_masked_sub_pixel_variance32x32_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance32x64 \
-  aom_highbd_8_masked_sub_pixel_variance32x64_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance32x8 \
-  aom_highbd_8_masked_sub_pixel_variance32x8_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance4x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance4x16 \
-  aom_highbd_8_masked_sub_pixel_variance4x16_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance4x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance4x4 \
-  aom_highbd_8_masked_sub_pixel_variance4x4_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance4x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance4x8 \
-  aom_highbd_8_masked_sub_pixel_variance4x8_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance64x128 \
-  aom_highbd_8_masked_sub_pixel_variance64x128_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance64x16 \
-  aom_highbd_8_masked_sub_pixel_variance64x16_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance64x32 \
-  aom_highbd_8_masked_sub_pixel_variance64x32_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance64x64 \
-  aom_highbd_8_masked_sub_pixel_variance64x64_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance8x16 \
-  aom_highbd_8_masked_sub_pixel_variance8x16_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance8x32 \
-  aom_highbd_8_masked_sub_pixel_variance8x32_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance8x4 \
-  aom_highbd_8_masked_sub_pixel_variance8x4_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-#define aom_highbd_8_masked_sub_pixel_variance8x8 \
-  aom_highbd_8_masked_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_8_mse16x16_c(const uint8_t* src_ptr,
-                                     int source_stride,
-                                     const uint8_t* ref_ptr,
-                                     int recon_stride,
-                                     unsigned int* sse);
-#define aom_highbd_8_mse16x16 aom_highbd_8_mse16x16_c
-
-unsigned int aom_highbd_8_mse16x8_c(const uint8_t* src_ptr,
-                                    int source_stride,
-                                    const uint8_t* ref_ptr,
-                                    int recon_stride,
-                                    unsigned int* sse);
-#define aom_highbd_8_mse16x8 aom_highbd_8_mse16x8_c
-
-unsigned int aom_highbd_8_mse8x16_c(const uint8_t* src_ptr,
-                                    int source_stride,
-                                    const uint8_t* ref_ptr,
-                                    int recon_stride,
-                                    unsigned int* sse);
-#define aom_highbd_8_mse8x16 aom_highbd_8_mse8x16_c
-
-unsigned int aom_highbd_8_mse8x8_c(const uint8_t* src_ptr,
-                                   int source_stride,
-                                   const uint8_t* ref_ptr,
-                                   int recon_stride,
-                                   unsigned int* sse);
-#define aom_highbd_8_mse8x8 aom_highbd_8_mse8x8_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance128x128 \
-  aom_highbd_8_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance128x64 \
-  aom_highbd_8_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance16x16 \
-  aom_highbd_8_sub_pixel_avg_variance16x16_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x32_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance16x32 \
-  aom_highbd_8_sub_pixel_avg_variance16x32_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x4_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance16x4 \
-  aom_highbd_8_sub_pixel_avg_variance16x4_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x64_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance16x64 \
-  aom_highbd_8_sub_pixel_avg_variance16x64_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance16x8 \
-  aom_highbd_8_sub_pixel_avg_variance16x8_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance32x16 \
-  aom_highbd_8_sub_pixel_avg_variance32x16_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x32_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance32x32 \
-  aom_highbd_8_sub_pixel_avg_variance32x32_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x64_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance32x64 \
-  aom_highbd_8_sub_pixel_avg_variance32x64_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance32x8 \
-  aom_highbd_8_sub_pixel_avg_variance32x8_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance4x16_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance4x16 \
-  aom_highbd_8_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse,
-                                                  const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance4x4 \
-  aom_highbd_8_sub_pixel_avg_variance4x4_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse,
-                                                  const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance4x8 \
-  aom_highbd_8_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance64x128 \
-  aom_highbd_8_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance64x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance64x16 \
-  aom_highbd_8_sub_pixel_avg_variance64x16_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance64x32_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance64x32 \
-  aom_highbd_8_sub_pixel_avg_variance64x32_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance64x64_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance64x64 \
-  aom_highbd_8_sub_pixel_avg_variance64x64_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance8x16 \
-  aom_highbd_8_sub_pixel_avg_variance8x16_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x32_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance8x32 \
-  aom_highbd_8_sub_pixel_avg_variance8x32_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse,
-                                                  const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance8x4 \
-  aom_highbd_8_sub_pixel_avg_variance8x4_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse,
-                                                  const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance8x8 \
-  aom_highbd_8_sub_pixel_avg_variance8x8_c
-
-uint32_t aom_highbd_8_sub_pixel_variance128x128_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance128x128 \
-  aom_highbd_8_sub_pixel_variance128x128_c
-
-uint32_t aom_highbd_8_sub_pixel_variance128x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance128x64 \
-  aom_highbd_8_sub_pixel_variance128x64_c
-
-uint32_t aom_highbd_8_sub_pixel_variance16x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance16x16 \
-  aom_highbd_8_sub_pixel_variance16x16_c
-
-uint32_t aom_highbd_8_sub_pixel_variance16x32_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance16x32 \
-  aom_highbd_8_sub_pixel_variance16x32_c
-
-uint32_t aom_highbd_8_sub_pixel_variance16x4_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance16x4 \
-  aom_highbd_8_sub_pixel_variance16x4_c
-
-uint32_t aom_highbd_8_sub_pixel_variance16x64_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance16x64 \
-  aom_highbd_8_sub_pixel_variance16x64_c
-
-uint32_t aom_highbd_8_sub_pixel_variance16x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance16x8 \
-  aom_highbd_8_sub_pixel_variance16x8_c
-
-uint32_t aom_highbd_8_sub_pixel_variance32x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance32x16 \
-  aom_highbd_8_sub_pixel_variance32x16_c
-
-uint32_t aom_highbd_8_sub_pixel_variance32x32_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance32x32 \
-  aom_highbd_8_sub_pixel_variance32x32_c
-
-uint32_t aom_highbd_8_sub_pixel_variance32x64_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance32x64 \
-  aom_highbd_8_sub_pixel_variance32x64_c
-
-uint32_t aom_highbd_8_sub_pixel_variance32x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance32x8 \
-  aom_highbd_8_sub_pixel_variance32x8_c
-
-uint32_t aom_highbd_8_sub_pixel_variance4x16_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance4x16 \
-  aom_highbd_8_sub_pixel_variance4x16_c
-
-uint32_t aom_highbd_8_sub_pixel_variance4x4_c(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance4x4 aom_highbd_8_sub_pixel_variance4x4_c
-
-uint32_t aom_highbd_8_sub_pixel_variance4x8_c(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance4x8 aom_highbd_8_sub_pixel_variance4x8_c
-
-uint32_t aom_highbd_8_sub_pixel_variance64x128_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance64x128 \
-  aom_highbd_8_sub_pixel_variance64x128_c
-
-uint32_t aom_highbd_8_sub_pixel_variance64x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance64x16 \
-  aom_highbd_8_sub_pixel_variance64x16_c
-
-uint32_t aom_highbd_8_sub_pixel_variance64x32_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance64x32 \
-  aom_highbd_8_sub_pixel_variance64x32_c
-
-uint32_t aom_highbd_8_sub_pixel_variance64x64_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance64x64 \
-  aom_highbd_8_sub_pixel_variance64x64_c
-
-uint32_t aom_highbd_8_sub_pixel_variance8x16_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance8x16 \
-  aom_highbd_8_sub_pixel_variance8x16_c
-
-uint32_t aom_highbd_8_sub_pixel_variance8x32_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance8x32 \
-  aom_highbd_8_sub_pixel_variance8x32_c
-
-uint32_t aom_highbd_8_sub_pixel_variance8x4_c(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance8x4 aom_highbd_8_sub_pixel_variance8x4_c
-
-uint32_t aom_highbd_8_sub_pixel_variance8x8_c(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance8x8 aom_highbd_8_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_8_variance128x128_c(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-#define aom_highbd_8_variance128x128 aom_highbd_8_variance128x128_c
-
-unsigned int aom_highbd_8_variance128x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_8_variance128x64 aom_highbd_8_variance128x64_c
-
-unsigned int aom_highbd_8_variance16x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_8_variance16x16 aom_highbd_8_variance16x16_c
-
-unsigned int aom_highbd_8_variance16x32_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_8_variance16x32 aom_highbd_8_variance16x32_c
-
-unsigned int aom_highbd_8_variance16x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         uint32_t* sse);
-#define aom_highbd_8_variance16x4 aom_highbd_8_variance16x4_c
-
-unsigned int aom_highbd_8_variance16x64_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_8_variance16x64 aom_highbd_8_variance16x64_c
-
-unsigned int aom_highbd_8_variance16x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_8_variance16x8 aom_highbd_8_variance16x8_c
-
-unsigned int aom_highbd_8_variance2x2_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance2x2 aom_highbd_8_variance2x2_c
-
-unsigned int aom_highbd_8_variance2x4_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance2x4 aom_highbd_8_variance2x4_c
-
-unsigned int aom_highbd_8_variance32x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_8_variance32x16 aom_highbd_8_variance32x16_c
-
-unsigned int aom_highbd_8_variance32x32_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_8_variance32x32 aom_highbd_8_variance32x32_c
-
-unsigned int aom_highbd_8_variance32x64_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_8_variance32x64 aom_highbd_8_variance32x64_c
-
-unsigned int aom_highbd_8_variance32x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         uint32_t* sse);
-#define aom_highbd_8_variance32x8 aom_highbd_8_variance32x8_c
-
-unsigned int aom_highbd_8_variance4x16_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         uint32_t* sse);
-#define aom_highbd_8_variance4x16 aom_highbd_8_variance4x16_c
-
-unsigned int aom_highbd_8_variance4x2_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance4x2 aom_highbd_8_variance4x2_c
-
-unsigned int aom_highbd_8_variance4x4_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance4x4 aom_highbd_8_variance4x4_c
-
-unsigned int aom_highbd_8_variance4x8_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance4x8 aom_highbd_8_variance4x8_c
-
-unsigned int aom_highbd_8_variance64x128_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_8_variance64x128 aom_highbd_8_variance64x128_c
-
-unsigned int aom_highbd_8_variance64x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_8_variance64x16 aom_highbd_8_variance64x16_c
-
-unsigned int aom_highbd_8_variance64x32_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_8_variance64x32 aom_highbd_8_variance64x32_c
-
-unsigned int aom_highbd_8_variance64x64_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-#define aom_highbd_8_variance64x64 aom_highbd_8_variance64x64_c
-
-unsigned int aom_highbd_8_variance8x16_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_8_variance8x16 aom_highbd_8_variance8x16_c
-
-unsigned int aom_highbd_8_variance8x32_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         uint32_t* sse);
-#define aom_highbd_8_variance8x32 aom_highbd_8_variance8x32_c
-
-unsigned int aom_highbd_8_variance8x4_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance8x4 aom_highbd_8_variance8x4_c
-
-unsigned int aom_highbd_8_variance8x8_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance8x8 aom_highbd_8_variance8x8_c
-
-unsigned int aom_highbd_avg_4x4_c(const uint8_t*, int p);
-#define aom_highbd_avg_4x4 aom_highbd_avg_4x4_c
-
-unsigned int aom_highbd_avg_8x8_c(const uint8_t*, int p);
-#define aom_highbd_avg_8x8 aom_highbd_avg_8x8_c
-
-void aom_highbd_blend_a64_d16_mask_c(uint8_t* dst,
-                                     uint32_t dst_stride,
-                                     const CONV_BUF_TYPE* src0,
-                                     uint32_t src0_stride,
-                                     const CONV_BUF_TYPE* src1,
-                                     uint32_t src1_stride,
-                                     const uint8_t* mask,
-                                     uint32_t mask_stride,
-                                     int w,
-                                     int h,
-                                     int subw,
-                                     int subh,
-                                     ConvolveParams* conv_params,
-                                     const int bd);
-#define aom_highbd_blend_a64_d16_mask aom_highbd_blend_a64_d16_mask_c
-
-void aom_highbd_blend_a64_hmask_c(uint8_t* dst,
-                                  uint32_t dst_stride,
-                                  const uint8_t* src0,
-                                  uint32_t src0_stride,
-                                  const uint8_t* src1,
-                                  uint32_t src1_stride,
-                                  const uint8_t* mask,
-                                  int w,
-                                  int h,
-                                  int bd);
-#define aom_highbd_blend_a64_hmask aom_highbd_blend_a64_hmask_c
-
-void aom_highbd_blend_a64_mask_c(uint8_t* dst,
-                                 uint32_t dst_stride,
-                                 const uint8_t* src0,
-                                 uint32_t src0_stride,
-                                 const uint8_t* src1,
-                                 uint32_t src1_stride,
-                                 const uint8_t* mask,
-                                 uint32_t mask_stride,
-                                 int w,
-                                 int h,
-                                 int subw,
-                                 int subh,
-                                 int bd);
-#define aom_highbd_blend_a64_mask aom_highbd_blend_a64_mask_c
-
-void aom_highbd_blend_a64_vmask_c(uint8_t* dst,
-                                  uint32_t dst_stride,
-                                  const uint8_t* src0,
-                                  uint32_t src0_stride,
-                                  const uint8_t* src1,
-                                  uint32_t src1_stride,
-                                  const uint8_t* mask,
-                                  int w,
-                                  int h,
-                                  int bd);
-#define aom_highbd_blend_a64_vmask aom_highbd_blend_a64_vmask_c
-
-void aom_highbd_comp_avg_pred_c(uint8_t* comp_pred8,
-                                const uint8_t* pred8,
-                                int width,
-                                int height,
-                                const uint8_t* ref8,
-                                int ref_stride);
-#define aom_highbd_comp_avg_pred aom_highbd_comp_avg_pred_c
-
-void aom_highbd_comp_avg_upsampled_pred_c(MACROBLOCKD* xd,
-                                          const struct AV1Common* const cm,
-                                          int mi_row,
-                                          int mi_col,
-                                          const MV* const mv,
-                                          uint8_t* comp_pred8,
-                                          const uint8_t* pred8,
-                                          int width,
-                                          int height,
-                                          int subpel_x_q3,
-                                          int subpel_y_q3,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          int bd,
-                                          int subpel_search);
-#define aom_highbd_comp_avg_upsampled_pred aom_highbd_comp_avg_upsampled_pred_c
-
-void aom_highbd_comp_mask_pred_c(uint8_t* comp_pred,
-                                 const uint8_t* pred8,
-                                 int width,
-                                 int height,
-                                 const uint8_t* ref8,
-                                 int ref_stride,
-                                 const uint8_t* mask,
-                                 int mask_stride,
-                                 int invert_mask);
-#define aom_highbd_comp_mask_pred aom_highbd_comp_mask_pred_c
-
-void aom_highbd_convolve8_horiz_c(const uint8_t* src,
-                                  ptrdiff_t src_stride,
-                                  uint8_t* dst,
-                                  ptrdiff_t dst_stride,
-                                  const int16_t* filter_x,
-                                  int x_step_q4,
-                                  const int16_t* filter_y,
-                                  int y_step_q4,
-                                  int w,
-                                  int h,
-                                  int bd);
-#define aom_highbd_convolve8_horiz aom_highbd_convolve8_horiz_c
-
-void aom_highbd_convolve8_vert_c(const uint8_t* src,
-                                 ptrdiff_t src_stride,
-                                 uint8_t* dst,
-                                 ptrdiff_t dst_stride,
-                                 const int16_t* filter_x,
-                                 int x_step_q4,
-                                 const int16_t* filter_y,
-                                 int y_step_q4,
-                                 int w,
-                                 int h,
-                                 int bd);
-#define aom_highbd_convolve8_vert aom_highbd_convolve8_vert_c
-
-void aom_highbd_convolve_copy_c(const uint16_t* src,
-                                ptrdiff_t src_stride,
-                                uint16_t* dst,
-                                ptrdiff_t dst_stride,
-                                int w,
-                                int h);
-#define aom_highbd_convolve_copy aom_highbd_convolve_copy_c
-
-void aom_highbd_dc_128_predictor_16x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_16x16 aom_highbd_dc_128_predictor_16x16_c
-
-void aom_highbd_dc_128_predictor_16x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_16x32 aom_highbd_dc_128_predictor_16x32_c
-
-void aom_highbd_dc_128_predictor_16x4_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_16x4 aom_highbd_dc_128_predictor_16x4_c
-
-void aom_highbd_dc_128_predictor_16x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_16x64 aom_highbd_dc_128_predictor_16x64_c
-
-void aom_highbd_dc_128_predictor_16x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_16x8 aom_highbd_dc_128_predictor_16x8_c
-
-void aom_highbd_dc_128_predictor_2x2_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_128_predictor_2x2 aom_highbd_dc_128_predictor_2x2_c
-
-void aom_highbd_dc_128_predictor_32x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_32x16 aom_highbd_dc_128_predictor_32x16_c
-
-void aom_highbd_dc_128_predictor_32x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_32x32 aom_highbd_dc_128_predictor_32x32_c
-
-void aom_highbd_dc_128_predictor_32x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_32x64 aom_highbd_dc_128_predictor_32x64_c
-
-void aom_highbd_dc_128_predictor_32x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_32x8 aom_highbd_dc_128_predictor_32x8_c
-
-void aom_highbd_dc_128_predictor_4x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_4x16 aom_highbd_dc_128_predictor_4x16_c
-
-void aom_highbd_dc_128_predictor_4x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_128_predictor_4x4 aom_highbd_dc_128_predictor_4x4_c
-
-void aom_highbd_dc_128_predictor_4x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_128_predictor_4x8 aom_highbd_dc_128_predictor_4x8_c
-
-void aom_highbd_dc_128_predictor_64x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_64x16 aom_highbd_dc_128_predictor_64x16_c
-
-void aom_highbd_dc_128_predictor_64x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_64x32 aom_highbd_dc_128_predictor_64x32_c
-
-void aom_highbd_dc_128_predictor_64x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_64x64 aom_highbd_dc_128_predictor_64x64_c
-
-void aom_highbd_dc_128_predictor_8x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_8x16 aom_highbd_dc_128_predictor_8x16_c
-
-void aom_highbd_dc_128_predictor_8x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_8x32 aom_highbd_dc_128_predictor_8x32_c
-
-void aom_highbd_dc_128_predictor_8x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_128_predictor_8x4 aom_highbd_dc_128_predictor_8x4_c
-
-void aom_highbd_dc_128_predictor_8x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_128_predictor_8x8 aom_highbd_dc_128_predictor_8x8_c
-
-void aom_highbd_dc_left_predictor_16x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_16x16 aom_highbd_dc_left_predictor_16x16_c
-
-void aom_highbd_dc_left_predictor_16x32_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_16x32 aom_highbd_dc_left_predictor_16x32_c
-
-void aom_highbd_dc_left_predictor_16x4_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_16x4 aom_highbd_dc_left_predictor_16x4_c
-
-void aom_highbd_dc_left_predictor_16x64_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_16x64 aom_highbd_dc_left_predictor_16x64_c
-
-void aom_highbd_dc_left_predictor_16x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_16x8 aom_highbd_dc_left_predictor_16x8_c
-
-void aom_highbd_dc_left_predictor_2x2_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_left_predictor_2x2 aom_highbd_dc_left_predictor_2x2_c
-
-void aom_highbd_dc_left_predictor_32x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_32x16 aom_highbd_dc_left_predictor_32x16_c
-
-void aom_highbd_dc_left_predictor_32x32_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_32x32 aom_highbd_dc_left_predictor_32x32_c
-
-void aom_highbd_dc_left_predictor_32x64_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_32x64 aom_highbd_dc_left_predictor_32x64_c
-
-void aom_highbd_dc_left_predictor_32x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_32x8 aom_highbd_dc_left_predictor_32x8_c
-
-void aom_highbd_dc_left_predictor_4x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_4x16 aom_highbd_dc_left_predictor_4x16_c
-
-void aom_highbd_dc_left_predictor_4x4_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_left_predictor_4x4 aom_highbd_dc_left_predictor_4x4_c
-
-void aom_highbd_dc_left_predictor_4x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_left_predictor_4x8 aom_highbd_dc_left_predictor_4x8_c
-
-void aom_highbd_dc_left_predictor_64x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_64x16 aom_highbd_dc_left_predictor_64x16_c
-
-void aom_highbd_dc_left_predictor_64x32_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_64x32 aom_highbd_dc_left_predictor_64x32_c
-
-void aom_highbd_dc_left_predictor_64x64_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_64x64 aom_highbd_dc_left_predictor_64x64_c
-
-void aom_highbd_dc_left_predictor_8x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_8x16 aom_highbd_dc_left_predictor_8x16_c
-
-void aom_highbd_dc_left_predictor_8x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_8x32 aom_highbd_dc_left_predictor_8x32_c
-
-void aom_highbd_dc_left_predictor_8x4_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_left_predictor_8x4 aom_highbd_dc_left_predictor_8x4_c
-
-void aom_highbd_dc_left_predictor_8x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_left_predictor_8x8 aom_highbd_dc_left_predictor_8x8_c
-
-void aom_highbd_dc_predictor_16x16_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-void aom_highbd_dc_predictor_16x16_neon(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_predictor_16x16 aom_highbd_dc_predictor_16x16_neon
-
-void aom_highbd_dc_predictor_16x32_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_16x32 aom_highbd_dc_predictor_16x32_c
-
-void aom_highbd_dc_predictor_16x4_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_16x4 aom_highbd_dc_predictor_16x4_c
-
-void aom_highbd_dc_predictor_16x64_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_16x64 aom_highbd_dc_predictor_16x64_c
-
-void aom_highbd_dc_predictor_16x8_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_16x8 aom_highbd_dc_predictor_16x8_c
-
-void aom_highbd_dc_predictor_2x2_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_dc_predictor_2x2 aom_highbd_dc_predictor_2x2_c
-
-void aom_highbd_dc_predictor_32x16_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_32x16 aom_highbd_dc_predictor_32x16_c
-
-void aom_highbd_dc_predictor_32x32_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-void aom_highbd_dc_predictor_32x32_neon(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_predictor_32x32 aom_highbd_dc_predictor_32x32_neon
-
-void aom_highbd_dc_predictor_32x64_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_32x64 aom_highbd_dc_predictor_32x64_c
-
-void aom_highbd_dc_predictor_32x8_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_32x8 aom_highbd_dc_predictor_32x8_c
-
-void aom_highbd_dc_predictor_4x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_4x16 aom_highbd_dc_predictor_4x16_c
-
-void aom_highbd_dc_predictor_4x4_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-void aom_highbd_dc_predictor_4x4_neon(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_dc_predictor_4x4 aom_highbd_dc_predictor_4x4_neon
-
-void aom_highbd_dc_predictor_4x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_dc_predictor_4x8 aom_highbd_dc_predictor_4x8_c
-
-void aom_highbd_dc_predictor_64x16_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_64x16 aom_highbd_dc_predictor_64x16_c
-
-void aom_highbd_dc_predictor_64x32_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_64x32 aom_highbd_dc_predictor_64x32_c
-
-void aom_highbd_dc_predictor_64x64_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-void aom_highbd_dc_predictor_64x64_neon(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_predictor_64x64 aom_highbd_dc_predictor_64x64_neon
-
-void aom_highbd_dc_predictor_8x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_8x16 aom_highbd_dc_predictor_8x16_c
-
-void aom_highbd_dc_predictor_8x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_8x32 aom_highbd_dc_predictor_8x32_c
-
-void aom_highbd_dc_predictor_8x4_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_dc_predictor_8x4 aom_highbd_dc_predictor_8x4_c
-
-void aom_highbd_dc_predictor_8x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-void aom_highbd_dc_predictor_8x8_neon(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_dc_predictor_8x8 aom_highbd_dc_predictor_8x8_neon
-
-void aom_highbd_dc_top_predictor_16x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_16x16 aom_highbd_dc_top_predictor_16x16_c
-
-void aom_highbd_dc_top_predictor_16x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_16x32 aom_highbd_dc_top_predictor_16x32_c
-
-void aom_highbd_dc_top_predictor_16x4_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_16x4 aom_highbd_dc_top_predictor_16x4_c
-
-void aom_highbd_dc_top_predictor_16x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_16x64 aom_highbd_dc_top_predictor_16x64_c
-
-void aom_highbd_dc_top_predictor_16x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_16x8 aom_highbd_dc_top_predictor_16x8_c
-
-void aom_highbd_dc_top_predictor_2x2_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_top_predictor_2x2 aom_highbd_dc_top_predictor_2x2_c
-
-void aom_highbd_dc_top_predictor_32x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_32x16 aom_highbd_dc_top_predictor_32x16_c
-
-void aom_highbd_dc_top_predictor_32x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_32x32 aom_highbd_dc_top_predictor_32x32_c
-
-void aom_highbd_dc_top_predictor_32x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_32x64 aom_highbd_dc_top_predictor_32x64_c
-
-void aom_highbd_dc_top_predictor_32x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_32x8 aom_highbd_dc_top_predictor_32x8_c
-
-void aom_highbd_dc_top_predictor_4x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_4x16 aom_highbd_dc_top_predictor_4x16_c
-
-void aom_highbd_dc_top_predictor_4x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_top_predictor_4x4 aom_highbd_dc_top_predictor_4x4_c
-
-void aom_highbd_dc_top_predictor_4x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_top_predictor_4x8 aom_highbd_dc_top_predictor_4x8_c
-
-void aom_highbd_dc_top_predictor_64x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_64x16 aom_highbd_dc_top_predictor_64x16_c
-
-void aom_highbd_dc_top_predictor_64x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_64x32 aom_highbd_dc_top_predictor_64x32_c
-
-void aom_highbd_dc_top_predictor_64x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_64x64 aom_highbd_dc_top_predictor_64x64_c
-
-void aom_highbd_dc_top_predictor_8x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_8x16 aom_highbd_dc_top_predictor_8x16_c
-
-void aom_highbd_dc_top_predictor_8x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_8x32 aom_highbd_dc_top_predictor_8x32_c
-
-void aom_highbd_dc_top_predictor_8x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_top_predictor_8x4 aom_highbd_dc_top_predictor_8x4_c
-
-void aom_highbd_dc_top_predictor_8x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_top_predictor_8x8 aom_highbd_dc_top_predictor_8x8_c
-
-void aom_highbd_dist_wtd_comp_avg_pred_c(uint8_t* comp_pred8,
-                                         const uint8_t* pred8,
-                                         int width,
-                                         int height,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_comp_avg_pred aom_highbd_dist_wtd_comp_avg_pred_c
-
-void aom_highbd_dist_wtd_comp_avg_upsampled_pred_c(
-    MACROBLOCKD* xd,
-    const struct AV1Common* const cm,
-    int mi_row,
-    int mi_col,
-    const MV* const mv,
-    uint8_t* comp_pred8,
-    const uint8_t* pred8,
-    int width,
-    int height,
-    int subpel_x_q3,
-    int subpel_y_q3,
-    const uint8_t* ref8,
-    int ref_stride,
-    int bd,
-    const DIST_WTD_COMP_PARAMS* jcp_param,
-    int subpel_search);
-#define aom_highbd_dist_wtd_comp_avg_upsampled_pred \
-  aom_highbd_dist_wtd_comp_avg_upsampled_pred_c
-
-unsigned int aom_highbd_dist_wtd_sad128x128_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad128x128_avg aom_highbd_dist_wtd_sad128x128_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad128x64_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad128x64_avg aom_highbd_dist_wtd_sad128x64_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad16x16_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad16x16_avg aom_highbd_dist_wtd_sad16x16_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad16x32_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad16x32_avg aom_highbd_dist_wtd_sad16x32_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad16x4_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad16x4_avg aom_highbd_dist_wtd_sad16x4_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad16x64_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad16x64_avg aom_highbd_dist_wtd_sad16x64_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad16x8_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad16x8_avg aom_highbd_dist_wtd_sad16x8_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad32x16_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad32x16_avg aom_highbd_dist_wtd_sad32x16_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad32x32_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad32x32_avg aom_highbd_dist_wtd_sad32x32_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad32x64_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad32x64_avg aom_highbd_dist_wtd_sad32x64_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad32x8_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad32x8_avg aom_highbd_dist_wtd_sad32x8_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad4x16_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad4x16_avg aom_highbd_dist_wtd_sad4x16_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad4x4_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad4x4_avg aom_highbd_dist_wtd_sad4x4_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad4x8_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad4x8_avg aom_highbd_dist_wtd_sad4x8_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad64x128_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad64x128_avg aom_highbd_dist_wtd_sad64x128_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad64x16_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad64x16_avg aom_highbd_dist_wtd_sad64x16_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad64x32_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad64x32_avg aom_highbd_dist_wtd_sad64x32_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad64x64_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad64x64_avg aom_highbd_dist_wtd_sad64x64_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad8x16_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad8x16_avg aom_highbd_dist_wtd_sad8x16_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad8x32_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad8x32_avg aom_highbd_dist_wtd_sad8x32_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad8x4_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad8x4_avg aom_highbd_dist_wtd_sad8x4_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad8x8_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad8x8_avg aom_highbd_dist_wtd_sad8x8_avg_c
-
-void aom_highbd_fdct8x8_c(const int16_t* input, tran_low_t* output, int stride);
-#define aom_highbd_fdct8x8 aom_highbd_fdct8x8_c
-
-void aom_highbd_h_predictor_16x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_16x16 aom_highbd_h_predictor_16x16_c
-
-void aom_highbd_h_predictor_16x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_16x32 aom_highbd_h_predictor_16x32_c
-
-void aom_highbd_h_predictor_16x4_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_16x4 aom_highbd_h_predictor_16x4_c
-
-void aom_highbd_h_predictor_16x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_16x64 aom_highbd_h_predictor_16x64_c
-
-void aom_highbd_h_predictor_16x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_16x8 aom_highbd_h_predictor_16x8_c
-
-void aom_highbd_h_predictor_2x2_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_h_predictor_2x2 aom_highbd_h_predictor_2x2_c
-
-void aom_highbd_h_predictor_32x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_32x16 aom_highbd_h_predictor_32x16_c
-
-void aom_highbd_h_predictor_32x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_32x32 aom_highbd_h_predictor_32x32_c
-
-void aom_highbd_h_predictor_32x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_32x64 aom_highbd_h_predictor_32x64_c
-
-void aom_highbd_h_predictor_32x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_32x8 aom_highbd_h_predictor_32x8_c
-
-void aom_highbd_h_predictor_4x16_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_4x16 aom_highbd_h_predictor_4x16_c
-
-void aom_highbd_h_predictor_4x4_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_h_predictor_4x4 aom_highbd_h_predictor_4x4_c
-
-void aom_highbd_h_predictor_4x8_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_h_predictor_4x8 aom_highbd_h_predictor_4x8_c
-
-void aom_highbd_h_predictor_64x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_64x16 aom_highbd_h_predictor_64x16_c
-
-void aom_highbd_h_predictor_64x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_64x32 aom_highbd_h_predictor_64x32_c
-
-void aom_highbd_h_predictor_64x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_64x64 aom_highbd_h_predictor_64x64_c
-
-void aom_highbd_h_predictor_8x16_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_8x16 aom_highbd_h_predictor_8x16_c
-
-void aom_highbd_h_predictor_8x32_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_8x32 aom_highbd_h_predictor_8x32_c
-
-void aom_highbd_h_predictor_8x4_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_h_predictor_8x4 aom_highbd_h_predictor_8x4_c
-
-void aom_highbd_h_predictor_8x8_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_h_predictor_8x8 aom_highbd_h_predictor_8x8_c
-
-void aom_highbd_hadamard_16x16_c(const int16_t* src_diff,
-                                 ptrdiff_t src_stride,
-                                 tran_low_t* coeff);
-#define aom_highbd_hadamard_16x16 aom_highbd_hadamard_16x16_c
-
-void aom_highbd_hadamard_32x32_c(const int16_t* src_diff,
-                                 ptrdiff_t src_stride,
-                                 tran_low_t* coeff);
-#define aom_highbd_hadamard_32x32 aom_highbd_hadamard_32x32_c
-
-void aom_highbd_hadamard_8x8_c(const int16_t* src_diff,
-                               ptrdiff_t src_stride,
-                               tran_low_t* coeff);
-#define aom_highbd_hadamard_8x8 aom_highbd_hadamard_8x8_c
-
-void aom_highbd_lpf_horizontal_14_c(uint16_t* s,
-                                    int pitch,
-                                    const uint8_t* blimit,
-                                    const uint8_t* limit,
-                                    const uint8_t* thresh,
-                                    int bd);
-#define aom_highbd_lpf_horizontal_14 aom_highbd_lpf_horizontal_14_c
-
-void aom_highbd_lpf_horizontal_14_dual_c(uint16_t* s,
-                                         int pitch,
-                                         const uint8_t* blimit0,
-                                         const uint8_t* limit0,
-                                         const uint8_t* thresh0,
-                                         const uint8_t* blimit1,
-                                         const uint8_t* limit1,
-                                         const uint8_t* thresh1,
-                                         int bd);
-#define aom_highbd_lpf_horizontal_14_dual aom_highbd_lpf_horizontal_14_dual_c
-
-void aom_highbd_lpf_horizontal_4_c(uint16_t* s,
-                                   int pitch,
-                                   const uint8_t* blimit,
-                                   const uint8_t* limit,
-                                   const uint8_t* thresh,
-                                   int bd);
-#define aom_highbd_lpf_horizontal_4 aom_highbd_lpf_horizontal_4_c
-
-void aom_highbd_lpf_horizontal_4_dual_c(uint16_t* s,
-                                        int pitch,
-                                        const uint8_t* blimit0,
-                                        const uint8_t* limit0,
-                                        const uint8_t* thresh0,
-                                        const uint8_t* blimit1,
-                                        const uint8_t* limit1,
-                                        const uint8_t* thresh1,
-                                        int bd);
-#define aom_highbd_lpf_horizontal_4_dual aom_highbd_lpf_horizontal_4_dual_c
-
-void aom_highbd_lpf_horizontal_6_c(uint16_t* s,
-                                   int pitch,
-                                   const uint8_t* blimit,
-                                   const uint8_t* limit,
-                                   const uint8_t* thresh,
-                                   int bd);
-#define aom_highbd_lpf_horizontal_6 aom_highbd_lpf_horizontal_6_c
-
-void aom_highbd_lpf_horizontal_6_dual_c(uint16_t* s,
-                                        int pitch,
-                                        const uint8_t* blimit0,
-                                        const uint8_t* limit0,
-                                        const uint8_t* thresh0,
-                                        const uint8_t* blimit1,
-                                        const uint8_t* limit1,
-                                        const uint8_t* thresh1,
-                                        int bd);
-#define aom_highbd_lpf_horizontal_6_dual aom_highbd_lpf_horizontal_6_dual_c
-
-void aom_highbd_lpf_horizontal_8_c(uint16_t* s,
-                                   int pitch,
-                                   const uint8_t* blimit,
-                                   const uint8_t* limit,
-                                   const uint8_t* thresh,
-                                   int bd);
-#define aom_highbd_lpf_horizontal_8 aom_highbd_lpf_horizontal_8_c
-
-void aom_highbd_lpf_horizontal_8_dual_c(uint16_t* s,
-                                        int pitch,
-                                        const uint8_t* blimit0,
-                                        const uint8_t* limit0,
-                                        const uint8_t* thresh0,
-                                        const uint8_t* blimit1,
-                                        const uint8_t* limit1,
-                                        const uint8_t* thresh1,
-                                        int bd);
-#define aom_highbd_lpf_horizontal_8_dual aom_highbd_lpf_horizontal_8_dual_c
-
-void aom_highbd_lpf_vertical_14_c(uint16_t* s,
-                                  int pitch,
-                                  const uint8_t* blimit,
-                                  const uint8_t* limit,
-                                  const uint8_t* thresh,
-                                  int bd);
-#define aom_highbd_lpf_vertical_14 aom_highbd_lpf_vertical_14_c
-
-void aom_highbd_lpf_vertical_14_dual_c(uint16_t* s,
-                                       int pitch,
-                                       const uint8_t* blimit0,
-                                       const uint8_t* limit0,
-                                       const uint8_t* thresh0,
-                                       const uint8_t* blimit1,
-                                       const uint8_t* limit1,
-                                       const uint8_t* thresh1,
-                                       int bd);
-#define aom_highbd_lpf_vertical_14_dual aom_highbd_lpf_vertical_14_dual_c
-
-void aom_highbd_lpf_vertical_4_c(uint16_t* s,
-                                 int pitch,
-                                 const uint8_t* blimit,
-                                 const uint8_t* limit,
-                                 const uint8_t* thresh,
-                                 int bd);
-#define aom_highbd_lpf_vertical_4 aom_highbd_lpf_vertical_4_c
-
-void aom_highbd_lpf_vertical_4_dual_c(uint16_t* s,
-                                      int pitch,
-                                      const uint8_t* blimit0,
-                                      const uint8_t* limit0,
-                                      const uint8_t* thresh0,
-                                      const uint8_t* blimit1,
-                                      const uint8_t* limit1,
-                                      const uint8_t* thresh1,
-                                      int bd);
-#define aom_highbd_lpf_vertical_4_dual aom_highbd_lpf_vertical_4_dual_c
-
-void aom_highbd_lpf_vertical_6_c(uint16_t* s,
-                                 int pitch,
-                                 const uint8_t* blimit,
-                                 const uint8_t* limit,
-                                 const uint8_t* thresh,
-                                 int bd);
-#define aom_highbd_lpf_vertical_6 aom_highbd_lpf_vertical_6_c
-
-void aom_highbd_lpf_vertical_6_dual_c(uint16_t* s,
-                                      int pitch,
-                                      const uint8_t* blimit0,
-                                      const uint8_t* limit0,
-                                      const uint8_t* thresh0,
-                                      const uint8_t* blimit1,
-                                      const uint8_t* limit1,
-                                      const uint8_t* thresh1,
-                                      int bd);
-#define aom_highbd_lpf_vertical_6_dual aom_highbd_lpf_vertical_6_dual_c
-
-void aom_highbd_lpf_vertical_8_c(uint16_t* s,
-                                 int pitch,
-                                 const uint8_t* blimit,
-                                 const uint8_t* limit,
-                                 const uint8_t* thresh,
-                                 int bd);
-#define aom_highbd_lpf_vertical_8 aom_highbd_lpf_vertical_8_c
-
-void aom_highbd_lpf_vertical_8_dual_c(uint16_t* s,
-                                      int pitch,
-                                      const uint8_t* blimit0,
-                                      const uint8_t* limit0,
-                                      const uint8_t* thresh0,
-                                      const uint8_t* blimit1,
-                                      const uint8_t* limit1,
-                                      const uint8_t* thresh1,
-                                      int bd);
-#define aom_highbd_lpf_vertical_8_dual aom_highbd_lpf_vertical_8_dual_c
-
-unsigned int aom_highbd_masked_sad128x128_c(const uint8_t* src8,
-                                            int src_stride,
-                                            const uint8_t* ref8,
-                                            int ref_stride,
-                                            const uint8_t* second_pred8,
-                                            const uint8_t* msk,
-                                            int msk_stride,
-                                            int invert_mask);
-#define aom_highbd_masked_sad128x128 aom_highbd_masked_sad128x128_c
-
-unsigned int aom_highbd_masked_sad128x64_c(const uint8_t* src8,
-                                           int src_stride,
-                                           const uint8_t* ref8,
-                                           int ref_stride,
-                                           const uint8_t* second_pred8,
-                                           const uint8_t* msk,
-                                           int msk_stride,
-                                           int invert_mask);
-#define aom_highbd_masked_sad128x64 aom_highbd_masked_sad128x64_c
-
-unsigned int aom_highbd_masked_sad16x16_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad16x16 aom_highbd_masked_sad16x16_c
-
-unsigned int aom_highbd_masked_sad16x32_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad16x32 aom_highbd_masked_sad16x32_c
-
-unsigned int aom_highbd_masked_sad16x4_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-#define aom_highbd_masked_sad16x4 aom_highbd_masked_sad16x4_c
-
-unsigned int aom_highbd_masked_sad16x64_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad16x64 aom_highbd_masked_sad16x64_c
-
-unsigned int aom_highbd_masked_sad16x8_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-#define aom_highbd_masked_sad16x8 aom_highbd_masked_sad16x8_c
-
-unsigned int aom_highbd_masked_sad32x16_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad32x16 aom_highbd_masked_sad32x16_c
-
-unsigned int aom_highbd_masked_sad32x32_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad32x32 aom_highbd_masked_sad32x32_c
-
-unsigned int aom_highbd_masked_sad32x64_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad32x64 aom_highbd_masked_sad32x64_c
-
-unsigned int aom_highbd_masked_sad32x8_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-#define aom_highbd_masked_sad32x8 aom_highbd_masked_sad32x8_c
-
-unsigned int aom_highbd_masked_sad4x16_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-#define aom_highbd_masked_sad4x16 aom_highbd_masked_sad4x16_c
-
-unsigned int aom_highbd_masked_sad4x4_c(const uint8_t* src8,
-                                        int src_stride,
-                                        const uint8_t* ref8,
-                                        int ref_stride,
-                                        const uint8_t* second_pred8,
-                                        const uint8_t* msk,
-                                        int msk_stride,
-                                        int invert_mask);
-#define aom_highbd_masked_sad4x4 aom_highbd_masked_sad4x4_c
-
-unsigned int aom_highbd_masked_sad4x8_c(const uint8_t* src8,
-                                        int src_stride,
-                                        const uint8_t* ref8,
-                                        int ref_stride,
-                                        const uint8_t* second_pred8,
-                                        const uint8_t* msk,
-                                        int msk_stride,
-                                        int invert_mask);
-#define aom_highbd_masked_sad4x8 aom_highbd_masked_sad4x8_c
-
-unsigned int aom_highbd_masked_sad64x128_c(const uint8_t* src8,
-                                           int src_stride,
-                                           const uint8_t* ref8,
-                                           int ref_stride,
-                                           const uint8_t* second_pred8,
-                                           const uint8_t* msk,
-                                           int msk_stride,
-                                           int invert_mask);
-#define aom_highbd_masked_sad64x128 aom_highbd_masked_sad64x128_c
-
-unsigned int aom_highbd_masked_sad64x16_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad64x16 aom_highbd_masked_sad64x16_c
-
-unsigned int aom_highbd_masked_sad64x32_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad64x32 aom_highbd_masked_sad64x32_c
-
-unsigned int aom_highbd_masked_sad64x64_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-#define aom_highbd_masked_sad64x64 aom_highbd_masked_sad64x64_c
-
-unsigned int aom_highbd_masked_sad8x16_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-#define aom_highbd_masked_sad8x16 aom_highbd_masked_sad8x16_c
-
-unsigned int aom_highbd_masked_sad8x32_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-#define aom_highbd_masked_sad8x32 aom_highbd_masked_sad8x32_c
-
-unsigned int aom_highbd_masked_sad8x4_c(const uint8_t* src8,
-                                        int src_stride,
-                                        const uint8_t* ref8,
-                                        int ref_stride,
-                                        const uint8_t* second_pred8,
-                                        const uint8_t* msk,
-                                        int msk_stride,
-                                        int invert_mask);
-#define aom_highbd_masked_sad8x4 aom_highbd_masked_sad8x4_c
-
-unsigned int aom_highbd_masked_sad8x8_c(const uint8_t* src8,
-                                        int src_stride,
-                                        const uint8_t* ref8,
-                                        int ref_stride,
-                                        const uint8_t* second_pred8,
-                                        const uint8_t* msk,
-                                        int msk_stride,
-                                        int invert_mask);
-#define aom_highbd_masked_sad8x8 aom_highbd_masked_sad8x8_c
-
-void aom_highbd_minmax_8x8_c(const uint8_t* s,
-                             int p,
-                             const uint8_t* d,
-                             int dp,
-                             int* min,
-                             int* max);
-#define aom_highbd_minmax_8x8 aom_highbd_minmax_8x8_c
-
-unsigned int aom_highbd_obmc_sad128x128_c(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask);
-#define aom_highbd_obmc_sad128x128 aom_highbd_obmc_sad128x128_c
-
-unsigned int aom_highbd_obmc_sad128x64_c(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask);
-#define aom_highbd_obmc_sad128x64 aom_highbd_obmc_sad128x64_c
-
-unsigned int aom_highbd_obmc_sad16x16_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad16x16 aom_highbd_obmc_sad16x16_c
-
-unsigned int aom_highbd_obmc_sad16x32_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad16x32 aom_highbd_obmc_sad16x32_c
-
-unsigned int aom_highbd_obmc_sad16x4_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-#define aom_highbd_obmc_sad16x4 aom_highbd_obmc_sad16x4_c
-
-unsigned int aom_highbd_obmc_sad16x64_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad16x64 aom_highbd_obmc_sad16x64_c
-
-unsigned int aom_highbd_obmc_sad16x8_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-#define aom_highbd_obmc_sad16x8 aom_highbd_obmc_sad16x8_c
-
-unsigned int aom_highbd_obmc_sad32x16_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad32x16 aom_highbd_obmc_sad32x16_c
-
-unsigned int aom_highbd_obmc_sad32x32_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad32x32 aom_highbd_obmc_sad32x32_c
-
-unsigned int aom_highbd_obmc_sad32x64_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad32x64 aom_highbd_obmc_sad32x64_c
-
-unsigned int aom_highbd_obmc_sad32x8_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-#define aom_highbd_obmc_sad32x8 aom_highbd_obmc_sad32x8_c
-
-unsigned int aom_highbd_obmc_sad4x16_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-#define aom_highbd_obmc_sad4x16 aom_highbd_obmc_sad4x16_c
-
-unsigned int aom_highbd_obmc_sad4x4_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-#define aom_highbd_obmc_sad4x4 aom_highbd_obmc_sad4x4_c
-
-unsigned int aom_highbd_obmc_sad4x8_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-#define aom_highbd_obmc_sad4x8 aom_highbd_obmc_sad4x8_c
-
-unsigned int aom_highbd_obmc_sad64x128_c(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask);
-#define aom_highbd_obmc_sad64x128 aom_highbd_obmc_sad64x128_c
-
-unsigned int aom_highbd_obmc_sad64x16_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad64x16 aom_highbd_obmc_sad64x16_c
-
-unsigned int aom_highbd_obmc_sad64x32_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad64x32 aom_highbd_obmc_sad64x32_c
-
-unsigned int aom_highbd_obmc_sad64x64_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-#define aom_highbd_obmc_sad64x64 aom_highbd_obmc_sad64x64_c
-
-unsigned int aom_highbd_obmc_sad8x16_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-#define aom_highbd_obmc_sad8x16 aom_highbd_obmc_sad8x16_c
-
-unsigned int aom_highbd_obmc_sad8x32_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-#define aom_highbd_obmc_sad8x32 aom_highbd_obmc_sad8x32_c
-
-unsigned int aom_highbd_obmc_sad8x4_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-#define aom_highbd_obmc_sad8x4 aom_highbd_obmc_sad8x4_c
-
-unsigned int aom_highbd_obmc_sad8x8_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-#define aom_highbd_obmc_sad8x8 aom_highbd_obmc_sad8x8_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance128x128_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance128x128 \
-  aom_highbd_obmc_sub_pixel_variance128x128_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance128x64_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance128x64 \
-  aom_highbd_obmc_sub_pixel_variance128x64_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance16x16_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance16x16 \
-  aom_highbd_obmc_sub_pixel_variance16x16_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance16x32_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance16x32 \
-  aom_highbd_obmc_sub_pixel_variance16x32_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance16x4_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance16x4 \
-  aom_highbd_obmc_sub_pixel_variance16x4_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance16x64_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance16x64 \
-  aom_highbd_obmc_sub_pixel_variance16x64_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance16x8_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance16x8 \
-  aom_highbd_obmc_sub_pixel_variance16x8_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance32x16_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance32x16 \
-  aom_highbd_obmc_sub_pixel_variance32x16_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance32x32_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance32x32 \
-  aom_highbd_obmc_sub_pixel_variance32x32_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance32x64_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance32x64 \
-  aom_highbd_obmc_sub_pixel_variance32x64_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance32x8_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance32x8 \
-  aom_highbd_obmc_sub_pixel_variance32x8_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance4x16_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance4x16 \
-  aom_highbd_obmc_sub_pixel_variance4x16_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance4x4_c(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance4x4 \
-  aom_highbd_obmc_sub_pixel_variance4x4_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance4x8_c(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance4x8 \
-  aom_highbd_obmc_sub_pixel_variance4x8_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance64x128_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance64x128 \
-  aom_highbd_obmc_sub_pixel_variance64x128_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance64x16_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance64x16 \
-  aom_highbd_obmc_sub_pixel_variance64x16_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance64x32_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance64x32 \
-  aom_highbd_obmc_sub_pixel_variance64x32_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance64x64_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance64x64 \
-  aom_highbd_obmc_sub_pixel_variance64x64_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance8x16_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance8x16 \
-  aom_highbd_obmc_sub_pixel_variance8x16_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance8x32_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance8x32 \
-  aom_highbd_obmc_sub_pixel_variance8x32_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance8x4_c(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance8x4 \
-  aom_highbd_obmc_sub_pixel_variance8x4_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance8x8_c(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance8x8 \
-  aom_highbd_obmc_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_obmc_variance128x128_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_highbd_obmc_variance128x128 aom_highbd_obmc_variance128x128_c
-
-unsigned int aom_highbd_obmc_variance128x64_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_obmc_variance128x64 aom_highbd_obmc_variance128x64_c
-
-unsigned int aom_highbd_obmc_variance16x16_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance16x16 aom_highbd_obmc_variance16x16_c
-
-unsigned int aom_highbd_obmc_variance16x32_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance16x32 aom_highbd_obmc_variance16x32_c
-
-unsigned int aom_highbd_obmc_variance16x4_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-#define aom_highbd_obmc_variance16x4 aom_highbd_obmc_variance16x4_c
-
-unsigned int aom_highbd_obmc_variance16x64_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance16x64 aom_highbd_obmc_variance16x64_c
-
-unsigned int aom_highbd_obmc_variance16x8_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-#define aom_highbd_obmc_variance16x8 aom_highbd_obmc_variance16x8_c
-
-unsigned int aom_highbd_obmc_variance32x16_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance32x16 aom_highbd_obmc_variance32x16_c
-
-unsigned int aom_highbd_obmc_variance32x32_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance32x32 aom_highbd_obmc_variance32x32_c
-
-unsigned int aom_highbd_obmc_variance32x64_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance32x64 aom_highbd_obmc_variance32x64_c
-
-unsigned int aom_highbd_obmc_variance32x8_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-#define aom_highbd_obmc_variance32x8 aom_highbd_obmc_variance32x8_c
-
-unsigned int aom_highbd_obmc_variance4x16_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-#define aom_highbd_obmc_variance4x16 aom_highbd_obmc_variance4x16_c
-
-unsigned int aom_highbd_obmc_variance4x4_c(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-#define aom_highbd_obmc_variance4x4 aom_highbd_obmc_variance4x4_c
-
-unsigned int aom_highbd_obmc_variance4x8_c(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-#define aom_highbd_obmc_variance4x8 aom_highbd_obmc_variance4x8_c
-
-unsigned int aom_highbd_obmc_variance64x128_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_highbd_obmc_variance64x128 aom_highbd_obmc_variance64x128_c
-
-unsigned int aom_highbd_obmc_variance64x16_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance64x16 aom_highbd_obmc_variance64x16_c
-
-unsigned int aom_highbd_obmc_variance64x32_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance64x32 aom_highbd_obmc_variance64x32_c
-
-unsigned int aom_highbd_obmc_variance64x64_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-#define aom_highbd_obmc_variance64x64 aom_highbd_obmc_variance64x64_c
-
-unsigned int aom_highbd_obmc_variance8x16_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-#define aom_highbd_obmc_variance8x16 aom_highbd_obmc_variance8x16_c
-
-unsigned int aom_highbd_obmc_variance8x32_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-#define aom_highbd_obmc_variance8x32 aom_highbd_obmc_variance8x32_c
-
-unsigned int aom_highbd_obmc_variance8x4_c(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-#define aom_highbd_obmc_variance8x4 aom_highbd_obmc_variance8x4_c
-
-unsigned int aom_highbd_obmc_variance8x8_c(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-#define aom_highbd_obmc_variance8x8 aom_highbd_obmc_variance8x8_c
-
-void aom_highbd_paeth_predictor_16x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_16x16 aom_highbd_paeth_predictor_16x16_c
-
-void aom_highbd_paeth_predictor_16x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_16x32 aom_highbd_paeth_predictor_16x32_c
-
-void aom_highbd_paeth_predictor_16x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_16x4 aom_highbd_paeth_predictor_16x4_c
-
-void aom_highbd_paeth_predictor_16x64_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_16x64 aom_highbd_paeth_predictor_16x64_c
-
-void aom_highbd_paeth_predictor_16x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_16x8 aom_highbd_paeth_predictor_16x8_c
-
-void aom_highbd_paeth_predictor_2x2_c(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_paeth_predictor_2x2 aom_highbd_paeth_predictor_2x2_c
-
-void aom_highbd_paeth_predictor_32x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_32x16 aom_highbd_paeth_predictor_32x16_c
-
-void aom_highbd_paeth_predictor_32x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_32x32 aom_highbd_paeth_predictor_32x32_c
-
-void aom_highbd_paeth_predictor_32x64_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_32x64 aom_highbd_paeth_predictor_32x64_c
-
-void aom_highbd_paeth_predictor_32x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_32x8 aom_highbd_paeth_predictor_32x8_c
-
-void aom_highbd_paeth_predictor_4x16_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_4x16 aom_highbd_paeth_predictor_4x16_c
-
-void aom_highbd_paeth_predictor_4x4_c(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_paeth_predictor_4x4 aom_highbd_paeth_predictor_4x4_c
-
-void aom_highbd_paeth_predictor_4x8_c(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_paeth_predictor_4x8 aom_highbd_paeth_predictor_4x8_c
-
-void aom_highbd_paeth_predictor_64x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_64x16 aom_highbd_paeth_predictor_64x16_c
-
-void aom_highbd_paeth_predictor_64x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_64x32 aom_highbd_paeth_predictor_64x32_c
-
-void aom_highbd_paeth_predictor_64x64_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_64x64 aom_highbd_paeth_predictor_64x64_c
-
-void aom_highbd_paeth_predictor_8x16_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_8x16 aom_highbd_paeth_predictor_8x16_c
-
-void aom_highbd_paeth_predictor_8x32_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_8x32 aom_highbd_paeth_predictor_8x32_c
-
-void aom_highbd_paeth_predictor_8x4_c(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_paeth_predictor_8x4 aom_highbd_paeth_predictor_8x4_c
-
-void aom_highbd_paeth_predictor_8x8_c(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_paeth_predictor_8x8 aom_highbd_paeth_predictor_8x8_c
-
-void aom_highbd_quantize_b_c(const tran_low_t* coeff_ptr,
-                             intptr_t n_coeffs,
-                             const int16_t* zbin_ptr,
-                             const int16_t* round_ptr,
-                             const int16_t* quant_ptr,
-                             const int16_t* quant_shift_ptr,
-                             tran_low_t* qcoeff_ptr,
-                             tran_low_t* dqcoeff_ptr,
-                             const int16_t* dequant_ptr,
-                             uint16_t* eob_ptr,
-                             const int16_t* scan,
-                             const int16_t* iscan);
-#define aom_highbd_quantize_b aom_highbd_quantize_b_c
-
-void aom_highbd_quantize_b_32x32_c(const tran_low_t* coeff_ptr,
-                                   intptr_t n_coeffs,
-                                   const int16_t* zbin_ptr,
-                                   const int16_t* round_ptr,
-                                   const int16_t* quant_ptr,
-                                   const int16_t* quant_shift_ptr,
-                                   tran_low_t* qcoeff_ptr,
-                                   tran_low_t* dqcoeff_ptr,
-                                   const int16_t* dequant_ptr,
-                                   uint16_t* eob_ptr,
-                                   const int16_t* scan,
-                                   const int16_t* iscan);
-#define aom_highbd_quantize_b_32x32 aom_highbd_quantize_b_32x32_c
-
-void aom_highbd_quantize_b_32x32_adaptive_c(const tran_low_t* coeff_ptr,
-                                            intptr_t n_coeffs,
-                                            const int16_t* zbin_ptr,
-                                            const int16_t* round_ptr,
-                                            const int16_t* quant_ptr,
-                                            const int16_t* quant_shift_ptr,
-                                            tran_low_t* qcoeff_ptr,
-                                            tran_low_t* dqcoeff_ptr,
-                                            const int16_t* dequant_ptr,
-                                            uint16_t* eob_ptr,
-                                            const int16_t* scan,
-                                            const int16_t* iscan);
-#define aom_highbd_quantize_b_32x32_adaptive \
-  aom_highbd_quantize_b_32x32_adaptive_c
-
-void aom_highbd_quantize_b_64x64_c(const tran_low_t* coeff_ptr,
-                                   intptr_t n_coeffs,
-                                   const int16_t* zbin_ptr,
-                                   const int16_t* round_ptr,
-                                   const int16_t* quant_ptr,
-                                   const int16_t* quant_shift_ptr,
-                                   tran_low_t* qcoeff_ptr,
-                                   tran_low_t* dqcoeff_ptr,
-                                   const int16_t* dequant_ptr,
-                                   uint16_t* eob_ptr,
-                                   const int16_t* scan,
-                                   const int16_t* iscan);
-#define aom_highbd_quantize_b_64x64 aom_highbd_quantize_b_64x64_c
-
-void aom_highbd_quantize_b_64x64_adaptive_c(const tran_low_t* coeff_ptr,
-                                            intptr_t n_coeffs,
-                                            const int16_t* zbin_ptr,
-                                            const int16_t* round_ptr,
-                                            const int16_t* quant_ptr,
-                                            const int16_t* quant_shift_ptr,
-                                            tran_low_t* qcoeff_ptr,
-                                            tran_low_t* dqcoeff_ptr,
-                                            const int16_t* dequant_ptr,
-                                            uint16_t* eob_ptr,
-                                            const int16_t* scan,
-                                            const int16_t* iscan);
-#define aom_highbd_quantize_b_64x64_adaptive \
-  aom_highbd_quantize_b_64x64_adaptive_c
-
-void aom_highbd_quantize_b_adaptive_c(const tran_low_t* coeff_ptr,
-                                      intptr_t n_coeffs,
-                                      const int16_t* zbin_ptr,
-                                      const int16_t* round_ptr,
-                                      const int16_t* quant_ptr,
-                                      const int16_t* quant_shift_ptr,
-                                      tran_low_t* qcoeff_ptr,
-                                      tran_low_t* dqcoeff_ptr,
-                                      const int16_t* dequant_ptr,
-                                      uint16_t* eob_ptr,
-                                      const int16_t* scan,
-                                      const int16_t* iscan);
-#define aom_highbd_quantize_b_adaptive aom_highbd_quantize_b_adaptive_c
-
-unsigned int aom_highbd_sad128x128_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride);
-#define aom_highbd_sad128x128 aom_highbd_sad128x128_c
-
-unsigned int aom_highbd_sad128x128_avg_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         const uint8_t* second_pred);
-#define aom_highbd_sad128x128_avg aom_highbd_sad128x128_avg_c
-
-void aom_highbd_sad128x128x4d_c(const uint8_t* src_ptr,
-                                int src_stride,
-                                const uint8_t* const ref_ptr[],
-                                int ref_stride,
-                                uint32_t* sad_array);
-#define aom_highbd_sad128x128x4d aom_highbd_sad128x128x4d_c
-
-unsigned int aom_highbd_sad128x64_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* ref_ptr,
-                                    int ref_stride);
-#define aom_highbd_sad128x64 aom_highbd_sad128x64_c
-
-unsigned int aom_highbd_sad128x64_avg_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        const uint8_t* second_pred);
-#define aom_highbd_sad128x64_avg aom_highbd_sad128x64_avg_c
-
-void aom_highbd_sad128x64x4d_c(const uint8_t* src_ptr,
-                               int src_stride,
-                               const uint8_t* const ref_ptr[],
-                               int ref_stride,
-                               uint32_t* sad_array);
-#define aom_highbd_sad128x64x4d aom_highbd_sad128x64x4d_c
-
-unsigned int aom_highbd_sad16x16_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad16x16 aom_highbd_sad16x16_c
-
-unsigned int aom_highbd_sad16x16_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad16x16_avg aom_highbd_sad16x16_avg_c
-
-void aom_highbd_sad16x16x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad16x16x4d aom_highbd_sad16x16x4d_c
-
-unsigned int aom_highbd_sad16x32_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad16x32 aom_highbd_sad16x32_c
-
-unsigned int aom_highbd_sad16x32_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad16x32_avg aom_highbd_sad16x32_avg_c
-
-void aom_highbd_sad16x32x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad16x32x4d aom_highbd_sad16x32x4d_c
-
-unsigned int aom_highbd_sad16x4_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-#define aom_highbd_sad16x4 aom_highbd_sad16x4_c
-
-unsigned int aom_highbd_sad16x4_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-#define aom_highbd_sad16x4_avg aom_highbd_sad16x4_avg_c
-
-void aom_highbd_sad16x4x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-#define aom_highbd_sad16x4x4d aom_highbd_sad16x4x4d_c
-
-unsigned int aom_highbd_sad16x64_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad16x64 aom_highbd_sad16x64_c
-
-unsigned int aom_highbd_sad16x64_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad16x64_avg aom_highbd_sad16x64_avg_c
-
-void aom_highbd_sad16x64x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad16x64x4d aom_highbd_sad16x64x4d_c
-
-unsigned int aom_highbd_sad16x8_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-#define aom_highbd_sad16x8 aom_highbd_sad16x8_c
-
-unsigned int aom_highbd_sad16x8_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-#define aom_highbd_sad16x8_avg aom_highbd_sad16x8_avg_c
-
-void aom_highbd_sad16x8x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-#define aom_highbd_sad16x8x4d aom_highbd_sad16x8x4d_c
-
-unsigned int aom_highbd_sad32x16_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad32x16 aom_highbd_sad32x16_c
-
-unsigned int aom_highbd_sad32x16_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad32x16_avg aom_highbd_sad32x16_avg_c
-
-void aom_highbd_sad32x16x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad32x16x4d aom_highbd_sad32x16x4d_c
-
-unsigned int aom_highbd_sad32x32_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad32x32 aom_highbd_sad32x32_c
-
-unsigned int aom_highbd_sad32x32_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad32x32_avg aom_highbd_sad32x32_avg_c
-
-void aom_highbd_sad32x32x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad32x32x4d aom_highbd_sad32x32x4d_c
-
-unsigned int aom_highbd_sad32x64_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad32x64 aom_highbd_sad32x64_c
-
-unsigned int aom_highbd_sad32x64_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad32x64_avg aom_highbd_sad32x64_avg_c
-
-void aom_highbd_sad32x64x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad32x64x4d aom_highbd_sad32x64x4d_c
-
-unsigned int aom_highbd_sad32x8_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-#define aom_highbd_sad32x8 aom_highbd_sad32x8_c
-
-unsigned int aom_highbd_sad32x8_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-#define aom_highbd_sad32x8_avg aom_highbd_sad32x8_avg_c
-
-void aom_highbd_sad32x8x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-#define aom_highbd_sad32x8x4d aom_highbd_sad32x8x4d_c
-
-unsigned int aom_highbd_sad4x16_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-#define aom_highbd_sad4x16 aom_highbd_sad4x16_c
-
-unsigned int aom_highbd_sad4x16_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-#define aom_highbd_sad4x16_avg aom_highbd_sad4x16_avg_c
-
-void aom_highbd_sad4x16x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-#define aom_highbd_sad4x16x4d aom_highbd_sad4x16x4d_c
-
-unsigned int aom_highbd_sad4x4_c(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride);
-#define aom_highbd_sad4x4 aom_highbd_sad4x4_c
-
-unsigned int aom_highbd_sad4x4_avg_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride,
-                                     const uint8_t* second_pred);
-#define aom_highbd_sad4x4_avg aom_highbd_sad4x4_avg_c
-
-void aom_highbd_sad4x4x4d_c(const uint8_t* src_ptr,
-                            int src_stride,
-                            const uint8_t* const ref_ptr[],
-                            int ref_stride,
-                            uint32_t* sad_array);
-#define aom_highbd_sad4x4x4d aom_highbd_sad4x4x4d_c
-
-unsigned int aom_highbd_sad4x8_c(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride);
-#define aom_highbd_sad4x8 aom_highbd_sad4x8_c
-
-unsigned int aom_highbd_sad4x8_avg_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride,
-                                     const uint8_t* second_pred);
-#define aom_highbd_sad4x8_avg aom_highbd_sad4x8_avg_c
-
-void aom_highbd_sad4x8x4d_c(const uint8_t* src_ptr,
-                            int src_stride,
-                            const uint8_t* const ref_ptr[],
-                            int ref_stride,
-                            uint32_t* sad_array);
-#define aom_highbd_sad4x8x4d aom_highbd_sad4x8x4d_c
-
-unsigned int aom_highbd_sad64x128_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* ref_ptr,
-                                    int ref_stride);
-#define aom_highbd_sad64x128 aom_highbd_sad64x128_c
-
-unsigned int aom_highbd_sad64x128_avg_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        const uint8_t* second_pred);
-#define aom_highbd_sad64x128_avg aom_highbd_sad64x128_avg_c
-
-void aom_highbd_sad64x128x4d_c(const uint8_t* src_ptr,
-                               int src_stride,
-                               const uint8_t* const ref_ptr[],
-                               int ref_stride,
-                               uint32_t* sad_array);
-#define aom_highbd_sad64x128x4d aom_highbd_sad64x128x4d_c
-
-unsigned int aom_highbd_sad64x16_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad64x16 aom_highbd_sad64x16_c
-
-unsigned int aom_highbd_sad64x16_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad64x16_avg aom_highbd_sad64x16_avg_c
-
-void aom_highbd_sad64x16x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad64x16x4d aom_highbd_sad64x16x4d_c
-
-unsigned int aom_highbd_sad64x32_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad64x32 aom_highbd_sad64x32_c
-
-unsigned int aom_highbd_sad64x32_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad64x32_avg aom_highbd_sad64x32_avg_c
-
-void aom_highbd_sad64x32x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad64x32x4d aom_highbd_sad64x32x4d_c
-
-unsigned int aom_highbd_sad64x64_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-#define aom_highbd_sad64x64 aom_highbd_sad64x64_c
-
-unsigned int aom_highbd_sad64x64_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-#define aom_highbd_sad64x64_avg aom_highbd_sad64x64_avg_c
-
-void aom_highbd_sad64x64x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-#define aom_highbd_sad64x64x4d aom_highbd_sad64x64x4d_c
-
-unsigned int aom_highbd_sad8x16_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-#define aom_highbd_sad8x16 aom_highbd_sad8x16_c
-
-unsigned int aom_highbd_sad8x16_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-#define aom_highbd_sad8x16_avg aom_highbd_sad8x16_avg_c
-
-void aom_highbd_sad8x16x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-#define aom_highbd_sad8x16x4d aom_highbd_sad8x16x4d_c
-
-unsigned int aom_highbd_sad8x32_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-#define aom_highbd_sad8x32 aom_highbd_sad8x32_c
-
-unsigned int aom_highbd_sad8x32_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-#define aom_highbd_sad8x32_avg aom_highbd_sad8x32_avg_c
-
-void aom_highbd_sad8x32x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-#define aom_highbd_sad8x32x4d aom_highbd_sad8x32x4d_c
-
-unsigned int aom_highbd_sad8x4_c(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride);
-#define aom_highbd_sad8x4 aom_highbd_sad8x4_c
-
-unsigned int aom_highbd_sad8x4_avg_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride,
-                                     const uint8_t* second_pred);
-#define aom_highbd_sad8x4_avg aom_highbd_sad8x4_avg_c
-
-void aom_highbd_sad8x4x4d_c(const uint8_t* src_ptr,
-                            int src_stride,
-                            const uint8_t* const ref_ptr[],
-                            int ref_stride,
-                            uint32_t* sad_array);
-#define aom_highbd_sad8x4x4d aom_highbd_sad8x4x4d_c
-
-unsigned int aom_highbd_sad8x8_c(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride);
-#define aom_highbd_sad8x8 aom_highbd_sad8x8_c
-
-unsigned int aom_highbd_sad8x8_avg_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride,
-                                     const uint8_t* second_pred);
-#define aom_highbd_sad8x8_avg aom_highbd_sad8x8_avg_c
-
-void aom_highbd_sad8x8x4d_c(const uint8_t* src_ptr,
-                            int src_stride,
-                            const uint8_t* const ref_ptr[],
-                            int ref_stride,
-                            uint32_t* sad_array);
-#define aom_highbd_sad8x8x4d aom_highbd_sad8x8x4d_c
-
-unsigned int aom_highbd_sad_skip_128x128_c(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride);
-#define aom_highbd_sad_skip_128x128 aom_highbd_sad_skip_128x128_c
-
-void aom_highbd_sad_skip_128x128x4d_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* const ref_ptr[],
-                                      int ref_stride,
-                                      uint32_t* sad_array);
-#define aom_highbd_sad_skip_128x128x4d aom_highbd_sad_skip_128x128x4d_c
-
-unsigned int aom_highbd_sad_skip_128x64_c(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride);
-#define aom_highbd_sad_skip_128x64 aom_highbd_sad_skip_128x64_c
-
-void aom_highbd_sad_skip_128x64x4d_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* const ref_ptr[],
-                                     int ref_stride,
-                                     uint32_t* sad_array);
-#define aom_highbd_sad_skip_128x64x4d aom_highbd_sad_skip_128x64x4d_c
-
-unsigned int aom_highbd_sad_skip_16x16_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_16x16 aom_highbd_sad_skip_16x16_c
-
-void aom_highbd_sad_skip_16x16x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_16x16x4d aom_highbd_sad_skip_16x16x4d_c
-
-unsigned int aom_highbd_sad_skip_16x32_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_16x32 aom_highbd_sad_skip_16x32_c
-
-void aom_highbd_sad_skip_16x32x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_16x32x4d aom_highbd_sad_skip_16x32x4d_c
-
-unsigned int aom_highbd_sad_skip_16x4_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-#define aom_highbd_sad_skip_16x4 aom_highbd_sad_skip_16x4_c
-
-void aom_highbd_sad_skip_16x4x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-#define aom_highbd_sad_skip_16x4x4d aom_highbd_sad_skip_16x4x4d_c
-
-unsigned int aom_highbd_sad_skip_16x64_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_16x64 aom_highbd_sad_skip_16x64_c
-
-void aom_highbd_sad_skip_16x64x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_16x64x4d aom_highbd_sad_skip_16x64x4d_c
-
-unsigned int aom_highbd_sad_skip_16x8_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-#define aom_highbd_sad_skip_16x8 aom_highbd_sad_skip_16x8_c
-
-void aom_highbd_sad_skip_16x8x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-#define aom_highbd_sad_skip_16x8x4d aom_highbd_sad_skip_16x8x4d_c
-
-unsigned int aom_highbd_sad_skip_32x16_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_32x16 aom_highbd_sad_skip_32x16_c
-
-void aom_highbd_sad_skip_32x16x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_32x16x4d aom_highbd_sad_skip_32x16x4d_c
-
-unsigned int aom_highbd_sad_skip_32x32_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_32x32 aom_highbd_sad_skip_32x32_c
-
-void aom_highbd_sad_skip_32x32x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_32x32x4d aom_highbd_sad_skip_32x32x4d_c
-
-unsigned int aom_highbd_sad_skip_32x64_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_32x64 aom_highbd_sad_skip_32x64_c
-
-void aom_highbd_sad_skip_32x64x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_32x64x4d aom_highbd_sad_skip_32x64x4d_c
-
-unsigned int aom_highbd_sad_skip_32x8_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-#define aom_highbd_sad_skip_32x8 aom_highbd_sad_skip_32x8_c
-
-void aom_highbd_sad_skip_32x8x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-#define aom_highbd_sad_skip_32x8x4d aom_highbd_sad_skip_32x8x4d_c
-
-unsigned int aom_highbd_sad_skip_4x16_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-#define aom_highbd_sad_skip_4x16 aom_highbd_sad_skip_4x16_c
-
-void aom_highbd_sad_skip_4x16x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-#define aom_highbd_sad_skip_4x16x4d aom_highbd_sad_skip_4x16x4d_c
-
-unsigned int aom_highbd_sad_skip_4x4_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride);
-#define aom_highbd_sad_skip_4x4 aom_highbd_sad_skip_4x4_c
-
-void aom_highbd_sad_skip_4x4x4d_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* const ref_ptr[],
-                                  int ref_stride,
-                                  uint32_t* sad_array);
-#define aom_highbd_sad_skip_4x4x4d aom_highbd_sad_skip_4x4x4d_c
-
-unsigned int aom_highbd_sad_skip_4x8_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride);
-#define aom_highbd_sad_skip_4x8 aom_highbd_sad_skip_4x8_c
-
-void aom_highbd_sad_skip_4x8x4d_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* const ref_ptr[],
-                                  int ref_stride,
-                                  uint32_t* sad_array);
-#define aom_highbd_sad_skip_4x8x4d aom_highbd_sad_skip_4x8x4d_c
-
-unsigned int aom_highbd_sad_skip_64x128_c(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride);
-#define aom_highbd_sad_skip_64x128 aom_highbd_sad_skip_64x128_c
-
-void aom_highbd_sad_skip_64x128x4d_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* const ref_ptr[],
-                                     int ref_stride,
-                                     uint32_t* sad_array);
-#define aom_highbd_sad_skip_64x128x4d aom_highbd_sad_skip_64x128x4d_c
-
-unsigned int aom_highbd_sad_skip_64x16_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_64x16 aom_highbd_sad_skip_64x16_c
-
-void aom_highbd_sad_skip_64x16x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_64x16x4d aom_highbd_sad_skip_64x16x4d_c
-
-unsigned int aom_highbd_sad_skip_64x32_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_64x32 aom_highbd_sad_skip_64x32_c
-
-void aom_highbd_sad_skip_64x32x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_64x32x4d aom_highbd_sad_skip_64x32x4d_c
-
-unsigned int aom_highbd_sad_skip_64x64_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-#define aom_highbd_sad_skip_64x64 aom_highbd_sad_skip_64x64_c
-
-void aom_highbd_sad_skip_64x64x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-#define aom_highbd_sad_skip_64x64x4d aom_highbd_sad_skip_64x64x4d_c
-
-unsigned int aom_highbd_sad_skip_8x16_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-#define aom_highbd_sad_skip_8x16 aom_highbd_sad_skip_8x16_c
-
-void aom_highbd_sad_skip_8x16x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-#define aom_highbd_sad_skip_8x16x4d aom_highbd_sad_skip_8x16x4d_c
-
-unsigned int aom_highbd_sad_skip_8x32_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-#define aom_highbd_sad_skip_8x32 aom_highbd_sad_skip_8x32_c
-
-void aom_highbd_sad_skip_8x32x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-#define aom_highbd_sad_skip_8x32x4d aom_highbd_sad_skip_8x32x4d_c
-
-unsigned int aom_highbd_sad_skip_8x4_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride);
-#define aom_highbd_sad_skip_8x4 aom_highbd_sad_skip_8x4_c
-
-void aom_highbd_sad_skip_8x4x4d_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* const ref_ptr[],
-                                  int ref_stride,
-                                  uint32_t* sad_array);
-#define aom_highbd_sad_skip_8x4x4d aom_highbd_sad_skip_8x4x4d_c
-
-unsigned int aom_highbd_sad_skip_8x8_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride);
-#define aom_highbd_sad_skip_8x8 aom_highbd_sad_skip_8x8_c
-
-void aom_highbd_sad_skip_8x8x4d_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* const ref_ptr[],
-                                  int ref_stride,
-                                  uint32_t* sad_array);
-#define aom_highbd_sad_skip_8x8x4d aom_highbd_sad_skip_8x8x4d_c
-
-void aom_highbd_smooth_h_predictor_16x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_16x16 \
-  aom_highbd_smooth_h_predictor_16x16_c
-
-void aom_highbd_smooth_h_predictor_16x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_16x32 \
-  aom_highbd_smooth_h_predictor_16x32_c
-
-void aom_highbd_smooth_h_predictor_16x4_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_16x4 aom_highbd_smooth_h_predictor_16x4_c
-
-void aom_highbd_smooth_h_predictor_16x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_16x64 \
-  aom_highbd_smooth_h_predictor_16x64_c
-
-void aom_highbd_smooth_h_predictor_16x8_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_16x8 aom_highbd_smooth_h_predictor_16x8_c
-
-void aom_highbd_smooth_h_predictor_2x2_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_h_predictor_2x2 aom_highbd_smooth_h_predictor_2x2_c
-
-void aom_highbd_smooth_h_predictor_32x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_32x16 \
-  aom_highbd_smooth_h_predictor_32x16_c
-
-void aom_highbd_smooth_h_predictor_32x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_32x32 \
-  aom_highbd_smooth_h_predictor_32x32_c
-
-void aom_highbd_smooth_h_predictor_32x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_32x64 \
-  aom_highbd_smooth_h_predictor_32x64_c
-
-void aom_highbd_smooth_h_predictor_32x8_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_32x8 aom_highbd_smooth_h_predictor_32x8_c
-
-void aom_highbd_smooth_h_predictor_4x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_4x16 aom_highbd_smooth_h_predictor_4x16_c
-
-void aom_highbd_smooth_h_predictor_4x4_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_h_predictor_4x4 aom_highbd_smooth_h_predictor_4x4_c
-
-void aom_highbd_smooth_h_predictor_4x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_h_predictor_4x8 aom_highbd_smooth_h_predictor_4x8_c
-
-void aom_highbd_smooth_h_predictor_64x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_64x16 \
-  aom_highbd_smooth_h_predictor_64x16_c
-
-void aom_highbd_smooth_h_predictor_64x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_64x32 \
-  aom_highbd_smooth_h_predictor_64x32_c
-
-void aom_highbd_smooth_h_predictor_64x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_64x64 \
-  aom_highbd_smooth_h_predictor_64x64_c
-
-void aom_highbd_smooth_h_predictor_8x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_8x16 aom_highbd_smooth_h_predictor_8x16_c
-
-void aom_highbd_smooth_h_predictor_8x32_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_8x32 aom_highbd_smooth_h_predictor_8x32_c
-
-void aom_highbd_smooth_h_predictor_8x4_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_h_predictor_8x4 aom_highbd_smooth_h_predictor_8x4_c
-
-void aom_highbd_smooth_h_predictor_8x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_h_predictor_8x8 aom_highbd_smooth_h_predictor_8x8_c
-
-void aom_highbd_smooth_predictor_16x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_16x16 aom_highbd_smooth_predictor_16x16_c
-
-void aom_highbd_smooth_predictor_16x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_16x32 aom_highbd_smooth_predictor_16x32_c
-
-void aom_highbd_smooth_predictor_16x4_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_16x4 aom_highbd_smooth_predictor_16x4_c
-
-void aom_highbd_smooth_predictor_16x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_16x64 aom_highbd_smooth_predictor_16x64_c
-
-void aom_highbd_smooth_predictor_16x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_16x8 aom_highbd_smooth_predictor_16x8_c
-
-void aom_highbd_smooth_predictor_2x2_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_smooth_predictor_2x2 aom_highbd_smooth_predictor_2x2_c
-
-void aom_highbd_smooth_predictor_32x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_32x16 aom_highbd_smooth_predictor_32x16_c
-
-void aom_highbd_smooth_predictor_32x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_32x32 aom_highbd_smooth_predictor_32x32_c
-
-void aom_highbd_smooth_predictor_32x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_32x64 aom_highbd_smooth_predictor_32x64_c
-
-void aom_highbd_smooth_predictor_32x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_32x8 aom_highbd_smooth_predictor_32x8_c
-
-void aom_highbd_smooth_predictor_4x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_4x16 aom_highbd_smooth_predictor_4x16_c
-
-void aom_highbd_smooth_predictor_4x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_smooth_predictor_4x4 aom_highbd_smooth_predictor_4x4_c
-
-void aom_highbd_smooth_predictor_4x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_smooth_predictor_4x8 aom_highbd_smooth_predictor_4x8_c
-
-void aom_highbd_smooth_predictor_64x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_64x16 aom_highbd_smooth_predictor_64x16_c
-
-void aom_highbd_smooth_predictor_64x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_64x32 aom_highbd_smooth_predictor_64x32_c
-
-void aom_highbd_smooth_predictor_64x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_64x64 aom_highbd_smooth_predictor_64x64_c
-
-void aom_highbd_smooth_predictor_8x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_8x16 aom_highbd_smooth_predictor_8x16_c
-
-void aom_highbd_smooth_predictor_8x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_8x32 aom_highbd_smooth_predictor_8x32_c
-
-void aom_highbd_smooth_predictor_8x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_smooth_predictor_8x4 aom_highbd_smooth_predictor_8x4_c
-
-void aom_highbd_smooth_predictor_8x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_smooth_predictor_8x8 aom_highbd_smooth_predictor_8x8_c
-
-void aom_highbd_smooth_v_predictor_16x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_16x16 \
-  aom_highbd_smooth_v_predictor_16x16_c
-
-void aom_highbd_smooth_v_predictor_16x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_16x32 \
-  aom_highbd_smooth_v_predictor_16x32_c
-
-void aom_highbd_smooth_v_predictor_16x4_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_16x4 aom_highbd_smooth_v_predictor_16x4_c
-
-void aom_highbd_smooth_v_predictor_16x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_16x64 \
-  aom_highbd_smooth_v_predictor_16x64_c
-
-void aom_highbd_smooth_v_predictor_16x8_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_16x8 aom_highbd_smooth_v_predictor_16x8_c
-
-void aom_highbd_smooth_v_predictor_2x2_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_v_predictor_2x2 aom_highbd_smooth_v_predictor_2x2_c
-
-void aom_highbd_smooth_v_predictor_32x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_32x16 \
-  aom_highbd_smooth_v_predictor_32x16_c
-
-void aom_highbd_smooth_v_predictor_32x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_32x32 \
-  aom_highbd_smooth_v_predictor_32x32_c
-
-void aom_highbd_smooth_v_predictor_32x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_32x64 \
-  aom_highbd_smooth_v_predictor_32x64_c
-
-void aom_highbd_smooth_v_predictor_32x8_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_32x8 aom_highbd_smooth_v_predictor_32x8_c
-
-void aom_highbd_smooth_v_predictor_4x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_4x16 aom_highbd_smooth_v_predictor_4x16_c
-
-void aom_highbd_smooth_v_predictor_4x4_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_v_predictor_4x4 aom_highbd_smooth_v_predictor_4x4_c
-
-void aom_highbd_smooth_v_predictor_4x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_v_predictor_4x8 aom_highbd_smooth_v_predictor_4x8_c
-
-void aom_highbd_smooth_v_predictor_64x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_64x16 \
-  aom_highbd_smooth_v_predictor_64x16_c
-
-void aom_highbd_smooth_v_predictor_64x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_64x32 \
-  aom_highbd_smooth_v_predictor_64x32_c
-
-void aom_highbd_smooth_v_predictor_64x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_64x64 \
-  aom_highbd_smooth_v_predictor_64x64_c
-
-void aom_highbd_smooth_v_predictor_8x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_8x16 aom_highbd_smooth_v_predictor_8x16_c
-
-void aom_highbd_smooth_v_predictor_8x32_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_8x32 aom_highbd_smooth_v_predictor_8x32_c
-
-void aom_highbd_smooth_v_predictor_8x4_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_v_predictor_8x4 aom_highbd_smooth_v_predictor_8x4_c
-
-void aom_highbd_smooth_v_predictor_8x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_v_predictor_8x8 aom_highbd_smooth_v_predictor_8x8_c
-
-int64_t aom_highbd_sse_c(const uint8_t* a8,
-                         int a_stride,
-                         const uint8_t* b8,
-                         int b_stride,
-                         int width,
-                         int height);
-int64_t aom_highbd_sse_neon(const uint8_t* a8,
-                            int a_stride,
-                            const uint8_t* b8,
-                            int b_stride,
-                            int width,
-                            int height);
-#define aom_highbd_sse aom_highbd_sse_neon
-
-void aom_highbd_subtract_block_c(int rows,
-                                 int cols,
-                                 int16_t* diff_ptr,
-                                 ptrdiff_t diff_stride,
-                                 const uint8_t* src_ptr,
-                                 ptrdiff_t src_stride,
-                                 const uint8_t* pred_ptr,
-                                 ptrdiff_t pred_stride,
-                                 int bd);
-#define aom_highbd_subtract_block aom_highbd_subtract_block_c
-
-void aom_highbd_upsampled_pred_c(MACROBLOCKD* xd,
-                                 const struct AV1Common* const cm,
-                                 int mi_row,
-                                 int mi_col,
-                                 const MV* const mv,
-                                 uint8_t* comp_pred8,
-                                 int width,
-                                 int height,
-                                 int subpel_x_q3,
-                                 int subpel_y_q3,
-                                 const uint8_t* ref8,
-                                 int ref_stride,
-                                 int bd,
-                                 int subpel_search);
-#define aom_highbd_upsampled_pred aom_highbd_upsampled_pred_c
-
-void aom_highbd_v_predictor_16x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_16x16 aom_highbd_v_predictor_16x16_c
-
-void aom_highbd_v_predictor_16x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_16x32 aom_highbd_v_predictor_16x32_c
-
-void aom_highbd_v_predictor_16x4_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_16x4 aom_highbd_v_predictor_16x4_c
-
-void aom_highbd_v_predictor_16x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_16x64 aom_highbd_v_predictor_16x64_c
-
-void aom_highbd_v_predictor_16x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_16x8 aom_highbd_v_predictor_16x8_c
-
-void aom_highbd_v_predictor_2x2_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_v_predictor_2x2 aom_highbd_v_predictor_2x2_c
-
-void aom_highbd_v_predictor_32x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_32x16 aom_highbd_v_predictor_32x16_c
-
-void aom_highbd_v_predictor_32x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_32x32 aom_highbd_v_predictor_32x32_c
-
-void aom_highbd_v_predictor_32x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_32x64 aom_highbd_v_predictor_32x64_c
-
-void aom_highbd_v_predictor_32x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_32x8 aom_highbd_v_predictor_32x8_c
-
-void aom_highbd_v_predictor_4x16_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_4x16 aom_highbd_v_predictor_4x16_c
-
-void aom_highbd_v_predictor_4x4_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_v_predictor_4x4 aom_highbd_v_predictor_4x4_c
-
-void aom_highbd_v_predictor_4x8_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_v_predictor_4x8 aom_highbd_v_predictor_4x8_c
-
-void aom_highbd_v_predictor_64x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_64x16 aom_highbd_v_predictor_64x16_c
-
-void aom_highbd_v_predictor_64x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_64x32 aom_highbd_v_predictor_64x32_c
-
-void aom_highbd_v_predictor_64x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_64x64 aom_highbd_v_predictor_64x64_c
-
-void aom_highbd_v_predictor_8x16_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_8x16 aom_highbd_v_predictor_8x16_c
-
-void aom_highbd_v_predictor_8x32_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_8x32 aom_highbd_v_predictor_8x32_c
-
-void aom_highbd_v_predictor_8x4_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_v_predictor_8x4 aom_highbd_v_predictor_8x4_c
-
-void aom_highbd_v_predictor_8x8_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_v_predictor_8x8 aom_highbd_v_predictor_8x8_c
-
 void aom_ifft16x16_float_c(const float* input, float* temp, float* output);
 #define aom_ifft16x16_float aom_ifft16x16_float_c
 
@@ -10727,498 +2507,6 @@
                              int h);
 #define aom_mse_wxh_16bit aom_mse_wxh_16bit_c
 
-uint64_t aom_mse_wxh_16bit_highbd_c(uint16_t* dst,
-                                    int dstride,
-                                    uint16_t* src,
-                                    int sstride,
-                                    int w,
-                                    int h);
-#define aom_mse_wxh_16bit_highbd aom_mse_wxh_16bit_highbd_c
-
-unsigned int aom_obmc_sad128x128_c(const uint8_t* pre,
-                                   int pre_stride,
-                                   const int32_t* wsrc,
-                                   const int32_t* mask);
-#define aom_obmc_sad128x128 aom_obmc_sad128x128_c
-
-unsigned int aom_obmc_sad128x64_c(const uint8_t* pre,
-                                  int pre_stride,
-                                  const int32_t* wsrc,
-                                  const int32_t* mask);
-#define aom_obmc_sad128x64 aom_obmc_sad128x64_c
-
-unsigned int aom_obmc_sad16x16_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad16x16 aom_obmc_sad16x16_c
-
-unsigned int aom_obmc_sad16x32_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad16x32 aom_obmc_sad16x32_c
-
-unsigned int aom_obmc_sad16x4_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-#define aom_obmc_sad16x4 aom_obmc_sad16x4_c
-
-unsigned int aom_obmc_sad16x64_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad16x64 aom_obmc_sad16x64_c
-
-unsigned int aom_obmc_sad16x8_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-#define aom_obmc_sad16x8 aom_obmc_sad16x8_c
-
-unsigned int aom_obmc_sad32x16_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad32x16 aom_obmc_sad32x16_c
-
-unsigned int aom_obmc_sad32x32_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad32x32 aom_obmc_sad32x32_c
-
-unsigned int aom_obmc_sad32x64_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad32x64 aom_obmc_sad32x64_c
-
-unsigned int aom_obmc_sad32x8_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-#define aom_obmc_sad32x8 aom_obmc_sad32x8_c
-
-unsigned int aom_obmc_sad4x16_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-#define aom_obmc_sad4x16 aom_obmc_sad4x16_c
-
-unsigned int aom_obmc_sad4x4_c(const uint8_t* pre,
-                               int pre_stride,
-                               const int32_t* wsrc,
-                               const int32_t* mask);
-#define aom_obmc_sad4x4 aom_obmc_sad4x4_c
-
-unsigned int aom_obmc_sad4x8_c(const uint8_t* pre,
-                               int pre_stride,
-                               const int32_t* wsrc,
-                               const int32_t* mask);
-#define aom_obmc_sad4x8 aom_obmc_sad4x8_c
-
-unsigned int aom_obmc_sad64x128_c(const uint8_t* pre,
-                                  int pre_stride,
-                                  const int32_t* wsrc,
-                                  const int32_t* mask);
-#define aom_obmc_sad64x128 aom_obmc_sad64x128_c
-
-unsigned int aom_obmc_sad64x16_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad64x16 aom_obmc_sad64x16_c
-
-unsigned int aom_obmc_sad64x32_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad64x32 aom_obmc_sad64x32_c
-
-unsigned int aom_obmc_sad64x64_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-#define aom_obmc_sad64x64 aom_obmc_sad64x64_c
-
-unsigned int aom_obmc_sad8x16_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-#define aom_obmc_sad8x16 aom_obmc_sad8x16_c
-
-unsigned int aom_obmc_sad8x32_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-#define aom_obmc_sad8x32 aom_obmc_sad8x32_c
-
-unsigned int aom_obmc_sad8x4_c(const uint8_t* pre,
-                               int pre_stride,
-                               const int32_t* wsrc,
-                               const int32_t* mask);
-#define aom_obmc_sad8x4 aom_obmc_sad8x4_c
-
-unsigned int aom_obmc_sad8x8_c(const uint8_t* pre,
-                               int pre_stride,
-                               const int32_t* wsrc,
-                               const int32_t* mask);
-#define aom_obmc_sad8x8 aom_obmc_sad8x8_c
-
-unsigned int aom_obmc_sub_pixel_variance128x128_c(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-#define aom_obmc_sub_pixel_variance128x128 aom_obmc_sub_pixel_variance128x128_c
-
-unsigned int aom_obmc_sub_pixel_variance128x64_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-#define aom_obmc_sub_pixel_variance128x64 aom_obmc_sub_pixel_variance128x64_c
-
-unsigned int aom_obmc_sub_pixel_variance16x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance16x16 aom_obmc_sub_pixel_variance16x16_c
-
-unsigned int aom_obmc_sub_pixel_variance16x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance16x32 aom_obmc_sub_pixel_variance16x32_c
-
-unsigned int aom_obmc_sub_pixel_variance16x4_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_obmc_sub_pixel_variance16x4 aom_obmc_sub_pixel_variance16x4_c
-
-unsigned int aom_obmc_sub_pixel_variance16x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance16x64 aom_obmc_sub_pixel_variance16x64_c
-
-unsigned int aom_obmc_sub_pixel_variance16x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_obmc_sub_pixel_variance16x8 aom_obmc_sub_pixel_variance16x8_c
-
-unsigned int aom_obmc_sub_pixel_variance32x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance32x16 aom_obmc_sub_pixel_variance32x16_c
-
-unsigned int aom_obmc_sub_pixel_variance32x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance32x32 aom_obmc_sub_pixel_variance32x32_c
-
-unsigned int aom_obmc_sub_pixel_variance32x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance32x64 aom_obmc_sub_pixel_variance32x64_c
-
-unsigned int aom_obmc_sub_pixel_variance32x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_obmc_sub_pixel_variance32x8 aom_obmc_sub_pixel_variance32x8_c
-
-unsigned int aom_obmc_sub_pixel_variance4x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_obmc_sub_pixel_variance4x16 aom_obmc_sub_pixel_variance4x16_c
-
-unsigned int aom_obmc_sub_pixel_variance4x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_obmc_sub_pixel_variance4x4 aom_obmc_sub_pixel_variance4x4_c
-
-unsigned int aom_obmc_sub_pixel_variance4x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_obmc_sub_pixel_variance4x8 aom_obmc_sub_pixel_variance4x8_c
-
-unsigned int aom_obmc_sub_pixel_variance64x128_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-#define aom_obmc_sub_pixel_variance64x128 aom_obmc_sub_pixel_variance64x128_c
-
-unsigned int aom_obmc_sub_pixel_variance64x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance64x16 aom_obmc_sub_pixel_variance64x16_c
-
-unsigned int aom_obmc_sub_pixel_variance64x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance64x32 aom_obmc_sub_pixel_variance64x32_c
-
-unsigned int aom_obmc_sub_pixel_variance64x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-#define aom_obmc_sub_pixel_variance64x64 aom_obmc_sub_pixel_variance64x64_c
-
-unsigned int aom_obmc_sub_pixel_variance8x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_obmc_sub_pixel_variance8x16 aom_obmc_sub_pixel_variance8x16_c
-
-unsigned int aom_obmc_sub_pixel_variance8x32_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-#define aom_obmc_sub_pixel_variance8x32 aom_obmc_sub_pixel_variance8x32_c
-
-unsigned int aom_obmc_sub_pixel_variance8x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_obmc_sub_pixel_variance8x4 aom_obmc_sub_pixel_variance8x4_c
-
-unsigned int aom_obmc_sub_pixel_variance8x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-#define aom_obmc_sub_pixel_variance8x8 aom_obmc_sub_pixel_variance8x8_c
-
-unsigned int aom_obmc_variance128x128_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask,
-                                        unsigned int* sse);
-#define aom_obmc_variance128x128 aom_obmc_variance128x128_c
-
-unsigned int aom_obmc_variance128x64_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask,
-                                       unsigned int* sse);
-#define aom_obmc_variance128x64 aom_obmc_variance128x64_c
-
-unsigned int aom_obmc_variance16x16_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance16x16 aom_obmc_variance16x16_c
-
-unsigned int aom_obmc_variance16x32_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance16x32 aom_obmc_variance16x32_c
-
-unsigned int aom_obmc_variance16x4_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-#define aom_obmc_variance16x4 aom_obmc_variance16x4_c
-
-unsigned int aom_obmc_variance16x64_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance16x64 aom_obmc_variance16x64_c
-
-unsigned int aom_obmc_variance16x8_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-#define aom_obmc_variance16x8 aom_obmc_variance16x8_c
-
-unsigned int aom_obmc_variance32x16_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance32x16 aom_obmc_variance32x16_c
-
-unsigned int aom_obmc_variance32x32_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance32x32 aom_obmc_variance32x32_c
-
-unsigned int aom_obmc_variance32x64_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance32x64 aom_obmc_variance32x64_c
-
-unsigned int aom_obmc_variance32x8_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-#define aom_obmc_variance32x8 aom_obmc_variance32x8_c
-
-unsigned int aom_obmc_variance4x16_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-#define aom_obmc_variance4x16 aom_obmc_variance4x16_c
-
-unsigned int aom_obmc_variance4x4_c(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask,
-                                    unsigned int* sse);
-#define aom_obmc_variance4x4 aom_obmc_variance4x4_c
-
-unsigned int aom_obmc_variance4x8_c(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask,
-                                    unsigned int* sse);
-#define aom_obmc_variance4x8 aom_obmc_variance4x8_c
-
-unsigned int aom_obmc_variance64x128_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask,
-                                       unsigned int* sse);
-#define aom_obmc_variance64x128 aom_obmc_variance64x128_c
-
-unsigned int aom_obmc_variance64x16_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance64x16 aom_obmc_variance64x16_c
-
-unsigned int aom_obmc_variance64x32_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance64x32 aom_obmc_variance64x32_c
-
-unsigned int aom_obmc_variance64x64_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-#define aom_obmc_variance64x64 aom_obmc_variance64x64_c
-
-unsigned int aom_obmc_variance8x16_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-#define aom_obmc_variance8x16 aom_obmc_variance8x16_c
-
-unsigned int aom_obmc_variance8x32_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-#define aom_obmc_variance8x32 aom_obmc_variance8x32_c
-
-unsigned int aom_obmc_variance8x4_c(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask,
-                                    unsigned int* sse);
-#define aom_obmc_variance8x4 aom_obmc_variance8x4_c
-
-unsigned int aom_obmc_variance8x8_c(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask,
-                                    unsigned int* sse);
-#define aom_obmc_variance8x8 aom_obmc_variance8x8_c
-
 void aom_paeth_predictor_16x16_c(uint8_t* dst,
                                  ptrdiff_t y_stride,
                                  const uint8_t* above,
diff --git a/third_party/libaom/source/config/win/arm64/config/av1_rtcd.h b/third_party/libaom/source/config/win/arm64/config/av1_rtcd.h
index d612ede3..c8b39bd0 100644
--- a/third_party/libaom/source/config/win/arm64/config/av1_rtcd.h
+++ b/third_party/libaom/source/config/win/arm64/config/av1_rtcd.h
@@ -114,46 +114,6 @@
                                 const int log_scale);
 #define aom_quantize_b_helper aom_quantize_b_helper_neon
 
-void av1_apply_selfguided_restoration_c(const uint8_t* dat,
-                                        int width,
-                                        int height,
-                                        int stride,
-                                        int eps,
-                                        const int* xqd,
-                                        uint8_t* dst,
-                                        int dst_stride,
-                                        int32_t* tmpbuf,
-                                        int bit_depth,
-                                        int highbd);
-void av1_apply_selfguided_restoration_neon(const uint8_t* dat,
-                                           int width,
-                                           int height,
-                                           int stride,
-                                           int eps,
-                                           const int* xqd,
-                                           uint8_t* dst,
-                                           int dst_stride,
-                                           int32_t* tmpbuf,
-                                           int bit_depth,
-                                           int highbd);
-#define av1_apply_selfguided_restoration av1_apply_selfguided_restoration_neon
-
-void av1_apply_temporal_filter_c(const struct yv12_buffer_config* ref_frame,
-                                 const struct macroblockd* mbd,
-                                 const BLOCK_SIZE block_size,
-                                 const int mb_row,
-                                 const int mb_col,
-                                 const int num_planes,
-                                 const double* noise_levels,
-                                 const MV* subblock_mvs,
-                                 const int* subblock_mses,
-                                 const int q_factor,
-                                 const int filter_strength,
-                                 const uint8_t* pred,
-                                 uint32_t* accum,
-                                 uint16_t* count);
-#define av1_apply_temporal_filter av1_apply_temporal_filter_c
-
 int64_t av1_block_error_c(const tran_low_t* coeff,
                           const tran_low_t* dqcoeff,
                           intptr_t block_size,
@@ -217,44 +177,6 @@
 #define av1_build_compound_diffwtd_mask_highbd \
   av1_build_compound_diffwtd_mask_highbd_c
 
-int64_t av1_calc_frame_error_c(const uint8_t* const ref,
-                               int stride,
-                               const uint8_t* const dst,
-                               int p_width,
-                               int p_height,
-                               int p_stride);
-#define av1_calc_frame_error av1_calc_frame_error_c
-
-void av1_calc_proj_params_c(const uint8_t* src8,
-                            int width,
-                            int height,
-                            int src_stride,
-                            const uint8_t* dat8,
-                            int dat_stride,
-                            int32_t* flt0,
-                            int flt0_stride,
-                            int32_t* flt1,
-                            int flt1_stride,
-                            int64_t H[2][2],
-                            int64_t C[2],
-                            const sgr_params_type* params);
-#define av1_calc_proj_params av1_calc_proj_params_c
-
-void av1_calc_proj_params_high_bd_c(const uint8_t* src8,
-                                    int width,
-                                    int height,
-                                    int src_stride,
-                                    const uint8_t* dat8,
-                                    int dat_stride,
-                                    int32_t* flt0,
-                                    int flt0_stride,
-                                    int32_t* flt1,
-                                    int flt1_stride,
-                                    int64_t H[2][2],
-                                    int64_t C[2],
-                                    const sgr_params_type* params);
-#define av1_calc_proj_params_high_bd av1_calc_proj_params_high_bd_c
-
 void av1_cnn_activate_c(float** input,
                         int channels,
                         int width,
@@ -321,33 +243,6 @@
                                        int y2);
 #define av1_compute_cross_correlation av1_compute_cross_correlation_c
 
-void av1_compute_stats_c(int wiener_win,
-                         const uint8_t* dgd8,
-                         const uint8_t* src8,
-                         int h_start,
-                         int h_end,
-                         int v_start,
-                         int v_end,
-                         int dgd_stride,
-                         int src_stride,
-                         int64_t* M,
-                         int64_t* H);
-#define av1_compute_stats av1_compute_stats_c
-
-void av1_compute_stats_highbd_c(int wiener_win,
-                                const uint8_t* dgd8,
-                                const uint8_t* src8,
-                                int h_start,
-                                int h_end,
-                                int v_start,
-                                int v_end,
-                                int dgd_stride,
-                                int src_stride,
-                                int64_t* M,
-                                int64_t* H,
-                                aom_bit_depth_t bit_depth);
-#define av1_compute_stats_highbd av1_compute_stats_highbd_c
-
 void av1_convolve_2d_scale_c(const uint8_t* src,
                              int src_stride,
                              uint8_t* dst,
@@ -863,30 +758,6 @@
                                   int8_t* const coeff_contexts);
 #define av1_get_nz_map_contexts av1_get_nz_map_contexts_neon
 
-void av1_highbd_apply_temporal_filter_c(
-    const struct yv12_buffer_config* ref_frame,
-    const struct macroblockd* mbd,
-    const BLOCK_SIZE block_size,
-    const int mb_row,
-    const int mb_col,
-    const int num_planes,
-    const double* noise_levels,
-    const MV* subblock_mvs,
-    const int* subblock_mses,
-    const int q_factor,
-    const int filter_strength,
-    const uint8_t* pred,
-    uint32_t* accum,
-    uint16_t* count);
-#define av1_highbd_apply_temporal_filter av1_highbd_apply_temporal_filter_c
-
-int64_t av1_highbd_block_error_c(const tran_low_t* coeff,
-                                 const tran_low_t* dqcoeff,
-                                 intptr_t block_size,
-                                 int64_t* ssz,
-                                 int bd);
-#define av1_highbd_block_error av1_highbd_block_error_c
-
 void av1_highbd_convolve8_c(const uint8_t* src,
                             ptrdiff_t src_stride,
                             uint8_t* dst,
@@ -926,36 +797,6 @@
                                  int bps);
 #define av1_highbd_convolve8_vert av1_highbd_convolve8_vert_c
 
-void av1_highbd_convolve_2d_scale_c(const uint16_t* src,
-                                    int src_stride,
-                                    uint16_t* dst,
-                                    int dst_stride,
-                                    int w,
-                                    int h,
-                                    const InterpFilterParams* filter_params_x,
-                                    const InterpFilterParams* filter_params_y,
-                                    const int subpel_x_qn,
-                                    const int x_step_qn,
-                                    const int subpel_y_qn,
-                                    const int y_step_qn,
-                                    ConvolveParams* conv_params,
-                                    int bd);
-#define av1_highbd_convolve_2d_scale av1_highbd_convolve_2d_scale_c
-
-void av1_highbd_convolve_2d_sr_c(const uint16_t* src,
-                                 int src_stride,
-                                 uint16_t* dst,
-                                 int dst_stride,
-                                 int w,
-                                 int h,
-                                 const InterpFilterParams* filter_params_x,
-                                 const InterpFilterParams* filter_params_y,
-                                 const int subpel_x_qn,
-                                 const int subpel_y_qn,
-                                 ConvolveParams* conv_params,
-                                 int bd);
-#define av1_highbd_convolve_2d_sr av1_highbd_convolve_2d_sr_c
-
 void av1_highbd_convolve_avg_c(const uint8_t* src,
                                ptrdiff_t src_stride,
                                uint8_t* dst,
@@ -982,128 +823,6 @@
                                 int bps);
 #define av1_highbd_convolve_copy av1_highbd_convolve_copy_c
 
-void av1_highbd_convolve_horiz_rs_c(const uint16_t* src,
-                                    int src_stride,
-                                    uint16_t* dst,
-                                    int dst_stride,
-                                    int w,
-                                    int h,
-                                    const int16_t* x_filters,
-                                    int x0_qn,
-                                    int x_step_qn,
-                                    int bd);
-#define av1_highbd_convolve_horiz_rs av1_highbd_convolve_horiz_rs_c
-
-void av1_highbd_convolve_x_sr_c(const uint16_t* src,
-                                int src_stride,
-                                uint16_t* dst,
-                                int dst_stride,
-                                int w,
-                                int h,
-                                const InterpFilterParams* filter_params_x,
-                                const int subpel_x_qn,
-                                ConvolveParams* conv_params,
-                                int bd);
-#define av1_highbd_convolve_x_sr av1_highbd_convolve_x_sr_c
-
-void av1_highbd_convolve_y_sr_c(const uint16_t* src,
-                                int src_stride,
-                                uint16_t* dst,
-                                int dst_stride,
-                                int w,
-                                int h,
-                                const InterpFilterParams* filter_params_y,
-                                const int subpel_y_qn,
-                                int bd);
-#define av1_highbd_convolve_y_sr av1_highbd_convolve_y_sr_c
-
-void av1_highbd_dist_wtd_convolve_2d_c(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_x,
-    const InterpFilterParams* filter_params_y,
-    const int subpel_x_qn,
-    const int subpel_y_qn,
-    ConvolveParams* conv_params,
-    int bd);
-#define av1_highbd_dist_wtd_convolve_2d av1_highbd_dist_wtd_convolve_2d_c
-
-void av1_highbd_dist_wtd_convolve_2d_copy_c(const uint16_t* src,
-                                            int src_stride,
-                                            uint16_t* dst,
-                                            int dst_stride,
-                                            int w,
-                                            int h,
-                                            ConvolveParams* conv_params,
-                                            int bd);
-#define av1_highbd_dist_wtd_convolve_2d_copy \
-  av1_highbd_dist_wtd_convolve_2d_copy_c
-
-void av1_highbd_dist_wtd_convolve_x_c(const uint16_t* src,
-                                      int src_stride,
-                                      uint16_t* dst,
-                                      int dst_stride,
-                                      int w,
-                                      int h,
-                                      const InterpFilterParams* filter_params_x,
-                                      const int subpel_x_qn,
-                                      ConvolveParams* conv_params,
-                                      int bd);
-#define av1_highbd_dist_wtd_convolve_x av1_highbd_dist_wtd_convolve_x_c
-
-void av1_highbd_dist_wtd_convolve_y_c(const uint16_t* src,
-                                      int src_stride,
-                                      uint16_t* dst,
-                                      int dst_stride,
-                                      int w,
-                                      int h,
-                                      const InterpFilterParams* filter_params_y,
-                                      const int subpel_y_qn,
-                                      ConvolveParams* conv_params,
-                                      int bd);
-#define av1_highbd_dist_wtd_convolve_y av1_highbd_dist_wtd_convolve_y_c
-
-void av1_highbd_dr_prediction_z1_c(uint16_t* dst,
-                                   ptrdiff_t stride,
-                                   int bw,
-                                   int bh,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int upsample_above,
-                                   int dx,
-                                   int dy,
-                                   int bd);
-#define av1_highbd_dr_prediction_z1 av1_highbd_dr_prediction_z1_c
-
-void av1_highbd_dr_prediction_z2_c(uint16_t* dst,
-                                   ptrdiff_t stride,
-                                   int bw,
-                                   int bh,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int upsample_above,
-                                   int upsample_left,
-                                   int dx,
-                                   int dy,
-                                   int bd);
-#define av1_highbd_dr_prediction_z2 av1_highbd_dr_prediction_z2_c
-
-void av1_highbd_dr_prediction_z3_c(uint16_t* dst,
-                                   ptrdiff_t stride,
-                                   int bw,
-                                   int bh,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int upsample_left,
-                                   int dx,
-                                   int dy,
-                                   int bd);
-#define av1_highbd_dr_prediction_z3 av1_highbd_dr_prediction_z3_c
-
 void av1_highbd_fwht4x4_c(const int16_t* input, tran_low_t* output, int stride);
 void av1_highbd_fwht4x4_neon(const int16_t* input,
                              tran_low_t* output,
@@ -1296,70 +1015,6 @@
                                 int bd);
 #define av1_highbd_iwht4x4_1_add av1_highbd_iwht4x4_1_add_c
 
-int64_t av1_highbd_pixel_proj_error_c(const uint8_t* src8,
-                                      int width,
-                                      int height,
-                                      int src_stride,
-                                      const uint8_t* dat8,
-                                      int dat_stride,
-                                      int32_t* flt0,
-                                      int flt0_stride,
-                                      int32_t* flt1,
-                                      int flt1_stride,
-                                      int xq[2],
-                                      const sgr_params_type* params);
-#define av1_highbd_pixel_proj_error av1_highbd_pixel_proj_error_c
-
-void av1_highbd_quantize_fp_c(const tran_low_t* coeff_ptr,
-                              intptr_t n_coeffs,
-                              const int16_t* zbin_ptr,
-                              const int16_t* round_ptr,
-                              const int16_t* quant_ptr,
-                              const int16_t* quant_shift_ptr,
-                              tran_low_t* qcoeff_ptr,
-                              tran_low_t* dqcoeff_ptr,
-                              const int16_t* dequant_ptr,
-                              uint16_t* eob_ptr,
-                              const int16_t* scan,
-                              const int16_t* iscan,
-                              int log_scale);
-#define av1_highbd_quantize_fp av1_highbd_quantize_fp_c
-
-void av1_highbd_warp_affine_c(const int32_t* mat,
-                              const uint16_t* ref,
-                              int width,
-                              int height,
-                              int stride,
-                              uint16_t* pred,
-                              int p_col,
-                              int p_row,
-                              int p_width,
-                              int p_height,
-                              int p_stride,
-                              int subsampling_x,
-                              int subsampling_y,
-                              int bd,
-                              ConvolveParams* conv_params,
-                              int16_t alpha,
-                              int16_t beta,
-                              int16_t gamma,
-                              int16_t delta);
-#define av1_highbd_warp_affine av1_highbd_warp_affine_c
-
-void av1_highbd_wiener_convolve_add_src_c(const uint8_t* src,
-                                          ptrdiff_t src_stride,
-                                          uint8_t* dst,
-                                          ptrdiff_t dst_stride,
-                                          const int16_t* filter_x,
-                                          int x_step_q4,
-                                          const int16_t* filter_y,
-                                          int y_step_q4,
-                                          int w,
-                                          int h,
-                                          const ConvolveParams* conv_params,
-                                          int bd);
-#define av1_highbd_wiener_convolve_add_src av1_highbd_wiener_convolve_add_src_c
-
 void av1_inv_txfm2d_add_16x16_c(const int32_t* input,
                                 uint16_t* output,
                                 int stride,
@@ -1603,32 +1258,6 @@
                              TxfmParam* txfm_param);
 #define av1_lowbd_fwd_txfm av1_lowbd_fwd_txfm_neon
 
-int64_t av1_lowbd_pixel_proj_error_c(const uint8_t* src8,
-                                     int width,
-                                     int height,
-                                     int src_stride,
-                                     const uint8_t* dat8,
-                                     int dat_stride,
-                                     int32_t* flt0,
-                                     int flt0_stride,
-                                     int32_t* flt1,
-                                     int flt1_stride,
-                                     int xq[2],
-                                     const sgr_params_type* params);
-int64_t av1_lowbd_pixel_proj_error_neon(const uint8_t* src8,
-                                        int width,
-                                        int height,
-                                        int src_stride,
-                                        const uint8_t* dat8,
-                                        int dat_stride,
-                                        int32_t* flt0,
-                                        int flt0_stride,
-                                        int32_t* flt1,
-                                        int flt1_stride,
-                                        int xq[2],
-                                        const sgr_params_type* params);
-#define av1_lowbd_pixel_proj_error av1_lowbd_pixel_proj_error_neon
-
 void av1_nn_predict_c(const float* input_nodes,
                       const NN_CONFIG* const nn_config,
                       int reduce_prec,
@@ -1770,28 +1399,6 @@
 void av1_round_shift_array_neon(int32_t* arr, int size, int bit);
 #define av1_round_shift_array av1_round_shift_array_neon
 
-int av1_selfguided_restoration_c(const uint8_t* dgd8,
-                                 int width,
-                                 int height,
-                                 int dgd_stride,
-                                 int32_t* flt0,
-                                 int32_t* flt1,
-                                 int flt_stride,
-                                 int sgr_params_idx,
-                                 int bit_depth,
-                                 int highbd);
-int av1_selfguided_restoration_neon(const uint8_t* dgd8,
-                                    int width,
-                                    int height,
-                                    int dgd_stride,
-                                    int32_t* flt0,
-                                    int32_t* flt1,
-                                    int flt_stride,
-                                    int sgr_params_idx,
-                                    int bit_depth,
-                                    int highbd);
-#define av1_selfguided_restoration av1_selfguided_restoration_neon
-
 void av1_txb_init_levels_c(const tran_low_t* const coeff,
                            const int width,
                            const int height,
@@ -1808,44 +1415,6 @@
 void av1_upsample_intra_edge_high_c(uint16_t* p, int sz, int bd);
 #define av1_upsample_intra_edge_high av1_upsample_intra_edge_high_c
 
-void av1_warp_affine_c(const int32_t* mat,
-                       const uint8_t* ref,
-                       int width,
-                       int height,
-                       int stride,
-                       uint8_t* pred,
-                       int p_col,
-                       int p_row,
-                       int p_width,
-                       int p_height,
-                       int p_stride,
-                       int subsampling_x,
-                       int subsampling_y,
-                       ConvolveParams* conv_params,
-                       int16_t alpha,
-                       int16_t beta,
-                       int16_t gamma,
-                       int16_t delta);
-void av1_warp_affine_neon(const int32_t* mat,
-                          const uint8_t* ref,
-                          int width,
-                          int height,
-                          int stride,
-                          uint8_t* pred,
-                          int p_col,
-                          int p_row,
-                          int p_width,
-                          int p_height,
-                          int p_stride,
-                          int subsampling_x,
-                          int subsampling_y,
-                          ConvolveParams* conv_params,
-                          int16_t alpha,
-                          int16_t beta,
-                          int16_t gamma,
-                          int16_t delta);
-#define av1_warp_affine av1_warp_affine_neon
-
 void av1_wedge_compute_delta_squares_c(int16_t* d,
                                        const int16_t* a,
                                        const int16_t* b,
@@ -1950,34 +1519,18 @@
                        int coeff_shift);
 #define cdef_find_dir cdef_find_dir_neon
 
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_420_hbd_c(TX_SIZE tx_size);
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_420_hbd_neon(TX_SIZE tx_size);
-#define cfl_get_luma_subsampling_420_hbd cfl_get_luma_subsampling_420_hbd_neon
-
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_420_lbd_c(TX_SIZE tx_size);
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_420_lbd_neon(TX_SIZE tx_size);
 #define cfl_get_luma_subsampling_420_lbd cfl_get_luma_subsampling_420_lbd_neon
 
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_422_hbd_c(TX_SIZE tx_size);
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_422_hbd_neon(TX_SIZE tx_size);
-#define cfl_get_luma_subsampling_422_hbd cfl_get_luma_subsampling_422_hbd_neon
-
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_422_lbd_c(TX_SIZE tx_size);
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_422_lbd_neon(TX_SIZE tx_size);
 #define cfl_get_luma_subsampling_422_lbd cfl_get_luma_subsampling_422_lbd_neon
 
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_444_hbd_c(TX_SIZE tx_size);
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_444_hbd_neon(TX_SIZE tx_size);
-#define cfl_get_luma_subsampling_444_hbd cfl_get_luma_subsampling_444_hbd_neon
-
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_444_lbd_c(TX_SIZE tx_size);
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_444_lbd_neon(TX_SIZE tx_size);
 #define cfl_get_luma_subsampling_444_lbd cfl_get_luma_subsampling_444_lbd_neon
 
-cfl_predict_hbd_fn cfl_get_predict_hbd_fn_c(TX_SIZE tx_size);
-cfl_predict_hbd_fn cfl_get_predict_hbd_fn_neon(TX_SIZE tx_size);
-#define cfl_get_predict_hbd_fn cfl_get_predict_hbd_fn_neon
-
 cfl_predict_lbd_fn cfl_get_predict_lbd_fn_c(TX_SIZE tx_size);
 cfl_predict_lbd_fn cfl_get_predict_lbd_fn_neon(TX_SIZE tx_size);
 #define cfl_get_predict_lbd_fn cfl_get_predict_lbd_fn_neon
diff --git a/third_party/libaom/source/config/win/ia32/config/aom_config.asm b/third_party/libaom/source/config/win/ia32/config/aom_config.asm
index cadc695..41bb8582 100644
--- a/third_party/libaom/source/config/win/ia32/config/aom_config.asm
+++ b/third_party/libaom/source/config/win/ia32/config/aom_config.asm
@@ -7,7 +7,7 @@
 %define CONFIG_ANALYZER 0
 %define CONFIG_AV1_DECODER 1
 %define CONFIG_AV1_ENCODER 1
-%define CONFIG_AV1_HIGHBITDEPTH 1
+%define CONFIG_AV1_HIGHBITDEPTH 0
 %define CONFIG_AV1_TEMPORAL_DENOISING 0
 %define CONFIG_BIG_ENDIAN 0
 %define CONFIG_BITSTREAM_DEBUG 0
@@ -37,7 +37,7 @@
 %define CONFIG_OS_SUPPORT 1
 %define CONFIG_PIC 1
 %define CONFIG_RD_DEBUG 0
-%define CONFIG_REALTIME_ONLY 0
+%define CONFIG_REALTIME_ONLY 1
 %define CONFIG_RUNTIME_CPU_DETECT 1
 %define CONFIG_SHARED 0
 %define CONFIG_SHARP_SETTINGS 0
diff --git a/third_party/libaom/source/config/win/ia32/config/aom_config.c b/third_party/libaom/source/config/win/ia32/config/aom_config.c
index 70b383ef..81d7896 100644
--- a/third_party/libaom/source/config/win/ia32/config/aom_config.c
+++ b/third_party/libaom/source/config/win/ia32/config/aom_config.c
@@ -9,5 +9,5 @@
  * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
  */
 #include "aom/aom_codec.h"
-static const char* const cfg = "cmake ../source/libaom -G \"Unix Makefiles\" -DCMAKE_TOOLCHAIN_FILE=\"../source/libaom/build/cmake/toolchains/x86-linux.cmake\" -DAOM_RTCD_FLAGS=--require-mmx;--require-sse;--require-sse2 -DCONFIG_AV1_ENCODER=1 -DCONFIG_LIBYUV=0 -DCONFIG_PIC=1 -DCONFIG_MAX_DECODE_PROFILE=0 -DCONFIG_NORMAL_TILE_MODE=1 -DCONFIG_SIZE_LIMIT=1 -DDECODE_HEIGHT_LIMIT=16384 -DDECODE_WIDTH_LIMIT=16384";
+static const char* const cfg = "cmake ../source/libaom -G \"Unix Makefiles\" -DCMAKE_TOOLCHAIN_FILE=\"../source/libaom/build/cmake/toolchains/x86-linux.cmake\" -DAOM_RTCD_FLAGS=--require-mmx;--require-sse;--require-sse2 -DCONFIG_AV1_ENCODER=1 -DCONFIG_LIBYUV=0 -DCONFIG_PIC=1 -DCONFIG_MAX_DECODE_PROFILE=0 -DCONFIG_NORMAL_TILE_MODE=1 -DCONFIG_SIZE_LIMIT=1 -DDECODE_HEIGHT_LIMIT=16384 -DDECODE_WIDTH_LIMIT=16384 -DCONFIG_REALTIME_ONLY=1 -DCONFIG_AV1_HIGHBITDEPTH=0";
 const char *aom_codec_build_config(void) {return cfg;}
diff --git a/third_party/libaom/source/config/win/ia32/config/aom_config.h b/third_party/libaom/source/config/win/ia32/config/aom_config.h
index 44b20f2..239e6a8d4 100644
--- a/third_party/libaom/source/config/win/ia32/config/aom_config.h
+++ b/third_party/libaom/source/config/win/ia32/config/aom_config.h
@@ -19,7 +19,7 @@
 #define CONFIG_ANALYZER 0
 #define CONFIG_AV1_DECODER 1
 #define CONFIG_AV1_ENCODER 1
-#define CONFIG_AV1_HIGHBITDEPTH 1
+#define CONFIG_AV1_HIGHBITDEPTH 0
 #define CONFIG_AV1_TEMPORAL_DENOISING 0
 #define CONFIG_BIG_ENDIAN 0
 #define CONFIG_BITSTREAM_DEBUG 0
@@ -49,7 +49,7 @@
 #define CONFIG_OS_SUPPORT 1
 #define CONFIG_PIC 1
 #define CONFIG_RD_DEBUG 0
-#define CONFIG_REALTIME_ONLY 0
+#define CONFIG_REALTIME_ONLY 1
 #define CONFIG_RUNTIME_CPU_DETECT 1
 #define CONFIG_SHARED 0
 #define CONFIG_SHARP_SETTINGS 0
diff --git a/third_party/libaom/source/config/win/ia32/config/aom_dsp_rtcd.h b/third_party/libaom/source/config/win/ia32/config/aom_dsp_rtcd.h
index 9994e757..305982d 100644
--- a/third_party/libaom/source/config/win/ia32/config/aom_dsp_rtcd.h
+++ b/third_party/libaom/source/config/win/ia32/config/aom_dsp_rtcd.h
@@ -2908,14548 +2908,6 @@
                               int16_t* coeff);
 #define aom_hadamard_lp_8x8 aom_hadamard_lp_8x8_sse2
 
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x128 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x64 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x16 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x16_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x32 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x32_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x4 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x4_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x64 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x64_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x8 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x8_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x16 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x16_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x32 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x32_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x64 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x64_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x8 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x8_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x16 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x4 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x4_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x8 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x128 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x16 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x16_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x32 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x32_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x64 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x64_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x16 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x16_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x32 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x32_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x4 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x4_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x8 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x8_c
-
-void aom_highbd_10_get16x16var_c(const uint8_t* src_ptr,
-                                 int source_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride,
-                                 unsigned int* sse,
-                                 int* sum);
-#define aom_highbd_10_get16x16var aom_highbd_10_get16x16var_c
-
-void aom_highbd_10_get8x8var_c(const uint8_t* src_ptr,
-                               int source_stride,
-                               const uint8_t* ref_ptr,
-                               int ref_stride,
-                               unsigned int* sse,
-                               int* sum);
-#define aom_highbd_10_get8x8var aom_highbd_10_get8x8var_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance128x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance128x128_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance128x128)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance128x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance128x64_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance128x64)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x16_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance16x16)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x32_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance16x32)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x4_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance16x4)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x64_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance16x64)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x8_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance16x8)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x16_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance32x16)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x32_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance32x32)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x64_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance32x64)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x8_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance32x8)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance4x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance4x16_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance4x16)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance4x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance4x4_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance4x4)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance4x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance4x8_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance4x8)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x128_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance64x128)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x16_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance64x16)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x32_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance64x32)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x64_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance64x64)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x16_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance8x16)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x32_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance8x32)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x4_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance8x4)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x8_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance8x8)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_mse16x16_c(const uint8_t* src_ptr,
-                                      int source_stride,
-                                      const uint8_t* ref_ptr,
-                                      int recon_stride,
-                                      unsigned int* sse);
-unsigned int aom_highbd_10_mse16x16_sse2(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int recon_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_mse16x16 aom_highbd_10_mse16x16_sse2
-
-unsigned int aom_highbd_10_mse16x8_c(const uint8_t* src_ptr,
-                                     int source_stride,
-                                     const uint8_t* ref_ptr,
-                                     int recon_stride,
-                                     unsigned int* sse);
-#define aom_highbd_10_mse16x8 aom_highbd_10_mse16x8_c
-
-unsigned int aom_highbd_10_mse8x16_c(const uint8_t* src_ptr,
-                                     int source_stride,
-                                     const uint8_t* ref_ptr,
-                                     int recon_stride,
-                                     unsigned int* sse);
-#define aom_highbd_10_mse8x16 aom_highbd_10_mse8x16_c
-
-unsigned int aom_highbd_10_mse8x8_c(const uint8_t* src_ptr,
-                                    int source_stride,
-                                    const uint8_t* ref_ptr,
-                                    int recon_stride,
-                                    unsigned int* sse);
-unsigned int aom_highbd_10_mse8x8_sse2(const uint8_t* src_ptr,
-                                       int source_stride,
-                                       const uint8_t* ref_ptr,
-                                       int recon_stride,
-                                       unsigned int* sse);
-#define aom_highbd_10_mse8x8 aom_highbd_10_mse8x8_sse2
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance128x128_c(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            int xoffset,
-                                                            int yoffset,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance128x128 \
-  aom_highbd_10_obmc_sub_pixel_variance128x128_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance128x64_c(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance128x64 \
-  aom_highbd_10_obmc_sub_pixel_variance128x64_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance16x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance16x16 \
-  aom_highbd_10_obmc_sub_pixel_variance16x16_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance16x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance16x32 \
-  aom_highbd_10_obmc_sub_pixel_variance16x32_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance16x4_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance16x4 \
-  aom_highbd_10_obmc_sub_pixel_variance16x4_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance16x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance16x64 \
-  aom_highbd_10_obmc_sub_pixel_variance16x64_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance16x8_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance16x8 \
-  aom_highbd_10_obmc_sub_pixel_variance16x8_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance32x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance32x16 \
-  aom_highbd_10_obmc_sub_pixel_variance32x16_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance32x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance32x32 \
-  aom_highbd_10_obmc_sub_pixel_variance32x32_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance32x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance32x64 \
-  aom_highbd_10_obmc_sub_pixel_variance32x64_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance32x8_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance32x8 \
-  aom_highbd_10_obmc_sub_pixel_variance32x8_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance4x16_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance4x16 \
-  aom_highbd_10_obmc_sub_pixel_variance4x16_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance4x4_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance4x4 \
-  aom_highbd_10_obmc_sub_pixel_variance4x4_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance4x8_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance4x8 \
-  aom_highbd_10_obmc_sub_pixel_variance4x8_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance64x128_c(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance64x128 \
-  aom_highbd_10_obmc_sub_pixel_variance64x128_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance64x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance64x16 \
-  aom_highbd_10_obmc_sub_pixel_variance64x16_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance64x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance64x32 \
-  aom_highbd_10_obmc_sub_pixel_variance64x32_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance64x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance64x64 \
-  aom_highbd_10_obmc_sub_pixel_variance64x64_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance8x16_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance8x16 \
-  aom_highbd_10_obmc_sub_pixel_variance8x16_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance8x32_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance8x32 \
-  aom_highbd_10_obmc_sub_pixel_variance8x32_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance8x4_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance8x4 \
-  aom_highbd_10_obmc_sub_pixel_variance8x4_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance8x8_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance8x8 \
-  aom_highbd_10_obmc_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_10_obmc_variance128x128_c(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance128x128_sse4_1(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance128x128)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance128x64_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance128x64_sse4_1(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance128x64)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance16x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance16x16_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance16x16)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance16x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance16x32_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance16x32)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance16x4_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance16x4_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance16x4)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance16x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance16x64_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance16x64)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance16x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance16x8_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance16x8)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance32x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance32x16_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance32x16)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance32x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance32x32_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance32x32)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance32x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance32x64_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance32x64)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance32x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance32x8_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance32x8)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance4x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance4x16_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance4x16)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance4x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance4x4_sse4_1(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance4x4)(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance4x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance4x8_sse4_1(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance4x8)(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance64x128_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance64x128_sse4_1(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance64x128)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance64x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance64x16_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance64x16)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance64x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance64x32_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance64x32)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance64x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance64x64_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance64x64)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance8x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance8x16_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance8x16)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance8x32_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance8x32_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance8x32)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance8x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance8x4_sse4_1(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance8x4)(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance8x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance8x8_sse4_1(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance8x8)(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance128x128 \
-  aom_highbd_10_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance128x64 \
-  aom_highbd_10_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x16_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance16x16 \
-  aom_highbd_10_sub_pixel_avg_variance16x16_sse2
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x32_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance16x32 \
-  aom_highbd_10_sub_pixel_avg_variance16x32_sse2
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x4_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x4_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance16x4 \
-  aom_highbd_10_sub_pixel_avg_variance16x4_sse2
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x64_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance16x64 \
-  aom_highbd_10_sub_pixel_avg_variance16x64_sse2
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x8_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance16x8 \
-  aom_highbd_10_sub_pixel_avg_variance16x8_sse2
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x16_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance32x16 \
-  aom_highbd_10_sub_pixel_avg_variance32x16_sse2
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x32_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance32x32 \
-  aom_highbd_10_sub_pixel_avg_variance32x32_sse2
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x64_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance32x64 \
-  aom_highbd_10_sub_pixel_avg_variance32x64_sse2
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x8_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x8_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance32x8 \
-  aom_highbd_10_sub_pixel_avg_variance32x8_sse2
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance4x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance4x16 \
-  aom_highbd_10_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance4x4_sse4_1(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-RTCD_EXTERN uint32_t (*aom_highbd_10_sub_pixel_avg_variance4x4)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance4x8 \
-  aom_highbd_10_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance64x128 \
-  aom_highbd_10_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance64x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance64x16_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance64x16 \
-  aom_highbd_10_sub_pixel_avg_variance64x16_sse2
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance64x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance64x32_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance64x32 \
-  aom_highbd_10_sub_pixel_avg_variance64x32_sse2
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance64x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance64x64_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance64x64 \
-  aom_highbd_10_sub_pixel_avg_variance64x64_sse2
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x16_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance8x16 \
-  aom_highbd_10_sub_pixel_avg_variance8x16_sse2
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x32_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x32_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance8x32 \
-  aom_highbd_10_sub_pixel_avg_variance8x32_sse2
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x4_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance8x4 \
-  aom_highbd_10_sub_pixel_avg_variance8x4_sse2
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x8_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance8x8 \
-  aom_highbd_10_sub_pixel_avg_variance8x8_sse2
-
-uint32_t aom_highbd_10_sub_pixel_variance128x128_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance128x128_sse2(const uint8_t* src_ptr,
-                                                      int source_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const uint8_t* ref_ptr,
-                                                      int ref_stride,
-                                                      uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance128x128_avx2(const uint8_t* src_ptr,
-                                                      int source_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const uint8_t* ref_ptr,
-                                                      int ref_stride,
-                                                      uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_10_sub_pixel_variance128x128)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-uint32_t aom_highbd_10_sub_pixel_variance128x64_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance128x64_sse2(const uint8_t* src_ptr,
-                                                     int source_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const uint8_t* ref_ptr,
-                                                     int ref_stride,
-                                                     uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance128x64_avx2(const uint8_t* src_ptr,
-                                                     int source_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const uint8_t* ref_ptr,
-                                                     int ref_stride,
-                                                     uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_10_sub_pixel_variance128x64)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-uint32_t aom_highbd_10_sub_pixel_variance16x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance16x16_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance16x16_avx2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_10_sub_pixel_variance16x16)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-uint32_t aom_highbd_10_sub_pixel_variance16x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance16x32_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance16x32_avx2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_10_sub_pixel_variance16x32)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-uint32_t aom_highbd_10_sub_pixel_variance16x4_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance16x4_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance16x4 \
-  aom_highbd_10_sub_pixel_variance16x4_sse2
-
-uint32_t aom_highbd_10_sub_pixel_variance16x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance16x64_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance16x64 \
-  aom_highbd_10_sub_pixel_variance16x64_sse2
-
-uint32_t aom_highbd_10_sub_pixel_variance16x8_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance16x8_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance16x8_avx2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_10_sub_pixel_variance16x8)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-uint32_t aom_highbd_10_sub_pixel_variance32x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance32x16_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance32x16_avx2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_10_sub_pixel_variance32x16)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-uint32_t aom_highbd_10_sub_pixel_variance32x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance32x32_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance32x32_avx2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_10_sub_pixel_variance32x32)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-uint32_t aom_highbd_10_sub_pixel_variance32x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance32x64_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance32x64_avx2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_10_sub_pixel_variance32x64)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-uint32_t aom_highbd_10_sub_pixel_variance32x8_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance32x8_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance32x8 \
-  aom_highbd_10_sub_pixel_variance32x8_sse2
-
-uint32_t aom_highbd_10_sub_pixel_variance4x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance4x16 \
-  aom_highbd_10_sub_pixel_variance4x16_c
-
-uint32_t aom_highbd_10_sub_pixel_variance4x4_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance4x4_sse4_1(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_10_sub_pixel_variance4x4)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-uint32_t aom_highbd_10_sub_pixel_variance4x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance4x8 \
-  aom_highbd_10_sub_pixel_variance4x8_c
-
-uint32_t aom_highbd_10_sub_pixel_variance64x128_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance64x128_sse2(const uint8_t* src_ptr,
-                                                     int source_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const uint8_t* ref_ptr,
-                                                     int ref_stride,
-                                                     uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance64x128_avx2(const uint8_t* src_ptr,
-                                                     int source_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const uint8_t* ref_ptr,
-                                                     int ref_stride,
-                                                     uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_10_sub_pixel_variance64x128)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-uint32_t aom_highbd_10_sub_pixel_variance64x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance64x16_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance64x16 \
-  aom_highbd_10_sub_pixel_variance64x16_sse2
-
-uint32_t aom_highbd_10_sub_pixel_variance64x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance64x32_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance64x32_avx2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_10_sub_pixel_variance64x32)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-uint32_t aom_highbd_10_sub_pixel_variance64x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance64x64_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance64x64_avx2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_10_sub_pixel_variance64x64)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-uint32_t aom_highbd_10_sub_pixel_variance8x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance8x16_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance8x16_avx2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_10_sub_pixel_variance8x16)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-uint32_t aom_highbd_10_sub_pixel_variance8x32_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance8x32_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance8x32 \
-  aom_highbd_10_sub_pixel_variance8x32_sse2
-
-uint32_t aom_highbd_10_sub_pixel_variance8x4_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance8x4_sse2(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance8x4 \
-  aom_highbd_10_sub_pixel_variance8x4_sse2
-
-uint32_t aom_highbd_10_sub_pixel_variance8x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance8x8_sse2(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance8x8_avx2(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_10_sub_pixel_variance8x8)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-unsigned int aom_highbd_10_variance128x128_c(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-unsigned int aom_highbd_10_variance128x128_sse2(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                unsigned int* sse);
-unsigned int aom_highbd_10_variance128x128_avx2(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_variance128x128)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_variance128x64_c(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-unsigned int aom_highbd_10_variance128x64_sse2(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               unsigned int* sse);
-unsigned int aom_highbd_10_variance128x64_avx2(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_variance128x64)(const uint8_t* src_ptr,
-                                                         int source_stride,
-                                                         const uint8_t* ref_ptr,
-                                                         int ref_stride,
-                                                         unsigned int* sse);
-
-unsigned int aom_highbd_10_variance16x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_10_variance16x16_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-unsigned int aom_highbd_10_variance16x16_avx2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_variance16x16)(const uint8_t* src_ptr,
-                                                        int source_stride,
-                                                        const uint8_t* ref_ptr,
-                                                        int ref_stride,
-                                                        unsigned int* sse);
-
-unsigned int aom_highbd_10_variance16x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_10_variance16x32_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-unsigned int aom_highbd_10_variance16x32_avx2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_variance16x32)(const uint8_t* src_ptr,
-                                                        int source_stride,
-                                                        const uint8_t* ref_ptr,
-                                                        int ref_stride,
-                                                        unsigned int* sse);
-
-unsigned int aom_highbd_10_variance16x4_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_10_variance16x4 aom_highbd_10_variance16x4_c
-
-unsigned int aom_highbd_10_variance16x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           uint32_t* sse);
-unsigned int aom_highbd_10_variance16x64_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-#define aom_highbd_10_variance16x64 aom_highbd_10_variance16x64_sse2
-
-unsigned int aom_highbd_10_variance16x8_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-unsigned int aom_highbd_10_variance16x8_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-unsigned int aom_highbd_10_variance16x8_avx2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_variance16x8)(const uint8_t* src_ptr,
-                                                       int source_stride,
-                                                       const uint8_t* ref_ptr,
-                                                       int ref_stride,
-                                                       unsigned int* sse);
-
-unsigned int aom_highbd_10_variance2x2_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance2x2 aom_highbd_10_variance2x2_c
-
-unsigned int aom_highbd_10_variance2x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance2x4 aom_highbd_10_variance2x4_c
-
-unsigned int aom_highbd_10_variance32x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_10_variance32x16_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-unsigned int aom_highbd_10_variance32x16_avx2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_variance32x16)(const uint8_t* src_ptr,
-                                                        int source_stride,
-                                                        const uint8_t* ref_ptr,
-                                                        int ref_stride,
-                                                        unsigned int* sse);
-
-unsigned int aom_highbd_10_variance32x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_10_variance32x32_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-unsigned int aom_highbd_10_variance32x32_avx2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_variance32x32)(const uint8_t* src_ptr,
-                                                        int source_stride,
-                                                        const uint8_t* ref_ptr,
-                                                        int ref_stride,
-                                                        unsigned int* sse);
-
-unsigned int aom_highbd_10_variance32x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_10_variance32x64_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-unsigned int aom_highbd_10_variance32x64_avx2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_variance32x64)(const uint8_t* src_ptr,
-                                                        int source_stride,
-                                                        const uint8_t* ref_ptr,
-                                                        int ref_stride,
-                                                        unsigned int* sse);
-
-unsigned int aom_highbd_10_variance32x8_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-unsigned int aom_highbd_10_variance32x8_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             uint32_t* sse);
-#define aom_highbd_10_variance32x8 aom_highbd_10_variance32x8_sse2
-
-unsigned int aom_highbd_10_variance4x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_10_variance4x16 aom_highbd_10_variance4x16_c
-
-unsigned int aom_highbd_10_variance4x2_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance4x2 aom_highbd_10_variance4x2_c
-
-unsigned int aom_highbd_10_variance4x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-unsigned int aom_highbd_10_variance4x4_sse4_1(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_variance4x4)(const uint8_t* src_ptr,
-                                                      int source_stride,
-                                                      const uint8_t* ref_ptr,
-                                                      int ref_stride,
-                                                      unsigned int* sse);
-
-unsigned int aom_highbd_10_variance4x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance4x8 aom_highbd_10_variance4x8_c
-
-unsigned int aom_highbd_10_variance64x128_c(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-unsigned int aom_highbd_10_variance64x128_sse2(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               unsigned int* sse);
-unsigned int aom_highbd_10_variance64x128_avx2(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_variance64x128)(const uint8_t* src_ptr,
-                                                         int source_stride,
-                                                         const uint8_t* ref_ptr,
-                                                         int ref_stride,
-                                                         unsigned int* sse);
-
-unsigned int aom_highbd_10_variance64x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           uint32_t* sse);
-unsigned int aom_highbd_10_variance64x16_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-#define aom_highbd_10_variance64x16 aom_highbd_10_variance64x16_sse2
-
-unsigned int aom_highbd_10_variance64x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_10_variance64x32_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-unsigned int aom_highbd_10_variance64x32_avx2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_variance64x32)(const uint8_t* src_ptr,
-                                                        int source_stride,
-                                                        const uint8_t* ref_ptr,
-                                                        int ref_stride,
-                                                        unsigned int* sse);
-
-unsigned int aom_highbd_10_variance64x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_10_variance64x64_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-unsigned int aom_highbd_10_variance64x64_avx2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_variance64x64)(const uint8_t* src_ptr,
-                                                        int source_stride,
-                                                        const uint8_t* ref_ptr,
-                                                        int ref_stride,
-                                                        unsigned int* sse);
-
-unsigned int aom_highbd_10_variance8x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-unsigned int aom_highbd_10_variance8x16_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-unsigned int aom_highbd_10_variance8x16_avx2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_variance8x16)(const uint8_t* src_ptr,
-                                                       int source_stride,
-                                                       const uint8_t* ref_ptr,
-                                                       int ref_stride,
-                                                       unsigned int* sse);
-
-unsigned int aom_highbd_10_variance8x32_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-unsigned int aom_highbd_10_variance8x32_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             uint32_t* sse);
-#define aom_highbd_10_variance8x32 aom_highbd_10_variance8x32_sse2
-
-unsigned int aom_highbd_10_variance8x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance8x4 aom_highbd_10_variance8x4_c
-
-unsigned int aom_highbd_10_variance8x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-unsigned int aom_highbd_10_variance8x8_sse2(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-unsigned int aom_highbd_10_variance8x8_avx2(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_variance8x8)(const uint8_t* src_ptr,
-                                                      int source_stride,
-                                                      const uint8_t* ref_ptr,
-                                                      int ref_stride,
-                                                      unsigned int* sse);
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x128 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x64 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x16 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x16_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x32 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x32_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x4 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x4_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x64 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x64_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x8 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x8_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x16 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x16_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x32 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x32_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x64 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x64_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x8 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x8_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x16 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x4 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x4_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x8 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x128 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x16 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x16_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x32 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x32_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x64 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x64_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x16 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x16_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x32 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x32_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x4 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x4_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x8 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x8_c
-
-void aom_highbd_12_get16x16var_c(const uint8_t* src_ptr,
-                                 int source_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride,
-                                 unsigned int* sse,
-                                 int* sum);
-#define aom_highbd_12_get16x16var aom_highbd_12_get16x16var_c
-
-void aom_highbd_12_get8x8var_c(const uint8_t* src_ptr,
-                               int source_stride,
-                               const uint8_t* ref_ptr,
-                               int ref_stride,
-                               unsigned int* sse,
-                               int* sum);
-#define aom_highbd_12_get8x8var aom_highbd_12_get8x8var_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance128x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance128x128_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance128x128)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance128x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance128x64_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance128x64)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x16_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance16x16)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x32_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance16x32)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x4_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance16x4)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x64_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance16x64)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x8_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance16x8)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x16_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance32x16)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x32_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance32x32)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x64_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance32x64)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x8_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance32x8)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance4x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance4x16_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance4x16)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance4x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance4x4_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance4x4)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance4x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance4x8_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance4x8)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x128_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance64x128)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x16_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance64x16)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x32_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance64x32)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x64_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance64x64)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x16_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance8x16)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x32_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance8x32)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x4_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance8x4)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x8_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance8x8)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_mse16x16_c(const uint8_t* src_ptr,
-                                      int source_stride,
-                                      const uint8_t* ref_ptr,
-                                      int recon_stride,
-                                      unsigned int* sse);
-unsigned int aom_highbd_12_mse16x16_sse2(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int recon_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_mse16x16 aom_highbd_12_mse16x16_sse2
-
-unsigned int aom_highbd_12_mse16x8_c(const uint8_t* src_ptr,
-                                     int source_stride,
-                                     const uint8_t* ref_ptr,
-                                     int recon_stride,
-                                     unsigned int* sse);
-#define aom_highbd_12_mse16x8 aom_highbd_12_mse16x8_c
-
-unsigned int aom_highbd_12_mse8x16_c(const uint8_t* src_ptr,
-                                     int source_stride,
-                                     const uint8_t* ref_ptr,
-                                     int recon_stride,
-                                     unsigned int* sse);
-#define aom_highbd_12_mse8x16 aom_highbd_12_mse8x16_c
-
-unsigned int aom_highbd_12_mse8x8_c(const uint8_t* src_ptr,
-                                    int source_stride,
-                                    const uint8_t* ref_ptr,
-                                    int recon_stride,
-                                    unsigned int* sse);
-unsigned int aom_highbd_12_mse8x8_sse2(const uint8_t* src_ptr,
-                                       int source_stride,
-                                       const uint8_t* ref_ptr,
-                                       int recon_stride,
-                                       unsigned int* sse);
-#define aom_highbd_12_mse8x8 aom_highbd_12_mse8x8_sse2
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance128x128_c(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            int xoffset,
-                                                            int yoffset,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance128x128 \
-  aom_highbd_12_obmc_sub_pixel_variance128x128_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance128x64_c(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance128x64 \
-  aom_highbd_12_obmc_sub_pixel_variance128x64_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance16x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance16x16 \
-  aom_highbd_12_obmc_sub_pixel_variance16x16_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance16x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance16x32 \
-  aom_highbd_12_obmc_sub_pixel_variance16x32_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance16x4_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance16x4 \
-  aom_highbd_12_obmc_sub_pixel_variance16x4_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance16x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance16x64 \
-  aom_highbd_12_obmc_sub_pixel_variance16x64_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance16x8_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance16x8 \
-  aom_highbd_12_obmc_sub_pixel_variance16x8_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance32x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance32x16 \
-  aom_highbd_12_obmc_sub_pixel_variance32x16_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance32x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance32x32 \
-  aom_highbd_12_obmc_sub_pixel_variance32x32_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance32x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance32x64 \
-  aom_highbd_12_obmc_sub_pixel_variance32x64_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance32x8_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance32x8 \
-  aom_highbd_12_obmc_sub_pixel_variance32x8_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance4x16_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance4x16 \
-  aom_highbd_12_obmc_sub_pixel_variance4x16_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance4x4_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance4x4 \
-  aom_highbd_12_obmc_sub_pixel_variance4x4_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance4x8_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance4x8 \
-  aom_highbd_12_obmc_sub_pixel_variance4x8_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance64x128_c(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance64x128 \
-  aom_highbd_12_obmc_sub_pixel_variance64x128_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance64x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance64x16 \
-  aom_highbd_12_obmc_sub_pixel_variance64x16_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance64x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance64x32 \
-  aom_highbd_12_obmc_sub_pixel_variance64x32_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance64x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance64x64 \
-  aom_highbd_12_obmc_sub_pixel_variance64x64_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance8x16_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance8x16 \
-  aom_highbd_12_obmc_sub_pixel_variance8x16_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance8x32_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance8x32 \
-  aom_highbd_12_obmc_sub_pixel_variance8x32_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance8x4_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance8x4 \
-  aom_highbd_12_obmc_sub_pixel_variance8x4_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance8x8_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance8x8 \
-  aom_highbd_12_obmc_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_12_obmc_variance128x128_c(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance128x128_sse4_1(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance128x128)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance128x64_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance128x64_sse4_1(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance128x64)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance16x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance16x16_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance16x16)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance16x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance16x32_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance16x32)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance16x4_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance16x4_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance16x4)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance16x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance16x64_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance16x64)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance16x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance16x8_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance16x8)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance32x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance32x16_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance32x16)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance32x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance32x32_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance32x32)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance32x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance32x64_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance32x64)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance32x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance32x8_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance32x8)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance4x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance4x16_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance4x16)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance4x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance4x4_sse4_1(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance4x4)(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance4x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance4x8_sse4_1(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance4x8)(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance64x128_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance64x128_sse4_1(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance64x128)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance64x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance64x16_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance64x16)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance64x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance64x32_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance64x32)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance64x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance64x64_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance64x64)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance8x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance8x16_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance8x16)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance8x32_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance8x32_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance8x32)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance8x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance8x4_sse4_1(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance8x4)(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance8x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance8x8_sse4_1(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance8x8)(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance128x128 \
-  aom_highbd_12_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance128x64 \
-  aom_highbd_12_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x16_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance16x16 \
-  aom_highbd_12_sub_pixel_avg_variance16x16_sse2
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x32_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance16x32 \
-  aom_highbd_12_sub_pixel_avg_variance16x32_sse2
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x4_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x4_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance16x4 \
-  aom_highbd_12_sub_pixel_avg_variance16x4_sse2
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x64_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance16x64 \
-  aom_highbd_12_sub_pixel_avg_variance16x64_sse2
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x8_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance16x8 \
-  aom_highbd_12_sub_pixel_avg_variance16x8_sse2
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x16_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance32x16 \
-  aom_highbd_12_sub_pixel_avg_variance32x16_sse2
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x32_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance32x32 \
-  aom_highbd_12_sub_pixel_avg_variance32x32_sse2
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x64_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance32x64 \
-  aom_highbd_12_sub_pixel_avg_variance32x64_sse2
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x8_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x8_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance32x8 \
-  aom_highbd_12_sub_pixel_avg_variance32x8_sse2
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance4x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance4x16 \
-  aom_highbd_12_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance4x4_sse4_1(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-RTCD_EXTERN uint32_t (*aom_highbd_12_sub_pixel_avg_variance4x4)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance4x8 \
-  aom_highbd_12_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance64x128 \
-  aom_highbd_12_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance64x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance64x16_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance64x16 \
-  aom_highbd_12_sub_pixel_avg_variance64x16_sse2
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance64x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance64x32_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance64x32 \
-  aom_highbd_12_sub_pixel_avg_variance64x32_sse2
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance64x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance64x64_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance64x64 \
-  aom_highbd_12_sub_pixel_avg_variance64x64_sse2
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x16_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance8x16 \
-  aom_highbd_12_sub_pixel_avg_variance8x16_sse2
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x32_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x32_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance8x32 \
-  aom_highbd_12_sub_pixel_avg_variance8x32_sse2
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x4_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance8x4 \
-  aom_highbd_12_sub_pixel_avg_variance8x4_sse2
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x8_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance8x8 \
-  aom_highbd_12_sub_pixel_avg_variance8x8_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance128x128_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance128x128_sse2(const uint8_t* src_ptr,
-                                                      int source_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const uint8_t* ref_ptr,
-                                                      int ref_stride,
-                                                      uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance128x128 \
-  aom_highbd_12_sub_pixel_variance128x128_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance128x64_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance128x64_sse2(const uint8_t* src_ptr,
-                                                     int source_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const uint8_t* ref_ptr,
-                                                     int ref_stride,
-                                                     uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance128x64 \
-  aom_highbd_12_sub_pixel_variance128x64_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance16x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance16x16_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance16x16 \
-  aom_highbd_12_sub_pixel_variance16x16_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance16x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance16x32_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance16x32 \
-  aom_highbd_12_sub_pixel_variance16x32_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance16x4_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance16x4_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance16x4 \
-  aom_highbd_12_sub_pixel_variance16x4_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance16x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance16x64_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance16x64 \
-  aom_highbd_12_sub_pixel_variance16x64_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance16x8_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance16x8_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance16x8 \
-  aom_highbd_12_sub_pixel_variance16x8_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance32x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance32x16_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance32x16 \
-  aom_highbd_12_sub_pixel_variance32x16_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance32x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance32x32_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance32x32 \
-  aom_highbd_12_sub_pixel_variance32x32_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance32x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance32x64_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance32x64 \
-  aom_highbd_12_sub_pixel_variance32x64_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance32x8_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance32x8_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance32x8 \
-  aom_highbd_12_sub_pixel_variance32x8_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance4x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance4x16 \
-  aom_highbd_12_sub_pixel_variance4x16_c
-
-uint32_t aom_highbd_12_sub_pixel_variance4x4_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance4x4_sse4_1(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_12_sub_pixel_variance4x4)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-uint32_t aom_highbd_12_sub_pixel_variance4x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance4x8 \
-  aom_highbd_12_sub_pixel_variance4x8_c
-
-uint32_t aom_highbd_12_sub_pixel_variance64x128_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance64x128_sse2(const uint8_t* src_ptr,
-                                                     int source_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const uint8_t* ref_ptr,
-                                                     int ref_stride,
-                                                     uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance64x128 \
-  aom_highbd_12_sub_pixel_variance64x128_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance64x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance64x16_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance64x16 \
-  aom_highbd_12_sub_pixel_variance64x16_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance64x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance64x32_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance64x32 \
-  aom_highbd_12_sub_pixel_variance64x32_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance64x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance64x64_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance64x64 \
-  aom_highbd_12_sub_pixel_variance64x64_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance8x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance8x16_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance8x16 \
-  aom_highbd_12_sub_pixel_variance8x16_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance8x32_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance8x32_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance8x32 \
-  aom_highbd_12_sub_pixel_variance8x32_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance8x4_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance8x4_sse2(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance8x4 \
-  aom_highbd_12_sub_pixel_variance8x4_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance8x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance8x8_sse2(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance8x8 \
-  aom_highbd_12_sub_pixel_variance8x8_sse2
-
-unsigned int aom_highbd_12_variance128x128_c(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-unsigned int aom_highbd_12_variance128x128_sse2(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                unsigned int* sse);
-#define aom_highbd_12_variance128x128 aom_highbd_12_variance128x128_sse2
-
-unsigned int aom_highbd_12_variance128x64_c(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-unsigned int aom_highbd_12_variance128x64_sse2(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               unsigned int* sse);
-#define aom_highbd_12_variance128x64 aom_highbd_12_variance128x64_sse2
-
-unsigned int aom_highbd_12_variance16x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_12_variance16x16_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-#define aom_highbd_12_variance16x16 aom_highbd_12_variance16x16_sse2
-
-unsigned int aom_highbd_12_variance16x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_12_variance16x32_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-#define aom_highbd_12_variance16x32 aom_highbd_12_variance16x32_sse2
-
-unsigned int aom_highbd_12_variance16x4_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_12_variance16x4 aom_highbd_12_variance16x4_c
-
-unsigned int aom_highbd_12_variance16x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           uint32_t* sse);
-unsigned int aom_highbd_12_variance16x64_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-#define aom_highbd_12_variance16x64 aom_highbd_12_variance16x64_sse2
-
-unsigned int aom_highbd_12_variance16x8_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-unsigned int aom_highbd_12_variance16x8_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-#define aom_highbd_12_variance16x8 aom_highbd_12_variance16x8_sse2
-
-unsigned int aom_highbd_12_variance2x2_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance2x2 aom_highbd_12_variance2x2_c
-
-unsigned int aom_highbd_12_variance2x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance2x4 aom_highbd_12_variance2x4_c
-
-unsigned int aom_highbd_12_variance32x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_12_variance32x16_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-#define aom_highbd_12_variance32x16 aom_highbd_12_variance32x16_sse2
-
-unsigned int aom_highbd_12_variance32x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_12_variance32x32_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-#define aom_highbd_12_variance32x32 aom_highbd_12_variance32x32_sse2
-
-unsigned int aom_highbd_12_variance32x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_12_variance32x64_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-#define aom_highbd_12_variance32x64 aom_highbd_12_variance32x64_sse2
-
-unsigned int aom_highbd_12_variance32x8_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-unsigned int aom_highbd_12_variance32x8_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             uint32_t* sse);
-#define aom_highbd_12_variance32x8 aom_highbd_12_variance32x8_sse2
-
-unsigned int aom_highbd_12_variance4x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_12_variance4x16 aom_highbd_12_variance4x16_c
-
-unsigned int aom_highbd_12_variance4x2_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance4x2 aom_highbd_12_variance4x2_c
-
-unsigned int aom_highbd_12_variance4x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-unsigned int aom_highbd_12_variance4x4_sse4_1(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_variance4x4)(const uint8_t* src_ptr,
-                                                      int source_stride,
-                                                      const uint8_t* ref_ptr,
-                                                      int ref_stride,
-                                                      unsigned int* sse);
-
-unsigned int aom_highbd_12_variance4x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance4x8 aom_highbd_12_variance4x8_c
-
-unsigned int aom_highbd_12_variance64x128_c(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-unsigned int aom_highbd_12_variance64x128_sse2(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               unsigned int* sse);
-#define aom_highbd_12_variance64x128 aom_highbd_12_variance64x128_sse2
-
-unsigned int aom_highbd_12_variance64x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           uint32_t* sse);
-unsigned int aom_highbd_12_variance64x16_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-#define aom_highbd_12_variance64x16 aom_highbd_12_variance64x16_sse2
-
-unsigned int aom_highbd_12_variance64x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_12_variance64x32_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-#define aom_highbd_12_variance64x32 aom_highbd_12_variance64x32_sse2
-
-unsigned int aom_highbd_12_variance64x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_12_variance64x64_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-#define aom_highbd_12_variance64x64 aom_highbd_12_variance64x64_sse2
-
-unsigned int aom_highbd_12_variance8x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-unsigned int aom_highbd_12_variance8x16_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-#define aom_highbd_12_variance8x16 aom_highbd_12_variance8x16_sse2
-
-unsigned int aom_highbd_12_variance8x32_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-unsigned int aom_highbd_12_variance8x32_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             uint32_t* sse);
-#define aom_highbd_12_variance8x32 aom_highbd_12_variance8x32_sse2
-
-unsigned int aom_highbd_12_variance8x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance8x4 aom_highbd_12_variance8x4_c
-
-unsigned int aom_highbd_12_variance8x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-unsigned int aom_highbd_12_variance8x8_sse2(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-#define aom_highbd_12_variance8x8 aom_highbd_12_variance8x8_sse2
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x128 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x64 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x16 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x16_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x32 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x32_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x4 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x4_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x64 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x64_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x8 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x8_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x16 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x16_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x32 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x32_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x64 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x64_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x8 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x8_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x16 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x4 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x4_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x8 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x128 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x16 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x16_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x32 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x32_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x64 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x64_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x16 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x16_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x32 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x32_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x4 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x4_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x8 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x8_c
-
-void aom_highbd_8_get16x16var_c(const uint8_t* src_ptr,
-                                int source_stride,
-                                const uint8_t* ref_ptr,
-                                int ref_stride,
-                                unsigned int* sse,
-                                int* sum);
-#define aom_highbd_8_get16x16var aom_highbd_8_get16x16var_c
-
-void aom_highbd_8_get8x8var_c(const uint8_t* src_ptr,
-                              int source_stride,
-                              const uint8_t* ref_ptr,
-                              int ref_stride,
-                              unsigned int* sse,
-                              int* sum);
-#define aom_highbd_8_get8x8var aom_highbd_8_get8x8var_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance128x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance128x128_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance128x128)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance128x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance128x64_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance128x64)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x16_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance16x16)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x32_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance16x32)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x4_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance16x4)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x64_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance16x64)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x8_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance16x8)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x16_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance32x16)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x32_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance32x32)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x64_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance32x64)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x8_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance32x8)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance4x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance4x16_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance4x16)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance4x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance4x4_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance4x4)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance4x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance4x8_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance4x8)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x128_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance64x128)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x16_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance64x16)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x32_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance64x32)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x64_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance64x64)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x16_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance8x16)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x32_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance8x32)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x4_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance8x4)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x8_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance8x8)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_mse16x16_c(const uint8_t* src_ptr,
-                                     int source_stride,
-                                     const uint8_t* ref_ptr,
-                                     int recon_stride,
-                                     unsigned int* sse);
-unsigned int aom_highbd_8_mse16x16_sse2(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int recon_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_mse16x16 aom_highbd_8_mse16x16_sse2
-
-unsigned int aom_highbd_8_mse16x8_c(const uint8_t* src_ptr,
-                                    int source_stride,
-                                    const uint8_t* ref_ptr,
-                                    int recon_stride,
-                                    unsigned int* sse);
-#define aom_highbd_8_mse16x8 aom_highbd_8_mse16x8_c
-
-unsigned int aom_highbd_8_mse8x16_c(const uint8_t* src_ptr,
-                                    int source_stride,
-                                    const uint8_t* ref_ptr,
-                                    int recon_stride,
-                                    unsigned int* sse);
-#define aom_highbd_8_mse8x16 aom_highbd_8_mse8x16_c
-
-unsigned int aom_highbd_8_mse8x8_c(const uint8_t* src_ptr,
-                                   int source_stride,
-                                   const uint8_t* ref_ptr,
-                                   int recon_stride,
-                                   unsigned int* sse);
-unsigned int aom_highbd_8_mse8x8_sse2(const uint8_t* src_ptr,
-                                      int source_stride,
-                                      const uint8_t* ref_ptr,
-                                      int recon_stride,
-                                      unsigned int* sse);
-#define aom_highbd_8_mse8x8 aom_highbd_8_mse8x8_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance128x128 \
-  aom_highbd_8_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance128x64 \
-  aom_highbd_8_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x16_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance16x16 \
-  aom_highbd_8_sub_pixel_avg_variance16x16_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x32_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x32_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance16x32 \
-  aom_highbd_8_sub_pixel_avg_variance16x32_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x4_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x4_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance16x4 \
-  aom_highbd_8_sub_pixel_avg_variance16x4_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x64_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x64_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance16x64 \
-  aom_highbd_8_sub_pixel_avg_variance16x64_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x8_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance16x8 \
-  aom_highbd_8_sub_pixel_avg_variance16x8_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x16_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance32x16 \
-  aom_highbd_8_sub_pixel_avg_variance32x16_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x32_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x32_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance32x32 \
-  aom_highbd_8_sub_pixel_avg_variance32x32_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x64_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x64_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance32x64 \
-  aom_highbd_8_sub_pixel_avg_variance32x64_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x8_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance32x8 \
-  aom_highbd_8_sub_pixel_avg_variance32x8_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance4x16_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance4x16 \
-  aom_highbd_8_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse,
-                                                  const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance4x4_sse4_1(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-RTCD_EXTERN uint32_t (*aom_highbd_8_sub_pixel_avg_variance4x4)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse,
-                                                  const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance4x8 \
-  aom_highbd_8_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance64x128 \
-  aom_highbd_8_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance64x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance64x16_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance64x16 \
-  aom_highbd_8_sub_pixel_avg_variance64x16_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance64x32_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance64x32_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance64x32 \
-  aom_highbd_8_sub_pixel_avg_variance64x32_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance64x64_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance64x64_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance64x64 \
-  aom_highbd_8_sub_pixel_avg_variance64x64_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x16_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance8x16 \
-  aom_highbd_8_sub_pixel_avg_variance8x16_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x32_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x32_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance8x32 \
-  aom_highbd_8_sub_pixel_avg_variance8x32_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse,
-                                                  const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x4_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance8x4 \
-  aom_highbd_8_sub_pixel_avg_variance8x4_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse,
-                                                  const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x8_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance8x8 \
-  aom_highbd_8_sub_pixel_avg_variance8x8_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance128x128_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance128x128_sse2(const uint8_t* src_ptr,
-                                                     int source_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const uint8_t* ref_ptr,
-                                                     int ref_stride,
-                                                     uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance128x128 \
-  aom_highbd_8_sub_pixel_variance128x128_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance128x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance128x64_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance128x64 \
-  aom_highbd_8_sub_pixel_variance128x64_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance16x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance16x16_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance16x16 \
-  aom_highbd_8_sub_pixel_variance16x16_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance16x32_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance16x32_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance16x32 \
-  aom_highbd_8_sub_pixel_variance16x32_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance16x4_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance16x4_sse2(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance16x4 \
-  aom_highbd_8_sub_pixel_variance16x4_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance16x64_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance16x64_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance16x64 \
-  aom_highbd_8_sub_pixel_variance16x64_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance16x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance16x8_sse2(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance16x8 \
-  aom_highbd_8_sub_pixel_variance16x8_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance32x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance32x16_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance32x16 \
-  aom_highbd_8_sub_pixel_variance32x16_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance32x32_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance32x32_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance32x32 \
-  aom_highbd_8_sub_pixel_variance32x32_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance32x64_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance32x64_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance32x64 \
-  aom_highbd_8_sub_pixel_variance32x64_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance32x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance32x8_sse2(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance32x8 \
-  aom_highbd_8_sub_pixel_variance32x8_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance4x16_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance4x16 \
-  aom_highbd_8_sub_pixel_variance4x16_c
-
-uint32_t aom_highbd_8_sub_pixel_variance4x4_c(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance4x4_sse4_1(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_8_sub_pixel_variance4x4)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-uint32_t aom_highbd_8_sub_pixel_variance4x8_c(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance4x8 aom_highbd_8_sub_pixel_variance4x8_c
-
-uint32_t aom_highbd_8_sub_pixel_variance64x128_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance64x128_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance64x128 \
-  aom_highbd_8_sub_pixel_variance64x128_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance64x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance64x16_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance64x16 \
-  aom_highbd_8_sub_pixel_variance64x16_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance64x32_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance64x32_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance64x32 \
-  aom_highbd_8_sub_pixel_variance64x32_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance64x64_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance64x64_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance64x64 \
-  aom_highbd_8_sub_pixel_variance64x64_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance8x16_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance8x16_sse2(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance8x16 \
-  aom_highbd_8_sub_pixel_variance8x16_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance8x32_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance8x32_sse2(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance8x32 \
-  aom_highbd_8_sub_pixel_variance8x32_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance8x4_c(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance8x4_sse2(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance8x4 \
-  aom_highbd_8_sub_pixel_variance8x4_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance8x8_c(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance8x8_sse2(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance8x8 \
-  aom_highbd_8_sub_pixel_variance8x8_sse2
-
-unsigned int aom_highbd_8_variance128x128_c(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-unsigned int aom_highbd_8_variance128x128_sse2(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               unsigned int* sse);
-#define aom_highbd_8_variance128x128 aom_highbd_8_variance128x128_sse2
-
-unsigned int aom_highbd_8_variance128x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_8_variance128x64_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-#define aom_highbd_8_variance128x64 aom_highbd_8_variance128x64_sse2
-
-unsigned int aom_highbd_8_variance16x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-unsigned int aom_highbd_8_variance16x16_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-#define aom_highbd_8_variance16x16 aom_highbd_8_variance16x16_sse2
-
-unsigned int aom_highbd_8_variance16x32_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-unsigned int aom_highbd_8_variance16x32_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-#define aom_highbd_8_variance16x32 aom_highbd_8_variance16x32_sse2
-
-unsigned int aom_highbd_8_variance16x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         uint32_t* sse);
-#define aom_highbd_8_variance16x4 aom_highbd_8_variance16x4_c
-
-unsigned int aom_highbd_8_variance16x64_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-unsigned int aom_highbd_8_variance16x64_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             uint32_t* sse);
-#define aom_highbd_8_variance16x64 aom_highbd_8_variance16x64_sse2
-
-unsigned int aom_highbd_8_variance16x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-unsigned int aom_highbd_8_variance16x8_sse2(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-#define aom_highbd_8_variance16x8 aom_highbd_8_variance16x8_sse2
-
-unsigned int aom_highbd_8_variance2x2_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance2x2 aom_highbd_8_variance2x2_c
-
-unsigned int aom_highbd_8_variance2x4_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance2x4 aom_highbd_8_variance2x4_c
-
-unsigned int aom_highbd_8_variance32x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-unsigned int aom_highbd_8_variance32x16_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-#define aom_highbd_8_variance32x16 aom_highbd_8_variance32x16_sse2
-
-unsigned int aom_highbd_8_variance32x32_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-unsigned int aom_highbd_8_variance32x32_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-#define aom_highbd_8_variance32x32 aom_highbd_8_variance32x32_sse2
-
-unsigned int aom_highbd_8_variance32x64_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-unsigned int aom_highbd_8_variance32x64_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-#define aom_highbd_8_variance32x64 aom_highbd_8_variance32x64_sse2
-
-unsigned int aom_highbd_8_variance32x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         uint32_t* sse);
-unsigned int aom_highbd_8_variance32x8_sse2(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            uint32_t* sse);
-#define aom_highbd_8_variance32x8 aom_highbd_8_variance32x8_sse2
-
-unsigned int aom_highbd_8_variance4x16_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         uint32_t* sse);
-#define aom_highbd_8_variance4x16 aom_highbd_8_variance4x16_c
-
-unsigned int aom_highbd_8_variance4x2_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance4x2 aom_highbd_8_variance4x2_c
-
-unsigned int aom_highbd_8_variance4x4_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-unsigned int aom_highbd_8_variance4x4_sse4_1(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_variance4x4)(const uint8_t* src_ptr,
-                                                     int source_stride,
-                                                     const uint8_t* ref_ptr,
-                                                     int ref_stride,
-                                                     unsigned int* sse);
-
-unsigned int aom_highbd_8_variance4x8_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance4x8 aom_highbd_8_variance4x8_c
-
-unsigned int aom_highbd_8_variance64x128_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_8_variance64x128_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-#define aom_highbd_8_variance64x128 aom_highbd_8_variance64x128_sse2
-
-unsigned int aom_highbd_8_variance64x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-unsigned int aom_highbd_8_variance64x16_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             uint32_t* sse);
-#define aom_highbd_8_variance64x16 aom_highbd_8_variance64x16_sse2
-
-unsigned int aom_highbd_8_variance64x32_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-unsigned int aom_highbd_8_variance64x32_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-#define aom_highbd_8_variance64x32 aom_highbd_8_variance64x32_sse2
-
-unsigned int aom_highbd_8_variance64x64_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-unsigned int aom_highbd_8_variance64x64_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-#define aom_highbd_8_variance64x64 aom_highbd_8_variance64x64_sse2
-
-unsigned int aom_highbd_8_variance8x16_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-unsigned int aom_highbd_8_variance8x16_sse2(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-#define aom_highbd_8_variance8x16 aom_highbd_8_variance8x16_sse2
-
-unsigned int aom_highbd_8_variance8x32_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         uint32_t* sse);
-unsigned int aom_highbd_8_variance8x32_sse2(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            uint32_t* sse);
-#define aom_highbd_8_variance8x32 aom_highbd_8_variance8x32_sse2
-
-unsigned int aom_highbd_8_variance8x4_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance8x4 aom_highbd_8_variance8x4_c
-
-unsigned int aom_highbd_8_variance8x8_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-unsigned int aom_highbd_8_variance8x8_sse2(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_8_variance8x8 aom_highbd_8_variance8x8_sse2
-
-unsigned int aom_highbd_avg_4x4_c(const uint8_t*, int p);
-#define aom_highbd_avg_4x4 aom_highbd_avg_4x4_c
-
-unsigned int aom_highbd_avg_8x8_c(const uint8_t*, int p);
-#define aom_highbd_avg_8x8 aom_highbd_avg_8x8_c
-
-void aom_highbd_blend_a64_d16_mask_c(uint8_t* dst,
-                                     uint32_t dst_stride,
-                                     const CONV_BUF_TYPE* src0,
-                                     uint32_t src0_stride,
-                                     const CONV_BUF_TYPE* src1,
-                                     uint32_t src1_stride,
-                                     const uint8_t* mask,
-                                     uint32_t mask_stride,
-                                     int w,
-                                     int h,
-                                     int subw,
-                                     int subh,
-                                     ConvolveParams* conv_params,
-                                     const int bd);
-void aom_highbd_blend_a64_d16_mask_sse4_1(uint8_t* dst,
-                                          uint32_t dst_stride,
-                                          const CONV_BUF_TYPE* src0,
-                                          uint32_t src0_stride,
-                                          const CONV_BUF_TYPE* src1,
-                                          uint32_t src1_stride,
-                                          const uint8_t* mask,
-                                          uint32_t mask_stride,
-                                          int w,
-                                          int h,
-                                          int subw,
-                                          int subh,
-                                          ConvolveParams* conv_params,
-                                          const int bd);
-void aom_highbd_blend_a64_d16_mask_avx2(uint8_t* dst,
-                                        uint32_t dst_stride,
-                                        const CONV_BUF_TYPE* src0,
-                                        uint32_t src0_stride,
-                                        const CONV_BUF_TYPE* src1,
-                                        uint32_t src1_stride,
-                                        const uint8_t* mask,
-                                        uint32_t mask_stride,
-                                        int w,
-                                        int h,
-                                        int subw,
-                                        int subh,
-                                        ConvolveParams* conv_params,
-                                        const int bd);
-RTCD_EXTERN void (*aom_highbd_blend_a64_d16_mask)(uint8_t* dst,
-                                                  uint32_t dst_stride,
-                                                  const CONV_BUF_TYPE* src0,
-                                                  uint32_t src0_stride,
-                                                  const CONV_BUF_TYPE* src1,
-                                                  uint32_t src1_stride,
-                                                  const uint8_t* mask,
-                                                  uint32_t mask_stride,
-                                                  int w,
-                                                  int h,
-                                                  int subw,
-                                                  int subh,
-                                                  ConvolveParams* conv_params,
-                                                  const int bd);
-
-void aom_highbd_blend_a64_hmask_c(uint8_t* dst,
-                                  uint32_t dst_stride,
-                                  const uint8_t* src0,
-                                  uint32_t src0_stride,
-                                  const uint8_t* src1,
-                                  uint32_t src1_stride,
-                                  const uint8_t* mask,
-                                  int w,
-                                  int h,
-                                  int bd);
-void aom_highbd_blend_a64_hmask_sse4_1(uint8_t* dst,
-                                       uint32_t dst_stride,
-                                       const uint8_t* src0,
-                                       uint32_t src0_stride,
-                                       const uint8_t* src1,
-                                       uint32_t src1_stride,
-                                       const uint8_t* mask,
-                                       int w,
-                                       int h,
-                                       int bd);
-RTCD_EXTERN void (*aom_highbd_blend_a64_hmask)(uint8_t* dst,
-                                               uint32_t dst_stride,
-                                               const uint8_t* src0,
-                                               uint32_t src0_stride,
-                                               const uint8_t* src1,
-                                               uint32_t src1_stride,
-                                               const uint8_t* mask,
-                                               int w,
-                                               int h,
-                                               int bd);
-
-void aom_highbd_blend_a64_mask_c(uint8_t* dst,
-                                 uint32_t dst_stride,
-                                 const uint8_t* src0,
-                                 uint32_t src0_stride,
-                                 const uint8_t* src1,
-                                 uint32_t src1_stride,
-                                 const uint8_t* mask,
-                                 uint32_t mask_stride,
-                                 int w,
-                                 int h,
-                                 int subw,
-                                 int subh,
-                                 int bd);
-void aom_highbd_blend_a64_mask_sse4_1(uint8_t* dst,
-                                      uint32_t dst_stride,
-                                      const uint8_t* src0,
-                                      uint32_t src0_stride,
-                                      const uint8_t* src1,
-                                      uint32_t src1_stride,
-                                      const uint8_t* mask,
-                                      uint32_t mask_stride,
-                                      int w,
-                                      int h,
-                                      int subw,
-                                      int subh,
-                                      int bd);
-RTCD_EXTERN void (*aom_highbd_blend_a64_mask)(uint8_t* dst,
-                                              uint32_t dst_stride,
-                                              const uint8_t* src0,
-                                              uint32_t src0_stride,
-                                              const uint8_t* src1,
-                                              uint32_t src1_stride,
-                                              const uint8_t* mask,
-                                              uint32_t mask_stride,
-                                              int w,
-                                              int h,
-                                              int subw,
-                                              int subh,
-                                              int bd);
-
-void aom_highbd_blend_a64_vmask_c(uint8_t* dst,
-                                  uint32_t dst_stride,
-                                  const uint8_t* src0,
-                                  uint32_t src0_stride,
-                                  const uint8_t* src1,
-                                  uint32_t src1_stride,
-                                  const uint8_t* mask,
-                                  int w,
-                                  int h,
-                                  int bd);
-void aom_highbd_blend_a64_vmask_sse4_1(uint8_t* dst,
-                                       uint32_t dst_stride,
-                                       const uint8_t* src0,
-                                       uint32_t src0_stride,
-                                       const uint8_t* src1,
-                                       uint32_t src1_stride,
-                                       const uint8_t* mask,
-                                       int w,
-                                       int h,
-                                       int bd);
-RTCD_EXTERN void (*aom_highbd_blend_a64_vmask)(uint8_t* dst,
-                                               uint32_t dst_stride,
-                                               const uint8_t* src0,
-                                               uint32_t src0_stride,
-                                               const uint8_t* src1,
-                                               uint32_t src1_stride,
-                                               const uint8_t* mask,
-                                               int w,
-                                               int h,
-                                               int bd);
-
-void aom_highbd_comp_avg_pred_c(uint8_t* comp_pred8,
-                                const uint8_t* pred8,
-                                int width,
-                                int height,
-                                const uint8_t* ref8,
-                                int ref_stride);
-#define aom_highbd_comp_avg_pred aom_highbd_comp_avg_pred_c
-
-void aom_highbd_comp_avg_upsampled_pred_c(MACROBLOCKD* xd,
-                                          const struct AV1Common* const cm,
-                                          int mi_row,
-                                          int mi_col,
-                                          const MV* const mv,
-                                          uint8_t* comp_pred8,
-                                          const uint8_t* pred8,
-                                          int width,
-                                          int height,
-                                          int subpel_x_q3,
-                                          int subpel_y_q3,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          int bd,
-                                          int subpel_search);
-void aom_highbd_comp_avg_upsampled_pred_sse2(MACROBLOCKD* xd,
-                                             const struct AV1Common* const cm,
-                                             int mi_row,
-                                             int mi_col,
-                                             const MV* const mv,
-                                             uint8_t* comp_pred8,
-                                             const uint8_t* pred8,
-                                             int width,
-                                             int height,
-                                             int subpel_x_q3,
-                                             int subpel_y_q3,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             int bd,
-                                             int subpel_search);
-#define aom_highbd_comp_avg_upsampled_pred \
-  aom_highbd_comp_avg_upsampled_pred_sse2
-
-void aom_highbd_comp_mask_pred_c(uint8_t* comp_pred,
-                                 const uint8_t* pred8,
-                                 int width,
-                                 int height,
-                                 const uint8_t* ref8,
-                                 int ref_stride,
-                                 const uint8_t* mask,
-                                 int mask_stride,
-                                 int invert_mask);
-void aom_highbd_comp_mask_pred_sse2(uint8_t* comp_pred,
-                                    const uint8_t* pred8,
-                                    int width,
-                                    int height,
-                                    const uint8_t* ref8,
-                                    int ref_stride,
-                                    const uint8_t* mask,
-                                    int mask_stride,
-                                    int invert_mask);
-void aom_highbd_comp_mask_pred_avx2(uint8_t* comp_pred,
-                                    const uint8_t* pred8,
-                                    int width,
-                                    int height,
-                                    const uint8_t* ref8,
-                                    int ref_stride,
-                                    const uint8_t* mask,
-                                    int mask_stride,
-                                    int invert_mask);
-RTCD_EXTERN void (*aom_highbd_comp_mask_pred)(uint8_t* comp_pred,
-                                              const uint8_t* pred8,
-                                              int width,
-                                              int height,
-                                              const uint8_t* ref8,
-                                              int ref_stride,
-                                              const uint8_t* mask,
-                                              int mask_stride,
-                                              int invert_mask);
-
-void aom_highbd_convolve8_horiz_c(const uint8_t* src,
-                                  ptrdiff_t src_stride,
-                                  uint8_t* dst,
-                                  ptrdiff_t dst_stride,
-                                  const int16_t* filter_x,
-                                  int x_step_q4,
-                                  const int16_t* filter_y,
-                                  int y_step_q4,
-                                  int w,
-                                  int h,
-                                  int bd);
-void aom_highbd_convolve8_horiz_sse2(const uint8_t* src,
-                                     ptrdiff_t src_stride,
-                                     uint8_t* dst,
-                                     ptrdiff_t dst_stride,
-                                     const int16_t* filter_x,
-                                     int x_step_q4,
-                                     const int16_t* filter_y,
-                                     int y_step_q4,
-                                     int w,
-                                     int h,
-                                     int bd);
-void aom_highbd_convolve8_horiz_avx2(const uint8_t* src,
-                                     ptrdiff_t src_stride,
-                                     uint8_t* dst,
-                                     ptrdiff_t dst_stride,
-                                     const int16_t* filter_x,
-                                     int x_step_q4,
-                                     const int16_t* filter_y,
-                                     int y_step_q4,
-                                     int w,
-                                     int h,
-                                     int bd);
-RTCD_EXTERN void (*aom_highbd_convolve8_horiz)(const uint8_t* src,
-                                               ptrdiff_t src_stride,
-                                               uint8_t* dst,
-                                               ptrdiff_t dst_stride,
-                                               const int16_t* filter_x,
-                                               int x_step_q4,
-                                               const int16_t* filter_y,
-                                               int y_step_q4,
-                                               int w,
-                                               int h,
-                                               int bd);
-
-void aom_highbd_convolve8_vert_c(const uint8_t* src,
-                                 ptrdiff_t src_stride,
-                                 uint8_t* dst,
-                                 ptrdiff_t dst_stride,
-                                 const int16_t* filter_x,
-                                 int x_step_q4,
-                                 const int16_t* filter_y,
-                                 int y_step_q4,
-                                 int w,
-                                 int h,
-                                 int bd);
-void aom_highbd_convolve8_vert_sse2(const uint8_t* src,
-                                    ptrdiff_t src_stride,
-                                    uint8_t* dst,
-                                    ptrdiff_t dst_stride,
-                                    const int16_t* filter_x,
-                                    int x_step_q4,
-                                    const int16_t* filter_y,
-                                    int y_step_q4,
-                                    int w,
-                                    int h,
-                                    int bd);
-void aom_highbd_convolve8_vert_avx2(const uint8_t* src,
-                                    ptrdiff_t src_stride,
-                                    uint8_t* dst,
-                                    ptrdiff_t dst_stride,
-                                    const int16_t* filter_x,
-                                    int x_step_q4,
-                                    const int16_t* filter_y,
-                                    int y_step_q4,
-                                    int w,
-                                    int h,
-                                    int bd);
-RTCD_EXTERN void (*aom_highbd_convolve8_vert)(const uint8_t* src,
-                                              ptrdiff_t src_stride,
-                                              uint8_t* dst,
-                                              ptrdiff_t dst_stride,
-                                              const int16_t* filter_x,
-                                              int x_step_q4,
-                                              const int16_t* filter_y,
-                                              int y_step_q4,
-                                              int w,
-                                              int h,
-                                              int bd);
-
-void aom_highbd_convolve_copy_c(const uint16_t* src,
-                                ptrdiff_t src_stride,
-                                uint16_t* dst,
-                                ptrdiff_t dst_stride,
-                                int w,
-                                int h);
-void aom_highbd_convolve_copy_sse2(const uint16_t* src,
-                                   ptrdiff_t src_stride,
-                                   uint16_t* dst,
-                                   ptrdiff_t dst_stride,
-                                   int w,
-                                   int h);
-void aom_highbd_convolve_copy_avx2(const uint16_t* src,
-                                   ptrdiff_t src_stride,
-                                   uint16_t* dst,
-                                   ptrdiff_t dst_stride,
-                                   int w,
-                                   int h);
-RTCD_EXTERN void (*aom_highbd_convolve_copy)(const uint16_t* src,
-                                             ptrdiff_t src_stride,
-                                             uint16_t* dst,
-                                             ptrdiff_t dst_stride,
-                                             int w,
-                                             int h);
-
-void aom_highbd_dc_128_predictor_16x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-void aom_highbd_dc_128_predictor_16x16_sse2(uint16_t* dst,
-                                            ptrdiff_t y_stride,
-                                            const uint16_t* above,
-                                            const uint16_t* left,
-                                            int bd);
-#define aom_highbd_dc_128_predictor_16x16 aom_highbd_dc_128_predictor_16x16_sse2
-
-void aom_highbd_dc_128_predictor_16x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-void aom_highbd_dc_128_predictor_16x32_sse2(uint16_t* dst,
-                                            ptrdiff_t y_stride,
-                                            const uint16_t* above,
-                                            const uint16_t* left,
-                                            int bd);
-#define aom_highbd_dc_128_predictor_16x32 aom_highbd_dc_128_predictor_16x32_sse2
-
-void aom_highbd_dc_128_predictor_16x4_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_16x4 aom_highbd_dc_128_predictor_16x4_c
-
-void aom_highbd_dc_128_predictor_16x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_16x64 aom_highbd_dc_128_predictor_16x64_c
-
-void aom_highbd_dc_128_predictor_16x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-void aom_highbd_dc_128_predictor_16x8_sse2(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_dc_128_predictor_16x8 aom_highbd_dc_128_predictor_16x8_sse2
-
-void aom_highbd_dc_128_predictor_2x2_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_128_predictor_2x2 aom_highbd_dc_128_predictor_2x2_c
-
-void aom_highbd_dc_128_predictor_32x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-void aom_highbd_dc_128_predictor_32x16_sse2(uint16_t* dst,
-                                            ptrdiff_t y_stride,
-                                            const uint16_t* above,
-                                            const uint16_t* left,
-                                            int bd);
-#define aom_highbd_dc_128_predictor_32x16 aom_highbd_dc_128_predictor_32x16_sse2
-
-void aom_highbd_dc_128_predictor_32x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-void aom_highbd_dc_128_predictor_32x32_sse2(uint16_t* dst,
-                                            ptrdiff_t y_stride,
-                                            const uint16_t* above,
-                                            const uint16_t* left,
-                                            int bd);
-#define aom_highbd_dc_128_predictor_32x32 aom_highbd_dc_128_predictor_32x32_sse2
-
-void aom_highbd_dc_128_predictor_32x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_32x64 aom_highbd_dc_128_predictor_32x64_c
-
-void aom_highbd_dc_128_predictor_32x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_32x8 aom_highbd_dc_128_predictor_32x8_c
-
-void aom_highbd_dc_128_predictor_4x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_4x16 aom_highbd_dc_128_predictor_4x16_c
-
-void aom_highbd_dc_128_predictor_4x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-void aom_highbd_dc_128_predictor_4x4_sse2(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_128_predictor_4x4 aom_highbd_dc_128_predictor_4x4_sse2
-
-void aom_highbd_dc_128_predictor_4x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-void aom_highbd_dc_128_predictor_4x8_sse2(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_128_predictor_4x8 aom_highbd_dc_128_predictor_4x8_sse2
-
-void aom_highbd_dc_128_predictor_64x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_64x16 aom_highbd_dc_128_predictor_64x16_c
-
-void aom_highbd_dc_128_predictor_64x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_64x32 aom_highbd_dc_128_predictor_64x32_c
-
-void aom_highbd_dc_128_predictor_64x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_64x64 aom_highbd_dc_128_predictor_64x64_c
-
-void aom_highbd_dc_128_predictor_8x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-void aom_highbd_dc_128_predictor_8x16_sse2(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_dc_128_predictor_8x16 aom_highbd_dc_128_predictor_8x16_sse2
-
-void aom_highbd_dc_128_predictor_8x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_8x32 aom_highbd_dc_128_predictor_8x32_c
-
-void aom_highbd_dc_128_predictor_8x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-void aom_highbd_dc_128_predictor_8x4_sse2(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_128_predictor_8x4 aom_highbd_dc_128_predictor_8x4_sse2
-
-void aom_highbd_dc_128_predictor_8x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-void aom_highbd_dc_128_predictor_8x8_sse2(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_128_predictor_8x8 aom_highbd_dc_128_predictor_8x8_sse2
-
-void aom_highbd_dc_left_predictor_16x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-void aom_highbd_dc_left_predictor_16x16_sse2(uint16_t* dst,
-                                             ptrdiff_t y_stride,
-                                             const uint16_t* above,
-                                             const uint16_t* left,
-                                             int bd);
-#define aom_highbd_dc_left_predictor_16x16 \
-  aom_highbd_dc_left_predictor_16x16_sse2
-
-void aom_highbd_dc_left_predictor_16x32_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-void aom_highbd_dc_left_predictor_16x32_sse2(uint16_t* dst,
-                                             ptrdiff_t y_stride,
-                                             const uint16_t* above,
-                                             const uint16_t* left,
-                                             int bd);
-#define aom_highbd_dc_left_predictor_16x32 \
-  aom_highbd_dc_left_predictor_16x32_sse2
-
-void aom_highbd_dc_left_predictor_16x4_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_16x4 aom_highbd_dc_left_predictor_16x4_c
-
-void aom_highbd_dc_left_predictor_16x64_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_16x64 aom_highbd_dc_left_predictor_16x64_c
-
-void aom_highbd_dc_left_predictor_16x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-void aom_highbd_dc_left_predictor_16x8_sse2(uint16_t* dst,
-                                            ptrdiff_t y_stride,
-                                            const uint16_t* above,
-                                            const uint16_t* left,
-                                            int bd);
-#define aom_highbd_dc_left_predictor_16x8 aom_highbd_dc_left_predictor_16x8_sse2
-
-void aom_highbd_dc_left_predictor_2x2_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_left_predictor_2x2 aom_highbd_dc_left_predictor_2x2_c
-
-void aom_highbd_dc_left_predictor_32x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-void aom_highbd_dc_left_predictor_32x16_sse2(uint16_t* dst,
-                                             ptrdiff_t y_stride,
-                                             const uint16_t* above,
-                                             const uint16_t* left,
-                                             int bd);
-#define aom_highbd_dc_left_predictor_32x16 \
-  aom_highbd_dc_left_predictor_32x16_sse2
-
-void aom_highbd_dc_left_predictor_32x32_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-void aom_highbd_dc_left_predictor_32x32_sse2(uint16_t* dst,
-                                             ptrdiff_t y_stride,
-                                             const uint16_t* above,
-                                             const uint16_t* left,
-                                             int bd);
-#define aom_highbd_dc_left_predictor_32x32 \
-  aom_highbd_dc_left_predictor_32x32_sse2
-
-void aom_highbd_dc_left_predictor_32x64_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_32x64 aom_highbd_dc_left_predictor_32x64_c
-
-void aom_highbd_dc_left_predictor_32x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_32x8 aom_highbd_dc_left_predictor_32x8_c
-
-void aom_highbd_dc_left_predictor_4x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_4x16 aom_highbd_dc_left_predictor_4x16_c
-
-void aom_highbd_dc_left_predictor_4x4_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-void aom_highbd_dc_left_predictor_4x4_sse2(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_dc_left_predictor_4x4 aom_highbd_dc_left_predictor_4x4_sse2
-
-void aom_highbd_dc_left_predictor_4x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-void aom_highbd_dc_left_predictor_4x8_sse2(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_dc_left_predictor_4x8 aom_highbd_dc_left_predictor_4x8_sse2
-
-void aom_highbd_dc_left_predictor_64x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_64x16 aom_highbd_dc_left_predictor_64x16_c
-
-void aom_highbd_dc_left_predictor_64x32_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_64x32 aom_highbd_dc_left_predictor_64x32_c
-
-void aom_highbd_dc_left_predictor_64x64_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_64x64 aom_highbd_dc_left_predictor_64x64_c
-
-void aom_highbd_dc_left_predictor_8x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-void aom_highbd_dc_left_predictor_8x16_sse2(uint16_t* dst,
-                                            ptrdiff_t y_stride,
-                                            const uint16_t* above,
-                                            const uint16_t* left,
-                                            int bd);
-#define aom_highbd_dc_left_predictor_8x16 aom_highbd_dc_left_predictor_8x16_sse2
-
-void aom_highbd_dc_left_predictor_8x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_8x32 aom_highbd_dc_left_predictor_8x32_c
-
-void aom_highbd_dc_left_predictor_8x4_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-void aom_highbd_dc_left_predictor_8x4_sse2(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_dc_left_predictor_8x4 aom_highbd_dc_left_predictor_8x4_sse2
-
-void aom_highbd_dc_left_predictor_8x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-void aom_highbd_dc_left_predictor_8x8_sse2(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_dc_left_predictor_8x8 aom_highbd_dc_left_predictor_8x8_sse2
-
-void aom_highbd_dc_predictor_16x16_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-void aom_highbd_dc_predictor_16x16_sse2(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_predictor_16x16 aom_highbd_dc_predictor_16x16_sse2
-
-void aom_highbd_dc_predictor_16x32_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-void aom_highbd_dc_predictor_16x32_sse2(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_predictor_16x32 aom_highbd_dc_predictor_16x32_sse2
-
-void aom_highbd_dc_predictor_16x4_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_16x4 aom_highbd_dc_predictor_16x4_c
-
-void aom_highbd_dc_predictor_16x64_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_16x64 aom_highbd_dc_predictor_16x64_c
-
-void aom_highbd_dc_predictor_16x8_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-void aom_highbd_dc_predictor_16x8_sse2(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_predictor_16x8 aom_highbd_dc_predictor_16x8_sse2
-
-void aom_highbd_dc_predictor_2x2_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_dc_predictor_2x2 aom_highbd_dc_predictor_2x2_c
-
-void aom_highbd_dc_predictor_32x16_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-void aom_highbd_dc_predictor_32x16_sse2(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_predictor_32x16 aom_highbd_dc_predictor_32x16_sse2
-
-void aom_highbd_dc_predictor_32x32_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-void aom_highbd_dc_predictor_32x32_sse2(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_predictor_32x32 aom_highbd_dc_predictor_32x32_sse2
-
-void aom_highbd_dc_predictor_32x64_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_32x64 aom_highbd_dc_predictor_32x64_c
-
-void aom_highbd_dc_predictor_32x8_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_32x8 aom_highbd_dc_predictor_32x8_c
-
-void aom_highbd_dc_predictor_4x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_4x16 aom_highbd_dc_predictor_4x16_c
-
-void aom_highbd_dc_predictor_4x4_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-void aom_highbd_dc_predictor_4x4_sse2(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_dc_predictor_4x4 aom_highbd_dc_predictor_4x4_sse2
-
-void aom_highbd_dc_predictor_4x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-void aom_highbd_dc_predictor_4x8_sse2(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_dc_predictor_4x8 aom_highbd_dc_predictor_4x8_sse2
-
-void aom_highbd_dc_predictor_64x16_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_64x16 aom_highbd_dc_predictor_64x16_c
-
-void aom_highbd_dc_predictor_64x32_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_64x32 aom_highbd_dc_predictor_64x32_c
-
-void aom_highbd_dc_predictor_64x64_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_64x64 aom_highbd_dc_predictor_64x64_c
-
-void aom_highbd_dc_predictor_8x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-void aom_highbd_dc_predictor_8x16_sse2(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_predictor_8x16 aom_highbd_dc_predictor_8x16_sse2
-
-void aom_highbd_dc_predictor_8x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_8x32 aom_highbd_dc_predictor_8x32_c
-
-void aom_highbd_dc_predictor_8x4_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-void aom_highbd_dc_predictor_8x4_sse2(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_dc_predictor_8x4 aom_highbd_dc_predictor_8x4_sse2
-
-void aom_highbd_dc_predictor_8x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-void aom_highbd_dc_predictor_8x8_sse2(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_dc_predictor_8x8 aom_highbd_dc_predictor_8x8_sse2
-
-void aom_highbd_dc_top_predictor_16x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-void aom_highbd_dc_top_predictor_16x16_sse2(uint16_t* dst,
-                                            ptrdiff_t y_stride,
-                                            const uint16_t* above,
-                                            const uint16_t* left,
-                                            int bd);
-#define aom_highbd_dc_top_predictor_16x16 aom_highbd_dc_top_predictor_16x16_sse2
-
-void aom_highbd_dc_top_predictor_16x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-void aom_highbd_dc_top_predictor_16x32_sse2(uint16_t* dst,
-                                            ptrdiff_t y_stride,
-                                            const uint16_t* above,
-                                            const uint16_t* left,
-                                            int bd);
-#define aom_highbd_dc_top_predictor_16x32 aom_highbd_dc_top_predictor_16x32_sse2
-
-void aom_highbd_dc_top_predictor_16x4_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_16x4 aom_highbd_dc_top_predictor_16x4_c
-
-void aom_highbd_dc_top_predictor_16x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_16x64 aom_highbd_dc_top_predictor_16x64_c
-
-void aom_highbd_dc_top_predictor_16x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-void aom_highbd_dc_top_predictor_16x8_sse2(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_dc_top_predictor_16x8 aom_highbd_dc_top_predictor_16x8_sse2
-
-void aom_highbd_dc_top_predictor_2x2_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_top_predictor_2x2 aom_highbd_dc_top_predictor_2x2_c
-
-void aom_highbd_dc_top_predictor_32x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-void aom_highbd_dc_top_predictor_32x16_sse2(uint16_t* dst,
-                                            ptrdiff_t y_stride,
-                                            const uint16_t* above,
-                                            const uint16_t* left,
-                                            int bd);
-#define aom_highbd_dc_top_predictor_32x16 aom_highbd_dc_top_predictor_32x16_sse2
-
-void aom_highbd_dc_top_predictor_32x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-void aom_highbd_dc_top_predictor_32x32_sse2(uint16_t* dst,
-                                            ptrdiff_t y_stride,
-                                            const uint16_t* above,
-                                            const uint16_t* left,
-                                            int bd);
-#define aom_highbd_dc_top_predictor_32x32 aom_highbd_dc_top_predictor_32x32_sse2
-
-void aom_highbd_dc_top_predictor_32x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_32x64 aom_highbd_dc_top_predictor_32x64_c
-
-void aom_highbd_dc_top_predictor_32x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_32x8 aom_highbd_dc_top_predictor_32x8_c
-
-void aom_highbd_dc_top_predictor_4x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_4x16 aom_highbd_dc_top_predictor_4x16_c
-
-void aom_highbd_dc_top_predictor_4x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-void aom_highbd_dc_top_predictor_4x4_sse2(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_top_predictor_4x4 aom_highbd_dc_top_predictor_4x4_sse2
-
-void aom_highbd_dc_top_predictor_4x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-void aom_highbd_dc_top_predictor_4x8_sse2(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_top_predictor_4x8 aom_highbd_dc_top_predictor_4x8_sse2
-
-void aom_highbd_dc_top_predictor_64x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_64x16 aom_highbd_dc_top_predictor_64x16_c
-
-void aom_highbd_dc_top_predictor_64x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_64x32 aom_highbd_dc_top_predictor_64x32_c
-
-void aom_highbd_dc_top_predictor_64x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_64x64 aom_highbd_dc_top_predictor_64x64_c
-
-void aom_highbd_dc_top_predictor_8x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-void aom_highbd_dc_top_predictor_8x16_sse2(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_dc_top_predictor_8x16 aom_highbd_dc_top_predictor_8x16_sse2
-
-void aom_highbd_dc_top_predictor_8x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_8x32 aom_highbd_dc_top_predictor_8x32_c
-
-void aom_highbd_dc_top_predictor_8x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-void aom_highbd_dc_top_predictor_8x4_sse2(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_top_predictor_8x4 aom_highbd_dc_top_predictor_8x4_sse2
-
-void aom_highbd_dc_top_predictor_8x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-void aom_highbd_dc_top_predictor_8x8_sse2(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_top_predictor_8x8 aom_highbd_dc_top_predictor_8x8_sse2
-
-void aom_highbd_dist_wtd_comp_avg_pred_c(uint8_t* comp_pred8,
-                                         const uint8_t* pred8,
-                                         int width,
-                                         int height,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const DIST_WTD_COMP_PARAMS* jcp_param);
-void aom_highbd_dist_wtd_comp_avg_pred_sse2(
-    uint8_t* comp_pred8,
-    const uint8_t* pred8,
-    int width,
-    int height,
-    const uint8_t* ref8,
-    int ref_stride,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_comp_avg_pred aom_highbd_dist_wtd_comp_avg_pred_sse2
-
-void aom_highbd_dist_wtd_comp_avg_upsampled_pred_c(
-    MACROBLOCKD* xd,
-    const struct AV1Common* const cm,
-    int mi_row,
-    int mi_col,
-    const MV* const mv,
-    uint8_t* comp_pred8,
-    const uint8_t* pred8,
-    int width,
-    int height,
-    int subpel_x_q3,
-    int subpel_y_q3,
-    const uint8_t* ref8,
-    int ref_stride,
-    int bd,
-    const DIST_WTD_COMP_PARAMS* jcp_param,
-    int subpel_search);
-void aom_highbd_dist_wtd_comp_avg_upsampled_pred_sse2(
-    MACROBLOCKD* xd,
-    const struct AV1Common* const cm,
-    int mi_row,
-    int mi_col,
-    const MV* const mv,
-    uint8_t* comp_pred8,
-    const uint8_t* pred8,
-    int width,
-    int height,
-    int subpel_x_q3,
-    int subpel_y_q3,
-    const uint8_t* ref8,
-    int ref_stride,
-    int bd,
-    const DIST_WTD_COMP_PARAMS* jcp_param,
-    int subpel_search);
-#define aom_highbd_dist_wtd_comp_avg_upsampled_pred \
-  aom_highbd_dist_wtd_comp_avg_upsampled_pred_sse2
-
-unsigned int aom_highbd_dist_wtd_sad128x128_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad128x128_avg aom_highbd_dist_wtd_sad128x128_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad128x64_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad128x64_avg aom_highbd_dist_wtd_sad128x64_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad16x16_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad16x16_avg aom_highbd_dist_wtd_sad16x16_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad16x32_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad16x32_avg aom_highbd_dist_wtd_sad16x32_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad16x4_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad16x4_avg aom_highbd_dist_wtd_sad16x4_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad16x64_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad16x64_avg aom_highbd_dist_wtd_sad16x64_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad16x8_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad16x8_avg aom_highbd_dist_wtd_sad16x8_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad32x16_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad32x16_avg aom_highbd_dist_wtd_sad32x16_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad32x32_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad32x32_avg aom_highbd_dist_wtd_sad32x32_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad32x64_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad32x64_avg aom_highbd_dist_wtd_sad32x64_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad32x8_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad32x8_avg aom_highbd_dist_wtd_sad32x8_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad4x16_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad4x16_avg aom_highbd_dist_wtd_sad4x16_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad4x4_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad4x4_avg aom_highbd_dist_wtd_sad4x4_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad4x8_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad4x8_avg aom_highbd_dist_wtd_sad4x8_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad64x128_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad64x128_avg aom_highbd_dist_wtd_sad64x128_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad64x16_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad64x16_avg aom_highbd_dist_wtd_sad64x16_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad64x32_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad64x32_avg aom_highbd_dist_wtd_sad64x32_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad64x64_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad64x64_avg aom_highbd_dist_wtd_sad64x64_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad8x16_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad8x16_avg aom_highbd_dist_wtd_sad8x16_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad8x32_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad8x32_avg aom_highbd_dist_wtd_sad8x32_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad8x4_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad8x4_avg aom_highbd_dist_wtd_sad8x4_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad8x8_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad8x8_avg aom_highbd_dist_wtd_sad8x8_avg_c
-
-void aom_highbd_fdct8x8_c(const int16_t* input, tran_low_t* output, int stride);
-void aom_highbd_fdct8x8_sse2(const int16_t* input,
-                             tran_low_t* output,
-                             int stride);
-#define aom_highbd_fdct8x8 aom_highbd_fdct8x8_sse2
-
-void aom_highbd_h_predictor_16x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-void aom_highbd_h_predictor_16x16_sse2(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_h_predictor_16x16 aom_highbd_h_predictor_16x16_sse2
-
-void aom_highbd_h_predictor_16x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-void aom_highbd_h_predictor_16x32_sse2(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_h_predictor_16x32 aom_highbd_h_predictor_16x32_sse2
-
-void aom_highbd_h_predictor_16x4_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_16x4 aom_highbd_h_predictor_16x4_c
-
-void aom_highbd_h_predictor_16x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_16x64 aom_highbd_h_predictor_16x64_c
-
-void aom_highbd_h_predictor_16x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-void aom_highbd_h_predictor_16x8_sse2(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_h_predictor_16x8 aom_highbd_h_predictor_16x8_sse2
-
-void aom_highbd_h_predictor_2x2_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_h_predictor_2x2 aom_highbd_h_predictor_2x2_c
-
-void aom_highbd_h_predictor_32x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-void aom_highbd_h_predictor_32x16_sse2(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_h_predictor_32x16 aom_highbd_h_predictor_32x16_sse2
-
-void aom_highbd_h_predictor_32x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-void aom_highbd_h_predictor_32x32_sse2(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_h_predictor_32x32 aom_highbd_h_predictor_32x32_sse2
-
-void aom_highbd_h_predictor_32x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_32x64 aom_highbd_h_predictor_32x64_c
-
-void aom_highbd_h_predictor_32x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_32x8 aom_highbd_h_predictor_32x8_c
-
-void aom_highbd_h_predictor_4x16_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_4x16 aom_highbd_h_predictor_4x16_c
-
-void aom_highbd_h_predictor_4x4_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-void aom_highbd_h_predictor_4x4_sse2(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_h_predictor_4x4 aom_highbd_h_predictor_4x4_sse2
-
-void aom_highbd_h_predictor_4x8_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-void aom_highbd_h_predictor_4x8_sse2(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_h_predictor_4x8 aom_highbd_h_predictor_4x8_sse2
-
-void aom_highbd_h_predictor_64x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_64x16 aom_highbd_h_predictor_64x16_c
-
-void aom_highbd_h_predictor_64x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_64x32 aom_highbd_h_predictor_64x32_c
-
-void aom_highbd_h_predictor_64x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_64x64 aom_highbd_h_predictor_64x64_c
-
-void aom_highbd_h_predictor_8x16_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-void aom_highbd_h_predictor_8x16_sse2(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_h_predictor_8x16 aom_highbd_h_predictor_8x16_sse2
-
-void aom_highbd_h_predictor_8x32_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_8x32 aom_highbd_h_predictor_8x32_c
-
-void aom_highbd_h_predictor_8x4_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-void aom_highbd_h_predictor_8x4_sse2(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_h_predictor_8x4 aom_highbd_h_predictor_8x4_sse2
-
-void aom_highbd_h_predictor_8x8_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-void aom_highbd_h_predictor_8x8_sse2(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_h_predictor_8x8 aom_highbd_h_predictor_8x8_sse2
-
-void aom_highbd_hadamard_16x16_c(const int16_t* src_diff,
-                                 ptrdiff_t src_stride,
-                                 tran_low_t* coeff);
-void aom_highbd_hadamard_16x16_avx2(const int16_t* src_diff,
-                                    ptrdiff_t src_stride,
-                                    tran_low_t* coeff);
-RTCD_EXTERN void (*aom_highbd_hadamard_16x16)(const int16_t* src_diff,
-                                              ptrdiff_t src_stride,
-                                              tran_low_t* coeff);
-
-void aom_highbd_hadamard_32x32_c(const int16_t* src_diff,
-                                 ptrdiff_t src_stride,
-                                 tran_low_t* coeff);
-void aom_highbd_hadamard_32x32_avx2(const int16_t* src_diff,
-                                    ptrdiff_t src_stride,
-                                    tran_low_t* coeff);
-RTCD_EXTERN void (*aom_highbd_hadamard_32x32)(const int16_t* src_diff,
-                                              ptrdiff_t src_stride,
-                                              tran_low_t* coeff);
-
-void aom_highbd_hadamard_8x8_c(const int16_t* src_diff,
-                               ptrdiff_t src_stride,
-                               tran_low_t* coeff);
-void aom_highbd_hadamard_8x8_avx2(const int16_t* src_diff,
-                                  ptrdiff_t src_stride,
-                                  tran_low_t* coeff);
-RTCD_EXTERN void (*aom_highbd_hadamard_8x8)(const int16_t* src_diff,
-                                            ptrdiff_t src_stride,
-                                            tran_low_t* coeff);
-
-void aom_highbd_lpf_horizontal_14_c(uint16_t* s,
-                                    int pitch,
-                                    const uint8_t* blimit,
-                                    const uint8_t* limit,
-                                    const uint8_t* thresh,
-                                    int bd);
-void aom_highbd_lpf_horizontal_14_sse2(uint16_t* s,
-                                       int pitch,
-                                       const uint8_t* blimit,
-                                       const uint8_t* limit,
-                                       const uint8_t* thresh,
-                                       int bd);
-#define aom_highbd_lpf_horizontal_14 aom_highbd_lpf_horizontal_14_sse2
-
-void aom_highbd_lpf_horizontal_14_dual_c(uint16_t* s,
-                                         int pitch,
-                                         const uint8_t* blimit0,
-                                         const uint8_t* limit0,
-                                         const uint8_t* thresh0,
-                                         const uint8_t* blimit1,
-                                         const uint8_t* limit1,
-                                         const uint8_t* thresh1,
-                                         int bd);
-void aom_highbd_lpf_horizontal_14_dual_sse2(uint16_t* s,
-                                            int pitch,
-                                            const uint8_t* blimit0,
-                                            const uint8_t* limit0,
-                                            const uint8_t* thresh0,
-                                            const uint8_t* blimit1,
-                                            const uint8_t* limit1,
-                                            const uint8_t* thresh1,
-                                            int bd);
-void aom_highbd_lpf_horizontal_14_dual_avx2(uint16_t* s,
-                                            int pitch,
-                                            const uint8_t* blimit0,
-                                            const uint8_t* limit0,
-                                            const uint8_t* thresh0,
-                                            const uint8_t* blimit1,
-                                            const uint8_t* limit1,
-                                            const uint8_t* thresh1,
-                                            int bd);
-RTCD_EXTERN void (*aom_highbd_lpf_horizontal_14_dual)(uint16_t* s,
-                                                      int pitch,
-                                                      const uint8_t* blimit0,
-                                                      const uint8_t* limit0,
-                                                      const uint8_t* thresh0,
-                                                      const uint8_t* blimit1,
-                                                      const uint8_t* limit1,
-                                                      const uint8_t* thresh1,
-                                                      int bd);
-
-void aom_highbd_lpf_horizontal_4_c(uint16_t* s,
-                                   int pitch,
-                                   const uint8_t* blimit,
-                                   const uint8_t* limit,
-                                   const uint8_t* thresh,
-                                   int bd);
-void aom_highbd_lpf_horizontal_4_sse2(uint16_t* s,
-                                      int pitch,
-                                      const uint8_t* blimit,
-                                      const uint8_t* limit,
-                                      const uint8_t* thresh,
-                                      int bd);
-#define aom_highbd_lpf_horizontal_4 aom_highbd_lpf_horizontal_4_sse2
-
-void aom_highbd_lpf_horizontal_4_dual_c(uint16_t* s,
-                                        int pitch,
-                                        const uint8_t* blimit0,
-                                        const uint8_t* limit0,
-                                        const uint8_t* thresh0,
-                                        const uint8_t* blimit1,
-                                        const uint8_t* limit1,
-                                        const uint8_t* thresh1,
-                                        int bd);
-void aom_highbd_lpf_horizontal_4_dual_sse2(uint16_t* s,
-                                           int pitch,
-                                           const uint8_t* blimit0,
-                                           const uint8_t* limit0,
-                                           const uint8_t* thresh0,
-                                           const uint8_t* blimit1,
-                                           const uint8_t* limit1,
-                                           const uint8_t* thresh1,
-                                           int bd);
-void aom_highbd_lpf_horizontal_4_dual_avx2(uint16_t* s,
-                                           int pitch,
-                                           const uint8_t* blimit0,
-                                           const uint8_t* limit0,
-                                           const uint8_t* thresh0,
-                                           const uint8_t* blimit1,
-                                           const uint8_t* limit1,
-                                           const uint8_t* thresh1,
-                                           int bd);
-RTCD_EXTERN void (*aom_highbd_lpf_horizontal_4_dual)(uint16_t* s,
-                                                     int pitch,
-                                                     const uint8_t* blimit0,
-                                                     const uint8_t* limit0,
-                                                     const uint8_t* thresh0,
-                                                     const uint8_t* blimit1,
-                                                     const uint8_t* limit1,
-                                                     const uint8_t* thresh1,
-                                                     int bd);
-
-void aom_highbd_lpf_horizontal_6_c(uint16_t* s,
-                                   int pitch,
-                                   const uint8_t* blimit,
-                                   const uint8_t* limit,
-                                   const uint8_t* thresh,
-                                   int bd);
-void aom_highbd_lpf_horizontal_6_sse2(uint16_t* s,
-                                      int pitch,
-                                      const uint8_t* blimit,
-                                      const uint8_t* limit,
-                                      const uint8_t* thresh,
-                                      int bd);
-#define aom_highbd_lpf_horizontal_6 aom_highbd_lpf_horizontal_6_sse2
-
-void aom_highbd_lpf_horizontal_6_dual_c(uint16_t* s,
-                                        int pitch,
-                                        const uint8_t* blimit0,
-                                        const uint8_t* limit0,
-                                        const uint8_t* thresh0,
-                                        const uint8_t* blimit1,
-                                        const uint8_t* limit1,
-                                        const uint8_t* thresh1,
-                                        int bd);
-void aom_highbd_lpf_horizontal_6_dual_sse2(uint16_t* s,
-                                           int pitch,
-                                           const uint8_t* blimit0,
-                                           const uint8_t* limit0,
-                                           const uint8_t* thresh0,
-                                           const uint8_t* blimit1,
-                                           const uint8_t* limit1,
-                                           const uint8_t* thresh1,
-                                           int bd);
-#define aom_highbd_lpf_horizontal_6_dual aom_highbd_lpf_horizontal_6_dual_sse2
-
-void aom_highbd_lpf_horizontal_8_c(uint16_t* s,
-                                   int pitch,
-                                   const uint8_t* blimit,
-                                   const uint8_t* limit,
-                                   const uint8_t* thresh,
-                                   int bd);
-void aom_highbd_lpf_horizontal_8_sse2(uint16_t* s,
-                                      int pitch,
-                                      const uint8_t* blimit,
-                                      const uint8_t* limit,
-                                      const uint8_t* thresh,
-                                      int bd);
-#define aom_highbd_lpf_horizontal_8 aom_highbd_lpf_horizontal_8_sse2
-
-void aom_highbd_lpf_horizontal_8_dual_c(uint16_t* s,
-                                        int pitch,
-                                        const uint8_t* blimit0,
-                                        const uint8_t* limit0,
-                                        const uint8_t* thresh0,
-                                        const uint8_t* blimit1,
-                                        const uint8_t* limit1,
-                                        const uint8_t* thresh1,
-                                        int bd);
-void aom_highbd_lpf_horizontal_8_dual_sse2(uint16_t* s,
-                                           int pitch,
-                                           const uint8_t* blimit0,
-                                           const uint8_t* limit0,
-                                           const uint8_t* thresh0,
-                                           const uint8_t* blimit1,
-                                           const uint8_t* limit1,
-                                           const uint8_t* thresh1,
-                                           int bd);
-void aom_highbd_lpf_horizontal_8_dual_avx2(uint16_t* s,
-                                           int pitch,
-                                           const uint8_t* blimit0,
-                                           const uint8_t* limit0,
-                                           const uint8_t* thresh0,
-                                           const uint8_t* blimit1,
-                                           const uint8_t* limit1,
-                                           const uint8_t* thresh1,
-                                           int bd);
-RTCD_EXTERN void (*aom_highbd_lpf_horizontal_8_dual)(uint16_t* s,
-                                                     int pitch,
-                                                     const uint8_t* blimit0,
-                                                     const uint8_t* limit0,
-                                                     const uint8_t* thresh0,
-                                                     const uint8_t* blimit1,
-                                                     const uint8_t* limit1,
-                                                     const uint8_t* thresh1,
-                                                     int bd);
-
-void aom_highbd_lpf_vertical_14_c(uint16_t* s,
-                                  int pitch,
-                                  const uint8_t* blimit,
-                                  const uint8_t* limit,
-                                  const uint8_t* thresh,
-                                  int bd);
-void aom_highbd_lpf_vertical_14_sse2(uint16_t* s,
-                                     int pitch,
-                                     const uint8_t* blimit,
-                                     const uint8_t* limit,
-                                     const uint8_t* thresh,
-                                     int bd);
-#define aom_highbd_lpf_vertical_14 aom_highbd_lpf_vertical_14_sse2
-
-void aom_highbd_lpf_vertical_14_dual_c(uint16_t* s,
-                                       int pitch,
-                                       const uint8_t* blimit0,
-                                       const uint8_t* limit0,
-                                       const uint8_t* thresh0,
-                                       const uint8_t* blimit1,
-                                       const uint8_t* limit1,
-                                       const uint8_t* thresh1,
-                                       int bd);
-void aom_highbd_lpf_vertical_14_dual_sse2(uint16_t* s,
-                                          int pitch,
-                                          const uint8_t* blimit0,
-                                          const uint8_t* limit0,
-                                          const uint8_t* thresh0,
-                                          const uint8_t* blimit1,
-                                          const uint8_t* limit1,
-                                          const uint8_t* thresh1,
-                                          int bd);
-void aom_highbd_lpf_vertical_14_dual_avx2(uint16_t* s,
-                                          int pitch,
-                                          const uint8_t* blimit0,
-                                          const uint8_t* limit0,
-                                          const uint8_t* thresh0,
-                                          const uint8_t* blimit1,
-                                          const uint8_t* limit1,
-                                          const uint8_t* thresh1,
-                                          int bd);
-RTCD_EXTERN void (*aom_highbd_lpf_vertical_14_dual)(uint16_t* s,
-                                                    int pitch,
-                                                    const uint8_t* blimit0,
-                                                    const uint8_t* limit0,
-                                                    const uint8_t* thresh0,
-                                                    const uint8_t* blimit1,
-                                                    const uint8_t* limit1,
-                                                    const uint8_t* thresh1,
-                                                    int bd);
-
-void aom_highbd_lpf_vertical_4_c(uint16_t* s,
-                                 int pitch,
-                                 const uint8_t* blimit,
-                                 const uint8_t* limit,
-                                 const uint8_t* thresh,
-                                 int bd);
-void aom_highbd_lpf_vertical_4_sse2(uint16_t* s,
-                                    int pitch,
-                                    const uint8_t* blimit,
-                                    const uint8_t* limit,
-                                    const uint8_t* thresh,
-                                    int bd);
-#define aom_highbd_lpf_vertical_4 aom_highbd_lpf_vertical_4_sse2
-
-void aom_highbd_lpf_vertical_4_dual_c(uint16_t* s,
-                                      int pitch,
-                                      const uint8_t* blimit0,
-                                      const uint8_t* limit0,
-                                      const uint8_t* thresh0,
-                                      const uint8_t* blimit1,
-                                      const uint8_t* limit1,
-                                      const uint8_t* thresh1,
-                                      int bd);
-void aom_highbd_lpf_vertical_4_dual_sse2(uint16_t* s,
-                                         int pitch,
-                                         const uint8_t* blimit0,
-                                         const uint8_t* limit0,
-                                         const uint8_t* thresh0,
-                                         const uint8_t* blimit1,
-                                         const uint8_t* limit1,
-                                         const uint8_t* thresh1,
-                                         int bd);
-void aom_highbd_lpf_vertical_4_dual_avx2(uint16_t* s,
-                                         int pitch,
-                                         const uint8_t* blimit0,
-                                         const uint8_t* limit0,
-                                         const uint8_t* thresh0,
-                                         const uint8_t* blimit1,
-                                         const uint8_t* limit1,
-                                         const uint8_t* thresh1,
-                                         int bd);
-RTCD_EXTERN void (*aom_highbd_lpf_vertical_4_dual)(uint16_t* s,
-                                                   int pitch,
-                                                   const uint8_t* blimit0,
-                                                   const uint8_t* limit0,
-                                                   const uint8_t* thresh0,
-                                                   const uint8_t* blimit1,
-                                                   const uint8_t* limit1,
-                                                   const uint8_t* thresh1,
-                                                   int bd);
-
-void aom_highbd_lpf_vertical_6_c(uint16_t* s,
-                                 int pitch,
-                                 const uint8_t* blimit,
-                                 const uint8_t* limit,
-                                 const uint8_t* thresh,
-                                 int bd);
-void aom_highbd_lpf_vertical_6_sse2(uint16_t* s,
-                                    int pitch,
-                                    const uint8_t* blimit,
-                                    const uint8_t* limit,
-                                    const uint8_t* thresh,
-                                    int bd);
-#define aom_highbd_lpf_vertical_6 aom_highbd_lpf_vertical_6_sse2
-
-void aom_highbd_lpf_vertical_6_dual_c(uint16_t* s,
-                                      int pitch,
-                                      const uint8_t* blimit0,
-                                      const uint8_t* limit0,
-                                      const uint8_t* thresh0,
-                                      const uint8_t* blimit1,
-                                      const uint8_t* limit1,
-                                      const uint8_t* thresh1,
-                                      int bd);
-void aom_highbd_lpf_vertical_6_dual_sse2(uint16_t* s,
-                                         int pitch,
-                                         const uint8_t* blimit0,
-                                         const uint8_t* limit0,
-                                         const uint8_t* thresh0,
-                                         const uint8_t* blimit1,
-                                         const uint8_t* limit1,
-                                         const uint8_t* thresh1,
-                                         int bd);
-#define aom_highbd_lpf_vertical_6_dual aom_highbd_lpf_vertical_6_dual_sse2
-
-void aom_highbd_lpf_vertical_8_c(uint16_t* s,
-                                 int pitch,
-                                 const uint8_t* blimit,
-                                 const uint8_t* limit,
-                                 const uint8_t* thresh,
-                                 int bd);
-void aom_highbd_lpf_vertical_8_sse2(uint16_t* s,
-                                    int pitch,
-                                    const uint8_t* blimit,
-                                    const uint8_t* limit,
-                                    const uint8_t* thresh,
-                                    int bd);
-#define aom_highbd_lpf_vertical_8 aom_highbd_lpf_vertical_8_sse2
-
-void aom_highbd_lpf_vertical_8_dual_c(uint16_t* s,
-                                      int pitch,
-                                      const uint8_t* blimit0,
-                                      const uint8_t* limit0,
-                                      const uint8_t* thresh0,
-                                      const uint8_t* blimit1,
-                                      const uint8_t* limit1,
-                                      const uint8_t* thresh1,
-                                      int bd);
-void aom_highbd_lpf_vertical_8_dual_sse2(uint16_t* s,
-                                         int pitch,
-                                         const uint8_t* blimit0,
-                                         const uint8_t* limit0,
-                                         const uint8_t* thresh0,
-                                         const uint8_t* blimit1,
-                                         const uint8_t* limit1,
-                                         const uint8_t* thresh1,
-                                         int bd);
-void aom_highbd_lpf_vertical_8_dual_avx2(uint16_t* s,
-                                         int pitch,
-                                         const uint8_t* blimit0,
-                                         const uint8_t* limit0,
-                                         const uint8_t* thresh0,
-                                         const uint8_t* blimit1,
-                                         const uint8_t* limit1,
-                                         const uint8_t* thresh1,
-                                         int bd);
-RTCD_EXTERN void (*aom_highbd_lpf_vertical_8_dual)(uint16_t* s,
-                                                   int pitch,
-                                                   const uint8_t* blimit0,
-                                                   const uint8_t* limit0,
-                                                   const uint8_t* thresh0,
-                                                   const uint8_t* blimit1,
-                                                   const uint8_t* limit1,
-                                                   const uint8_t* thresh1,
-                                                   int bd);
-
-unsigned int aom_highbd_masked_sad128x128_c(const uint8_t* src8,
-                                            int src_stride,
-                                            const uint8_t* ref8,
-                                            int ref_stride,
-                                            const uint8_t* second_pred8,
-                                            const uint8_t* msk,
-                                            int msk_stride,
-                                            int invert_mask);
-unsigned int aom_highbd_masked_sad128x128_ssse3(const uint8_t* src8,
-                                                int src_stride,
-                                                const uint8_t* ref8,
-                                                int ref_stride,
-                                                const uint8_t* second_pred8,
-                                                const uint8_t* msk,
-                                                int msk_stride,
-                                                int invert_mask);
-unsigned int aom_highbd_masked_sad128x128_avx2(const uint8_t* src8,
-                                               int src_stride,
-                                               const uint8_t* ref8,
-                                               int ref_stride,
-                                               const uint8_t* second_pred8,
-                                               const uint8_t* msk,
-                                               int msk_stride,
-                                               int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad128x128)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad128x64_c(const uint8_t* src8,
-                                           int src_stride,
-                                           const uint8_t* ref8,
-                                           int ref_stride,
-                                           const uint8_t* second_pred8,
-                                           const uint8_t* msk,
-                                           int msk_stride,
-                                           int invert_mask);
-unsigned int aom_highbd_masked_sad128x64_ssse3(const uint8_t* src8,
-                                               int src_stride,
-                                               const uint8_t* ref8,
-                                               int ref_stride,
-                                               const uint8_t* second_pred8,
-                                               const uint8_t* msk,
-                                               int msk_stride,
-                                               int invert_mask);
-unsigned int aom_highbd_masked_sad128x64_avx2(const uint8_t* src8,
-                                              int src_stride,
-                                              const uint8_t* ref8,
-                                              int ref_stride,
-                                              const uint8_t* second_pred8,
-                                              const uint8_t* msk,
-                                              int msk_stride,
-                                              int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad128x64)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad16x16_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-unsigned int aom_highbd_masked_sad16x16_ssse3(const uint8_t* src8,
-                                              int src_stride,
-                                              const uint8_t* ref8,
-                                              int ref_stride,
-                                              const uint8_t* second_pred8,
-                                              const uint8_t* msk,
-                                              int msk_stride,
-                                              int invert_mask);
-unsigned int aom_highbd_masked_sad16x16_avx2(const uint8_t* src8,
-                                             int src_stride,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             const uint8_t* second_pred8,
-                                             const uint8_t* msk,
-                                             int msk_stride,
-                                             int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad16x16)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad16x32_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-unsigned int aom_highbd_masked_sad16x32_ssse3(const uint8_t* src8,
-                                              int src_stride,
-                                              const uint8_t* ref8,
-                                              int ref_stride,
-                                              const uint8_t* second_pred8,
-                                              const uint8_t* msk,
-                                              int msk_stride,
-                                              int invert_mask);
-unsigned int aom_highbd_masked_sad16x32_avx2(const uint8_t* src8,
-                                             int src_stride,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             const uint8_t* second_pred8,
-                                             const uint8_t* msk,
-                                             int msk_stride,
-                                             int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad16x32)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad16x4_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-unsigned int aom_highbd_masked_sad16x4_ssse3(const uint8_t* src8,
-                                             int src_stride,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             const uint8_t* second_pred8,
-                                             const uint8_t* msk,
-                                             int msk_stride,
-                                             int invert_mask);
-unsigned int aom_highbd_masked_sad16x4_avx2(const uint8_t* src8,
-                                            int src_stride,
-                                            const uint8_t* ref8,
-                                            int ref_stride,
-                                            const uint8_t* second_pred8,
-                                            const uint8_t* msk,
-                                            int msk_stride,
-                                            int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad16x4)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad16x64_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-unsigned int aom_highbd_masked_sad16x64_ssse3(const uint8_t* src8,
-                                              int src_stride,
-                                              const uint8_t* ref8,
-                                              int ref_stride,
-                                              const uint8_t* second_pred8,
-                                              const uint8_t* msk,
-                                              int msk_stride,
-                                              int invert_mask);
-unsigned int aom_highbd_masked_sad16x64_avx2(const uint8_t* src8,
-                                             int src_stride,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             const uint8_t* second_pred8,
-                                             const uint8_t* msk,
-                                             int msk_stride,
-                                             int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad16x64)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad16x8_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-unsigned int aom_highbd_masked_sad16x8_ssse3(const uint8_t* src8,
-                                             int src_stride,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             const uint8_t* second_pred8,
-                                             const uint8_t* msk,
-                                             int msk_stride,
-                                             int invert_mask);
-unsigned int aom_highbd_masked_sad16x8_avx2(const uint8_t* src8,
-                                            int src_stride,
-                                            const uint8_t* ref8,
-                                            int ref_stride,
-                                            const uint8_t* second_pred8,
-                                            const uint8_t* msk,
-                                            int msk_stride,
-                                            int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad16x8)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad32x16_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-unsigned int aom_highbd_masked_sad32x16_ssse3(const uint8_t* src8,
-                                              int src_stride,
-                                              const uint8_t* ref8,
-                                              int ref_stride,
-                                              const uint8_t* second_pred8,
-                                              const uint8_t* msk,
-                                              int msk_stride,
-                                              int invert_mask);
-unsigned int aom_highbd_masked_sad32x16_avx2(const uint8_t* src8,
-                                             int src_stride,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             const uint8_t* second_pred8,
-                                             const uint8_t* msk,
-                                             int msk_stride,
-                                             int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad32x16)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad32x32_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-unsigned int aom_highbd_masked_sad32x32_ssse3(const uint8_t* src8,
-                                              int src_stride,
-                                              const uint8_t* ref8,
-                                              int ref_stride,
-                                              const uint8_t* second_pred8,
-                                              const uint8_t* msk,
-                                              int msk_stride,
-                                              int invert_mask);
-unsigned int aom_highbd_masked_sad32x32_avx2(const uint8_t* src8,
-                                             int src_stride,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             const uint8_t* second_pred8,
-                                             const uint8_t* msk,
-                                             int msk_stride,
-                                             int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad32x32)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad32x64_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-unsigned int aom_highbd_masked_sad32x64_ssse3(const uint8_t* src8,
-                                              int src_stride,
-                                              const uint8_t* ref8,
-                                              int ref_stride,
-                                              const uint8_t* second_pred8,
-                                              const uint8_t* msk,
-                                              int msk_stride,
-                                              int invert_mask);
-unsigned int aom_highbd_masked_sad32x64_avx2(const uint8_t* src8,
-                                             int src_stride,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             const uint8_t* second_pred8,
-                                             const uint8_t* msk,
-                                             int msk_stride,
-                                             int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad32x64)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad32x8_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-unsigned int aom_highbd_masked_sad32x8_ssse3(const uint8_t* src8,
-                                             int src_stride,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             const uint8_t* second_pred8,
-                                             const uint8_t* msk,
-                                             int msk_stride,
-                                             int invert_mask);
-unsigned int aom_highbd_masked_sad32x8_avx2(const uint8_t* src8,
-                                            int src_stride,
-                                            const uint8_t* ref8,
-                                            int ref_stride,
-                                            const uint8_t* second_pred8,
-                                            const uint8_t* msk,
-                                            int msk_stride,
-                                            int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad32x8)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad4x16_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-unsigned int aom_highbd_masked_sad4x16_ssse3(const uint8_t* src8,
-                                             int src_stride,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             const uint8_t* second_pred8,
-                                             const uint8_t* msk,
-                                             int msk_stride,
-                                             int invert_mask);
-unsigned int aom_highbd_masked_sad4x16_avx2(const uint8_t* src8,
-                                            int src_stride,
-                                            const uint8_t* ref8,
-                                            int ref_stride,
-                                            const uint8_t* second_pred8,
-                                            const uint8_t* msk,
-                                            int msk_stride,
-                                            int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad4x16)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad4x4_c(const uint8_t* src8,
-                                        int src_stride,
-                                        const uint8_t* ref8,
-                                        int ref_stride,
-                                        const uint8_t* second_pred8,
-                                        const uint8_t* msk,
-                                        int msk_stride,
-                                        int invert_mask);
-unsigned int aom_highbd_masked_sad4x4_ssse3(const uint8_t* src8,
-                                            int src_stride,
-                                            const uint8_t* ref8,
-                                            int ref_stride,
-                                            const uint8_t* second_pred8,
-                                            const uint8_t* msk,
-                                            int msk_stride,
-                                            int invert_mask);
-unsigned int aom_highbd_masked_sad4x4_avx2(const uint8_t* src8,
-                                           int src_stride,
-                                           const uint8_t* ref8,
-                                           int ref_stride,
-                                           const uint8_t* second_pred8,
-                                           const uint8_t* msk,
-                                           int msk_stride,
-                                           int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad4x4)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad4x8_c(const uint8_t* src8,
-                                        int src_stride,
-                                        const uint8_t* ref8,
-                                        int ref_stride,
-                                        const uint8_t* second_pred8,
-                                        const uint8_t* msk,
-                                        int msk_stride,
-                                        int invert_mask);
-unsigned int aom_highbd_masked_sad4x8_ssse3(const uint8_t* src8,
-                                            int src_stride,
-                                            const uint8_t* ref8,
-                                            int ref_stride,
-                                            const uint8_t* second_pred8,
-                                            const uint8_t* msk,
-                                            int msk_stride,
-                                            int invert_mask);
-unsigned int aom_highbd_masked_sad4x8_avx2(const uint8_t* src8,
-                                           int src_stride,
-                                           const uint8_t* ref8,
-                                           int ref_stride,
-                                           const uint8_t* second_pred8,
-                                           const uint8_t* msk,
-                                           int msk_stride,
-                                           int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad4x8)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad64x128_c(const uint8_t* src8,
-                                           int src_stride,
-                                           const uint8_t* ref8,
-                                           int ref_stride,
-                                           const uint8_t* second_pred8,
-                                           const uint8_t* msk,
-                                           int msk_stride,
-                                           int invert_mask);
-unsigned int aom_highbd_masked_sad64x128_ssse3(const uint8_t* src8,
-                                               int src_stride,
-                                               const uint8_t* ref8,
-                                               int ref_stride,
-                                               const uint8_t* second_pred8,
-                                               const uint8_t* msk,
-                                               int msk_stride,
-                                               int invert_mask);
-unsigned int aom_highbd_masked_sad64x128_avx2(const uint8_t* src8,
-                                              int src_stride,
-                                              const uint8_t* ref8,
-                                              int ref_stride,
-                                              const uint8_t* second_pred8,
-                                              const uint8_t* msk,
-                                              int msk_stride,
-                                              int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad64x128)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad64x16_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-unsigned int aom_highbd_masked_sad64x16_ssse3(const uint8_t* src8,
-                                              int src_stride,
-                                              const uint8_t* ref8,
-                                              int ref_stride,
-                                              const uint8_t* second_pred8,
-                                              const uint8_t* msk,
-                                              int msk_stride,
-                                              int invert_mask);
-unsigned int aom_highbd_masked_sad64x16_avx2(const uint8_t* src8,
-                                             int src_stride,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             const uint8_t* second_pred8,
-                                             const uint8_t* msk,
-                                             int msk_stride,
-                                             int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad64x16)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad64x32_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-unsigned int aom_highbd_masked_sad64x32_ssse3(const uint8_t* src8,
-                                              int src_stride,
-                                              const uint8_t* ref8,
-                                              int ref_stride,
-                                              const uint8_t* second_pred8,
-                                              const uint8_t* msk,
-                                              int msk_stride,
-                                              int invert_mask);
-unsigned int aom_highbd_masked_sad64x32_avx2(const uint8_t* src8,
-                                             int src_stride,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             const uint8_t* second_pred8,
-                                             const uint8_t* msk,
-                                             int msk_stride,
-                                             int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad64x32)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad64x64_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-unsigned int aom_highbd_masked_sad64x64_ssse3(const uint8_t* src8,
-                                              int src_stride,
-                                              const uint8_t* ref8,
-                                              int ref_stride,
-                                              const uint8_t* second_pred8,
-                                              const uint8_t* msk,
-                                              int msk_stride,
-                                              int invert_mask);
-unsigned int aom_highbd_masked_sad64x64_avx2(const uint8_t* src8,
-                                             int src_stride,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             const uint8_t* second_pred8,
-                                             const uint8_t* msk,
-                                             int msk_stride,
-                                             int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad64x64)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad8x16_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-unsigned int aom_highbd_masked_sad8x16_ssse3(const uint8_t* src8,
-                                             int src_stride,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             const uint8_t* second_pred8,
-                                             const uint8_t* msk,
-                                             int msk_stride,
-                                             int invert_mask);
-unsigned int aom_highbd_masked_sad8x16_avx2(const uint8_t* src8,
-                                            int src_stride,
-                                            const uint8_t* ref8,
-                                            int ref_stride,
-                                            const uint8_t* second_pred8,
-                                            const uint8_t* msk,
-                                            int msk_stride,
-                                            int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad8x16)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad8x32_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-unsigned int aom_highbd_masked_sad8x32_ssse3(const uint8_t* src8,
-                                             int src_stride,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             const uint8_t* second_pred8,
-                                             const uint8_t* msk,
-                                             int msk_stride,
-                                             int invert_mask);
-unsigned int aom_highbd_masked_sad8x32_avx2(const uint8_t* src8,
-                                            int src_stride,
-                                            const uint8_t* ref8,
-                                            int ref_stride,
-                                            const uint8_t* second_pred8,
-                                            const uint8_t* msk,
-                                            int msk_stride,
-                                            int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad8x32)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad8x4_c(const uint8_t* src8,
-                                        int src_stride,
-                                        const uint8_t* ref8,
-                                        int ref_stride,
-                                        const uint8_t* second_pred8,
-                                        const uint8_t* msk,
-                                        int msk_stride,
-                                        int invert_mask);
-unsigned int aom_highbd_masked_sad8x4_ssse3(const uint8_t* src8,
-                                            int src_stride,
-                                            const uint8_t* ref8,
-                                            int ref_stride,
-                                            const uint8_t* second_pred8,
-                                            const uint8_t* msk,
-                                            int msk_stride,
-                                            int invert_mask);
-unsigned int aom_highbd_masked_sad8x4_avx2(const uint8_t* src8,
-                                           int src_stride,
-                                           const uint8_t* ref8,
-                                           int ref_stride,
-                                           const uint8_t* second_pred8,
-                                           const uint8_t* msk,
-                                           int msk_stride,
-                                           int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad8x4)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad8x8_c(const uint8_t* src8,
-                                        int src_stride,
-                                        const uint8_t* ref8,
-                                        int ref_stride,
-                                        const uint8_t* second_pred8,
-                                        const uint8_t* msk,
-                                        int msk_stride,
-                                        int invert_mask);
-unsigned int aom_highbd_masked_sad8x8_ssse3(const uint8_t* src8,
-                                            int src_stride,
-                                            const uint8_t* ref8,
-                                            int ref_stride,
-                                            const uint8_t* second_pred8,
-                                            const uint8_t* msk,
-                                            int msk_stride,
-                                            int invert_mask);
-unsigned int aom_highbd_masked_sad8x8_avx2(const uint8_t* src8,
-                                           int src_stride,
-                                           const uint8_t* ref8,
-                                           int ref_stride,
-                                           const uint8_t* second_pred8,
-                                           const uint8_t* msk,
-                                           int msk_stride,
-                                           int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad8x8)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-void aom_highbd_minmax_8x8_c(const uint8_t* s,
-                             int p,
-                             const uint8_t* d,
-                             int dp,
-                             int* min,
-                             int* max);
-#define aom_highbd_minmax_8x8 aom_highbd_minmax_8x8_c
-
-unsigned int aom_highbd_obmc_sad128x128_c(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask);
-unsigned int aom_highbd_obmc_sad128x128_sse4_1(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask);
-unsigned int aom_highbd_obmc_sad128x128_avx2(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad128x128)(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad128x64_c(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask);
-unsigned int aom_highbd_obmc_sad128x64_sse4_1(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask);
-unsigned int aom_highbd_obmc_sad128x64_avx2(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad128x64)(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad16x16_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-unsigned int aom_highbd_obmc_sad16x16_sse4_1(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-unsigned int aom_highbd_obmc_sad16x16_avx2(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad16x16)(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad16x32_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-unsigned int aom_highbd_obmc_sad16x32_sse4_1(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-unsigned int aom_highbd_obmc_sad16x32_avx2(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad16x32)(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad16x4_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-unsigned int aom_highbd_obmc_sad16x4_sse4_1(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask);
-unsigned int aom_highbd_obmc_sad16x4_avx2(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad16x4)(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad16x64_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-unsigned int aom_highbd_obmc_sad16x64_sse4_1(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-unsigned int aom_highbd_obmc_sad16x64_avx2(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad16x64)(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad16x8_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-unsigned int aom_highbd_obmc_sad16x8_sse4_1(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask);
-unsigned int aom_highbd_obmc_sad16x8_avx2(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad16x8)(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad32x16_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-unsigned int aom_highbd_obmc_sad32x16_sse4_1(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-unsigned int aom_highbd_obmc_sad32x16_avx2(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad32x16)(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad32x32_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-unsigned int aom_highbd_obmc_sad32x32_sse4_1(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-unsigned int aom_highbd_obmc_sad32x32_avx2(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad32x32)(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad32x64_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-unsigned int aom_highbd_obmc_sad32x64_sse4_1(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-unsigned int aom_highbd_obmc_sad32x64_avx2(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad32x64)(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad32x8_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-unsigned int aom_highbd_obmc_sad32x8_sse4_1(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask);
-unsigned int aom_highbd_obmc_sad32x8_avx2(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad32x8)(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad4x16_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-unsigned int aom_highbd_obmc_sad4x16_sse4_1(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask);
-unsigned int aom_highbd_obmc_sad4x16_avx2(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad4x16)(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad4x4_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-unsigned int aom_highbd_obmc_sad4x4_sse4_1(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask);
-unsigned int aom_highbd_obmc_sad4x4_avx2(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad4x4)(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad4x8_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-unsigned int aom_highbd_obmc_sad4x8_sse4_1(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask);
-unsigned int aom_highbd_obmc_sad4x8_avx2(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad4x8)(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad64x128_c(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask);
-unsigned int aom_highbd_obmc_sad64x128_sse4_1(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask);
-unsigned int aom_highbd_obmc_sad64x128_avx2(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad64x128)(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad64x16_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-unsigned int aom_highbd_obmc_sad64x16_sse4_1(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-unsigned int aom_highbd_obmc_sad64x16_avx2(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad64x16)(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad64x32_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-unsigned int aom_highbd_obmc_sad64x32_sse4_1(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-unsigned int aom_highbd_obmc_sad64x32_avx2(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad64x32)(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad64x64_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-unsigned int aom_highbd_obmc_sad64x64_sse4_1(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-unsigned int aom_highbd_obmc_sad64x64_avx2(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad64x64)(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad8x16_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-unsigned int aom_highbd_obmc_sad8x16_sse4_1(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask);
-unsigned int aom_highbd_obmc_sad8x16_avx2(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad8x16)(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad8x32_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-unsigned int aom_highbd_obmc_sad8x32_sse4_1(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask);
-unsigned int aom_highbd_obmc_sad8x32_avx2(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad8x32)(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad8x4_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-unsigned int aom_highbd_obmc_sad8x4_sse4_1(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask);
-unsigned int aom_highbd_obmc_sad8x4_avx2(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad8x4)(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad8x8_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-unsigned int aom_highbd_obmc_sad8x8_sse4_1(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask);
-unsigned int aom_highbd_obmc_sad8x8_avx2(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad8x8)(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sub_pixel_variance128x128_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance128x128 \
-  aom_highbd_obmc_sub_pixel_variance128x128_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance128x64_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance128x64 \
-  aom_highbd_obmc_sub_pixel_variance128x64_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance16x16_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance16x16 \
-  aom_highbd_obmc_sub_pixel_variance16x16_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance16x32_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance16x32 \
-  aom_highbd_obmc_sub_pixel_variance16x32_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance16x4_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance16x4 \
-  aom_highbd_obmc_sub_pixel_variance16x4_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance16x64_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance16x64 \
-  aom_highbd_obmc_sub_pixel_variance16x64_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance16x8_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance16x8 \
-  aom_highbd_obmc_sub_pixel_variance16x8_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance32x16_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance32x16 \
-  aom_highbd_obmc_sub_pixel_variance32x16_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance32x32_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance32x32 \
-  aom_highbd_obmc_sub_pixel_variance32x32_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance32x64_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance32x64 \
-  aom_highbd_obmc_sub_pixel_variance32x64_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance32x8_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance32x8 \
-  aom_highbd_obmc_sub_pixel_variance32x8_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance4x16_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance4x16 \
-  aom_highbd_obmc_sub_pixel_variance4x16_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance4x4_c(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance4x4 \
-  aom_highbd_obmc_sub_pixel_variance4x4_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance4x8_c(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance4x8 \
-  aom_highbd_obmc_sub_pixel_variance4x8_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance64x128_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance64x128 \
-  aom_highbd_obmc_sub_pixel_variance64x128_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance64x16_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance64x16 \
-  aom_highbd_obmc_sub_pixel_variance64x16_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance64x32_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance64x32 \
-  aom_highbd_obmc_sub_pixel_variance64x32_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance64x64_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance64x64 \
-  aom_highbd_obmc_sub_pixel_variance64x64_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance8x16_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance8x16 \
-  aom_highbd_obmc_sub_pixel_variance8x16_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance8x32_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance8x32 \
-  aom_highbd_obmc_sub_pixel_variance8x32_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance8x4_c(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance8x4 \
-  aom_highbd_obmc_sub_pixel_variance8x4_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance8x8_c(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance8x8 \
-  aom_highbd_obmc_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_obmc_variance128x128_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_highbd_obmc_variance128x128_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance128x128)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance128x64_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-unsigned int aom_highbd_obmc_variance128x64_sse4_1(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance128x64)(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance16x16_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-unsigned int aom_highbd_obmc_variance16x16_sse4_1(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance16x16)(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance16x32_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-unsigned int aom_highbd_obmc_variance16x32_sse4_1(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance16x32)(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance16x4_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-unsigned int aom_highbd_obmc_variance16x4_sse4_1(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance16x4)(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance16x64_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-unsigned int aom_highbd_obmc_variance16x64_sse4_1(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance16x64)(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance16x8_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-unsigned int aom_highbd_obmc_variance16x8_sse4_1(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance16x8)(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance32x16_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-unsigned int aom_highbd_obmc_variance32x16_sse4_1(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance32x16)(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance32x32_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-unsigned int aom_highbd_obmc_variance32x32_sse4_1(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance32x32)(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance32x64_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-unsigned int aom_highbd_obmc_variance32x64_sse4_1(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance32x64)(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance32x8_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-unsigned int aom_highbd_obmc_variance32x8_sse4_1(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance32x8)(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance4x16_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-unsigned int aom_highbd_obmc_variance4x16_sse4_1(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance4x16)(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance4x4_c(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-unsigned int aom_highbd_obmc_variance4x4_sse4_1(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance4x4)(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance4x8_c(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-unsigned int aom_highbd_obmc_variance4x8_sse4_1(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance4x8)(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance64x128_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-unsigned int aom_highbd_obmc_variance64x128_sse4_1(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance64x128)(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance64x16_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-unsigned int aom_highbd_obmc_variance64x16_sse4_1(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance64x16)(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance64x32_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-unsigned int aom_highbd_obmc_variance64x32_sse4_1(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance64x32)(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance64x64_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-unsigned int aom_highbd_obmc_variance64x64_sse4_1(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance64x64)(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance8x16_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-unsigned int aom_highbd_obmc_variance8x16_sse4_1(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance8x16)(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance8x32_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-unsigned int aom_highbd_obmc_variance8x32_sse4_1(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance8x32)(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance8x4_c(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-unsigned int aom_highbd_obmc_variance8x4_sse4_1(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance8x4)(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance8x8_c(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-unsigned int aom_highbd_obmc_variance8x8_sse4_1(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance8x8)(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-
-void aom_highbd_paeth_predictor_16x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_16x16 aom_highbd_paeth_predictor_16x16_c
-
-void aom_highbd_paeth_predictor_16x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_16x32 aom_highbd_paeth_predictor_16x32_c
-
-void aom_highbd_paeth_predictor_16x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_16x4 aom_highbd_paeth_predictor_16x4_c
-
-void aom_highbd_paeth_predictor_16x64_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_16x64 aom_highbd_paeth_predictor_16x64_c
-
-void aom_highbd_paeth_predictor_16x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_16x8 aom_highbd_paeth_predictor_16x8_c
-
-void aom_highbd_paeth_predictor_2x2_c(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_paeth_predictor_2x2 aom_highbd_paeth_predictor_2x2_c
-
-void aom_highbd_paeth_predictor_32x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_32x16 aom_highbd_paeth_predictor_32x16_c
-
-void aom_highbd_paeth_predictor_32x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_32x32 aom_highbd_paeth_predictor_32x32_c
-
-void aom_highbd_paeth_predictor_32x64_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_32x64 aom_highbd_paeth_predictor_32x64_c
-
-void aom_highbd_paeth_predictor_32x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_32x8 aom_highbd_paeth_predictor_32x8_c
-
-void aom_highbd_paeth_predictor_4x16_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_4x16 aom_highbd_paeth_predictor_4x16_c
-
-void aom_highbd_paeth_predictor_4x4_c(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_paeth_predictor_4x4 aom_highbd_paeth_predictor_4x4_c
-
-void aom_highbd_paeth_predictor_4x8_c(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_paeth_predictor_4x8 aom_highbd_paeth_predictor_4x8_c
-
-void aom_highbd_paeth_predictor_64x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_64x16 aom_highbd_paeth_predictor_64x16_c
-
-void aom_highbd_paeth_predictor_64x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_64x32 aom_highbd_paeth_predictor_64x32_c
-
-void aom_highbd_paeth_predictor_64x64_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_64x64 aom_highbd_paeth_predictor_64x64_c
-
-void aom_highbd_paeth_predictor_8x16_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_8x16 aom_highbd_paeth_predictor_8x16_c
-
-void aom_highbd_paeth_predictor_8x32_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_8x32 aom_highbd_paeth_predictor_8x32_c
-
-void aom_highbd_paeth_predictor_8x4_c(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_paeth_predictor_8x4 aom_highbd_paeth_predictor_8x4_c
-
-void aom_highbd_paeth_predictor_8x8_c(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_paeth_predictor_8x8 aom_highbd_paeth_predictor_8x8_c
-
-void aom_highbd_quantize_b_c(const tran_low_t* coeff_ptr,
-                             intptr_t n_coeffs,
-                             const int16_t* zbin_ptr,
-                             const int16_t* round_ptr,
-                             const int16_t* quant_ptr,
-                             const int16_t* quant_shift_ptr,
-                             tran_low_t* qcoeff_ptr,
-                             tran_low_t* dqcoeff_ptr,
-                             const int16_t* dequant_ptr,
-                             uint16_t* eob_ptr,
-                             const int16_t* scan,
-                             const int16_t* iscan);
-void aom_highbd_quantize_b_sse2(const tran_low_t* coeff_ptr,
-                                intptr_t n_coeffs,
-                                const int16_t* zbin_ptr,
-                                const int16_t* round_ptr,
-                                const int16_t* quant_ptr,
-                                const int16_t* quant_shift_ptr,
-                                tran_low_t* qcoeff_ptr,
-                                tran_low_t* dqcoeff_ptr,
-                                const int16_t* dequant_ptr,
-                                uint16_t* eob_ptr,
-                                const int16_t* scan,
-                                const int16_t* iscan);
-void aom_highbd_quantize_b_avx2(const tran_low_t* coeff_ptr,
-                                intptr_t n_coeffs,
-                                const int16_t* zbin_ptr,
-                                const int16_t* round_ptr,
-                                const int16_t* quant_ptr,
-                                const int16_t* quant_shift_ptr,
-                                tran_low_t* qcoeff_ptr,
-                                tran_low_t* dqcoeff_ptr,
-                                const int16_t* dequant_ptr,
-                                uint16_t* eob_ptr,
-                                const int16_t* scan,
-                                const int16_t* iscan);
-RTCD_EXTERN void (*aom_highbd_quantize_b)(const tran_low_t* coeff_ptr,
-                                          intptr_t n_coeffs,
-                                          const int16_t* zbin_ptr,
-                                          const int16_t* round_ptr,
-                                          const int16_t* quant_ptr,
-                                          const int16_t* quant_shift_ptr,
-                                          tran_low_t* qcoeff_ptr,
-                                          tran_low_t* dqcoeff_ptr,
-                                          const int16_t* dequant_ptr,
-                                          uint16_t* eob_ptr,
-                                          const int16_t* scan,
-                                          const int16_t* iscan);
-
-void aom_highbd_quantize_b_32x32_c(const tran_low_t* coeff_ptr,
-                                   intptr_t n_coeffs,
-                                   const int16_t* zbin_ptr,
-                                   const int16_t* round_ptr,
-                                   const int16_t* quant_ptr,
-                                   const int16_t* quant_shift_ptr,
-                                   tran_low_t* qcoeff_ptr,
-                                   tran_low_t* dqcoeff_ptr,
-                                   const int16_t* dequant_ptr,
-                                   uint16_t* eob_ptr,
-                                   const int16_t* scan,
-                                   const int16_t* iscan);
-void aom_highbd_quantize_b_32x32_sse2(const tran_low_t* coeff_ptr,
-                                      intptr_t n_coeffs,
-                                      const int16_t* zbin_ptr,
-                                      const int16_t* round_ptr,
-                                      const int16_t* quant_ptr,
-                                      const int16_t* quant_shift_ptr,
-                                      tran_low_t* qcoeff_ptr,
-                                      tran_low_t* dqcoeff_ptr,
-                                      const int16_t* dequant_ptr,
-                                      uint16_t* eob_ptr,
-                                      const int16_t* scan,
-                                      const int16_t* iscan);
-#define aom_highbd_quantize_b_32x32 aom_highbd_quantize_b_32x32_sse2
-
-void aom_highbd_quantize_b_32x32_adaptive_c(const tran_low_t* coeff_ptr,
-                                            intptr_t n_coeffs,
-                                            const int16_t* zbin_ptr,
-                                            const int16_t* round_ptr,
-                                            const int16_t* quant_ptr,
-                                            const int16_t* quant_shift_ptr,
-                                            tran_low_t* qcoeff_ptr,
-                                            tran_low_t* dqcoeff_ptr,
-                                            const int16_t* dequant_ptr,
-                                            uint16_t* eob_ptr,
-                                            const int16_t* scan,
-                                            const int16_t* iscan);
-void aom_highbd_quantize_b_32x32_adaptive_sse2(const tran_low_t* coeff_ptr,
-                                               intptr_t n_coeffs,
-                                               const int16_t* zbin_ptr,
-                                               const int16_t* round_ptr,
-                                               const int16_t* quant_ptr,
-                                               const int16_t* quant_shift_ptr,
-                                               tran_low_t* qcoeff_ptr,
-                                               tran_low_t* dqcoeff_ptr,
-                                               const int16_t* dequant_ptr,
-                                               uint16_t* eob_ptr,
-                                               const int16_t* scan,
-                                               const int16_t* iscan);
-void aom_highbd_quantize_b_32x32_adaptive_avx2(const tran_low_t* coeff_ptr,
-                                               intptr_t n_coeffs,
-                                               const int16_t* zbin_ptr,
-                                               const int16_t* round_ptr,
-                                               const int16_t* quant_ptr,
-                                               const int16_t* quant_shift_ptr,
-                                               tran_low_t* qcoeff_ptr,
-                                               tran_low_t* dqcoeff_ptr,
-                                               const int16_t* dequant_ptr,
-                                               uint16_t* eob_ptr,
-                                               const int16_t* scan,
-                                               const int16_t* iscan);
-RTCD_EXTERN void (*aom_highbd_quantize_b_32x32_adaptive)(
-    const tran_low_t* coeff_ptr,
-    intptr_t n_coeffs,
-    const int16_t* zbin_ptr,
-    const int16_t* round_ptr,
-    const int16_t* quant_ptr,
-    const int16_t* quant_shift_ptr,
-    tran_low_t* qcoeff_ptr,
-    tran_low_t* dqcoeff_ptr,
-    const int16_t* dequant_ptr,
-    uint16_t* eob_ptr,
-    const int16_t* scan,
-    const int16_t* iscan);
-
-void aom_highbd_quantize_b_64x64_c(const tran_low_t* coeff_ptr,
-                                   intptr_t n_coeffs,
-                                   const int16_t* zbin_ptr,
-                                   const int16_t* round_ptr,
-                                   const int16_t* quant_ptr,
-                                   const int16_t* quant_shift_ptr,
-                                   tran_low_t* qcoeff_ptr,
-                                   tran_low_t* dqcoeff_ptr,
-                                   const int16_t* dequant_ptr,
-                                   uint16_t* eob_ptr,
-                                   const int16_t* scan,
-                                   const int16_t* iscan);
-void aom_highbd_quantize_b_64x64_sse2(const tran_low_t* coeff_ptr,
-                                      intptr_t n_coeffs,
-                                      const int16_t* zbin_ptr,
-                                      const int16_t* round_ptr,
-                                      const int16_t* quant_ptr,
-                                      const int16_t* quant_shift_ptr,
-                                      tran_low_t* qcoeff_ptr,
-                                      tran_low_t* dqcoeff_ptr,
-                                      const int16_t* dequant_ptr,
-                                      uint16_t* eob_ptr,
-                                      const int16_t* scan,
-                                      const int16_t* iscan);
-#define aom_highbd_quantize_b_64x64 aom_highbd_quantize_b_64x64_sse2
-
-void aom_highbd_quantize_b_64x64_adaptive_c(const tran_low_t* coeff_ptr,
-                                            intptr_t n_coeffs,
-                                            const int16_t* zbin_ptr,
-                                            const int16_t* round_ptr,
-                                            const int16_t* quant_ptr,
-                                            const int16_t* quant_shift_ptr,
-                                            tran_low_t* qcoeff_ptr,
-                                            tran_low_t* dqcoeff_ptr,
-                                            const int16_t* dequant_ptr,
-                                            uint16_t* eob_ptr,
-                                            const int16_t* scan,
-                                            const int16_t* iscan);
-void aom_highbd_quantize_b_64x64_adaptive_sse2(const tran_low_t* coeff_ptr,
-                                               intptr_t n_coeffs,
-                                               const int16_t* zbin_ptr,
-                                               const int16_t* round_ptr,
-                                               const int16_t* quant_ptr,
-                                               const int16_t* quant_shift_ptr,
-                                               tran_low_t* qcoeff_ptr,
-                                               tran_low_t* dqcoeff_ptr,
-                                               const int16_t* dequant_ptr,
-                                               uint16_t* eob_ptr,
-                                               const int16_t* scan,
-                                               const int16_t* iscan);
-#define aom_highbd_quantize_b_64x64_adaptive \
-  aom_highbd_quantize_b_64x64_adaptive_sse2
-
-void aom_highbd_quantize_b_adaptive_c(const tran_low_t* coeff_ptr,
-                                      intptr_t n_coeffs,
-                                      const int16_t* zbin_ptr,
-                                      const int16_t* round_ptr,
-                                      const int16_t* quant_ptr,
-                                      const int16_t* quant_shift_ptr,
-                                      tran_low_t* qcoeff_ptr,
-                                      tran_low_t* dqcoeff_ptr,
-                                      const int16_t* dequant_ptr,
-                                      uint16_t* eob_ptr,
-                                      const int16_t* scan,
-                                      const int16_t* iscan);
-void aom_highbd_quantize_b_adaptive_sse2(const tran_low_t* coeff_ptr,
-                                         intptr_t n_coeffs,
-                                         const int16_t* zbin_ptr,
-                                         const int16_t* round_ptr,
-                                         const int16_t* quant_ptr,
-                                         const int16_t* quant_shift_ptr,
-                                         tran_low_t* qcoeff_ptr,
-                                         tran_low_t* dqcoeff_ptr,
-                                         const int16_t* dequant_ptr,
-                                         uint16_t* eob_ptr,
-                                         const int16_t* scan,
-                                         const int16_t* iscan);
-void aom_highbd_quantize_b_adaptive_avx2(const tran_low_t* coeff_ptr,
-                                         intptr_t n_coeffs,
-                                         const int16_t* zbin_ptr,
-                                         const int16_t* round_ptr,
-                                         const int16_t* quant_ptr,
-                                         const int16_t* quant_shift_ptr,
-                                         tran_low_t* qcoeff_ptr,
-                                         tran_low_t* dqcoeff_ptr,
-                                         const int16_t* dequant_ptr,
-                                         uint16_t* eob_ptr,
-                                         const int16_t* scan,
-                                         const int16_t* iscan);
-RTCD_EXTERN void (*aom_highbd_quantize_b_adaptive)(
-    const tran_low_t* coeff_ptr,
-    intptr_t n_coeffs,
-    const int16_t* zbin_ptr,
-    const int16_t* round_ptr,
-    const int16_t* quant_ptr,
-    const int16_t* quant_shift_ptr,
-    tran_low_t* qcoeff_ptr,
-    tran_low_t* dqcoeff_ptr,
-    const int16_t* dequant_ptr,
-    uint16_t* eob_ptr,
-    const int16_t* scan,
-    const int16_t* iscan);
-
-unsigned int aom_highbd_sad128x128_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride);
-unsigned int aom_highbd_sad128x128_avx2(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad128x128)(const uint8_t* src_ptr,
-                                                  int src_stride,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride);
-
-unsigned int aom_highbd_sad128x128_avg_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         const uint8_t* second_pred);
-unsigned int aom_highbd_sad128x128_avg_avx2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            const uint8_t* second_pred);
-RTCD_EXTERN unsigned int (*aom_highbd_sad128x128_avg)(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred);
-
-void aom_highbd_sad128x128x4d_c(const uint8_t* src_ptr,
-                                int src_stride,
-                                const uint8_t* const ref_ptr[],
-                                int ref_stride,
-                                uint32_t* sad_array);
-void aom_highbd_sad128x128x4d_avx2(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad128x128x4d)(const uint8_t* src_ptr,
-                                             int src_stride,
-                                             const uint8_t* const ref_ptr[],
-                                             int ref_stride,
-                                             uint32_t* sad_array);
-
-unsigned int aom_highbd_sad128x64_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* ref_ptr,
-                                    int ref_stride);
-unsigned int aom_highbd_sad128x64_avx2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad128x64)(const uint8_t* src_ptr,
-                                                 int src_stride,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride);
-
-unsigned int aom_highbd_sad128x64_avg_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        const uint8_t* second_pred);
-unsigned int aom_highbd_sad128x64_avg_avx2(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           const uint8_t* second_pred);
-RTCD_EXTERN unsigned int (*aom_highbd_sad128x64_avg)(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred);
-
-void aom_highbd_sad128x64x4d_c(const uint8_t* src_ptr,
-                               int src_stride,
-                               const uint8_t* const ref_ptr[],
-                               int ref_stride,
-                               uint32_t* sad_array);
-void aom_highbd_sad128x64x4d_avx2(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* const ref_ptr[],
-                                  int ref_stride,
-                                  uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad128x64x4d)(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* const ref_ptr[],
-                                            int ref_stride,
-                                            uint32_t* sad_array);
-
-unsigned int aom_highbd_sad16x16_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-unsigned int aom_highbd_sad16x16_sse2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-unsigned int aom_highbd_sad16x16_avx2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad16x16)(const uint8_t* src_ptr,
-                                                int src_stride,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride);
-
-unsigned int aom_highbd_sad16x16_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-unsigned int aom_highbd_sad16x16_avg_sse2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-unsigned int aom_highbd_sad16x16_avg_avx2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-RTCD_EXTERN unsigned int (*aom_highbd_sad16x16_avg)(const uint8_t* src_ptr,
-                                                    int src_stride,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    const uint8_t* second_pred);
-
-void aom_highbd_sad16x16x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-void aom_highbd_sad16x16x4d_sse2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-void aom_highbd_sad16x16x4d_avx2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad16x16x4d)(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* const ref_ptr[],
-                                           int ref_stride,
-                                           uint32_t* sad_array);
-
-unsigned int aom_highbd_sad16x32_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-unsigned int aom_highbd_sad16x32_sse2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-unsigned int aom_highbd_sad16x32_avx2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad16x32)(const uint8_t* src_ptr,
-                                                int src_stride,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride);
-
-unsigned int aom_highbd_sad16x32_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-unsigned int aom_highbd_sad16x32_avg_sse2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-unsigned int aom_highbd_sad16x32_avg_avx2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-RTCD_EXTERN unsigned int (*aom_highbd_sad16x32_avg)(const uint8_t* src_ptr,
-                                                    int src_stride,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    const uint8_t* second_pred);
-
-void aom_highbd_sad16x32x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-void aom_highbd_sad16x32x4d_sse2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-void aom_highbd_sad16x32x4d_avx2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad16x32x4d)(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* const ref_ptr[],
-                                           int ref_stride,
-                                           uint32_t* sad_array);
-
-unsigned int aom_highbd_sad16x4_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-unsigned int aom_highbd_sad16x4_sse2(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride);
-unsigned int aom_highbd_sad16x4_avx2(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad16x4)(const uint8_t* src_ptr,
-                                               int src_stride,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride);
-
-unsigned int aom_highbd_sad16x4_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-unsigned int aom_highbd_sad16x4_avg_sse2(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         const uint8_t* second_pred);
-unsigned int aom_highbd_sad16x4_avg_avx2(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         const uint8_t* second_pred);
-RTCD_EXTERN unsigned int (*aom_highbd_sad16x4_avg)(const uint8_t* src_ptr,
-                                                   int src_stride,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   const uint8_t* second_pred);
-
-void aom_highbd_sad16x4x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-void aom_highbd_sad16x4x4d_sse2(const uint8_t* src_ptr,
-                                int src_stride,
-                                const uint8_t* const ref_ptr[],
-                                int ref_stride,
-                                uint32_t* sad_array);
-void aom_highbd_sad16x4x4d_avx2(const uint8_t* src_ptr,
-                                int src_stride,
-                                const uint8_t* const ref_ptr[],
-                                int ref_stride,
-                                uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad16x4x4d)(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* const ref_ptr[],
-                                          int ref_stride,
-                                          uint32_t* sad_array);
-
-unsigned int aom_highbd_sad16x64_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-unsigned int aom_highbd_sad16x64_sse2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-unsigned int aom_highbd_sad16x64_avx2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad16x64)(const uint8_t* src_ptr,
-                                                int src_stride,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride);
-
-unsigned int aom_highbd_sad16x64_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-unsigned int aom_highbd_sad16x64_avg_sse2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-unsigned int aom_highbd_sad16x64_avg_avx2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-RTCD_EXTERN unsigned int (*aom_highbd_sad16x64_avg)(const uint8_t* src_ptr,
-                                                    int src_stride,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    const uint8_t* second_pred);
-
-void aom_highbd_sad16x64x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-void aom_highbd_sad16x64x4d_sse2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-void aom_highbd_sad16x64x4d_avx2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad16x64x4d)(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* const ref_ptr[],
-                                           int ref_stride,
-                                           uint32_t* sad_array);
-
-unsigned int aom_highbd_sad16x8_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-unsigned int aom_highbd_sad16x8_sse2(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride);
-unsigned int aom_highbd_sad16x8_avx2(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad16x8)(const uint8_t* src_ptr,
-                                               int src_stride,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride);
-
-unsigned int aom_highbd_sad16x8_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-unsigned int aom_highbd_sad16x8_avg_sse2(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         const uint8_t* second_pred);
-unsigned int aom_highbd_sad16x8_avg_avx2(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         const uint8_t* second_pred);
-RTCD_EXTERN unsigned int (*aom_highbd_sad16x8_avg)(const uint8_t* src_ptr,
-                                                   int src_stride,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   const uint8_t* second_pred);
-
-void aom_highbd_sad16x8x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-void aom_highbd_sad16x8x4d_sse2(const uint8_t* src_ptr,
-                                int src_stride,
-                                const uint8_t* const ref_ptr[],
-                                int ref_stride,
-                                uint32_t* sad_array);
-void aom_highbd_sad16x8x4d_avx2(const uint8_t* src_ptr,
-                                int src_stride,
-                                const uint8_t* const ref_ptr[],
-                                int ref_stride,
-                                uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad16x8x4d)(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* const ref_ptr[],
-                                          int ref_stride,
-                                          uint32_t* sad_array);
-
-unsigned int aom_highbd_sad32x16_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-unsigned int aom_highbd_sad32x16_sse2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-unsigned int aom_highbd_sad32x16_avx2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad32x16)(const uint8_t* src_ptr,
-                                                int src_stride,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride);
-
-unsigned int aom_highbd_sad32x16_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-unsigned int aom_highbd_sad32x16_avg_sse2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-unsigned int aom_highbd_sad32x16_avg_avx2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-RTCD_EXTERN unsigned int (*aom_highbd_sad32x16_avg)(const uint8_t* src_ptr,
-                                                    int src_stride,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    const uint8_t* second_pred);
-
-void aom_highbd_sad32x16x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-void aom_highbd_sad32x16x4d_sse2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-void aom_highbd_sad32x16x4d_avx2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad32x16x4d)(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* const ref_ptr[],
-                                           int ref_stride,
-                                           uint32_t* sad_array);
-
-unsigned int aom_highbd_sad32x32_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-unsigned int aom_highbd_sad32x32_sse2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-unsigned int aom_highbd_sad32x32_avx2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad32x32)(const uint8_t* src_ptr,
-                                                int src_stride,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride);
-
-unsigned int aom_highbd_sad32x32_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-unsigned int aom_highbd_sad32x32_avg_sse2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-unsigned int aom_highbd_sad32x32_avg_avx2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-RTCD_EXTERN unsigned int (*aom_highbd_sad32x32_avg)(const uint8_t* src_ptr,
-                                                    int src_stride,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    const uint8_t* second_pred);
-
-void aom_highbd_sad32x32x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-void aom_highbd_sad32x32x4d_sse2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-void aom_highbd_sad32x32x4d_avx2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad32x32x4d)(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* const ref_ptr[],
-                                           int ref_stride,
-                                           uint32_t* sad_array);
-
-unsigned int aom_highbd_sad32x64_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-unsigned int aom_highbd_sad32x64_sse2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-unsigned int aom_highbd_sad32x64_avx2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad32x64)(const uint8_t* src_ptr,
-                                                int src_stride,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride);
-
-unsigned int aom_highbd_sad32x64_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-unsigned int aom_highbd_sad32x64_avg_sse2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-unsigned int aom_highbd_sad32x64_avg_avx2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-RTCD_EXTERN unsigned int (*aom_highbd_sad32x64_avg)(const uint8_t* src_ptr,
-                                                    int src_stride,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    const uint8_t* second_pred);
-
-void aom_highbd_sad32x64x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-void aom_highbd_sad32x64x4d_sse2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-void aom_highbd_sad32x64x4d_avx2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad32x64x4d)(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* const ref_ptr[],
-                                           int ref_stride,
-                                           uint32_t* sad_array);
-
-unsigned int aom_highbd_sad32x8_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-unsigned int aom_highbd_sad32x8_sse2(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride);
-unsigned int aom_highbd_sad32x8_avx2(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad32x8)(const uint8_t* src_ptr,
-                                               int src_stride,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride);
-
-unsigned int aom_highbd_sad32x8_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-unsigned int aom_highbd_sad32x8_avg_sse2(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         const uint8_t* second_pred);
-unsigned int aom_highbd_sad32x8_avg_avx2(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         const uint8_t* second_pred);
-RTCD_EXTERN unsigned int (*aom_highbd_sad32x8_avg)(const uint8_t* src_ptr,
-                                                   int src_stride,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   const uint8_t* second_pred);
-
-void aom_highbd_sad32x8x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-void aom_highbd_sad32x8x4d_sse2(const uint8_t* src_ptr,
-                                int src_stride,
-                                const uint8_t* const ref_ptr[],
-                                int ref_stride,
-                                uint32_t* sad_array);
-void aom_highbd_sad32x8x4d_avx2(const uint8_t* src_ptr,
-                                int src_stride,
-                                const uint8_t* const ref_ptr[],
-                                int ref_stride,
-                                uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad32x8x4d)(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* const ref_ptr[],
-                                          int ref_stride,
-                                          uint32_t* sad_array);
-
-unsigned int aom_highbd_sad4x16_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-unsigned int aom_highbd_sad4x16_sse2(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride);
-#define aom_highbd_sad4x16 aom_highbd_sad4x16_sse2
-
-unsigned int aom_highbd_sad4x16_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-unsigned int aom_highbd_sad4x16_avg_sse2(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         const uint8_t* second_pred);
-#define aom_highbd_sad4x16_avg aom_highbd_sad4x16_avg_sse2
-
-void aom_highbd_sad4x16x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-void aom_highbd_sad4x16x4d_sse2(const uint8_t* src_ptr,
-                                int src_stride,
-                                const uint8_t* const ref_ptr[],
-                                int ref_stride,
-                                uint32_t* sad_array);
-#define aom_highbd_sad4x16x4d aom_highbd_sad4x16x4d_sse2
-
-unsigned int aom_highbd_sad4x4_c(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride);
-unsigned int aom_highbd_sad4x4_sse2(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* ref_ptr,
-                                    int ref_stride);
-#define aom_highbd_sad4x4 aom_highbd_sad4x4_sse2
-
-unsigned int aom_highbd_sad4x4_avg_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride,
-                                     const uint8_t* second_pred);
-unsigned int aom_highbd_sad4x4_avg_sse2(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        const uint8_t* second_pred);
-#define aom_highbd_sad4x4_avg aom_highbd_sad4x4_avg_sse2
-
-void aom_highbd_sad4x4x4d_c(const uint8_t* src_ptr,
-                            int src_stride,
-                            const uint8_t* const ref_ptr[],
-                            int ref_stride,
-                            uint32_t* sad_array);
-void aom_highbd_sad4x4x4d_sse2(const uint8_t* src_ptr,
-                               int src_stride,
-                               const uint8_t* const ref_ptr[],
-                               int ref_stride,
-                               uint32_t* sad_array);
-#define aom_highbd_sad4x4x4d aom_highbd_sad4x4x4d_sse2
-
-unsigned int aom_highbd_sad4x8_c(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride);
-unsigned int aom_highbd_sad4x8_sse2(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* ref_ptr,
-                                    int ref_stride);
-#define aom_highbd_sad4x8 aom_highbd_sad4x8_sse2
-
-unsigned int aom_highbd_sad4x8_avg_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride,
-                                     const uint8_t* second_pred);
-unsigned int aom_highbd_sad4x8_avg_sse2(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        const uint8_t* second_pred);
-#define aom_highbd_sad4x8_avg aom_highbd_sad4x8_avg_sse2
-
-void aom_highbd_sad4x8x4d_c(const uint8_t* src_ptr,
-                            int src_stride,
-                            const uint8_t* const ref_ptr[],
-                            int ref_stride,
-                            uint32_t* sad_array);
-void aom_highbd_sad4x8x4d_sse2(const uint8_t* src_ptr,
-                               int src_stride,
-                               const uint8_t* const ref_ptr[],
-                               int ref_stride,
-                               uint32_t* sad_array);
-#define aom_highbd_sad4x8x4d aom_highbd_sad4x8x4d_sse2
-
-unsigned int aom_highbd_sad64x128_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* ref_ptr,
-                                    int ref_stride);
-unsigned int aom_highbd_sad64x128_avx2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad64x128)(const uint8_t* src_ptr,
-                                                 int src_stride,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride);
-
-unsigned int aom_highbd_sad64x128_avg_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        const uint8_t* second_pred);
-unsigned int aom_highbd_sad64x128_avg_avx2(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           const uint8_t* second_pred);
-RTCD_EXTERN unsigned int (*aom_highbd_sad64x128_avg)(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred);
-
-void aom_highbd_sad64x128x4d_c(const uint8_t* src_ptr,
-                               int src_stride,
-                               const uint8_t* const ref_ptr[],
-                               int ref_stride,
-                               uint32_t* sad_array);
-void aom_highbd_sad64x128x4d_avx2(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* const ref_ptr[],
-                                  int ref_stride,
-                                  uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad64x128x4d)(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* const ref_ptr[],
-                                            int ref_stride,
-                                            uint32_t* sad_array);
-
-unsigned int aom_highbd_sad64x16_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-unsigned int aom_highbd_sad64x16_sse2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-unsigned int aom_highbd_sad64x16_avx2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad64x16)(const uint8_t* src_ptr,
-                                                int src_stride,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride);
-
-unsigned int aom_highbd_sad64x16_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-unsigned int aom_highbd_sad64x16_avg_sse2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-unsigned int aom_highbd_sad64x16_avg_avx2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-RTCD_EXTERN unsigned int (*aom_highbd_sad64x16_avg)(const uint8_t* src_ptr,
-                                                    int src_stride,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    const uint8_t* second_pred);
-
-void aom_highbd_sad64x16x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-void aom_highbd_sad64x16x4d_sse2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-void aom_highbd_sad64x16x4d_avx2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad64x16x4d)(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* const ref_ptr[],
-                                           int ref_stride,
-                                           uint32_t* sad_array);
-
-unsigned int aom_highbd_sad64x32_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-unsigned int aom_highbd_sad64x32_sse2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-unsigned int aom_highbd_sad64x32_avx2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad64x32)(const uint8_t* src_ptr,
-                                                int src_stride,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride);
-
-unsigned int aom_highbd_sad64x32_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-unsigned int aom_highbd_sad64x32_avg_sse2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-unsigned int aom_highbd_sad64x32_avg_avx2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-RTCD_EXTERN unsigned int (*aom_highbd_sad64x32_avg)(const uint8_t* src_ptr,
-                                                    int src_stride,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    const uint8_t* second_pred);
-
-void aom_highbd_sad64x32x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-void aom_highbd_sad64x32x4d_sse2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-void aom_highbd_sad64x32x4d_avx2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad64x32x4d)(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* const ref_ptr[],
-                                           int ref_stride,
-                                           uint32_t* sad_array);
-
-unsigned int aom_highbd_sad64x64_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-unsigned int aom_highbd_sad64x64_sse2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-unsigned int aom_highbd_sad64x64_avx2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad64x64)(const uint8_t* src_ptr,
-                                                int src_stride,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride);
-
-unsigned int aom_highbd_sad64x64_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-unsigned int aom_highbd_sad64x64_avg_sse2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-unsigned int aom_highbd_sad64x64_avg_avx2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-RTCD_EXTERN unsigned int (*aom_highbd_sad64x64_avg)(const uint8_t* src_ptr,
-                                                    int src_stride,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    const uint8_t* second_pred);
-
-void aom_highbd_sad64x64x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-void aom_highbd_sad64x64x4d_sse2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-void aom_highbd_sad64x64x4d_avx2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad64x64x4d)(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* const ref_ptr[],
-                                           int ref_stride,
-                                           uint32_t* sad_array);
-
-unsigned int aom_highbd_sad8x16_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-unsigned int aom_highbd_sad8x16_sse2(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride);
-#define aom_highbd_sad8x16 aom_highbd_sad8x16_sse2
-
-unsigned int aom_highbd_sad8x16_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-unsigned int aom_highbd_sad8x16_avg_sse2(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         const uint8_t* second_pred);
-#define aom_highbd_sad8x16_avg aom_highbd_sad8x16_avg_sse2
-
-void aom_highbd_sad8x16x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-void aom_highbd_sad8x16x4d_sse2(const uint8_t* src_ptr,
-                                int src_stride,
-                                const uint8_t* const ref_ptr[],
-                                int ref_stride,
-                                uint32_t* sad_array);
-#define aom_highbd_sad8x16x4d aom_highbd_sad8x16x4d_sse2
-
-unsigned int aom_highbd_sad8x32_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-unsigned int aom_highbd_sad8x32_sse2(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride);
-#define aom_highbd_sad8x32 aom_highbd_sad8x32_sse2
-
-unsigned int aom_highbd_sad8x32_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-unsigned int aom_highbd_sad8x32_avg_sse2(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         const uint8_t* second_pred);
-#define aom_highbd_sad8x32_avg aom_highbd_sad8x32_avg_sse2
-
-void aom_highbd_sad8x32x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-void aom_highbd_sad8x32x4d_sse2(const uint8_t* src_ptr,
-                                int src_stride,
-                                const uint8_t* const ref_ptr[],
-                                int ref_stride,
-                                uint32_t* sad_array);
-#define aom_highbd_sad8x32x4d aom_highbd_sad8x32x4d_sse2
-
-unsigned int aom_highbd_sad8x4_c(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride);
-unsigned int aom_highbd_sad8x4_sse2(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* ref_ptr,
-                                    int ref_stride);
-#define aom_highbd_sad8x4 aom_highbd_sad8x4_sse2
-
-unsigned int aom_highbd_sad8x4_avg_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride,
-                                     const uint8_t* second_pred);
-unsigned int aom_highbd_sad8x4_avg_sse2(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        const uint8_t* second_pred);
-#define aom_highbd_sad8x4_avg aom_highbd_sad8x4_avg_sse2
-
-void aom_highbd_sad8x4x4d_c(const uint8_t* src_ptr,
-                            int src_stride,
-                            const uint8_t* const ref_ptr[],
-                            int ref_stride,
-                            uint32_t* sad_array);
-void aom_highbd_sad8x4x4d_sse2(const uint8_t* src_ptr,
-                               int src_stride,
-                               const uint8_t* const ref_ptr[],
-                               int ref_stride,
-                               uint32_t* sad_array);
-#define aom_highbd_sad8x4x4d aom_highbd_sad8x4x4d_sse2
-
-unsigned int aom_highbd_sad8x8_c(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride);
-unsigned int aom_highbd_sad8x8_sse2(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* ref_ptr,
-                                    int ref_stride);
-#define aom_highbd_sad8x8 aom_highbd_sad8x8_sse2
-
-unsigned int aom_highbd_sad8x8_avg_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride,
-                                     const uint8_t* second_pred);
-unsigned int aom_highbd_sad8x8_avg_sse2(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        const uint8_t* second_pred);
-#define aom_highbd_sad8x8_avg aom_highbd_sad8x8_avg_sse2
-
-void aom_highbd_sad8x8x4d_c(const uint8_t* src_ptr,
-                            int src_stride,
-                            const uint8_t* const ref_ptr[],
-                            int ref_stride,
-                            uint32_t* sad_array);
-void aom_highbd_sad8x8x4d_sse2(const uint8_t* src_ptr,
-                               int src_stride,
-                               const uint8_t* const ref_ptr[],
-                               int ref_stride,
-                               uint32_t* sad_array);
-#define aom_highbd_sad8x8x4d aom_highbd_sad8x8x4d_sse2
-
-unsigned int aom_highbd_sad_skip_128x128_c(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride);
-unsigned int aom_highbd_sad_skip_128x128_avx2(const uint8_t* src_ptr,
-                                              int src_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad_skip_128x128)(const uint8_t* src_ptr,
-                                                        int src_stride,
-                                                        const uint8_t* ref_ptr,
-                                                        int ref_stride);
-
-void aom_highbd_sad_skip_128x128x4d_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* const ref_ptr[],
-                                      int ref_stride,
-                                      uint32_t* sad_array);
-void aom_highbd_sad_skip_128x128x4d_avx2(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* const ref_ptr[],
-                                         int ref_stride,
-                                         uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad_skip_128x128x4d)(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* const ref_ptr[],
-    int ref_stride,
-    uint32_t* sad_array);
-
-unsigned int aom_highbd_sad_skip_128x64_c(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride);
-unsigned int aom_highbd_sad_skip_128x64_avx2(const uint8_t* src_ptr,
-                                             int src_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad_skip_128x64)(const uint8_t* src_ptr,
-                                                       int src_stride,
-                                                       const uint8_t* ref_ptr,
-                                                       int ref_stride);
-
-void aom_highbd_sad_skip_128x64x4d_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* const ref_ptr[],
-                                     int ref_stride,
-                                     uint32_t* sad_array);
-void aom_highbd_sad_skip_128x64x4d_avx2(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* const ref_ptr[],
-                                        int ref_stride,
-                                        uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad_skip_128x64x4d)(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* const ref_ptr[],
-    int ref_stride,
-    uint32_t* sad_array);
-
-unsigned int aom_highbd_sad_skip_16x16_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-unsigned int aom_highbd_sad_skip_16x16_sse2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-unsigned int aom_highbd_sad_skip_16x16_avx2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad_skip_16x16)(const uint8_t* src_ptr,
-                                                      int src_stride,
-                                                      const uint8_t* ref_ptr,
-                                                      int ref_stride);
-
-void aom_highbd_sad_skip_16x16x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-void aom_highbd_sad_skip_16x16x4d_sse2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-void aom_highbd_sad_skip_16x16x4d_avx2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad_skip_16x16x4d)(const uint8_t* src_ptr,
-                                                 int src_stride,
-                                                 const uint8_t* const ref_ptr[],
-                                                 int ref_stride,
-                                                 uint32_t* sad_array);
-
-unsigned int aom_highbd_sad_skip_16x32_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-unsigned int aom_highbd_sad_skip_16x32_sse2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-unsigned int aom_highbd_sad_skip_16x32_avx2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad_skip_16x32)(const uint8_t* src_ptr,
-                                                      int src_stride,
-                                                      const uint8_t* ref_ptr,
-                                                      int ref_stride);
-
-void aom_highbd_sad_skip_16x32x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-void aom_highbd_sad_skip_16x32x4d_sse2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-void aom_highbd_sad_skip_16x32x4d_avx2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad_skip_16x32x4d)(const uint8_t* src_ptr,
-                                                 int src_stride,
-                                                 const uint8_t* const ref_ptr[],
-                                                 int ref_stride,
-                                                 uint32_t* sad_array);
-
-unsigned int aom_highbd_sad_skip_16x4_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-#define aom_highbd_sad_skip_16x4 aom_highbd_sad_skip_16x4_c
-
-void aom_highbd_sad_skip_16x4x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-#define aom_highbd_sad_skip_16x4x4d aom_highbd_sad_skip_16x4x4d_c
-
-unsigned int aom_highbd_sad_skip_16x64_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-unsigned int aom_highbd_sad_skip_16x64_sse2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-unsigned int aom_highbd_sad_skip_16x64_avx2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad_skip_16x64)(const uint8_t* src_ptr,
-                                                      int src_stride,
-                                                      const uint8_t* ref_ptr,
-                                                      int ref_stride);
-
-void aom_highbd_sad_skip_16x64x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-void aom_highbd_sad_skip_16x64x4d_sse2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-void aom_highbd_sad_skip_16x64x4d_avx2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad_skip_16x64x4d)(const uint8_t* src_ptr,
-                                                 int src_stride,
-                                                 const uint8_t* const ref_ptr[],
-                                                 int ref_stride,
-                                                 uint32_t* sad_array);
-
-unsigned int aom_highbd_sad_skip_16x8_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-unsigned int aom_highbd_sad_skip_16x8_sse2(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride);
-unsigned int aom_highbd_sad_skip_16x8_avx2(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad_skip_16x8)(const uint8_t* src_ptr,
-                                                     int src_stride,
-                                                     const uint8_t* ref_ptr,
-                                                     int ref_stride);
-
-void aom_highbd_sad_skip_16x8x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-void aom_highbd_sad_skip_16x8x4d_sse2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* const ref_ptr[],
-                                      int ref_stride,
-                                      uint32_t* sad_array);
-void aom_highbd_sad_skip_16x8x4d_avx2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* const ref_ptr[],
-                                      int ref_stride,
-                                      uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad_skip_16x8x4d)(const uint8_t* src_ptr,
-                                                int src_stride,
-                                                const uint8_t* const ref_ptr[],
-                                                int ref_stride,
-                                                uint32_t* sad_array);
-
-unsigned int aom_highbd_sad_skip_32x16_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-unsigned int aom_highbd_sad_skip_32x16_sse2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-unsigned int aom_highbd_sad_skip_32x16_avx2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad_skip_32x16)(const uint8_t* src_ptr,
-                                                      int src_stride,
-                                                      const uint8_t* ref_ptr,
-                                                      int ref_stride);
-
-void aom_highbd_sad_skip_32x16x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-void aom_highbd_sad_skip_32x16x4d_sse2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-void aom_highbd_sad_skip_32x16x4d_avx2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad_skip_32x16x4d)(const uint8_t* src_ptr,
-                                                 int src_stride,
-                                                 const uint8_t* const ref_ptr[],
-                                                 int ref_stride,
-                                                 uint32_t* sad_array);
-
-unsigned int aom_highbd_sad_skip_32x32_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-unsigned int aom_highbd_sad_skip_32x32_sse2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-unsigned int aom_highbd_sad_skip_32x32_avx2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad_skip_32x32)(const uint8_t* src_ptr,
-                                                      int src_stride,
-                                                      const uint8_t* ref_ptr,
-                                                      int ref_stride);
-
-void aom_highbd_sad_skip_32x32x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-void aom_highbd_sad_skip_32x32x4d_sse2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-void aom_highbd_sad_skip_32x32x4d_avx2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad_skip_32x32x4d)(const uint8_t* src_ptr,
-                                                 int src_stride,
-                                                 const uint8_t* const ref_ptr[],
-                                                 int ref_stride,
-                                                 uint32_t* sad_array);
-
-unsigned int aom_highbd_sad_skip_32x64_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-unsigned int aom_highbd_sad_skip_32x64_sse2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-unsigned int aom_highbd_sad_skip_32x64_avx2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad_skip_32x64)(const uint8_t* src_ptr,
-                                                      int src_stride,
-                                                      const uint8_t* ref_ptr,
-                                                      int ref_stride);
-
-void aom_highbd_sad_skip_32x64x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-void aom_highbd_sad_skip_32x64x4d_sse2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-void aom_highbd_sad_skip_32x64x4d_avx2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad_skip_32x64x4d)(const uint8_t* src_ptr,
-                                                 int src_stride,
-                                                 const uint8_t* const ref_ptr[],
-                                                 int ref_stride,
-                                                 uint32_t* sad_array);
-
-unsigned int aom_highbd_sad_skip_32x8_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-unsigned int aom_highbd_sad_skip_32x8_sse2(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride);
-unsigned int aom_highbd_sad_skip_32x8_avx2(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad_skip_32x8)(const uint8_t* src_ptr,
-                                                     int src_stride,
-                                                     const uint8_t* ref_ptr,
-                                                     int ref_stride);
-
-void aom_highbd_sad_skip_32x8x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-void aom_highbd_sad_skip_32x8x4d_sse2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* const ref_ptr[],
-                                      int ref_stride,
-                                      uint32_t* sad_array);
-void aom_highbd_sad_skip_32x8x4d_avx2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* const ref_ptr[],
-                                      int ref_stride,
-                                      uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad_skip_32x8x4d)(const uint8_t* src_ptr,
-                                                int src_stride,
-                                                const uint8_t* const ref_ptr[],
-                                                int ref_stride,
-                                                uint32_t* sad_array);
-
-unsigned int aom_highbd_sad_skip_4x16_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-unsigned int aom_highbd_sad_skip_4x16_sse2(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride);
-#define aom_highbd_sad_skip_4x16 aom_highbd_sad_skip_4x16_sse2
-
-void aom_highbd_sad_skip_4x16x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-void aom_highbd_sad_skip_4x16x4d_sse2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* const ref_ptr[],
-                                      int ref_stride,
-                                      uint32_t* sad_array);
-#define aom_highbd_sad_skip_4x16x4d aom_highbd_sad_skip_4x16x4d_sse2
-
-unsigned int aom_highbd_sad_skip_4x4_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride);
-#define aom_highbd_sad_skip_4x4 aom_highbd_sad_skip_4x4_c
-
-void aom_highbd_sad_skip_4x4x4d_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* const ref_ptr[],
-                                  int ref_stride,
-                                  uint32_t* sad_array);
-#define aom_highbd_sad_skip_4x4x4d aom_highbd_sad_skip_4x4x4d_c
-
-unsigned int aom_highbd_sad_skip_4x8_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride);
-unsigned int aom_highbd_sad_skip_4x8_sse2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride);
-#define aom_highbd_sad_skip_4x8 aom_highbd_sad_skip_4x8_sse2
-
-void aom_highbd_sad_skip_4x8x4d_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* const ref_ptr[],
-                                  int ref_stride,
-                                  uint32_t* sad_array);
-void aom_highbd_sad_skip_4x8x4d_sse2(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* const ref_ptr[],
-                                     int ref_stride,
-                                     uint32_t* sad_array);
-#define aom_highbd_sad_skip_4x8x4d aom_highbd_sad_skip_4x8x4d_sse2
-
-unsigned int aom_highbd_sad_skip_64x128_c(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride);
-unsigned int aom_highbd_sad_skip_64x128_avx2(const uint8_t* src_ptr,
-                                             int src_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad_skip_64x128)(const uint8_t* src_ptr,
-                                                       int src_stride,
-                                                       const uint8_t* ref_ptr,
-                                                       int ref_stride);
-
-void aom_highbd_sad_skip_64x128x4d_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* const ref_ptr[],
-                                     int ref_stride,
-                                     uint32_t* sad_array);
-void aom_highbd_sad_skip_64x128x4d_avx2(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* const ref_ptr[],
-                                        int ref_stride,
-                                        uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad_skip_64x128x4d)(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* const ref_ptr[],
-    int ref_stride,
-    uint32_t* sad_array);
-
-unsigned int aom_highbd_sad_skip_64x16_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-unsigned int aom_highbd_sad_skip_64x16_sse2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-unsigned int aom_highbd_sad_skip_64x16_avx2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad_skip_64x16)(const uint8_t* src_ptr,
-                                                      int src_stride,
-                                                      const uint8_t* ref_ptr,
-                                                      int ref_stride);
-
-void aom_highbd_sad_skip_64x16x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-void aom_highbd_sad_skip_64x16x4d_sse2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-void aom_highbd_sad_skip_64x16x4d_avx2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad_skip_64x16x4d)(const uint8_t* src_ptr,
-                                                 int src_stride,
-                                                 const uint8_t* const ref_ptr[],
-                                                 int ref_stride,
-                                                 uint32_t* sad_array);
-
-unsigned int aom_highbd_sad_skip_64x32_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-unsigned int aom_highbd_sad_skip_64x32_sse2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-unsigned int aom_highbd_sad_skip_64x32_avx2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad_skip_64x32)(const uint8_t* src_ptr,
-                                                      int src_stride,
-                                                      const uint8_t* ref_ptr,
-                                                      int ref_stride);
-
-void aom_highbd_sad_skip_64x32x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-void aom_highbd_sad_skip_64x32x4d_sse2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-void aom_highbd_sad_skip_64x32x4d_avx2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad_skip_64x32x4d)(const uint8_t* src_ptr,
-                                                 int src_stride,
-                                                 const uint8_t* const ref_ptr[],
-                                                 int ref_stride,
-                                                 uint32_t* sad_array);
-
-unsigned int aom_highbd_sad_skip_64x64_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-unsigned int aom_highbd_sad_skip_64x64_sse2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-unsigned int aom_highbd_sad_skip_64x64_avx2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad_skip_64x64)(const uint8_t* src_ptr,
-                                                      int src_stride,
-                                                      const uint8_t* ref_ptr,
-                                                      int ref_stride);
-
-void aom_highbd_sad_skip_64x64x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-void aom_highbd_sad_skip_64x64x4d_sse2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-void aom_highbd_sad_skip_64x64x4d_avx2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad_skip_64x64x4d)(const uint8_t* src_ptr,
-                                                 int src_stride,
-                                                 const uint8_t* const ref_ptr[],
-                                                 int ref_stride,
-                                                 uint32_t* sad_array);
-
-unsigned int aom_highbd_sad_skip_8x16_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-unsigned int aom_highbd_sad_skip_8x16_sse2(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride);
-#define aom_highbd_sad_skip_8x16 aom_highbd_sad_skip_8x16_sse2
-
-void aom_highbd_sad_skip_8x16x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-void aom_highbd_sad_skip_8x16x4d_sse2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* const ref_ptr[],
-                                      int ref_stride,
-                                      uint32_t* sad_array);
-#define aom_highbd_sad_skip_8x16x4d aom_highbd_sad_skip_8x16x4d_sse2
-
-unsigned int aom_highbd_sad_skip_8x32_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-unsigned int aom_highbd_sad_skip_8x32_sse2(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride);
-#define aom_highbd_sad_skip_8x32 aom_highbd_sad_skip_8x32_sse2
-
-void aom_highbd_sad_skip_8x32x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-void aom_highbd_sad_skip_8x32x4d_sse2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* const ref_ptr[],
-                                      int ref_stride,
-                                      uint32_t* sad_array);
-#define aom_highbd_sad_skip_8x32x4d aom_highbd_sad_skip_8x32x4d_sse2
-
-unsigned int aom_highbd_sad_skip_8x4_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride);
-#define aom_highbd_sad_skip_8x4 aom_highbd_sad_skip_8x4_c
-
-void aom_highbd_sad_skip_8x4x4d_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* const ref_ptr[],
-                                  int ref_stride,
-                                  uint32_t* sad_array);
-#define aom_highbd_sad_skip_8x4x4d aom_highbd_sad_skip_8x4x4d_c
-
-unsigned int aom_highbd_sad_skip_8x8_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride);
-unsigned int aom_highbd_sad_skip_8x8_sse2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride);
-#define aom_highbd_sad_skip_8x8 aom_highbd_sad_skip_8x8_sse2
-
-void aom_highbd_sad_skip_8x8x4d_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* const ref_ptr[],
-                                  int ref_stride,
-                                  uint32_t* sad_array);
-void aom_highbd_sad_skip_8x8x4d_sse2(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* const ref_ptr[],
-                                     int ref_stride,
-                                     uint32_t* sad_array);
-#define aom_highbd_sad_skip_8x8x4d aom_highbd_sad_skip_8x8x4d_sse2
-
-void aom_highbd_smooth_h_predictor_16x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_16x16 \
-  aom_highbd_smooth_h_predictor_16x16_c
-
-void aom_highbd_smooth_h_predictor_16x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_16x32 \
-  aom_highbd_smooth_h_predictor_16x32_c
-
-void aom_highbd_smooth_h_predictor_16x4_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_16x4 aom_highbd_smooth_h_predictor_16x4_c
-
-void aom_highbd_smooth_h_predictor_16x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_16x64 \
-  aom_highbd_smooth_h_predictor_16x64_c
-
-void aom_highbd_smooth_h_predictor_16x8_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_16x8 aom_highbd_smooth_h_predictor_16x8_c
-
-void aom_highbd_smooth_h_predictor_2x2_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_h_predictor_2x2 aom_highbd_smooth_h_predictor_2x2_c
-
-void aom_highbd_smooth_h_predictor_32x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_32x16 \
-  aom_highbd_smooth_h_predictor_32x16_c
-
-void aom_highbd_smooth_h_predictor_32x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_32x32 \
-  aom_highbd_smooth_h_predictor_32x32_c
-
-void aom_highbd_smooth_h_predictor_32x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_32x64 \
-  aom_highbd_smooth_h_predictor_32x64_c
-
-void aom_highbd_smooth_h_predictor_32x8_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_32x8 aom_highbd_smooth_h_predictor_32x8_c
-
-void aom_highbd_smooth_h_predictor_4x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_4x16 aom_highbd_smooth_h_predictor_4x16_c
-
-void aom_highbd_smooth_h_predictor_4x4_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_h_predictor_4x4 aom_highbd_smooth_h_predictor_4x4_c
-
-void aom_highbd_smooth_h_predictor_4x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_h_predictor_4x8 aom_highbd_smooth_h_predictor_4x8_c
-
-void aom_highbd_smooth_h_predictor_64x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_64x16 \
-  aom_highbd_smooth_h_predictor_64x16_c
-
-void aom_highbd_smooth_h_predictor_64x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_64x32 \
-  aom_highbd_smooth_h_predictor_64x32_c
-
-void aom_highbd_smooth_h_predictor_64x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_64x64 \
-  aom_highbd_smooth_h_predictor_64x64_c
-
-void aom_highbd_smooth_h_predictor_8x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_8x16 aom_highbd_smooth_h_predictor_8x16_c
-
-void aom_highbd_smooth_h_predictor_8x32_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_8x32 aom_highbd_smooth_h_predictor_8x32_c
-
-void aom_highbd_smooth_h_predictor_8x4_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_h_predictor_8x4 aom_highbd_smooth_h_predictor_8x4_c
-
-void aom_highbd_smooth_h_predictor_8x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_h_predictor_8x8 aom_highbd_smooth_h_predictor_8x8_c
-
-void aom_highbd_smooth_predictor_16x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_16x16 aom_highbd_smooth_predictor_16x16_c
-
-void aom_highbd_smooth_predictor_16x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_16x32 aom_highbd_smooth_predictor_16x32_c
-
-void aom_highbd_smooth_predictor_16x4_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_16x4 aom_highbd_smooth_predictor_16x4_c
-
-void aom_highbd_smooth_predictor_16x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_16x64 aom_highbd_smooth_predictor_16x64_c
-
-void aom_highbd_smooth_predictor_16x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_16x8 aom_highbd_smooth_predictor_16x8_c
-
-void aom_highbd_smooth_predictor_2x2_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_smooth_predictor_2x2 aom_highbd_smooth_predictor_2x2_c
-
-void aom_highbd_smooth_predictor_32x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_32x16 aom_highbd_smooth_predictor_32x16_c
-
-void aom_highbd_smooth_predictor_32x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_32x32 aom_highbd_smooth_predictor_32x32_c
-
-void aom_highbd_smooth_predictor_32x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_32x64 aom_highbd_smooth_predictor_32x64_c
-
-void aom_highbd_smooth_predictor_32x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_32x8 aom_highbd_smooth_predictor_32x8_c
-
-void aom_highbd_smooth_predictor_4x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_4x16 aom_highbd_smooth_predictor_4x16_c
-
-void aom_highbd_smooth_predictor_4x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_smooth_predictor_4x4 aom_highbd_smooth_predictor_4x4_c
-
-void aom_highbd_smooth_predictor_4x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_smooth_predictor_4x8 aom_highbd_smooth_predictor_4x8_c
-
-void aom_highbd_smooth_predictor_64x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_64x16 aom_highbd_smooth_predictor_64x16_c
-
-void aom_highbd_smooth_predictor_64x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_64x32 aom_highbd_smooth_predictor_64x32_c
-
-void aom_highbd_smooth_predictor_64x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_64x64 aom_highbd_smooth_predictor_64x64_c
-
-void aom_highbd_smooth_predictor_8x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_8x16 aom_highbd_smooth_predictor_8x16_c
-
-void aom_highbd_smooth_predictor_8x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_8x32 aom_highbd_smooth_predictor_8x32_c
-
-void aom_highbd_smooth_predictor_8x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_smooth_predictor_8x4 aom_highbd_smooth_predictor_8x4_c
-
-void aom_highbd_smooth_predictor_8x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_smooth_predictor_8x8 aom_highbd_smooth_predictor_8x8_c
-
-void aom_highbd_smooth_v_predictor_16x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_16x16 \
-  aom_highbd_smooth_v_predictor_16x16_c
-
-void aom_highbd_smooth_v_predictor_16x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_16x32 \
-  aom_highbd_smooth_v_predictor_16x32_c
-
-void aom_highbd_smooth_v_predictor_16x4_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_16x4 aom_highbd_smooth_v_predictor_16x4_c
-
-void aom_highbd_smooth_v_predictor_16x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_16x64 \
-  aom_highbd_smooth_v_predictor_16x64_c
-
-void aom_highbd_smooth_v_predictor_16x8_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_16x8 aom_highbd_smooth_v_predictor_16x8_c
-
-void aom_highbd_smooth_v_predictor_2x2_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_v_predictor_2x2 aom_highbd_smooth_v_predictor_2x2_c
-
-void aom_highbd_smooth_v_predictor_32x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_32x16 \
-  aom_highbd_smooth_v_predictor_32x16_c
-
-void aom_highbd_smooth_v_predictor_32x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_32x32 \
-  aom_highbd_smooth_v_predictor_32x32_c
-
-void aom_highbd_smooth_v_predictor_32x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_32x64 \
-  aom_highbd_smooth_v_predictor_32x64_c
-
-void aom_highbd_smooth_v_predictor_32x8_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_32x8 aom_highbd_smooth_v_predictor_32x8_c
-
-void aom_highbd_smooth_v_predictor_4x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_4x16 aom_highbd_smooth_v_predictor_4x16_c
-
-void aom_highbd_smooth_v_predictor_4x4_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_v_predictor_4x4 aom_highbd_smooth_v_predictor_4x4_c
-
-void aom_highbd_smooth_v_predictor_4x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_v_predictor_4x8 aom_highbd_smooth_v_predictor_4x8_c
-
-void aom_highbd_smooth_v_predictor_64x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_64x16 \
-  aom_highbd_smooth_v_predictor_64x16_c
-
-void aom_highbd_smooth_v_predictor_64x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_64x32 \
-  aom_highbd_smooth_v_predictor_64x32_c
-
-void aom_highbd_smooth_v_predictor_64x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_64x64 \
-  aom_highbd_smooth_v_predictor_64x64_c
-
-void aom_highbd_smooth_v_predictor_8x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_8x16 aom_highbd_smooth_v_predictor_8x16_c
-
-void aom_highbd_smooth_v_predictor_8x32_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_8x32 aom_highbd_smooth_v_predictor_8x32_c
-
-void aom_highbd_smooth_v_predictor_8x4_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_v_predictor_8x4 aom_highbd_smooth_v_predictor_8x4_c
-
-void aom_highbd_smooth_v_predictor_8x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_v_predictor_8x8 aom_highbd_smooth_v_predictor_8x8_c
-
-int64_t aom_highbd_sse_c(const uint8_t* a8,
-                         int a_stride,
-                         const uint8_t* b8,
-                         int b_stride,
-                         int width,
-                         int height);
-int64_t aom_highbd_sse_sse4_1(const uint8_t* a8,
-                              int a_stride,
-                              const uint8_t* b8,
-                              int b_stride,
-                              int width,
-                              int height);
-int64_t aom_highbd_sse_avx2(const uint8_t* a8,
-                            int a_stride,
-                            const uint8_t* b8,
-                            int b_stride,
-                            int width,
-                            int height);
-RTCD_EXTERN int64_t (*aom_highbd_sse)(const uint8_t* a8,
-                                      int a_stride,
-                                      const uint8_t* b8,
-                                      int b_stride,
-                                      int width,
-                                      int height);
-
-void aom_highbd_subtract_block_c(int rows,
-                                 int cols,
-                                 int16_t* diff_ptr,
-                                 ptrdiff_t diff_stride,
-                                 const uint8_t* src_ptr,
-                                 ptrdiff_t src_stride,
-                                 const uint8_t* pred_ptr,
-                                 ptrdiff_t pred_stride,
-                                 int bd);
-void aom_highbd_subtract_block_sse2(int rows,
-                                    int cols,
-                                    int16_t* diff_ptr,
-                                    ptrdiff_t diff_stride,
-                                    const uint8_t* src_ptr,
-                                    ptrdiff_t src_stride,
-                                    const uint8_t* pred_ptr,
-                                    ptrdiff_t pred_stride,
-                                    int bd);
-#define aom_highbd_subtract_block aom_highbd_subtract_block_sse2
-
-void aom_highbd_upsampled_pred_c(MACROBLOCKD* xd,
-                                 const struct AV1Common* const cm,
-                                 int mi_row,
-                                 int mi_col,
-                                 const MV* const mv,
-                                 uint8_t* comp_pred8,
-                                 int width,
-                                 int height,
-                                 int subpel_x_q3,
-                                 int subpel_y_q3,
-                                 const uint8_t* ref8,
-                                 int ref_stride,
-                                 int bd,
-                                 int subpel_search);
-void aom_highbd_upsampled_pred_sse2(MACROBLOCKD* xd,
-                                    const struct AV1Common* const cm,
-                                    int mi_row,
-                                    int mi_col,
-                                    const MV* const mv,
-                                    uint8_t* comp_pred8,
-                                    int width,
-                                    int height,
-                                    int subpel_x_q3,
-                                    int subpel_y_q3,
-                                    const uint8_t* ref8,
-                                    int ref_stride,
-                                    int bd,
-                                    int subpel_search);
-#define aom_highbd_upsampled_pred aom_highbd_upsampled_pred_sse2
-
-void aom_highbd_v_predictor_16x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-void aom_highbd_v_predictor_16x16_sse2(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_v_predictor_16x16 aom_highbd_v_predictor_16x16_sse2
-
-void aom_highbd_v_predictor_16x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-void aom_highbd_v_predictor_16x32_sse2(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_v_predictor_16x32 aom_highbd_v_predictor_16x32_sse2
-
-void aom_highbd_v_predictor_16x4_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_16x4 aom_highbd_v_predictor_16x4_c
-
-void aom_highbd_v_predictor_16x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_16x64 aom_highbd_v_predictor_16x64_c
-
-void aom_highbd_v_predictor_16x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-void aom_highbd_v_predictor_16x8_sse2(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_v_predictor_16x8 aom_highbd_v_predictor_16x8_sse2
-
-void aom_highbd_v_predictor_2x2_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_v_predictor_2x2 aom_highbd_v_predictor_2x2_c
-
-void aom_highbd_v_predictor_32x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-void aom_highbd_v_predictor_32x16_sse2(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_v_predictor_32x16 aom_highbd_v_predictor_32x16_sse2
-
-void aom_highbd_v_predictor_32x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-void aom_highbd_v_predictor_32x32_sse2(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_v_predictor_32x32 aom_highbd_v_predictor_32x32_sse2
-
-void aom_highbd_v_predictor_32x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_32x64 aom_highbd_v_predictor_32x64_c
-
-void aom_highbd_v_predictor_32x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_32x8 aom_highbd_v_predictor_32x8_c
-
-void aom_highbd_v_predictor_4x16_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_4x16 aom_highbd_v_predictor_4x16_c
-
-void aom_highbd_v_predictor_4x4_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-void aom_highbd_v_predictor_4x4_sse2(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_v_predictor_4x4 aom_highbd_v_predictor_4x4_sse2
-
-void aom_highbd_v_predictor_4x8_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-void aom_highbd_v_predictor_4x8_sse2(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_v_predictor_4x8 aom_highbd_v_predictor_4x8_sse2
-
-void aom_highbd_v_predictor_64x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_64x16 aom_highbd_v_predictor_64x16_c
-
-void aom_highbd_v_predictor_64x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_64x32 aom_highbd_v_predictor_64x32_c
-
-void aom_highbd_v_predictor_64x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_64x64 aom_highbd_v_predictor_64x64_c
-
-void aom_highbd_v_predictor_8x16_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-void aom_highbd_v_predictor_8x16_sse2(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_v_predictor_8x16 aom_highbd_v_predictor_8x16_sse2
-
-void aom_highbd_v_predictor_8x32_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_8x32 aom_highbd_v_predictor_8x32_c
-
-void aom_highbd_v_predictor_8x4_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-void aom_highbd_v_predictor_8x4_sse2(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_v_predictor_8x4 aom_highbd_v_predictor_8x4_sse2
-
-void aom_highbd_v_predictor_8x8_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-void aom_highbd_v_predictor_8x8_sse2(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_v_predictor_8x8 aom_highbd_v_predictor_8x8_sse2
-
 void aom_ifft16x16_float_c(const float* input, float* temp, float* output);
 void aom_ifft16x16_float_sse2(const float* input, float* temp, float* output);
 void aom_ifft16x16_float_avx2(const float* input, float* temp, float* output);
@@ -20005,1363 +5463,6 @@
                                           int w,
                                           int h);
 
-uint64_t aom_mse_wxh_16bit_highbd_c(uint16_t* dst,
-                                    int dstride,
-                                    uint16_t* src,
-                                    int sstride,
-                                    int w,
-                                    int h);
-uint64_t aom_mse_wxh_16bit_highbd_sse2(uint16_t* dst,
-                                       int dstride,
-                                       uint16_t* src,
-                                       int sstride,
-                                       int w,
-                                       int h);
-uint64_t aom_mse_wxh_16bit_highbd_avx2(uint16_t* dst,
-                                       int dstride,
-                                       uint16_t* src,
-                                       int sstride,
-                                       int w,
-                                       int h);
-RTCD_EXTERN uint64_t (*aom_mse_wxh_16bit_highbd)(uint16_t* dst,
-                                                 int dstride,
-                                                 uint16_t* src,
-                                                 int sstride,
-                                                 int w,
-                                                 int h);
-
-unsigned int aom_obmc_sad128x128_c(const uint8_t* pre,
-                                   int pre_stride,
-                                   const int32_t* wsrc,
-                                   const int32_t* mask);
-unsigned int aom_obmc_sad128x128_sse4_1(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-unsigned int aom_obmc_sad128x128_avx2(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad128x128)(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask);
-
-unsigned int aom_obmc_sad128x64_c(const uint8_t* pre,
-                                  int pre_stride,
-                                  const int32_t* wsrc,
-                                  const int32_t* mask);
-unsigned int aom_obmc_sad128x64_sse4_1(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-unsigned int aom_obmc_sad128x64_avx2(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad128x64)(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask);
-
-unsigned int aom_obmc_sad16x16_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-unsigned int aom_obmc_sad16x16_sse4_1(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-unsigned int aom_obmc_sad16x16_avx2(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad16x16)(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask);
-
-unsigned int aom_obmc_sad16x32_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-unsigned int aom_obmc_sad16x32_sse4_1(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-unsigned int aom_obmc_sad16x32_avx2(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad16x32)(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask);
-
-unsigned int aom_obmc_sad16x4_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-unsigned int aom_obmc_sad16x4_sse4_1(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask);
-unsigned int aom_obmc_sad16x4_avx2(const uint8_t* pre,
-                                   int pre_stride,
-                                   const int32_t* wsrc,
-                                   const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad16x4)(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-
-unsigned int aom_obmc_sad16x64_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-unsigned int aom_obmc_sad16x64_sse4_1(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-unsigned int aom_obmc_sad16x64_avx2(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad16x64)(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask);
-
-unsigned int aom_obmc_sad16x8_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-unsigned int aom_obmc_sad16x8_sse4_1(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask);
-unsigned int aom_obmc_sad16x8_avx2(const uint8_t* pre,
-                                   int pre_stride,
-                                   const int32_t* wsrc,
-                                   const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad16x8)(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-
-unsigned int aom_obmc_sad32x16_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-unsigned int aom_obmc_sad32x16_sse4_1(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-unsigned int aom_obmc_sad32x16_avx2(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad32x16)(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask);
-
-unsigned int aom_obmc_sad32x32_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-unsigned int aom_obmc_sad32x32_sse4_1(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-unsigned int aom_obmc_sad32x32_avx2(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad32x32)(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask);
-
-unsigned int aom_obmc_sad32x64_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-unsigned int aom_obmc_sad32x64_sse4_1(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-unsigned int aom_obmc_sad32x64_avx2(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad32x64)(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask);
-
-unsigned int aom_obmc_sad32x8_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-unsigned int aom_obmc_sad32x8_sse4_1(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask);
-unsigned int aom_obmc_sad32x8_avx2(const uint8_t* pre,
-                                   int pre_stride,
-                                   const int32_t* wsrc,
-                                   const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad32x8)(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-
-unsigned int aom_obmc_sad4x16_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-unsigned int aom_obmc_sad4x16_sse4_1(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask);
-unsigned int aom_obmc_sad4x16_avx2(const uint8_t* pre,
-                                   int pre_stride,
-                                   const int32_t* wsrc,
-                                   const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad4x16)(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-
-unsigned int aom_obmc_sad4x4_c(const uint8_t* pre,
-                               int pre_stride,
-                               const int32_t* wsrc,
-                               const int32_t* mask);
-unsigned int aom_obmc_sad4x4_sse4_1(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask);
-unsigned int aom_obmc_sad4x4_avx2(const uint8_t* pre,
-                                  int pre_stride,
-                                  const int32_t* wsrc,
-                                  const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad4x4)(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask);
-
-unsigned int aom_obmc_sad4x8_c(const uint8_t* pre,
-                               int pre_stride,
-                               const int32_t* wsrc,
-                               const int32_t* mask);
-unsigned int aom_obmc_sad4x8_sse4_1(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask);
-unsigned int aom_obmc_sad4x8_avx2(const uint8_t* pre,
-                                  int pre_stride,
-                                  const int32_t* wsrc,
-                                  const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad4x8)(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask);
-
-unsigned int aom_obmc_sad64x128_c(const uint8_t* pre,
-                                  int pre_stride,
-                                  const int32_t* wsrc,
-                                  const int32_t* mask);
-unsigned int aom_obmc_sad64x128_sse4_1(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-unsigned int aom_obmc_sad64x128_avx2(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad64x128)(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask);
-
-unsigned int aom_obmc_sad64x16_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-unsigned int aom_obmc_sad64x16_sse4_1(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-unsigned int aom_obmc_sad64x16_avx2(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad64x16)(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask);
-
-unsigned int aom_obmc_sad64x32_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-unsigned int aom_obmc_sad64x32_sse4_1(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-unsigned int aom_obmc_sad64x32_avx2(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad64x32)(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask);
-
-unsigned int aom_obmc_sad64x64_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-unsigned int aom_obmc_sad64x64_sse4_1(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-unsigned int aom_obmc_sad64x64_avx2(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad64x64)(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask);
-
-unsigned int aom_obmc_sad8x16_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-unsigned int aom_obmc_sad8x16_sse4_1(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask);
-unsigned int aom_obmc_sad8x16_avx2(const uint8_t* pre,
-                                   int pre_stride,
-                                   const int32_t* wsrc,
-                                   const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad8x16)(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-
-unsigned int aom_obmc_sad8x32_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-unsigned int aom_obmc_sad8x32_sse4_1(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask);
-unsigned int aom_obmc_sad8x32_avx2(const uint8_t* pre,
-                                   int pre_stride,
-                                   const int32_t* wsrc,
-                                   const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad8x32)(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-
-unsigned int aom_obmc_sad8x4_c(const uint8_t* pre,
-                               int pre_stride,
-                               const int32_t* wsrc,
-                               const int32_t* mask);
-unsigned int aom_obmc_sad8x4_sse4_1(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask);
-unsigned int aom_obmc_sad8x4_avx2(const uint8_t* pre,
-                                  int pre_stride,
-                                  const int32_t* wsrc,
-                                  const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad8x4)(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask);
-
-unsigned int aom_obmc_sad8x8_c(const uint8_t* pre,
-                               int pre_stride,
-                               const int32_t* wsrc,
-                               const int32_t* mask);
-unsigned int aom_obmc_sad8x8_sse4_1(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask);
-unsigned int aom_obmc_sad8x8_avx2(const uint8_t* pre,
-                                  int pre_stride,
-                                  const int32_t* wsrc,
-                                  const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad8x8)(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask);
-
-unsigned int aom_obmc_sub_pixel_variance128x128_c(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance128x128_sse4_1(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance128x128)(
-    const uint8_t* pre,
-    int pre_stride,
-    int xoffset,
-    int yoffset,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance128x64_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance128x64_sse4_1(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance128x64)(
-    const uint8_t* pre,
-    int pre_stride,
-    int xoffset,
-    int yoffset,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance16x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance16x16_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance16x16)(
-    const uint8_t* pre,
-    int pre_stride,
-    int xoffset,
-    int yoffset,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance16x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance16x32_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance16x32)(
-    const uint8_t* pre,
-    int pre_stride,
-    int xoffset,
-    int yoffset,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance16x4_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance16x4_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance16x4)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            int xoffset,
-                                                            int yoffset,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance16x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance16x64_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance16x64)(
-    const uint8_t* pre,
-    int pre_stride,
-    int xoffset,
-    int yoffset,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance16x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance16x8_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance16x8)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            int xoffset,
-                                                            int yoffset,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance32x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance32x16_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance32x16)(
-    const uint8_t* pre,
-    int pre_stride,
-    int xoffset,
-    int yoffset,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance32x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance32x32_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance32x32)(
-    const uint8_t* pre,
-    int pre_stride,
-    int xoffset,
-    int yoffset,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance32x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance32x64_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance32x64)(
-    const uint8_t* pre,
-    int pre_stride,
-    int xoffset,
-    int yoffset,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance32x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance32x8_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance32x8)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            int xoffset,
-                                                            int yoffset,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance4x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance4x16_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance4x16)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            int xoffset,
-                                                            int yoffset,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance4x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance4x4_sse4_1(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance4x4)(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance4x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance4x8_sse4_1(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance4x8)(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance64x128_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance64x128_sse4_1(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance64x128)(
-    const uint8_t* pre,
-    int pre_stride,
-    int xoffset,
-    int yoffset,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance64x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance64x16_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance64x16)(
-    const uint8_t* pre,
-    int pre_stride,
-    int xoffset,
-    int yoffset,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance64x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance64x32_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance64x32)(
-    const uint8_t* pre,
-    int pre_stride,
-    int xoffset,
-    int yoffset,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance64x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance64x64_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance64x64)(
-    const uint8_t* pre,
-    int pre_stride,
-    int xoffset,
-    int yoffset,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance8x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance8x16_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance8x16)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            int xoffset,
-                                                            int yoffset,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance8x32_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance8x32_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance8x32)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            int xoffset,
-                                                            int yoffset,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance8x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance8x4_sse4_1(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance8x4)(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance8x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance8x8_sse4_1(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance8x8)(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-
-unsigned int aom_obmc_variance128x128_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask,
-                                        unsigned int* sse);
-unsigned int aom_obmc_variance128x128_sse4_1(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-unsigned int aom_obmc_variance128x128_avx2(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance128x128)(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-
-unsigned int aom_obmc_variance128x64_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask,
-                                       unsigned int* sse);
-unsigned int aom_obmc_variance128x64_sse4_1(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-unsigned int aom_obmc_variance128x64_avx2(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask,
-                                          unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance128x64)(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-
-unsigned int aom_obmc_variance16x16_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-unsigned int aom_obmc_variance16x16_sse4_1(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-unsigned int aom_obmc_variance16x16_avx2(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask,
-                                         unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance16x16)(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-
-unsigned int aom_obmc_variance16x32_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-unsigned int aom_obmc_variance16x32_sse4_1(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-unsigned int aom_obmc_variance16x32_avx2(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask,
-                                         unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance16x32)(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-
-unsigned int aom_obmc_variance16x4_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-unsigned int aom_obmc_variance16x4_sse4_1(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask,
-                                          unsigned int* sse);
-unsigned int aom_obmc_variance16x4_avx2(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask,
-                                        unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance16x4)(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-
-unsigned int aom_obmc_variance16x64_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-unsigned int aom_obmc_variance16x64_sse4_1(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-unsigned int aom_obmc_variance16x64_avx2(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask,
-                                         unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance16x64)(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-
-unsigned int aom_obmc_variance16x8_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-unsigned int aom_obmc_variance16x8_sse4_1(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask,
-                                          unsigned int* sse);
-unsigned int aom_obmc_variance16x8_avx2(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask,
-                                        unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance16x8)(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-
-unsigned int aom_obmc_variance32x16_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-unsigned int aom_obmc_variance32x16_sse4_1(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-unsigned int aom_obmc_variance32x16_avx2(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask,
-                                         unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance32x16)(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-
-unsigned int aom_obmc_variance32x32_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-unsigned int aom_obmc_variance32x32_sse4_1(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-unsigned int aom_obmc_variance32x32_avx2(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask,
-                                         unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance32x32)(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-
-unsigned int aom_obmc_variance32x64_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-unsigned int aom_obmc_variance32x64_sse4_1(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-unsigned int aom_obmc_variance32x64_avx2(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask,
-                                         unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance32x64)(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-
-unsigned int aom_obmc_variance32x8_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-unsigned int aom_obmc_variance32x8_sse4_1(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask,
-                                          unsigned int* sse);
-unsigned int aom_obmc_variance32x8_avx2(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask,
-                                        unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance32x8)(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-
-unsigned int aom_obmc_variance4x16_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-unsigned int aom_obmc_variance4x16_sse4_1(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask,
-                                          unsigned int* sse);
-unsigned int aom_obmc_variance4x16_avx2(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask,
-                                        unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance4x16)(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-
-unsigned int aom_obmc_variance4x4_c(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask,
-                                    unsigned int* sse);
-unsigned int aom_obmc_variance4x4_sse4_1(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask,
-                                         unsigned int* sse);
-unsigned int aom_obmc_variance4x4_avx2(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask,
-                                       unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance4x4)(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-
-unsigned int aom_obmc_variance4x8_c(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask,
-                                    unsigned int* sse);
-unsigned int aom_obmc_variance4x8_sse4_1(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask,
-                                         unsigned int* sse);
-unsigned int aom_obmc_variance4x8_avx2(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask,
-                                       unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance4x8)(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-
-unsigned int aom_obmc_variance64x128_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask,
-                                       unsigned int* sse);
-unsigned int aom_obmc_variance64x128_sse4_1(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-unsigned int aom_obmc_variance64x128_avx2(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask,
-                                          unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance64x128)(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-
-unsigned int aom_obmc_variance64x16_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-unsigned int aom_obmc_variance64x16_sse4_1(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-unsigned int aom_obmc_variance64x16_avx2(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask,
-                                         unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance64x16)(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-
-unsigned int aom_obmc_variance64x32_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-unsigned int aom_obmc_variance64x32_sse4_1(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-unsigned int aom_obmc_variance64x32_avx2(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask,
-                                         unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance64x32)(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-
-unsigned int aom_obmc_variance64x64_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-unsigned int aom_obmc_variance64x64_sse4_1(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-unsigned int aom_obmc_variance64x64_avx2(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask,
-                                         unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance64x64)(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-
-unsigned int aom_obmc_variance8x16_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-unsigned int aom_obmc_variance8x16_sse4_1(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask,
-                                          unsigned int* sse);
-unsigned int aom_obmc_variance8x16_avx2(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask,
-                                        unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance8x16)(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-
-unsigned int aom_obmc_variance8x32_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-unsigned int aom_obmc_variance8x32_sse4_1(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask,
-                                          unsigned int* sse);
-unsigned int aom_obmc_variance8x32_avx2(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask,
-                                        unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance8x32)(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-
-unsigned int aom_obmc_variance8x4_c(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask,
-                                    unsigned int* sse);
-unsigned int aom_obmc_variance8x4_sse4_1(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask,
-                                         unsigned int* sse);
-unsigned int aom_obmc_variance8x4_avx2(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask,
-                                       unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance8x4)(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-
-unsigned int aom_obmc_variance8x8_c(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask,
-                                    unsigned int* sse);
-unsigned int aom_obmc_variance8x8_sse4_1(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask,
-                                         unsigned int* sse);
-unsigned int aom_obmc_variance8x8_avx2(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask,
-                                       unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance8x8)(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-
 void aom_paeth_predictor_16x16_c(uint8_t* dst,
                                  ptrdiff_t y_stride,
                                  const uint8_t* above,
@@ -27316,1188 +11417,6 @@
   aom_hadamard_lp_16x16 = aom_hadamard_lp_16x16_c;
   if (flags & HAS_AVX2)
     aom_hadamard_lp_16x16 = aom_hadamard_lp_16x16_avx2;
-  aom_highbd_10_masked_sub_pixel_variance128x128 =
-      aom_highbd_10_masked_sub_pixel_variance128x128_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance128x128 =
-        aom_highbd_10_masked_sub_pixel_variance128x128_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance128x64 =
-      aom_highbd_10_masked_sub_pixel_variance128x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance128x64 =
-        aom_highbd_10_masked_sub_pixel_variance128x64_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance16x16 =
-      aom_highbd_10_masked_sub_pixel_variance16x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance16x16 =
-        aom_highbd_10_masked_sub_pixel_variance16x16_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance16x32 =
-      aom_highbd_10_masked_sub_pixel_variance16x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance16x32 =
-        aom_highbd_10_masked_sub_pixel_variance16x32_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance16x4 =
-      aom_highbd_10_masked_sub_pixel_variance16x4_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance16x4 =
-        aom_highbd_10_masked_sub_pixel_variance16x4_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance16x64 =
-      aom_highbd_10_masked_sub_pixel_variance16x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance16x64 =
-        aom_highbd_10_masked_sub_pixel_variance16x64_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance16x8 =
-      aom_highbd_10_masked_sub_pixel_variance16x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance16x8 =
-        aom_highbd_10_masked_sub_pixel_variance16x8_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance32x16 =
-      aom_highbd_10_masked_sub_pixel_variance32x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance32x16 =
-        aom_highbd_10_masked_sub_pixel_variance32x16_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance32x32 =
-      aom_highbd_10_masked_sub_pixel_variance32x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance32x32 =
-        aom_highbd_10_masked_sub_pixel_variance32x32_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance32x64 =
-      aom_highbd_10_masked_sub_pixel_variance32x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance32x64 =
-        aom_highbd_10_masked_sub_pixel_variance32x64_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance32x8 =
-      aom_highbd_10_masked_sub_pixel_variance32x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance32x8 =
-        aom_highbd_10_masked_sub_pixel_variance32x8_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance4x16 =
-      aom_highbd_10_masked_sub_pixel_variance4x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance4x16 =
-        aom_highbd_10_masked_sub_pixel_variance4x16_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance4x4 =
-      aom_highbd_10_masked_sub_pixel_variance4x4_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance4x4 =
-        aom_highbd_10_masked_sub_pixel_variance4x4_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance4x8 =
-      aom_highbd_10_masked_sub_pixel_variance4x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance4x8 =
-        aom_highbd_10_masked_sub_pixel_variance4x8_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance64x128 =
-      aom_highbd_10_masked_sub_pixel_variance64x128_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance64x128 =
-        aom_highbd_10_masked_sub_pixel_variance64x128_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance64x16 =
-      aom_highbd_10_masked_sub_pixel_variance64x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance64x16 =
-        aom_highbd_10_masked_sub_pixel_variance64x16_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance64x32 =
-      aom_highbd_10_masked_sub_pixel_variance64x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance64x32 =
-        aom_highbd_10_masked_sub_pixel_variance64x32_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance64x64 =
-      aom_highbd_10_masked_sub_pixel_variance64x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance64x64 =
-        aom_highbd_10_masked_sub_pixel_variance64x64_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance8x16 =
-      aom_highbd_10_masked_sub_pixel_variance8x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance8x16 =
-        aom_highbd_10_masked_sub_pixel_variance8x16_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance8x32 =
-      aom_highbd_10_masked_sub_pixel_variance8x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance8x32 =
-        aom_highbd_10_masked_sub_pixel_variance8x32_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance8x4 =
-      aom_highbd_10_masked_sub_pixel_variance8x4_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance8x4 =
-        aom_highbd_10_masked_sub_pixel_variance8x4_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance8x8 =
-      aom_highbd_10_masked_sub_pixel_variance8x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance8x8 =
-        aom_highbd_10_masked_sub_pixel_variance8x8_ssse3;
-  aom_highbd_10_obmc_variance128x128 = aom_highbd_10_obmc_variance128x128_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance128x128 =
-        aom_highbd_10_obmc_variance128x128_sse4_1;
-  aom_highbd_10_obmc_variance128x64 = aom_highbd_10_obmc_variance128x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance128x64 =
-        aom_highbd_10_obmc_variance128x64_sse4_1;
-  aom_highbd_10_obmc_variance16x16 = aom_highbd_10_obmc_variance16x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance16x16 = aom_highbd_10_obmc_variance16x16_sse4_1;
-  aom_highbd_10_obmc_variance16x32 = aom_highbd_10_obmc_variance16x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance16x32 = aom_highbd_10_obmc_variance16x32_sse4_1;
-  aom_highbd_10_obmc_variance16x4 = aom_highbd_10_obmc_variance16x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance16x4 = aom_highbd_10_obmc_variance16x4_sse4_1;
-  aom_highbd_10_obmc_variance16x64 = aom_highbd_10_obmc_variance16x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance16x64 = aom_highbd_10_obmc_variance16x64_sse4_1;
-  aom_highbd_10_obmc_variance16x8 = aom_highbd_10_obmc_variance16x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance16x8 = aom_highbd_10_obmc_variance16x8_sse4_1;
-  aom_highbd_10_obmc_variance32x16 = aom_highbd_10_obmc_variance32x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance32x16 = aom_highbd_10_obmc_variance32x16_sse4_1;
-  aom_highbd_10_obmc_variance32x32 = aom_highbd_10_obmc_variance32x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance32x32 = aom_highbd_10_obmc_variance32x32_sse4_1;
-  aom_highbd_10_obmc_variance32x64 = aom_highbd_10_obmc_variance32x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance32x64 = aom_highbd_10_obmc_variance32x64_sse4_1;
-  aom_highbd_10_obmc_variance32x8 = aom_highbd_10_obmc_variance32x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance32x8 = aom_highbd_10_obmc_variance32x8_sse4_1;
-  aom_highbd_10_obmc_variance4x16 = aom_highbd_10_obmc_variance4x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance4x16 = aom_highbd_10_obmc_variance4x16_sse4_1;
-  aom_highbd_10_obmc_variance4x4 = aom_highbd_10_obmc_variance4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance4x4 = aom_highbd_10_obmc_variance4x4_sse4_1;
-  aom_highbd_10_obmc_variance4x8 = aom_highbd_10_obmc_variance4x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance4x8 = aom_highbd_10_obmc_variance4x8_sse4_1;
-  aom_highbd_10_obmc_variance64x128 = aom_highbd_10_obmc_variance64x128_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance64x128 =
-        aom_highbd_10_obmc_variance64x128_sse4_1;
-  aom_highbd_10_obmc_variance64x16 = aom_highbd_10_obmc_variance64x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance64x16 = aom_highbd_10_obmc_variance64x16_sse4_1;
-  aom_highbd_10_obmc_variance64x32 = aom_highbd_10_obmc_variance64x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance64x32 = aom_highbd_10_obmc_variance64x32_sse4_1;
-  aom_highbd_10_obmc_variance64x64 = aom_highbd_10_obmc_variance64x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance64x64 = aom_highbd_10_obmc_variance64x64_sse4_1;
-  aom_highbd_10_obmc_variance8x16 = aom_highbd_10_obmc_variance8x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance8x16 = aom_highbd_10_obmc_variance8x16_sse4_1;
-  aom_highbd_10_obmc_variance8x32 = aom_highbd_10_obmc_variance8x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance8x32 = aom_highbd_10_obmc_variance8x32_sse4_1;
-  aom_highbd_10_obmc_variance8x4 = aom_highbd_10_obmc_variance8x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance8x4 = aom_highbd_10_obmc_variance8x4_sse4_1;
-  aom_highbd_10_obmc_variance8x8 = aom_highbd_10_obmc_variance8x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance8x8 = aom_highbd_10_obmc_variance8x8_sse4_1;
-  aom_highbd_10_sub_pixel_avg_variance4x4 =
-      aom_highbd_10_sub_pixel_avg_variance4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_sub_pixel_avg_variance4x4 =
-        aom_highbd_10_sub_pixel_avg_variance4x4_sse4_1;
-  aom_highbd_10_sub_pixel_variance128x128 =
-      aom_highbd_10_sub_pixel_variance128x128_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_sub_pixel_variance128x128 =
-        aom_highbd_10_sub_pixel_variance128x128_avx2;
-  aom_highbd_10_sub_pixel_variance128x64 =
-      aom_highbd_10_sub_pixel_variance128x64_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_sub_pixel_variance128x64 =
-        aom_highbd_10_sub_pixel_variance128x64_avx2;
-  aom_highbd_10_sub_pixel_variance16x16 =
-      aom_highbd_10_sub_pixel_variance16x16_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_sub_pixel_variance16x16 =
-        aom_highbd_10_sub_pixel_variance16x16_avx2;
-  aom_highbd_10_sub_pixel_variance16x32 =
-      aom_highbd_10_sub_pixel_variance16x32_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_sub_pixel_variance16x32 =
-        aom_highbd_10_sub_pixel_variance16x32_avx2;
-  aom_highbd_10_sub_pixel_variance16x8 =
-      aom_highbd_10_sub_pixel_variance16x8_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_sub_pixel_variance16x8 =
-        aom_highbd_10_sub_pixel_variance16x8_avx2;
-  aom_highbd_10_sub_pixel_variance32x16 =
-      aom_highbd_10_sub_pixel_variance32x16_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_sub_pixel_variance32x16 =
-        aom_highbd_10_sub_pixel_variance32x16_avx2;
-  aom_highbd_10_sub_pixel_variance32x32 =
-      aom_highbd_10_sub_pixel_variance32x32_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_sub_pixel_variance32x32 =
-        aom_highbd_10_sub_pixel_variance32x32_avx2;
-  aom_highbd_10_sub_pixel_variance32x64 =
-      aom_highbd_10_sub_pixel_variance32x64_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_sub_pixel_variance32x64 =
-        aom_highbd_10_sub_pixel_variance32x64_avx2;
-  aom_highbd_10_sub_pixel_variance4x4 = aom_highbd_10_sub_pixel_variance4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_sub_pixel_variance4x4 =
-        aom_highbd_10_sub_pixel_variance4x4_sse4_1;
-  aom_highbd_10_sub_pixel_variance64x128 =
-      aom_highbd_10_sub_pixel_variance64x128_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_sub_pixel_variance64x128 =
-        aom_highbd_10_sub_pixel_variance64x128_avx2;
-  aom_highbd_10_sub_pixel_variance64x32 =
-      aom_highbd_10_sub_pixel_variance64x32_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_sub_pixel_variance64x32 =
-        aom_highbd_10_sub_pixel_variance64x32_avx2;
-  aom_highbd_10_sub_pixel_variance64x64 =
-      aom_highbd_10_sub_pixel_variance64x64_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_sub_pixel_variance64x64 =
-        aom_highbd_10_sub_pixel_variance64x64_avx2;
-  aom_highbd_10_sub_pixel_variance8x16 =
-      aom_highbd_10_sub_pixel_variance8x16_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_sub_pixel_variance8x16 =
-        aom_highbd_10_sub_pixel_variance8x16_avx2;
-  aom_highbd_10_sub_pixel_variance8x8 =
-      aom_highbd_10_sub_pixel_variance8x8_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_sub_pixel_variance8x8 =
-        aom_highbd_10_sub_pixel_variance8x8_avx2;
-  aom_highbd_10_variance128x128 = aom_highbd_10_variance128x128_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_variance128x128 = aom_highbd_10_variance128x128_avx2;
-  aom_highbd_10_variance128x64 = aom_highbd_10_variance128x64_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_variance128x64 = aom_highbd_10_variance128x64_avx2;
-  aom_highbd_10_variance16x16 = aom_highbd_10_variance16x16_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_variance16x16 = aom_highbd_10_variance16x16_avx2;
-  aom_highbd_10_variance16x32 = aom_highbd_10_variance16x32_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_variance16x32 = aom_highbd_10_variance16x32_avx2;
-  aom_highbd_10_variance16x8 = aom_highbd_10_variance16x8_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_variance16x8 = aom_highbd_10_variance16x8_avx2;
-  aom_highbd_10_variance32x16 = aom_highbd_10_variance32x16_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_variance32x16 = aom_highbd_10_variance32x16_avx2;
-  aom_highbd_10_variance32x32 = aom_highbd_10_variance32x32_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_variance32x32 = aom_highbd_10_variance32x32_avx2;
-  aom_highbd_10_variance32x64 = aom_highbd_10_variance32x64_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_variance32x64 = aom_highbd_10_variance32x64_avx2;
-  aom_highbd_10_variance4x4 = aom_highbd_10_variance4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_variance4x4 = aom_highbd_10_variance4x4_sse4_1;
-  aom_highbd_10_variance64x128 = aom_highbd_10_variance64x128_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_variance64x128 = aom_highbd_10_variance64x128_avx2;
-  aom_highbd_10_variance64x32 = aom_highbd_10_variance64x32_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_variance64x32 = aom_highbd_10_variance64x32_avx2;
-  aom_highbd_10_variance64x64 = aom_highbd_10_variance64x64_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_variance64x64 = aom_highbd_10_variance64x64_avx2;
-  aom_highbd_10_variance8x16 = aom_highbd_10_variance8x16_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_variance8x16 = aom_highbd_10_variance8x16_avx2;
-  aom_highbd_10_variance8x8 = aom_highbd_10_variance8x8_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_variance8x8 = aom_highbd_10_variance8x8_avx2;
-  aom_highbd_12_masked_sub_pixel_variance128x128 =
-      aom_highbd_12_masked_sub_pixel_variance128x128_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance128x128 =
-        aom_highbd_12_masked_sub_pixel_variance128x128_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance128x64 =
-      aom_highbd_12_masked_sub_pixel_variance128x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance128x64 =
-        aom_highbd_12_masked_sub_pixel_variance128x64_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance16x16 =
-      aom_highbd_12_masked_sub_pixel_variance16x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance16x16 =
-        aom_highbd_12_masked_sub_pixel_variance16x16_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance16x32 =
-      aom_highbd_12_masked_sub_pixel_variance16x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance16x32 =
-        aom_highbd_12_masked_sub_pixel_variance16x32_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance16x4 =
-      aom_highbd_12_masked_sub_pixel_variance16x4_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance16x4 =
-        aom_highbd_12_masked_sub_pixel_variance16x4_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance16x64 =
-      aom_highbd_12_masked_sub_pixel_variance16x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance16x64 =
-        aom_highbd_12_masked_sub_pixel_variance16x64_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance16x8 =
-      aom_highbd_12_masked_sub_pixel_variance16x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance16x8 =
-        aom_highbd_12_masked_sub_pixel_variance16x8_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance32x16 =
-      aom_highbd_12_masked_sub_pixel_variance32x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance32x16 =
-        aom_highbd_12_masked_sub_pixel_variance32x16_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance32x32 =
-      aom_highbd_12_masked_sub_pixel_variance32x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance32x32 =
-        aom_highbd_12_masked_sub_pixel_variance32x32_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance32x64 =
-      aom_highbd_12_masked_sub_pixel_variance32x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance32x64 =
-        aom_highbd_12_masked_sub_pixel_variance32x64_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance32x8 =
-      aom_highbd_12_masked_sub_pixel_variance32x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance32x8 =
-        aom_highbd_12_masked_sub_pixel_variance32x8_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance4x16 =
-      aom_highbd_12_masked_sub_pixel_variance4x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance4x16 =
-        aom_highbd_12_masked_sub_pixel_variance4x16_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance4x4 =
-      aom_highbd_12_masked_sub_pixel_variance4x4_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance4x4 =
-        aom_highbd_12_masked_sub_pixel_variance4x4_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance4x8 =
-      aom_highbd_12_masked_sub_pixel_variance4x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance4x8 =
-        aom_highbd_12_masked_sub_pixel_variance4x8_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance64x128 =
-      aom_highbd_12_masked_sub_pixel_variance64x128_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance64x128 =
-        aom_highbd_12_masked_sub_pixel_variance64x128_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance64x16 =
-      aom_highbd_12_masked_sub_pixel_variance64x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance64x16 =
-        aom_highbd_12_masked_sub_pixel_variance64x16_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance64x32 =
-      aom_highbd_12_masked_sub_pixel_variance64x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance64x32 =
-        aom_highbd_12_masked_sub_pixel_variance64x32_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance64x64 =
-      aom_highbd_12_masked_sub_pixel_variance64x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance64x64 =
-        aom_highbd_12_masked_sub_pixel_variance64x64_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance8x16 =
-      aom_highbd_12_masked_sub_pixel_variance8x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance8x16 =
-        aom_highbd_12_masked_sub_pixel_variance8x16_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance8x32 =
-      aom_highbd_12_masked_sub_pixel_variance8x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance8x32 =
-        aom_highbd_12_masked_sub_pixel_variance8x32_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance8x4 =
-      aom_highbd_12_masked_sub_pixel_variance8x4_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance8x4 =
-        aom_highbd_12_masked_sub_pixel_variance8x4_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance8x8 =
-      aom_highbd_12_masked_sub_pixel_variance8x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance8x8 =
-        aom_highbd_12_masked_sub_pixel_variance8x8_ssse3;
-  aom_highbd_12_obmc_variance128x128 = aom_highbd_12_obmc_variance128x128_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance128x128 =
-        aom_highbd_12_obmc_variance128x128_sse4_1;
-  aom_highbd_12_obmc_variance128x64 = aom_highbd_12_obmc_variance128x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance128x64 =
-        aom_highbd_12_obmc_variance128x64_sse4_1;
-  aom_highbd_12_obmc_variance16x16 = aom_highbd_12_obmc_variance16x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance16x16 = aom_highbd_12_obmc_variance16x16_sse4_1;
-  aom_highbd_12_obmc_variance16x32 = aom_highbd_12_obmc_variance16x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance16x32 = aom_highbd_12_obmc_variance16x32_sse4_1;
-  aom_highbd_12_obmc_variance16x4 = aom_highbd_12_obmc_variance16x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance16x4 = aom_highbd_12_obmc_variance16x4_sse4_1;
-  aom_highbd_12_obmc_variance16x64 = aom_highbd_12_obmc_variance16x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance16x64 = aom_highbd_12_obmc_variance16x64_sse4_1;
-  aom_highbd_12_obmc_variance16x8 = aom_highbd_12_obmc_variance16x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance16x8 = aom_highbd_12_obmc_variance16x8_sse4_1;
-  aom_highbd_12_obmc_variance32x16 = aom_highbd_12_obmc_variance32x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance32x16 = aom_highbd_12_obmc_variance32x16_sse4_1;
-  aom_highbd_12_obmc_variance32x32 = aom_highbd_12_obmc_variance32x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance32x32 = aom_highbd_12_obmc_variance32x32_sse4_1;
-  aom_highbd_12_obmc_variance32x64 = aom_highbd_12_obmc_variance32x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance32x64 = aom_highbd_12_obmc_variance32x64_sse4_1;
-  aom_highbd_12_obmc_variance32x8 = aom_highbd_12_obmc_variance32x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance32x8 = aom_highbd_12_obmc_variance32x8_sse4_1;
-  aom_highbd_12_obmc_variance4x16 = aom_highbd_12_obmc_variance4x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance4x16 = aom_highbd_12_obmc_variance4x16_sse4_1;
-  aom_highbd_12_obmc_variance4x4 = aom_highbd_12_obmc_variance4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance4x4 = aom_highbd_12_obmc_variance4x4_sse4_1;
-  aom_highbd_12_obmc_variance4x8 = aom_highbd_12_obmc_variance4x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance4x8 = aom_highbd_12_obmc_variance4x8_sse4_1;
-  aom_highbd_12_obmc_variance64x128 = aom_highbd_12_obmc_variance64x128_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance64x128 =
-        aom_highbd_12_obmc_variance64x128_sse4_1;
-  aom_highbd_12_obmc_variance64x16 = aom_highbd_12_obmc_variance64x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance64x16 = aom_highbd_12_obmc_variance64x16_sse4_1;
-  aom_highbd_12_obmc_variance64x32 = aom_highbd_12_obmc_variance64x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance64x32 = aom_highbd_12_obmc_variance64x32_sse4_1;
-  aom_highbd_12_obmc_variance64x64 = aom_highbd_12_obmc_variance64x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance64x64 = aom_highbd_12_obmc_variance64x64_sse4_1;
-  aom_highbd_12_obmc_variance8x16 = aom_highbd_12_obmc_variance8x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance8x16 = aom_highbd_12_obmc_variance8x16_sse4_1;
-  aom_highbd_12_obmc_variance8x32 = aom_highbd_12_obmc_variance8x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance8x32 = aom_highbd_12_obmc_variance8x32_sse4_1;
-  aom_highbd_12_obmc_variance8x4 = aom_highbd_12_obmc_variance8x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance8x4 = aom_highbd_12_obmc_variance8x4_sse4_1;
-  aom_highbd_12_obmc_variance8x8 = aom_highbd_12_obmc_variance8x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance8x8 = aom_highbd_12_obmc_variance8x8_sse4_1;
-  aom_highbd_12_sub_pixel_avg_variance4x4 =
-      aom_highbd_12_sub_pixel_avg_variance4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_sub_pixel_avg_variance4x4 =
-        aom_highbd_12_sub_pixel_avg_variance4x4_sse4_1;
-  aom_highbd_12_sub_pixel_variance4x4 = aom_highbd_12_sub_pixel_variance4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_sub_pixel_variance4x4 =
-        aom_highbd_12_sub_pixel_variance4x4_sse4_1;
-  aom_highbd_12_variance4x4 = aom_highbd_12_variance4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_variance4x4 = aom_highbd_12_variance4x4_sse4_1;
-  aom_highbd_8_masked_sub_pixel_variance128x128 =
-      aom_highbd_8_masked_sub_pixel_variance128x128_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance128x128 =
-        aom_highbd_8_masked_sub_pixel_variance128x128_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance128x64 =
-      aom_highbd_8_masked_sub_pixel_variance128x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance128x64 =
-        aom_highbd_8_masked_sub_pixel_variance128x64_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance16x16 =
-      aom_highbd_8_masked_sub_pixel_variance16x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance16x16 =
-        aom_highbd_8_masked_sub_pixel_variance16x16_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance16x32 =
-      aom_highbd_8_masked_sub_pixel_variance16x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance16x32 =
-        aom_highbd_8_masked_sub_pixel_variance16x32_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance16x4 =
-      aom_highbd_8_masked_sub_pixel_variance16x4_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance16x4 =
-        aom_highbd_8_masked_sub_pixel_variance16x4_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance16x64 =
-      aom_highbd_8_masked_sub_pixel_variance16x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance16x64 =
-        aom_highbd_8_masked_sub_pixel_variance16x64_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance16x8 =
-      aom_highbd_8_masked_sub_pixel_variance16x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance16x8 =
-        aom_highbd_8_masked_sub_pixel_variance16x8_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance32x16 =
-      aom_highbd_8_masked_sub_pixel_variance32x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance32x16 =
-        aom_highbd_8_masked_sub_pixel_variance32x16_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance32x32 =
-      aom_highbd_8_masked_sub_pixel_variance32x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance32x32 =
-        aom_highbd_8_masked_sub_pixel_variance32x32_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance32x64 =
-      aom_highbd_8_masked_sub_pixel_variance32x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance32x64 =
-        aom_highbd_8_masked_sub_pixel_variance32x64_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance32x8 =
-      aom_highbd_8_masked_sub_pixel_variance32x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance32x8 =
-        aom_highbd_8_masked_sub_pixel_variance32x8_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance4x16 =
-      aom_highbd_8_masked_sub_pixel_variance4x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance4x16 =
-        aom_highbd_8_masked_sub_pixel_variance4x16_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance4x4 =
-      aom_highbd_8_masked_sub_pixel_variance4x4_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance4x4 =
-        aom_highbd_8_masked_sub_pixel_variance4x4_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance4x8 =
-      aom_highbd_8_masked_sub_pixel_variance4x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance4x8 =
-        aom_highbd_8_masked_sub_pixel_variance4x8_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance64x128 =
-      aom_highbd_8_masked_sub_pixel_variance64x128_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance64x128 =
-        aom_highbd_8_masked_sub_pixel_variance64x128_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance64x16 =
-      aom_highbd_8_masked_sub_pixel_variance64x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance64x16 =
-        aom_highbd_8_masked_sub_pixel_variance64x16_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance64x32 =
-      aom_highbd_8_masked_sub_pixel_variance64x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance64x32 =
-        aom_highbd_8_masked_sub_pixel_variance64x32_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance64x64 =
-      aom_highbd_8_masked_sub_pixel_variance64x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance64x64 =
-        aom_highbd_8_masked_sub_pixel_variance64x64_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance8x16 =
-      aom_highbd_8_masked_sub_pixel_variance8x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance8x16 =
-        aom_highbd_8_masked_sub_pixel_variance8x16_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance8x32 =
-      aom_highbd_8_masked_sub_pixel_variance8x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance8x32 =
-        aom_highbd_8_masked_sub_pixel_variance8x32_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance8x4 =
-      aom_highbd_8_masked_sub_pixel_variance8x4_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance8x4 =
-        aom_highbd_8_masked_sub_pixel_variance8x4_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance8x8 =
-      aom_highbd_8_masked_sub_pixel_variance8x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance8x8 =
-        aom_highbd_8_masked_sub_pixel_variance8x8_ssse3;
-  aom_highbd_8_sub_pixel_avg_variance4x4 =
-      aom_highbd_8_sub_pixel_avg_variance4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_8_sub_pixel_avg_variance4x4 =
-        aom_highbd_8_sub_pixel_avg_variance4x4_sse4_1;
-  aom_highbd_8_sub_pixel_variance4x4 = aom_highbd_8_sub_pixel_variance4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_8_sub_pixel_variance4x4 =
-        aom_highbd_8_sub_pixel_variance4x4_sse4_1;
-  aom_highbd_8_variance4x4 = aom_highbd_8_variance4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_8_variance4x4 = aom_highbd_8_variance4x4_sse4_1;
-  aom_highbd_blend_a64_d16_mask = aom_highbd_blend_a64_d16_mask_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_blend_a64_d16_mask = aom_highbd_blend_a64_d16_mask_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_blend_a64_d16_mask = aom_highbd_blend_a64_d16_mask_avx2;
-  aom_highbd_blend_a64_hmask = aom_highbd_blend_a64_hmask_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_blend_a64_hmask = aom_highbd_blend_a64_hmask_sse4_1;
-  aom_highbd_blend_a64_mask = aom_highbd_blend_a64_mask_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_blend_a64_mask = aom_highbd_blend_a64_mask_sse4_1;
-  aom_highbd_blend_a64_vmask = aom_highbd_blend_a64_vmask_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_blend_a64_vmask = aom_highbd_blend_a64_vmask_sse4_1;
-  aom_highbd_comp_mask_pred = aom_highbd_comp_mask_pred_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_comp_mask_pred = aom_highbd_comp_mask_pred_avx2;
-  aom_highbd_convolve8_horiz = aom_highbd_convolve8_horiz_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_convolve8_horiz = aom_highbd_convolve8_horiz_avx2;
-  aom_highbd_convolve8_vert = aom_highbd_convolve8_vert_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_convolve8_vert = aom_highbd_convolve8_vert_avx2;
-  aom_highbd_convolve_copy = aom_highbd_convolve_copy_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_convolve_copy = aom_highbd_convolve_copy_avx2;
-  aom_highbd_hadamard_16x16 = aom_highbd_hadamard_16x16_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_hadamard_16x16 = aom_highbd_hadamard_16x16_avx2;
-  aom_highbd_hadamard_32x32 = aom_highbd_hadamard_32x32_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_hadamard_32x32 = aom_highbd_hadamard_32x32_avx2;
-  aom_highbd_hadamard_8x8 = aom_highbd_hadamard_8x8_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_hadamard_8x8 = aom_highbd_hadamard_8x8_avx2;
-  aom_highbd_lpf_horizontal_14_dual = aom_highbd_lpf_horizontal_14_dual_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_lpf_horizontal_14_dual = aom_highbd_lpf_horizontal_14_dual_avx2;
-  aom_highbd_lpf_horizontal_4_dual = aom_highbd_lpf_horizontal_4_dual_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_lpf_horizontal_4_dual = aom_highbd_lpf_horizontal_4_dual_avx2;
-  aom_highbd_lpf_horizontal_8_dual = aom_highbd_lpf_horizontal_8_dual_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_lpf_horizontal_8_dual = aom_highbd_lpf_horizontal_8_dual_avx2;
-  aom_highbd_lpf_vertical_14_dual = aom_highbd_lpf_vertical_14_dual_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_lpf_vertical_14_dual = aom_highbd_lpf_vertical_14_dual_avx2;
-  aom_highbd_lpf_vertical_4_dual = aom_highbd_lpf_vertical_4_dual_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_lpf_vertical_4_dual = aom_highbd_lpf_vertical_4_dual_avx2;
-  aom_highbd_lpf_vertical_8_dual = aom_highbd_lpf_vertical_8_dual_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_lpf_vertical_8_dual = aom_highbd_lpf_vertical_8_dual_avx2;
-  aom_highbd_masked_sad128x128 = aom_highbd_masked_sad128x128_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad128x128 = aom_highbd_masked_sad128x128_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad128x128 = aom_highbd_masked_sad128x128_avx2;
-  aom_highbd_masked_sad128x64 = aom_highbd_masked_sad128x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad128x64 = aom_highbd_masked_sad128x64_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad128x64 = aom_highbd_masked_sad128x64_avx2;
-  aom_highbd_masked_sad16x16 = aom_highbd_masked_sad16x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad16x16 = aom_highbd_masked_sad16x16_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad16x16 = aom_highbd_masked_sad16x16_avx2;
-  aom_highbd_masked_sad16x32 = aom_highbd_masked_sad16x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad16x32 = aom_highbd_masked_sad16x32_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad16x32 = aom_highbd_masked_sad16x32_avx2;
-  aom_highbd_masked_sad16x4 = aom_highbd_masked_sad16x4_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad16x4 = aom_highbd_masked_sad16x4_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad16x4 = aom_highbd_masked_sad16x4_avx2;
-  aom_highbd_masked_sad16x64 = aom_highbd_masked_sad16x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad16x64 = aom_highbd_masked_sad16x64_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad16x64 = aom_highbd_masked_sad16x64_avx2;
-  aom_highbd_masked_sad16x8 = aom_highbd_masked_sad16x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad16x8 = aom_highbd_masked_sad16x8_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad16x8 = aom_highbd_masked_sad16x8_avx2;
-  aom_highbd_masked_sad32x16 = aom_highbd_masked_sad32x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad32x16 = aom_highbd_masked_sad32x16_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad32x16 = aom_highbd_masked_sad32x16_avx2;
-  aom_highbd_masked_sad32x32 = aom_highbd_masked_sad32x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad32x32 = aom_highbd_masked_sad32x32_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad32x32 = aom_highbd_masked_sad32x32_avx2;
-  aom_highbd_masked_sad32x64 = aom_highbd_masked_sad32x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad32x64 = aom_highbd_masked_sad32x64_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad32x64 = aom_highbd_masked_sad32x64_avx2;
-  aom_highbd_masked_sad32x8 = aom_highbd_masked_sad32x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad32x8 = aom_highbd_masked_sad32x8_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad32x8 = aom_highbd_masked_sad32x8_avx2;
-  aom_highbd_masked_sad4x16 = aom_highbd_masked_sad4x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad4x16 = aom_highbd_masked_sad4x16_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad4x16 = aom_highbd_masked_sad4x16_avx2;
-  aom_highbd_masked_sad4x4 = aom_highbd_masked_sad4x4_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad4x4 = aom_highbd_masked_sad4x4_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad4x4 = aom_highbd_masked_sad4x4_avx2;
-  aom_highbd_masked_sad4x8 = aom_highbd_masked_sad4x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad4x8 = aom_highbd_masked_sad4x8_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad4x8 = aom_highbd_masked_sad4x8_avx2;
-  aom_highbd_masked_sad64x128 = aom_highbd_masked_sad64x128_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad64x128 = aom_highbd_masked_sad64x128_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad64x128 = aom_highbd_masked_sad64x128_avx2;
-  aom_highbd_masked_sad64x16 = aom_highbd_masked_sad64x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad64x16 = aom_highbd_masked_sad64x16_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad64x16 = aom_highbd_masked_sad64x16_avx2;
-  aom_highbd_masked_sad64x32 = aom_highbd_masked_sad64x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad64x32 = aom_highbd_masked_sad64x32_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad64x32 = aom_highbd_masked_sad64x32_avx2;
-  aom_highbd_masked_sad64x64 = aom_highbd_masked_sad64x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad64x64 = aom_highbd_masked_sad64x64_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad64x64 = aom_highbd_masked_sad64x64_avx2;
-  aom_highbd_masked_sad8x16 = aom_highbd_masked_sad8x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad8x16 = aom_highbd_masked_sad8x16_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad8x16 = aom_highbd_masked_sad8x16_avx2;
-  aom_highbd_masked_sad8x32 = aom_highbd_masked_sad8x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad8x32 = aom_highbd_masked_sad8x32_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad8x32 = aom_highbd_masked_sad8x32_avx2;
-  aom_highbd_masked_sad8x4 = aom_highbd_masked_sad8x4_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad8x4 = aom_highbd_masked_sad8x4_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad8x4 = aom_highbd_masked_sad8x4_avx2;
-  aom_highbd_masked_sad8x8 = aom_highbd_masked_sad8x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad8x8 = aom_highbd_masked_sad8x8_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad8x8 = aom_highbd_masked_sad8x8_avx2;
-  aom_highbd_obmc_sad128x128 = aom_highbd_obmc_sad128x128_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad128x128 = aom_highbd_obmc_sad128x128_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad128x128 = aom_highbd_obmc_sad128x128_avx2;
-  aom_highbd_obmc_sad128x64 = aom_highbd_obmc_sad128x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad128x64 = aom_highbd_obmc_sad128x64_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad128x64 = aom_highbd_obmc_sad128x64_avx2;
-  aom_highbd_obmc_sad16x16 = aom_highbd_obmc_sad16x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad16x16 = aom_highbd_obmc_sad16x16_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad16x16 = aom_highbd_obmc_sad16x16_avx2;
-  aom_highbd_obmc_sad16x32 = aom_highbd_obmc_sad16x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad16x32 = aom_highbd_obmc_sad16x32_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad16x32 = aom_highbd_obmc_sad16x32_avx2;
-  aom_highbd_obmc_sad16x4 = aom_highbd_obmc_sad16x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad16x4 = aom_highbd_obmc_sad16x4_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad16x4 = aom_highbd_obmc_sad16x4_avx2;
-  aom_highbd_obmc_sad16x64 = aom_highbd_obmc_sad16x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad16x64 = aom_highbd_obmc_sad16x64_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad16x64 = aom_highbd_obmc_sad16x64_avx2;
-  aom_highbd_obmc_sad16x8 = aom_highbd_obmc_sad16x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad16x8 = aom_highbd_obmc_sad16x8_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad16x8 = aom_highbd_obmc_sad16x8_avx2;
-  aom_highbd_obmc_sad32x16 = aom_highbd_obmc_sad32x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad32x16 = aom_highbd_obmc_sad32x16_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad32x16 = aom_highbd_obmc_sad32x16_avx2;
-  aom_highbd_obmc_sad32x32 = aom_highbd_obmc_sad32x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad32x32 = aom_highbd_obmc_sad32x32_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad32x32 = aom_highbd_obmc_sad32x32_avx2;
-  aom_highbd_obmc_sad32x64 = aom_highbd_obmc_sad32x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad32x64 = aom_highbd_obmc_sad32x64_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad32x64 = aom_highbd_obmc_sad32x64_avx2;
-  aom_highbd_obmc_sad32x8 = aom_highbd_obmc_sad32x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad32x8 = aom_highbd_obmc_sad32x8_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad32x8 = aom_highbd_obmc_sad32x8_avx2;
-  aom_highbd_obmc_sad4x16 = aom_highbd_obmc_sad4x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad4x16 = aom_highbd_obmc_sad4x16_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad4x16 = aom_highbd_obmc_sad4x16_avx2;
-  aom_highbd_obmc_sad4x4 = aom_highbd_obmc_sad4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad4x4 = aom_highbd_obmc_sad4x4_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad4x4 = aom_highbd_obmc_sad4x4_avx2;
-  aom_highbd_obmc_sad4x8 = aom_highbd_obmc_sad4x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad4x8 = aom_highbd_obmc_sad4x8_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad4x8 = aom_highbd_obmc_sad4x8_avx2;
-  aom_highbd_obmc_sad64x128 = aom_highbd_obmc_sad64x128_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad64x128 = aom_highbd_obmc_sad64x128_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad64x128 = aom_highbd_obmc_sad64x128_avx2;
-  aom_highbd_obmc_sad64x16 = aom_highbd_obmc_sad64x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad64x16 = aom_highbd_obmc_sad64x16_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad64x16 = aom_highbd_obmc_sad64x16_avx2;
-  aom_highbd_obmc_sad64x32 = aom_highbd_obmc_sad64x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad64x32 = aom_highbd_obmc_sad64x32_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad64x32 = aom_highbd_obmc_sad64x32_avx2;
-  aom_highbd_obmc_sad64x64 = aom_highbd_obmc_sad64x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad64x64 = aom_highbd_obmc_sad64x64_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad64x64 = aom_highbd_obmc_sad64x64_avx2;
-  aom_highbd_obmc_sad8x16 = aom_highbd_obmc_sad8x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad8x16 = aom_highbd_obmc_sad8x16_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad8x16 = aom_highbd_obmc_sad8x16_avx2;
-  aom_highbd_obmc_sad8x32 = aom_highbd_obmc_sad8x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad8x32 = aom_highbd_obmc_sad8x32_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad8x32 = aom_highbd_obmc_sad8x32_avx2;
-  aom_highbd_obmc_sad8x4 = aom_highbd_obmc_sad8x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad8x4 = aom_highbd_obmc_sad8x4_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad8x4 = aom_highbd_obmc_sad8x4_avx2;
-  aom_highbd_obmc_sad8x8 = aom_highbd_obmc_sad8x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad8x8 = aom_highbd_obmc_sad8x8_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad8x8 = aom_highbd_obmc_sad8x8_avx2;
-  aom_highbd_obmc_variance128x128 = aom_highbd_obmc_variance128x128_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance128x128 = aom_highbd_obmc_variance128x128_sse4_1;
-  aom_highbd_obmc_variance128x64 = aom_highbd_obmc_variance128x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance128x64 = aom_highbd_obmc_variance128x64_sse4_1;
-  aom_highbd_obmc_variance16x16 = aom_highbd_obmc_variance16x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance16x16 = aom_highbd_obmc_variance16x16_sse4_1;
-  aom_highbd_obmc_variance16x32 = aom_highbd_obmc_variance16x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance16x32 = aom_highbd_obmc_variance16x32_sse4_1;
-  aom_highbd_obmc_variance16x4 = aom_highbd_obmc_variance16x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance16x4 = aom_highbd_obmc_variance16x4_sse4_1;
-  aom_highbd_obmc_variance16x64 = aom_highbd_obmc_variance16x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance16x64 = aom_highbd_obmc_variance16x64_sse4_1;
-  aom_highbd_obmc_variance16x8 = aom_highbd_obmc_variance16x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance16x8 = aom_highbd_obmc_variance16x8_sse4_1;
-  aom_highbd_obmc_variance32x16 = aom_highbd_obmc_variance32x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance32x16 = aom_highbd_obmc_variance32x16_sse4_1;
-  aom_highbd_obmc_variance32x32 = aom_highbd_obmc_variance32x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance32x32 = aom_highbd_obmc_variance32x32_sse4_1;
-  aom_highbd_obmc_variance32x64 = aom_highbd_obmc_variance32x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance32x64 = aom_highbd_obmc_variance32x64_sse4_1;
-  aom_highbd_obmc_variance32x8 = aom_highbd_obmc_variance32x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance32x8 = aom_highbd_obmc_variance32x8_sse4_1;
-  aom_highbd_obmc_variance4x16 = aom_highbd_obmc_variance4x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance4x16 = aom_highbd_obmc_variance4x16_sse4_1;
-  aom_highbd_obmc_variance4x4 = aom_highbd_obmc_variance4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance4x4 = aom_highbd_obmc_variance4x4_sse4_1;
-  aom_highbd_obmc_variance4x8 = aom_highbd_obmc_variance4x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance4x8 = aom_highbd_obmc_variance4x8_sse4_1;
-  aom_highbd_obmc_variance64x128 = aom_highbd_obmc_variance64x128_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance64x128 = aom_highbd_obmc_variance64x128_sse4_1;
-  aom_highbd_obmc_variance64x16 = aom_highbd_obmc_variance64x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance64x16 = aom_highbd_obmc_variance64x16_sse4_1;
-  aom_highbd_obmc_variance64x32 = aom_highbd_obmc_variance64x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance64x32 = aom_highbd_obmc_variance64x32_sse4_1;
-  aom_highbd_obmc_variance64x64 = aom_highbd_obmc_variance64x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance64x64 = aom_highbd_obmc_variance64x64_sse4_1;
-  aom_highbd_obmc_variance8x16 = aom_highbd_obmc_variance8x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance8x16 = aom_highbd_obmc_variance8x16_sse4_1;
-  aom_highbd_obmc_variance8x32 = aom_highbd_obmc_variance8x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance8x32 = aom_highbd_obmc_variance8x32_sse4_1;
-  aom_highbd_obmc_variance8x4 = aom_highbd_obmc_variance8x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance8x4 = aom_highbd_obmc_variance8x4_sse4_1;
-  aom_highbd_obmc_variance8x8 = aom_highbd_obmc_variance8x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance8x8 = aom_highbd_obmc_variance8x8_sse4_1;
-  aom_highbd_quantize_b = aom_highbd_quantize_b_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_quantize_b = aom_highbd_quantize_b_avx2;
-  aom_highbd_quantize_b_32x32_adaptive =
-      aom_highbd_quantize_b_32x32_adaptive_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_quantize_b_32x32_adaptive =
-        aom_highbd_quantize_b_32x32_adaptive_avx2;
-  aom_highbd_quantize_b_adaptive = aom_highbd_quantize_b_adaptive_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_quantize_b_adaptive = aom_highbd_quantize_b_adaptive_avx2;
-  aom_highbd_sad128x128 = aom_highbd_sad128x128_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad128x128 = aom_highbd_sad128x128_avx2;
-  aom_highbd_sad128x128_avg = aom_highbd_sad128x128_avg_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad128x128_avg = aom_highbd_sad128x128_avg_avx2;
-  aom_highbd_sad128x128x4d = aom_highbd_sad128x128x4d_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad128x128x4d = aom_highbd_sad128x128x4d_avx2;
-  aom_highbd_sad128x64 = aom_highbd_sad128x64_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad128x64 = aom_highbd_sad128x64_avx2;
-  aom_highbd_sad128x64_avg = aom_highbd_sad128x64_avg_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad128x64_avg = aom_highbd_sad128x64_avg_avx2;
-  aom_highbd_sad128x64x4d = aom_highbd_sad128x64x4d_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad128x64x4d = aom_highbd_sad128x64x4d_avx2;
-  aom_highbd_sad16x16 = aom_highbd_sad16x16_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad16x16 = aom_highbd_sad16x16_avx2;
-  aom_highbd_sad16x16_avg = aom_highbd_sad16x16_avg_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad16x16_avg = aom_highbd_sad16x16_avg_avx2;
-  aom_highbd_sad16x16x4d = aom_highbd_sad16x16x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad16x16x4d = aom_highbd_sad16x16x4d_avx2;
-  aom_highbd_sad16x32 = aom_highbd_sad16x32_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad16x32 = aom_highbd_sad16x32_avx2;
-  aom_highbd_sad16x32_avg = aom_highbd_sad16x32_avg_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad16x32_avg = aom_highbd_sad16x32_avg_avx2;
-  aom_highbd_sad16x32x4d = aom_highbd_sad16x32x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad16x32x4d = aom_highbd_sad16x32x4d_avx2;
-  aom_highbd_sad16x4 = aom_highbd_sad16x4_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad16x4 = aom_highbd_sad16x4_avx2;
-  aom_highbd_sad16x4_avg = aom_highbd_sad16x4_avg_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad16x4_avg = aom_highbd_sad16x4_avg_avx2;
-  aom_highbd_sad16x4x4d = aom_highbd_sad16x4x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad16x4x4d = aom_highbd_sad16x4x4d_avx2;
-  aom_highbd_sad16x64 = aom_highbd_sad16x64_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad16x64 = aom_highbd_sad16x64_avx2;
-  aom_highbd_sad16x64_avg = aom_highbd_sad16x64_avg_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad16x64_avg = aom_highbd_sad16x64_avg_avx2;
-  aom_highbd_sad16x64x4d = aom_highbd_sad16x64x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad16x64x4d = aom_highbd_sad16x64x4d_avx2;
-  aom_highbd_sad16x8 = aom_highbd_sad16x8_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad16x8 = aom_highbd_sad16x8_avx2;
-  aom_highbd_sad16x8_avg = aom_highbd_sad16x8_avg_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad16x8_avg = aom_highbd_sad16x8_avg_avx2;
-  aom_highbd_sad16x8x4d = aom_highbd_sad16x8x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad16x8x4d = aom_highbd_sad16x8x4d_avx2;
-  aom_highbd_sad32x16 = aom_highbd_sad32x16_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad32x16 = aom_highbd_sad32x16_avx2;
-  aom_highbd_sad32x16_avg = aom_highbd_sad32x16_avg_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad32x16_avg = aom_highbd_sad32x16_avg_avx2;
-  aom_highbd_sad32x16x4d = aom_highbd_sad32x16x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad32x16x4d = aom_highbd_sad32x16x4d_avx2;
-  aom_highbd_sad32x32 = aom_highbd_sad32x32_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad32x32 = aom_highbd_sad32x32_avx2;
-  aom_highbd_sad32x32_avg = aom_highbd_sad32x32_avg_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad32x32_avg = aom_highbd_sad32x32_avg_avx2;
-  aom_highbd_sad32x32x4d = aom_highbd_sad32x32x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad32x32x4d = aom_highbd_sad32x32x4d_avx2;
-  aom_highbd_sad32x64 = aom_highbd_sad32x64_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad32x64 = aom_highbd_sad32x64_avx2;
-  aom_highbd_sad32x64_avg = aom_highbd_sad32x64_avg_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad32x64_avg = aom_highbd_sad32x64_avg_avx2;
-  aom_highbd_sad32x64x4d = aom_highbd_sad32x64x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad32x64x4d = aom_highbd_sad32x64x4d_avx2;
-  aom_highbd_sad32x8 = aom_highbd_sad32x8_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad32x8 = aom_highbd_sad32x8_avx2;
-  aom_highbd_sad32x8_avg = aom_highbd_sad32x8_avg_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad32x8_avg = aom_highbd_sad32x8_avg_avx2;
-  aom_highbd_sad32x8x4d = aom_highbd_sad32x8x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad32x8x4d = aom_highbd_sad32x8x4d_avx2;
-  aom_highbd_sad64x128 = aom_highbd_sad64x128_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad64x128 = aom_highbd_sad64x128_avx2;
-  aom_highbd_sad64x128_avg = aom_highbd_sad64x128_avg_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad64x128_avg = aom_highbd_sad64x128_avg_avx2;
-  aom_highbd_sad64x128x4d = aom_highbd_sad64x128x4d_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad64x128x4d = aom_highbd_sad64x128x4d_avx2;
-  aom_highbd_sad64x16 = aom_highbd_sad64x16_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad64x16 = aom_highbd_sad64x16_avx2;
-  aom_highbd_sad64x16_avg = aom_highbd_sad64x16_avg_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad64x16_avg = aom_highbd_sad64x16_avg_avx2;
-  aom_highbd_sad64x16x4d = aom_highbd_sad64x16x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad64x16x4d = aom_highbd_sad64x16x4d_avx2;
-  aom_highbd_sad64x32 = aom_highbd_sad64x32_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad64x32 = aom_highbd_sad64x32_avx2;
-  aom_highbd_sad64x32_avg = aom_highbd_sad64x32_avg_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad64x32_avg = aom_highbd_sad64x32_avg_avx2;
-  aom_highbd_sad64x32x4d = aom_highbd_sad64x32x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad64x32x4d = aom_highbd_sad64x32x4d_avx2;
-  aom_highbd_sad64x64 = aom_highbd_sad64x64_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad64x64 = aom_highbd_sad64x64_avx2;
-  aom_highbd_sad64x64_avg = aom_highbd_sad64x64_avg_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad64x64_avg = aom_highbd_sad64x64_avg_avx2;
-  aom_highbd_sad64x64x4d = aom_highbd_sad64x64x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad64x64x4d = aom_highbd_sad64x64x4d_avx2;
-  aom_highbd_sad_skip_128x128 = aom_highbd_sad_skip_128x128_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_128x128 = aom_highbd_sad_skip_128x128_avx2;
-  aom_highbd_sad_skip_128x128x4d = aom_highbd_sad_skip_128x128x4d_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_128x128x4d = aom_highbd_sad_skip_128x128x4d_avx2;
-  aom_highbd_sad_skip_128x64 = aom_highbd_sad_skip_128x64_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_128x64 = aom_highbd_sad_skip_128x64_avx2;
-  aom_highbd_sad_skip_128x64x4d = aom_highbd_sad_skip_128x64x4d_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_128x64x4d = aom_highbd_sad_skip_128x64x4d_avx2;
-  aom_highbd_sad_skip_16x16 = aom_highbd_sad_skip_16x16_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_16x16 = aom_highbd_sad_skip_16x16_avx2;
-  aom_highbd_sad_skip_16x16x4d = aom_highbd_sad_skip_16x16x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_16x16x4d = aom_highbd_sad_skip_16x16x4d_avx2;
-  aom_highbd_sad_skip_16x32 = aom_highbd_sad_skip_16x32_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_16x32 = aom_highbd_sad_skip_16x32_avx2;
-  aom_highbd_sad_skip_16x32x4d = aom_highbd_sad_skip_16x32x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_16x32x4d = aom_highbd_sad_skip_16x32x4d_avx2;
-  aom_highbd_sad_skip_16x64 = aom_highbd_sad_skip_16x64_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_16x64 = aom_highbd_sad_skip_16x64_avx2;
-  aom_highbd_sad_skip_16x64x4d = aom_highbd_sad_skip_16x64x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_16x64x4d = aom_highbd_sad_skip_16x64x4d_avx2;
-  aom_highbd_sad_skip_16x8 = aom_highbd_sad_skip_16x8_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_16x8 = aom_highbd_sad_skip_16x8_avx2;
-  aom_highbd_sad_skip_16x8x4d = aom_highbd_sad_skip_16x8x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_16x8x4d = aom_highbd_sad_skip_16x8x4d_avx2;
-  aom_highbd_sad_skip_32x16 = aom_highbd_sad_skip_32x16_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_32x16 = aom_highbd_sad_skip_32x16_avx2;
-  aom_highbd_sad_skip_32x16x4d = aom_highbd_sad_skip_32x16x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_32x16x4d = aom_highbd_sad_skip_32x16x4d_avx2;
-  aom_highbd_sad_skip_32x32 = aom_highbd_sad_skip_32x32_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_32x32 = aom_highbd_sad_skip_32x32_avx2;
-  aom_highbd_sad_skip_32x32x4d = aom_highbd_sad_skip_32x32x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_32x32x4d = aom_highbd_sad_skip_32x32x4d_avx2;
-  aom_highbd_sad_skip_32x64 = aom_highbd_sad_skip_32x64_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_32x64 = aom_highbd_sad_skip_32x64_avx2;
-  aom_highbd_sad_skip_32x64x4d = aom_highbd_sad_skip_32x64x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_32x64x4d = aom_highbd_sad_skip_32x64x4d_avx2;
-  aom_highbd_sad_skip_32x8 = aom_highbd_sad_skip_32x8_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_32x8 = aom_highbd_sad_skip_32x8_avx2;
-  aom_highbd_sad_skip_32x8x4d = aom_highbd_sad_skip_32x8x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_32x8x4d = aom_highbd_sad_skip_32x8x4d_avx2;
-  aom_highbd_sad_skip_64x128 = aom_highbd_sad_skip_64x128_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_64x128 = aom_highbd_sad_skip_64x128_avx2;
-  aom_highbd_sad_skip_64x128x4d = aom_highbd_sad_skip_64x128x4d_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_64x128x4d = aom_highbd_sad_skip_64x128x4d_avx2;
-  aom_highbd_sad_skip_64x16 = aom_highbd_sad_skip_64x16_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_64x16 = aom_highbd_sad_skip_64x16_avx2;
-  aom_highbd_sad_skip_64x16x4d = aom_highbd_sad_skip_64x16x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_64x16x4d = aom_highbd_sad_skip_64x16x4d_avx2;
-  aom_highbd_sad_skip_64x32 = aom_highbd_sad_skip_64x32_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_64x32 = aom_highbd_sad_skip_64x32_avx2;
-  aom_highbd_sad_skip_64x32x4d = aom_highbd_sad_skip_64x32x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_64x32x4d = aom_highbd_sad_skip_64x32x4d_avx2;
-  aom_highbd_sad_skip_64x64 = aom_highbd_sad_skip_64x64_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_64x64 = aom_highbd_sad_skip_64x64_avx2;
-  aom_highbd_sad_skip_64x64x4d = aom_highbd_sad_skip_64x64x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_64x64x4d = aom_highbd_sad_skip_64x64x4d_avx2;
-  aom_highbd_sse = aom_highbd_sse_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_sse = aom_highbd_sse_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_sse = aom_highbd_sse_avx2;
   aom_ifft16x16_float = aom_ifft16x16_float_sse2;
   if (flags & HAS_AVX2)
     aom_ifft16x16_float = aom_ifft16x16_float_avx2;
@@ -28772,298 +11691,6 @@
   aom_mse_wxh_16bit = aom_mse_wxh_16bit_sse2;
   if (flags & HAS_AVX2)
     aom_mse_wxh_16bit = aom_mse_wxh_16bit_avx2;
-  aom_mse_wxh_16bit_highbd = aom_mse_wxh_16bit_highbd_sse2;
-  if (flags & HAS_AVX2)
-    aom_mse_wxh_16bit_highbd = aom_mse_wxh_16bit_highbd_avx2;
-  aom_obmc_sad128x128 = aom_obmc_sad128x128_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad128x128 = aom_obmc_sad128x128_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad128x128 = aom_obmc_sad128x128_avx2;
-  aom_obmc_sad128x64 = aom_obmc_sad128x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad128x64 = aom_obmc_sad128x64_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad128x64 = aom_obmc_sad128x64_avx2;
-  aom_obmc_sad16x16 = aom_obmc_sad16x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad16x16 = aom_obmc_sad16x16_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad16x16 = aom_obmc_sad16x16_avx2;
-  aom_obmc_sad16x32 = aom_obmc_sad16x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad16x32 = aom_obmc_sad16x32_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad16x32 = aom_obmc_sad16x32_avx2;
-  aom_obmc_sad16x4 = aom_obmc_sad16x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad16x4 = aom_obmc_sad16x4_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad16x4 = aom_obmc_sad16x4_avx2;
-  aom_obmc_sad16x64 = aom_obmc_sad16x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad16x64 = aom_obmc_sad16x64_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad16x64 = aom_obmc_sad16x64_avx2;
-  aom_obmc_sad16x8 = aom_obmc_sad16x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad16x8 = aom_obmc_sad16x8_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad16x8 = aom_obmc_sad16x8_avx2;
-  aom_obmc_sad32x16 = aom_obmc_sad32x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad32x16 = aom_obmc_sad32x16_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad32x16 = aom_obmc_sad32x16_avx2;
-  aom_obmc_sad32x32 = aom_obmc_sad32x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad32x32 = aom_obmc_sad32x32_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad32x32 = aom_obmc_sad32x32_avx2;
-  aom_obmc_sad32x64 = aom_obmc_sad32x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad32x64 = aom_obmc_sad32x64_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad32x64 = aom_obmc_sad32x64_avx2;
-  aom_obmc_sad32x8 = aom_obmc_sad32x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad32x8 = aom_obmc_sad32x8_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad32x8 = aom_obmc_sad32x8_avx2;
-  aom_obmc_sad4x16 = aom_obmc_sad4x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad4x16 = aom_obmc_sad4x16_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad4x16 = aom_obmc_sad4x16_avx2;
-  aom_obmc_sad4x4 = aom_obmc_sad4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad4x4 = aom_obmc_sad4x4_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad4x4 = aom_obmc_sad4x4_avx2;
-  aom_obmc_sad4x8 = aom_obmc_sad4x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad4x8 = aom_obmc_sad4x8_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad4x8 = aom_obmc_sad4x8_avx2;
-  aom_obmc_sad64x128 = aom_obmc_sad64x128_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad64x128 = aom_obmc_sad64x128_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad64x128 = aom_obmc_sad64x128_avx2;
-  aom_obmc_sad64x16 = aom_obmc_sad64x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad64x16 = aom_obmc_sad64x16_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad64x16 = aom_obmc_sad64x16_avx2;
-  aom_obmc_sad64x32 = aom_obmc_sad64x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad64x32 = aom_obmc_sad64x32_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad64x32 = aom_obmc_sad64x32_avx2;
-  aom_obmc_sad64x64 = aom_obmc_sad64x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad64x64 = aom_obmc_sad64x64_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad64x64 = aom_obmc_sad64x64_avx2;
-  aom_obmc_sad8x16 = aom_obmc_sad8x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad8x16 = aom_obmc_sad8x16_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad8x16 = aom_obmc_sad8x16_avx2;
-  aom_obmc_sad8x32 = aom_obmc_sad8x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad8x32 = aom_obmc_sad8x32_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad8x32 = aom_obmc_sad8x32_avx2;
-  aom_obmc_sad8x4 = aom_obmc_sad8x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad8x4 = aom_obmc_sad8x4_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad8x4 = aom_obmc_sad8x4_avx2;
-  aom_obmc_sad8x8 = aom_obmc_sad8x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad8x8 = aom_obmc_sad8x8_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad8x8 = aom_obmc_sad8x8_avx2;
-  aom_obmc_sub_pixel_variance128x128 = aom_obmc_sub_pixel_variance128x128_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance128x128 =
-        aom_obmc_sub_pixel_variance128x128_sse4_1;
-  aom_obmc_sub_pixel_variance128x64 = aom_obmc_sub_pixel_variance128x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance128x64 =
-        aom_obmc_sub_pixel_variance128x64_sse4_1;
-  aom_obmc_sub_pixel_variance16x16 = aom_obmc_sub_pixel_variance16x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance16x16 = aom_obmc_sub_pixel_variance16x16_sse4_1;
-  aom_obmc_sub_pixel_variance16x32 = aom_obmc_sub_pixel_variance16x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance16x32 = aom_obmc_sub_pixel_variance16x32_sse4_1;
-  aom_obmc_sub_pixel_variance16x4 = aom_obmc_sub_pixel_variance16x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance16x4 = aom_obmc_sub_pixel_variance16x4_sse4_1;
-  aom_obmc_sub_pixel_variance16x64 = aom_obmc_sub_pixel_variance16x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance16x64 = aom_obmc_sub_pixel_variance16x64_sse4_1;
-  aom_obmc_sub_pixel_variance16x8 = aom_obmc_sub_pixel_variance16x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance16x8 = aom_obmc_sub_pixel_variance16x8_sse4_1;
-  aom_obmc_sub_pixel_variance32x16 = aom_obmc_sub_pixel_variance32x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance32x16 = aom_obmc_sub_pixel_variance32x16_sse4_1;
-  aom_obmc_sub_pixel_variance32x32 = aom_obmc_sub_pixel_variance32x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance32x32 = aom_obmc_sub_pixel_variance32x32_sse4_1;
-  aom_obmc_sub_pixel_variance32x64 = aom_obmc_sub_pixel_variance32x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance32x64 = aom_obmc_sub_pixel_variance32x64_sse4_1;
-  aom_obmc_sub_pixel_variance32x8 = aom_obmc_sub_pixel_variance32x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance32x8 = aom_obmc_sub_pixel_variance32x8_sse4_1;
-  aom_obmc_sub_pixel_variance4x16 = aom_obmc_sub_pixel_variance4x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance4x16 = aom_obmc_sub_pixel_variance4x16_sse4_1;
-  aom_obmc_sub_pixel_variance4x4 = aom_obmc_sub_pixel_variance4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance4x4 = aom_obmc_sub_pixel_variance4x4_sse4_1;
-  aom_obmc_sub_pixel_variance4x8 = aom_obmc_sub_pixel_variance4x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance4x8 = aom_obmc_sub_pixel_variance4x8_sse4_1;
-  aom_obmc_sub_pixel_variance64x128 = aom_obmc_sub_pixel_variance64x128_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance64x128 =
-        aom_obmc_sub_pixel_variance64x128_sse4_1;
-  aom_obmc_sub_pixel_variance64x16 = aom_obmc_sub_pixel_variance64x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance64x16 = aom_obmc_sub_pixel_variance64x16_sse4_1;
-  aom_obmc_sub_pixel_variance64x32 = aom_obmc_sub_pixel_variance64x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance64x32 = aom_obmc_sub_pixel_variance64x32_sse4_1;
-  aom_obmc_sub_pixel_variance64x64 = aom_obmc_sub_pixel_variance64x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance64x64 = aom_obmc_sub_pixel_variance64x64_sse4_1;
-  aom_obmc_sub_pixel_variance8x16 = aom_obmc_sub_pixel_variance8x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance8x16 = aom_obmc_sub_pixel_variance8x16_sse4_1;
-  aom_obmc_sub_pixel_variance8x32 = aom_obmc_sub_pixel_variance8x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance8x32 = aom_obmc_sub_pixel_variance8x32_sse4_1;
-  aom_obmc_sub_pixel_variance8x4 = aom_obmc_sub_pixel_variance8x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance8x4 = aom_obmc_sub_pixel_variance8x4_sse4_1;
-  aom_obmc_sub_pixel_variance8x8 = aom_obmc_sub_pixel_variance8x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance8x8 = aom_obmc_sub_pixel_variance8x8_sse4_1;
-  aom_obmc_variance128x128 = aom_obmc_variance128x128_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance128x128 = aom_obmc_variance128x128_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance128x128 = aom_obmc_variance128x128_avx2;
-  aom_obmc_variance128x64 = aom_obmc_variance128x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance128x64 = aom_obmc_variance128x64_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance128x64 = aom_obmc_variance128x64_avx2;
-  aom_obmc_variance16x16 = aom_obmc_variance16x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance16x16 = aom_obmc_variance16x16_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance16x16 = aom_obmc_variance16x16_avx2;
-  aom_obmc_variance16x32 = aom_obmc_variance16x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance16x32 = aom_obmc_variance16x32_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance16x32 = aom_obmc_variance16x32_avx2;
-  aom_obmc_variance16x4 = aom_obmc_variance16x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance16x4 = aom_obmc_variance16x4_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance16x4 = aom_obmc_variance16x4_avx2;
-  aom_obmc_variance16x64 = aom_obmc_variance16x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance16x64 = aom_obmc_variance16x64_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance16x64 = aom_obmc_variance16x64_avx2;
-  aom_obmc_variance16x8 = aom_obmc_variance16x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance16x8 = aom_obmc_variance16x8_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance16x8 = aom_obmc_variance16x8_avx2;
-  aom_obmc_variance32x16 = aom_obmc_variance32x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance32x16 = aom_obmc_variance32x16_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance32x16 = aom_obmc_variance32x16_avx2;
-  aom_obmc_variance32x32 = aom_obmc_variance32x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance32x32 = aom_obmc_variance32x32_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance32x32 = aom_obmc_variance32x32_avx2;
-  aom_obmc_variance32x64 = aom_obmc_variance32x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance32x64 = aom_obmc_variance32x64_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance32x64 = aom_obmc_variance32x64_avx2;
-  aom_obmc_variance32x8 = aom_obmc_variance32x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance32x8 = aom_obmc_variance32x8_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance32x8 = aom_obmc_variance32x8_avx2;
-  aom_obmc_variance4x16 = aom_obmc_variance4x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance4x16 = aom_obmc_variance4x16_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance4x16 = aom_obmc_variance4x16_avx2;
-  aom_obmc_variance4x4 = aom_obmc_variance4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance4x4 = aom_obmc_variance4x4_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance4x4 = aom_obmc_variance4x4_avx2;
-  aom_obmc_variance4x8 = aom_obmc_variance4x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance4x8 = aom_obmc_variance4x8_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance4x8 = aom_obmc_variance4x8_avx2;
-  aom_obmc_variance64x128 = aom_obmc_variance64x128_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance64x128 = aom_obmc_variance64x128_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance64x128 = aom_obmc_variance64x128_avx2;
-  aom_obmc_variance64x16 = aom_obmc_variance64x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance64x16 = aom_obmc_variance64x16_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance64x16 = aom_obmc_variance64x16_avx2;
-  aom_obmc_variance64x32 = aom_obmc_variance64x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance64x32 = aom_obmc_variance64x32_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance64x32 = aom_obmc_variance64x32_avx2;
-  aom_obmc_variance64x64 = aom_obmc_variance64x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance64x64 = aom_obmc_variance64x64_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance64x64 = aom_obmc_variance64x64_avx2;
-  aom_obmc_variance8x16 = aom_obmc_variance8x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance8x16 = aom_obmc_variance8x16_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance8x16 = aom_obmc_variance8x16_avx2;
-  aom_obmc_variance8x32 = aom_obmc_variance8x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance8x32 = aom_obmc_variance8x32_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance8x32 = aom_obmc_variance8x32_avx2;
-  aom_obmc_variance8x4 = aom_obmc_variance8x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance8x4 = aom_obmc_variance8x4_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance8x4 = aom_obmc_variance8x4_avx2;
-  aom_obmc_variance8x8 = aom_obmc_variance8x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance8x8 = aom_obmc_variance8x8_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance8x8 = aom_obmc_variance8x8_avx2;
   aom_paeth_predictor_16x16 = aom_paeth_predictor_16x16_c;
   if (flags & HAS_SSSE3)
     aom_paeth_predictor_16x16 = aom_paeth_predictor_16x16_ssse3;
diff --git a/third_party/libaom/source/config/win/ia32/config/av1_rtcd.h b/third_party/libaom/source/config/win/ia32/config/av1_rtcd.h
index c2ef24b..fa27090 100644
--- a/third_party/libaom/source/config/win/ia32/config/av1_rtcd.h
+++ b/third_party/libaom/source/config/win/ia32/config/av1_rtcd.h
@@ -99,109 +99,6 @@
                              const int log_scale);
 #define aom_quantize_b_helper aom_quantize_b_helper_c
 
-void av1_apply_selfguided_restoration_c(const uint8_t* dat,
-                                        int width,
-                                        int height,
-                                        int stride,
-                                        int eps,
-                                        const int* xqd,
-                                        uint8_t* dst,
-                                        int dst_stride,
-                                        int32_t* tmpbuf,
-                                        int bit_depth,
-                                        int highbd);
-void av1_apply_selfguided_restoration_sse4_1(const uint8_t* dat,
-                                             int width,
-                                             int height,
-                                             int stride,
-                                             int eps,
-                                             const int* xqd,
-                                             uint8_t* dst,
-                                             int dst_stride,
-                                             int32_t* tmpbuf,
-                                             int bit_depth,
-                                             int highbd);
-void av1_apply_selfguided_restoration_avx2(const uint8_t* dat,
-                                           int width,
-                                           int height,
-                                           int stride,
-                                           int eps,
-                                           const int* xqd,
-                                           uint8_t* dst,
-                                           int dst_stride,
-                                           int32_t* tmpbuf,
-                                           int bit_depth,
-                                           int highbd);
-RTCD_EXTERN void (*av1_apply_selfguided_restoration)(const uint8_t* dat,
-                                                     int width,
-                                                     int height,
-                                                     int stride,
-                                                     int eps,
-                                                     const int* xqd,
-                                                     uint8_t* dst,
-                                                     int dst_stride,
-                                                     int32_t* tmpbuf,
-                                                     int bit_depth,
-                                                     int highbd);
-
-void av1_apply_temporal_filter_c(const struct yv12_buffer_config* ref_frame,
-                                 const struct macroblockd* mbd,
-                                 const BLOCK_SIZE block_size,
-                                 const int mb_row,
-                                 const int mb_col,
-                                 const int num_planes,
-                                 const double* noise_levels,
-                                 const MV* subblock_mvs,
-                                 const int* subblock_mses,
-                                 const int q_factor,
-                                 const int filter_strength,
-                                 const uint8_t* pred,
-                                 uint32_t* accum,
-                                 uint16_t* count);
-void av1_apply_temporal_filter_sse2(const struct yv12_buffer_config* ref_frame,
-                                    const struct macroblockd* mbd,
-                                    const BLOCK_SIZE block_size,
-                                    const int mb_row,
-                                    const int mb_col,
-                                    const int num_planes,
-                                    const double* noise_levels,
-                                    const MV* subblock_mvs,
-                                    const int* subblock_mses,
-                                    const int q_factor,
-                                    const int filter_strength,
-                                    const uint8_t* pred,
-                                    uint32_t* accum,
-                                    uint16_t* count);
-void av1_apply_temporal_filter_avx2(const struct yv12_buffer_config* ref_frame,
-                                    const struct macroblockd* mbd,
-                                    const BLOCK_SIZE block_size,
-                                    const int mb_row,
-                                    const int mb_col,
-                                    const int num_planes,
-                                    const double* noise_levels,
-                                    const MV* subblock_mvs,
-                                    const int* subblock_mses,
-                                    const int q_factor,
-                                    const int filter_strength,
-                                    const uint8_t* pred,
-                                    uint32_t* accum,
-                                    uint16_t* count);
-RTCD_EXTERN void (*av1_apply_temporal_filter)(
-    const struct yv12_buffer_config* ref_frame,
-    const struct macroblockd* mbd,
-    const BLOCK_SIZE block_size,
-    const int mb_row,
-    const int mb_col,
-    const int num_planes,
-    const double* noise_levels,
-    const MV* subblock_mvs,
-    const int* subblock_mses,
-    const int q_factor,
-    const int filter_strength,
-    const uint8_t* pred,
-    uint32_t* accum,
-    uint16_t* count);
-
 int64_t av1_block_error_c(const tran_low_t* coeff,
                           const tran_low_t* dqcoeff,
                           intptr_t block_size,
@@ -342,137 +239,6 @@
     int w,
     int bd);
 
-int64_t av1_calc_frame_error_c(const uint8_t* const ref,
-                               int stride,
-                               const uint8_t* const dst,
-                               int p_width,
-                               int p_height,
-                               int p_stride);
-int64_t av1_calc_frame_error_sse2(const uint8_t* const ref,
-                                  int stride,
-                                  const uint8_t* const dst,
-                                  int p_width,
-                                  int p_height,
-                                  int p_stride);
-int64_t av1_calc_frame_error_avx2(const uint8_t* const ref,
-                                  int stride,
-                                  const uint8_t* const dst,
-                                  int p_width,
-                                  int p_height,
-                                  int p_stride);
-RTCD_EXTERN int64_t (*av1_calc_frame_error)(const uint8_t* const ref,
-                                            int stride,
-                                            const uint8_t* const dst,
-                                            int p_width,
-                                            int p_height,
-                                            int p_stride);
-
-void av1_calc_proj_params_c(const uint8_t* src8,
-                            int width,
-                            int height,
-                            int src_stride,
-                            const uint8_t* dat8,
-                            int dat_stride,
-                            int32_t* flt0,
-                            int flt0_stride,
-                            int32_t* flt1,
-                            int flt1_stride,
-                            int64_t H[2][2],
-                            int64_t C[2],
-                            const sgr_params_type* params);
-void av1_calc_proj_params_sse4_1(const uint8_t* src8,
-                                 int width,
-                                 int height,
-                                 int src_stride,
-                                 const uint8_t* dat8,
-                                 int dat_stride,
-                                 int32_t* flt0,
-                                 int flt0_stride,
-                                 int32_t* flt1,
-                                 int flt1_stride,
-                                 int64_t H[2][2],
-                                 int64_t C[2],
-                                 const sgr_params_type* params);
-void av1_calc_proj_params_avx2(const uint8_t* src8,
-                               int width,
-                               int height,
-                               int src_stride,
-                               const uint8_t* dat8,
-                               int dat_stride,
-                               int32_t* flt0,
-                               int flt0_stride,
-                               int32_t* flt1,
-                               int flt1_stride,
-                               int64_t H[2][2],
-                               int64_t C[2],
-                               const sgr_params_type* params);
-RTCD_EXTERN void (*av1_calc_proj_params)(const uint8_t* src8,
-                                         int width,
-                                         int height,
-                                         int src_stride,
-                                         const uint8_t* dat8,
-                                         int dat_stride,
-                                         int32_t* flt0,
-                                         int flt0_stride,
-                                         int32_t* flt1,
-                                         int flt1_stride,
-                                         int64_t H[2][2],
-                                         int64_t C[2],
-                                         const sgr_params_type* params);
-
-void av1_calc_proj_params_high_bd_c(const uint8_t* src8,
-                                    int width,
-                                    int height,
-                                    int src_stride,
-                                    const uint8_t* dat8,
-                                    int dat_stride,
-                                    int32_t* flt0,
-                                    int flt0_stride,
-                                    int32_t* flt1,
-                                    int flt1_stride,
-                                    int64_t H[2][2],
-                                    int64_t C[2],
-                                    const sgr_params_type* params);
-void av1_calc_proj_params_high_bd_sse4_1(const uint8_t* src8,
-                                         int width,
-                                         int height,
-                                         int src_stride,
-                                         const uint8_t* dat8,
-                                         int dat_stride,
-                                         int32_t* flt0,
-                                         int flt0_stride,
-                                         int32_t* flt1,
-                                         int flt1_stride,
-                                         int64_t H[2][2],
-                                         int64_t C[2],
-                                         const sgr_params_type* params);
-void av1_calc_proj_params_high_bd_avx2(const uint8_t* src8,
-                                       int width,
-                                       int height,
-                                       int src_stride,
-                                       const uint8_t* dat8,
-                                       int dat_stride,
-                                       int32_t* flt0,
-                                       int flt0_stride,
-                                       int32_t* flt1,
-                                       int flt1_stride,
-                                       int64_t H[2][2],
-                                       int64_t C[2],
-                                       const sgr_params_type* params);
-RTCD_EXTERN void (*av1_calc_proj_params_high_bd)(const uint8_t* src8,
-                                                 int width,
-                                                 int height,
-                                                 int src_stride,
-                                                 const uint8_t* dat8,
-                                                 int dat_stride,
-                                                 int32_t* flt0,
-                                                 int flt0_stride,
-                                                 int32_t* flt1,
-                                                 int flt1_stride,
-                                                 int64_t H[2][2],
-                                                 int64_t C[2],
-                                                 const sgr_params_type* params);
-
 void av1_cnn_activate_c(float** input,
                         int channels,
                         int width,
@@ -562,100 +328,6 @@
                                                     int x2,
                                                     int y2);
 
-void av1_compute_stats_c(int wiener_win,
-                         const uint8_t* dgd8,
-                         const uint8_t* src8,
-                         int h_start,
-                         int h_end,
-                         int v_start,
-                         int v_end,
-                         int dgd_stride,
-                         int src_stride,
-                         int64_t* M,
-                         int64_t* H);
-void av1_compute_stats_sse4_1(int wiener_win,
-                              const uint8_t* dgd8,
-                              const uint8_t* src8,
-                              int h_start,
-                              int h_end,
-                              int v_start,
-                              int v_end,
-                              int dgd_stride,
-                              int src_stride,
-                              int64_t* M,
-                              int64_t* H);
-void av1_compute_stats_avx2(int wiener_win,
-                            const uint8_t* dgd8,
-                            const uint8_t* src8,
-                            int h_start,
-                            int h_end,
-                            int v_start,
-                            int v_end,
-                            int dgd_stride,
-                            int src_stride,
-                            int64_t* M,
-                            int64_t* H);
-RTCD_EXTERN void (*av1_compute_stats)(int wiener_win,
-                                      const uint8_t* dgd8,
-                                      const uint8_t* src8,
-                                      int h_start,
-                                      int h_end,
-                                      int v_start,
-                                      int v_end,
-                                      int dgd_stride,
-                                      int src_stride,
-                                      int64_t* M,
-                                      int64_t* H);
-
-void av1_compute_stats_highbd_c(int wiener_win,
-                                const uint8_t* dgd8,
-                                const uint8_t* src8,
-                                int h_start,
-                                int h_end,
-                                int v_start,
-                                int v_end,
-                                int dgd_stride,
-                                int src_stride,
-                                int64_t* M,
-                                int64_t* H,
-                                aom_bit_depth_t bit_depth);
-void av1_compute_stats_highbd_sse4_1(int wiener_win,
-                                     const uint8_t* dgd8,
-                                     const uint8_t* src8,
-                                     int h_start,
-                                     int h_end,
-                                     int v_start,
-                                     int v_end,
-                                     int dgd_stride,
-                                     int src_stride,
-                                     int64_t* M,
-                                     int64_t* H,
-                                     aom_bit_depth_t bit_depth);
-void av1_compute_stats_highbd_avx2(int wiener_win,
-                                   const uint8_t* dgd8,
-                                   const uint8_t* src8,
-                                   int h_start,
-                                   int h_end,
-                                   int v_start,
-                                   int v_end,
-                                   int dgd_stride,
-                                   int src_stride,
-                                   int64_t* M,
-                                   int64_t* H,
-                                   aom_bit_depth_t bit_depth);
-RTCD_EXTERN void (*av1_compute_stats_highbd)(int wiener_win,
-                                             const uint8_t* dgd8,
-                                             const uint8_t* src8,
-                                             int h_start,
-                                             int h_end,
-                                             int v_start,
-                                             int v_end,
-                                             int dgd_stride,
-                                             int src_stride,
-                                             int64_t* M,
-                                             int64_t* H,
-                                             aom_bit_depth_t bit_depth);
-
 void av1_convolve_2d_scale_c(const uint8_t* src,
                              int src_stride,
                              uint8_t* dst,
@@ -1505,88 +1177,6 @@
                                   int8_t* const coeff_contexts);
 #define av1_get_nz_map_contexts av1_get_nz_map_contexts_sse2
 
-void av1_highbd_apply_temporal_filter_c(
-    const struct yv12_buffer_config* ref_frame,
-    const struct macroblockd* mbd,
-    const BLOCK_SIZE block_size,
-    const int mb_row,
-    const int mb_col,
-    const int num_planes,
-    const double* noise_levels,
-    const MV* subblock_mvs,
-    const int* subblock_mses,
-    const int q_factor,
-    const int filter_strength,
-    const uint8_t* pred,
-    uint32_t* accum,
-    uint16_t* count);
-void av1_highbd_apply_temporal_filter_sse2(
-    const struct yv12_buffer_config* ref_frame,
-    const struct macroblockd* mbd,
-    const BLOCK_SIZE block_size,
-    const int mb_row,
-    const int mb_col,
-    const int num_planes,
-    const double* noise_levels,
-    const MV* subblock_mvs,
-    const int* subblock_mses,
-    const int q_factor,
-    const int filter_strength,
-    const uint8_t* pred,
-    uint32_t* accum,
-    uint16_t* count);
-void av1_highbd_apply_temporal_filter_avx2(
-    const struct yv12_buffer_config* ref_frame,
-    const struct macroblockd* mbd,
-    const BLOCK_SIZE block_size,
-    const int mb_row,
-    const int mb_col,
-    const int num_planes,
-    const double* noise_levels,
-    const MV* subblock_mvs,
-    const int* subblock_mses,
-    const int q_factor,
-    const int filter_strength,
-    const uint8_t* pred,
-    uint32_t* accum,
-    uint16_t* count);
-RTCD_EXTERN void (*av1_highbd_apply_temporal_filter)(
-    const struct yv12_buffer_config* ref_frame,
-    const struct macroblockd* mbd,
-    const BLOCK_SIZE block_size,
-    const int mb_row,
-    const int mb_col,
-    const int num_planes,
-    const double* noise_levels,
-    const MV* subblock_mvs,
-    const int* subblock_mses,
-    const int q_factor,
-    const int filter_strength,
-    const uint8_t* pred,
-    uint32_t* accum,
-    uint16_t* count);
-
-int64_t av1_highbd_block_error_c(const tran_low_t* coeff,
-                                 const tran_low_t* dqcoeff,
-                                 intptr_t block_size,
-                                 int64_t* ssz,
-                                 int bd);
-int64_t av1_highbd_block_error_sse2(const tran_low_t* coeff,
-                                    const tran_low_t* dqcoeff,
-                                    intptr_t block_size,
-                                    int64_t* ssz,
-                                    int bd);
-int64_t av1_highbd_block_error_avx2(const tran_low_t* coeff,
-                                    const tran_low_t* dqcoeff,
-                                    intptr_t block_size,
-                                    int64_t* ssz,
-                                    int bd);
-RTCD_EXTERN int64_t (*av1_highbd_block_error)(const tran_low_t* coeff,
-                                              const tran_low_t* dqcoeff,
-                                              intptr_t block_size,
-                                              int64_t* ssz,
-                                              int bd);
-
 void av1_highbd_convolve8_c(const uint8_t* src,
                             ptrdiff_t src_stride,
                             uint8_t* dst,
@@ -1626,101 +1216,6 @@
                                  int bps);
 #define av1_highbd_convolve8_vert av1_highbd_convolve8_vert_c
 
-void av1_highbd_convolve_2d_scale_c(const uint16_t* src,
-                                    int src_stride,
-                                    uint16_t* dst,
-                                    int dst_stride,
-                                    int w,
-                                    int h,
-                                    const InterpFilterParams* filter_params_x,
-                                    const InterpFilterParams* filter_params_y,
-                                    const int subpel_x_qn,
-                                    const int x_step_qn,
-                                    const int subpel_y_qn,
-                                    const int y_step_qn,
-                                    ConvolveParams* conv_params,
-                                    int bd);
-void av1_highbd_convolve_2d_scale_sse4_1(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_x,
-    const InterpFilterParams* filter_params_y,
-    const int subpel_x_qn,
-    const int x_step_qn,
-    const int subpel_y_qn,
-    const int y_step_qn,
-    ConvolveParams* conv_params,
-    int bd);
-RTCD_EXTERN void (*av1_highbd_convolve_2d_scale)(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_x,
-    const InterpFilterParams* filter_params_y,
-    const int subpel_x_qn,
-    const int x_step_qn,
-    const int subpel_y_qn,
-    const int y_step_qn,
-    ConvolveParams* conv_params,
-    int bd);
-
-void av1_highbd_convolve_2d_sr_c(const uint16_t* src,
-                                 int src_stride,
-                                 uint16_t* dst,
-                                 int dst_stride,
-                                 int w,
-                                 int h,
-                                 const InterpFilterParams* filter_params_x,
-                                 const InterpFilterParams* filter_params_y,
-                                 const int subpel_x_qn,
-                                 const int subpel_y_qn,
-                                 ConvolveParams* conv_params,
-                                 int bd);
-void av1_highbd_convolve_2d_sr_ssse3(const uint16_t* src,
-                                     int src_stride,
-                                     uint16_t* dst,
-                                     int dst_stride,
-                                     int w,
-                                     int h,
-                                     const InterpFilterParams* filter_params_x,
-                                     const InterpFilterParams* filter_params_y,
-                                     const int subpel_x_qn,
-                                     const int subpel_y_qn,
-                                     ConvolveParams* conv_params,
-                                     int bd);
-void av1_highbd_convolve_2d_sr_avx2(const uint16_t* src,
-                                    int src_stride,
-                                    uint16_t* dst,
-                                    int dst_stride,
-                                    int w,
-                                    int h,
-                                    const InterpFilterParams* filter_params_x,
-                                    const InterpFilterParams* filter_params_y,
-                                    const int subpel_x_qn,
-                                    const int subpel_y_qn,
-                                    ConvolveParams* conv_params,
-                                    int bd);
-RTCD_EXTERN void (*av1_highbd_convolve_2d_sr)(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_x,
-    const InterpFilterParams* filter_params_y,
-    const int subpel_x_qn,
-    const int subpel_y_qn,
-    ConvolveParams* conv_params,
-    int bd);
-
 void av1_highbd_convolve_avg_c(const uint8_t* src,
                                ptrdiff_t src_stride,
                                uint8_t* dst,
@@ -1747,388 +1242,6 @@
                                 int bps);
 #define av1_highbd_convolve_copy av1_highbd_convolve_copy_c
 
-void av1_highbd_convolve_horiz_rs_c(const uint16_t* src,
-                                    int src_stride,
-                                    uint16_t* dst,
-                                    int dst_stride,
-                                    int w,
-                                    int h,
-                                    const int16_t* x_filters,
-                                    int x0_qn,
-                                    int x_step_qn,
-                                    int bd);
-void av1_highbd_convolve_horiz_rs_sse4_1(const uint16_t* src,
-                                         int src_stride,
-                                         uint16_t* dst,
-                                         int dst_stride,
-                                         int w,
-                                         int h,
-                                         const int16_t* x_filters,
-                                         int x0_qn,
-                                         int x_step_qn,
-                                         int bd);
-RTCD_EXTERN void (*av1_highbd_convolve_horiz_rs)(const uint16_t* src,
-                                                 int src_stride,
-                                                 uint16_t* dst,
-                                                 int dst_stride,
-                                                 int w,
-                                                 int h,
-                                                 const int16_t* x_filters,
-                                                 int x0_qn,
-                                                 int x_step_qn,
-                                                 int bd);
-
-void av1_highbd_convolve_x_sr_c(const uint16_t* src,
-                                int src_stride,
-                                uint16_t* dst,
-                                int dst_stride,
-                                int w,
-                                int h,
-                                const InterpFilterParams* filter_params_x,
-                                const int subpel_x_qn,
-                                ConvolveParams* conv_params,
-                                int bd);
-void av1_highbd_convolve_x_sr_ssse3(const uint16_t* src,
-                                    int src_stride,
-                                    uint16_t* dst,
-                                    int dst_stride,
-                                    int w,
-                                    int h,
-                                    const InterpFilterParams* filter_params_x,
-                                    const int subpel_x_qn,
-                                    ConvolveParams* conv_params,
-                                    int bd);
-void av1_highbd_convolve_x_sr_avx2(const uint16_t* src,
-                                   int src_stride,
-                                   uint16_t* dst,
-                                   int dst_stride,
-                                   int w,
-                                   int h,
-                                   const InterpFilterParams* filter_params_x,
-                                   const int subpel_x_qn,
-                                   ConvolveParams* conv_params,
-                                   int bd);
-RTCD_EXTERN void (*av1_highbd_convolve_x_sr)(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_x,
-    const int subpel_x_qn,
-    ConvolveParams* conv_params,
-    int bd);
-
-void av1_highbd_convolve_y_sr_c(const uint16_t* src,
-                                int src_stride,
-                                uint16_t* dst,
-                                int dst_stride,
-                                int w,
-                                int h,
-                                const InterpFilterParams* filter_params_y,
-                                const int subpel_y_qn,
-                                int bd);
-void av1_highbd_convolve_y_sr_ssse3(const uint16_t* src,
-                                    int src_stride,
-                                    uint16_t* dst,
-                                    int dst_stride,
-                                    int w,
-                                    int h,
-                                    const InterpFilterParams* filter_params_y,
-                                    const int subpel_y_qn,
-                                    int bd);
-void av1_highbd_convolve_y_sr_avx2(const uint16_t* src,
-                                   int src_stride,
-                                   uint16_t* dst,
-                                   int dst_stride,
-                                   int w,
-                                   int h,
-                                   const InterpFilterParams* filter_params_y,
-                                   const int subpel_y_qn,
-                                   int bd);
-RTCD_EXTERN void (*av1_highbd_convolve_y_sr)(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_y,
-    const int subpel_y_qn,
-    int bd);
-
-void av1_highbd_dist_wtd_convolve_2d_c(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_x,
-    const InterpFilterParams* filter_params_y,
-    const int subpel_x_qn,
-    const int subpel_y_qn,
-    ConvolveParams* conv_params,
-    int bd);
-void av1_highbd_dist_wtd_convolve_2d_sse4_1(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_x,
-    const InterpFilterParams* filter_params_y,
-    const int subpel_x_qn,
-    const int subpel_y_qn,
-    ConvolveParams* conv_params,
-    int bd);
-void av1_highbd_dist_wtd_convolve_2d_avx2(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_x,
-    const InterpFilterParams* filter_params_y,
-    const int subpel_x_qn,
-    const int subpel_y_qn,
-    ConvolveParams* conv_params,
-    int bd);
-RTCD_EXTERN void (*av1_highbd_dist_wtd_convolve_2d)(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_x,
-    const InterpFilterParams* filter_params_y,
-    const int subpel_x_qn,
-    const int subpel_y_qn,
-    ConvolveParams* conv_params,
-    int bd);
-
-void av1_highbd_dist_wtd_convolve_2d_copy_c(const uint16_t* src,
-                                            int src_stride,
-                                            uint16_t* dst,
-                                            int dst_stride,
-                                            int w,
-                                            int h,
-                                            ConvolveParams* conv_params,
-                                            int bd);
-void av1_highbd_dist_wtd_convolve_2d_copy_sse4_1(const uint16_t* src,
-                                                 int src_stride,
-                                                 uint16_t* dst,
-                                                 int dst_stride,
-                                                 int w,
-                                                 int h,
-                                                 ConvolveParams* conv_params,
-                                                 int bd);
-void av1_highbd_dist_wtd_convolve_2d_copy_avx2(const uint16_t* src,
-                                               int src_stride,
-                                               uint16_t* dst,
-                                               int dst_stride,
-                                               int w,
-                                               int h,
-                                               ConvolveParams* conv_params,
-                                               int bd);
-RTCD_EXTERN void (*av1_highbd_dist_wtd_convolve_2d_copy)(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    ConvolveParams* conv_params,
-    int bd);
-
-void av1_highbd_dist_wtd_convolve_x_c(const uint16_t* src,
-                                      int src_stride,
-                                      uint16_t* dst,
-                                      int dst_stride,
-                                      int w,
-                                      int h,
-                                      const InterpFilterParams* filter_params_x,
-                                      const int subpel_x_qn,
-                                      ConvolveParams* conv_params,
-                                      int bd);
-void av1_highbd_dist_wtd_convolve_x_sse4_1(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_x,
-    const int subpel_x_qn,
-    ConvolveParams* conv_params,
-    int bd);
-void av1_highbd_dist_wtd_convolve_x_avx2(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_x,
-    const int subpel_x_qn,
-    ConvolveParams* conv_params,
-    int bd);
-RTCD_EXTERN void (*av1_highbd_dist_wtd_convolve_x)(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_x,
-    const int subpel_x_qn,
-    ConvolveParams* conv_params,
-    int bd);
-
-void av1_highbd_dist_wtd_convolve_y_c(const uint16_t* src,
-                                      int src_stride,
-                                      uint16_t* dst,
-                                      int dst_stride,
-                                      int w,
-                                      int h,
-                                      const InterpFilterParams* filter_params_y,
-                                      const int subpel_y_qn,
-                                      ConvolveParams* conv_params,
-                                      int bd);
-void av1_highbd_dist_wtd_convolve_y_sse4_1(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_y,
-    const int subpel_y_qn,
-    ConvolveParams* conv_params,
-    int bd);
-void av1_highbd_dist_wtd_convolve_y_avx2(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_y,
-    const int subpel_y_qn,
-    ConvolveParams* conv_params,
-    int bd);
-RTCD_EXTERN void (*av1_highbd_dist_wtd_convolve_y)(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_y,
-    const int subpel_y_qn,
-    ConvolveParams* conv_params,
-    int bd);
-
-void av1_highbd_dr_prediction_z1_c(uint16_t* dst,
-                                   ptrdiff_t stride,
-                                   int bw,
-                                   int bh,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int upsample_above,
-                                   int dx,
-                                   int dy,
-                                   int bd);
-void av1_highbd_dr_prediction_z1_avx2(uint16_t* dst,
-                                      ptrdiff_t stride,
-                                      int bw,
-                                      int bh,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int upsample_above,
-                                      int dx,
-                                      int dy,
-                                      int bd);
-RTCD_EXTERN void (*av1_highbd_dr_prediction_z1)(uint16_t* dst,
-                                                ptrdiff_t stride,
-                                                int bw,
-                                                int bh,
-                                                const uint16_t* above,
-                                                const uint16_t* left,
-                                                int upsample_above,
-                                                int dx,
-                                                int dy,
-                                                int bd);
-
-void av1_highbd_dr_prediction_z2_c(uint16_t* dst,
-                                   ptrdiff_t stride,
-                                   int bw,
-                                   int bh,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int upsample_above,
-                                   int upsample_left,
-                                   int dx,
-                                   int dy,
-                                   int bd);
-void av1_highbd_dr_prediction_z2_avx2(uint16_t* dst,
-                                      ptrdiff_t stride,
-                                      int bw,
-                                      int bh,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int upsample_above,
-                                      int upsample_left,
-                                      int dx,
-                                      int dy,
-                                      int bd);
-RTCD_EXTERN void (*av1_highbd_dr_prediction_z2)(uint16_t* dst,
-                                                ptrdiff_t stride,
-                                                int bw,
-                                                int bh,
-                                                const uint16_t* above,
-                                                const uint16_t* left,
-                                                int upsample_above,
-                                                int upsample_left,
-                                                int dx,
-                                                int dy,
-                                                int bd);
-
-void av1_highbd_dr_prediction_z3_c(uint16_t* dst,
-                                   ptrdiff_t stride,
-                                   int bw,
-                                   int bh,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int upsample_left,
-                                   int dx,
-                                   int dy,
-                                   int bd);
-void av1_highbd_dr_prediction_z3_avx2(uint16_t* dst,
-                                      ptrdiff_t stride,
-                                      int bw,
-                                      int bh,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int upsample_left,
-                                      int dx,
-                                      int dy,
-                                      int bd);
-RTCD_EXTERN void (*av1_highbd_dr_prediction_z3)(uint16_t* dst,
-                                                ptrdiff_t stride,
-                                                int bw,
-                                                int bh,
-                                                const uint16_t* above,
-                                                const uint16_t* left,
-                                                int upsample_left,
-                                                int dx,
-                                                int dy,
-                                                int bd);
-
 void av1_highbd_fwht4x4_c(const int16_t* input, tran_low_t* output, int stride);
 #define av1_highbd_fwht4x4 av1_highbd_fwht4x4_c
 
@@ -2311,236 +1424,6 @@
                                 int bd);
 #define av1_highbd_iwht4x4_1_add av1_highbd_iwht4x4_1_add_c
 
-int64_t av1_highbd_pixel_proj_error_c(const uint8_t* src8,
-                                      int width,
-                                      int height,
-                                      int src_stride,
-                                      const uint8_t* dat8,
-                                      int dat_stride,
-                                      int32_t* flt0,
-                                      int flt0_stride,
-                                      int32_t* flt1,
-                                      int flt1_stride,
-                                      int xq[2],
-                                      const sgr_params_type* params);
-int64_t av1_highbd_pixel_proj_error_sse4_1(const uint8_t* src8,
-                                           int width,
-                                           int height,
-                                           int src_stride,
-                                           const uint8_t* dat8,
-                                           int dat_stride,
-                                           int32_t* flt0,
-                                           int flt0_stride,
-                                           int32_t* flt1,
-                                           int flt1_stride,
-                                           int xq[2],
-                                           const sgr_params_type* params);
-int64_t av1_highbd_pixel_proj_error_avx2(const uint8_t* src8,
-                                         int width,
-                                         int height,
-                                         int src_stride,
-                                         const uint8_t* dat8,
-                                         int dat_stride,
-                                         int32_t* flt0,
-                                         int flt0_stride,
-                                         int32_t* flt1,
-                                         int flt1_stride,
-                                         int xq[2],
-                                         const sgr_params_type* params);
-RTCD_EXTERN int64_t (*av1_highbd_pixel_proj_error)(
-    const uint8_t* src8,
-    int width,
-    int height,
-    int src_stride,
-    const uint8_t* dat8,
-    int dat_stride,
-    int32_t* flt0,
-    int flt0_stride,
-    int32_t* flt1,
-    int flt1_stride,
-    int xq[2],
-    const sgr_params_type* params);
-
-void av1_highbd_quantize_fp_c(const tran_low_t* coeff_ptr,
-                              intptr_t n_coeffs,
-                              const int16_t* zbin_ptr,
-                              const int16_t* round_ptr,
-                              const int16_t* quant_ptr,
-                              const int16_t* quant_shift_ptr,
-                              tran_low_t* qcoeff_ptr,
-                              tran_low_t* dqcoeff_ptr,
-                              const int16_t* dequant_ptr,
-                              uint16_t* eob_ptr,
-                              const int16_t* scan,
-                              const int16_t* iscan,
-                              int log_scale);
-void av1_highbd_quantize_fp_sse4_1(const tran_low_t* coeff_ptr,
-                                   intptr_t n_coeffs,
-                                   const int16_t* zbin_ptr,
-                                   const int16_t* round_ptr,
-                                   const int16_t* quant_ptr,
-                                   const int16_t* quant_shift_ptr,
-                                   tran_low_t* qcoeff_ptr,
-                                   tran_low_t* dqcoeff_ptr,
-                                   const int16_t* dequant_ptr,
-                                   uint16_t* eob_ptr,
-                                   const int16_t* scan,
-                                   const int16_t* iscan,
-                                   int log_scale);
-void av1_highbd_quantize_fp_avx2(const tran_low_t* coeff_ptr,
-                                 intptr_t n_coeffs,
-                                 const int16_t* zbin_ptr,
-                                 const int16_t* round_ptr,
-                                 const int16_t* quant_ptr,
-                                 const int16_t* quant_shift_ptr,
-                                 tran_low_t* qcoeff_ptr,
-                                 tran_low_t* dqcoeff_ptr,
-                                 const int16_t* dequant_ptr,
-                                 uint16_t* eob_ptr,
-                                 const int16_t* scan,
-                                 const int16_t* iscan,
-                                 int log_scale);
-RTCD_EXTERN void (*av1_highbd_quantize_fp)(const tran_low_t* coeff_ptr,
-                                           intptr_t n_coeffs,
-                                           const int16_t* zbin_ptr,
-                                           const int16_t* round_ptr,
-                                           const int16_t* quant_ptr,
-                                           const int16_t* quant_shift_ptr,
-                                           tran_low_t* qcoeff_ptr,
-                                           tran_low_t* dqcoeff_ptr,
-                                           const int16_t* dequant_ptr,
-                                           uint16_t* eob_ptr,
-                                           const int16_t* scan,
-                                           const int16_t* iscan,
-                                           int log_scale);
-
-void av1_highbd_warp_affine_c(const int32_t* mat,
-                              const uint16_t* ref,
-                              int width,
-                              int height,
-                              int stride,
-                              uint16_t* pred,
-                              int p_col,
-                              int p_row,
-                              int p_width,
-                              int p_height,
-                              int p_stride,
-                              int subsampling_x,
-                              int subsampling_y,
-                              int bd,
-                              ConvolveParams* conv_params,
-                              int16_t alpha,
-                              int16_t beta,
-                              int16_t gamma,
-                              int16_t delta);
-void av1_highbd_warp_affine_sse4_1(const int32_t* mat,
-                                   const uint16_t* ref,
-                                   int width,
-                                   int height,
-                                   int stride,
-                                   uint16_t* pred,
-                                   int p_col,
-                                   int p_row,
-                                   int p_width,
-                                   int p_height,
-                                   int p_stride,
-                                   int subsampling_x,
-                                   int subsampling_y,
-                                   int bd,
-                                   ConvolveParams* conv_params,
-                                   int16_t alpha,
-                                   int16_t beta,
-                                   int16_t gamma,
-                                   int16_t delta);
-void av1_highbd_warp_affine_avx2(const int32_t* mat,
-                                 const uint16_t* ref,
-                                 int width,
-                                 int height,
-                                 int stride,
-                                 uint16_t* pred,
-                                 int p_col,
-                                 int p_row,
-                                 int p_width,
-                                 int p_height,
-                                 int p_stride,
-                                 int subsampling_x,
-                                 int subsampling_y,
-                                 int bd,
-                                 ConvolveParams* conv_params,
-                                 int16_t alpha,
-                                 int16_t beta,
-                                 int16_t gamma,
-                                 int16_t delta);
-RTCD_EXTERN void (*av1_highbd_warp_affine)(const int32_t* mat,
-                                           const uint16_t* ref,
-                                           int width,
-                                           int height,
-                                           int stride,
-                                           uint16_t* pred,
-                                           int p_col,
-                                           int p_row,
-                                           int p_width,
-                                           int p_height,
-                                           int p_stride,
-                                           int subsampling_x,
-                                           int subsampling_y,
-                                           int bd,
-                                           ConvolveParams* conv_params,
-                                           int16_t alpha,
-                                           int16_t beta,
-                                           int16_t gamma,
-                                           int16_t delta);
-
-void av1_highbd_wiener_convolve_add_src_c(const uint8_t* src,
-                                          ptrdiff_t src_stride,
-                                          uint8_t* dst,
-                                          ptrdiff_t dst_stride,
-                                          const int16_t* filter_x,
-                                          int x_step_q4,
-                                          const int16_t* filter_y,
-                                          int y_step_q4,
-                                          int w,
-                                          int h,
-                                          const ConvolveParams* conv_params,
-                                          int bd);
-void av1_highbd_wiener_convolve_add_src_ssse3(const uint8_t* src,
-                                              ptrdiff_t src_stride,
-                                              uint8_t* dst,
-                                              ptrdiff_t dst_stride,
-                                              const int16_t* filter_x,
-                                              int x_step_q4,
-                                              const int16_t* filter_y,
-                                              int y_step_q4,
-                                              int w,
-                                              int h,
-                                              const ConvolveParams* conv_params,
-                                              int bd);
-void av1_highbd_wiener_convolve_add_src_avx2(const uint8_t* src,
-                                             ptrdiff_t src_stride,
-                                             uint8_t* dst,
-                                             ptrdiff_t dst_stride,
-                                             const int16_t* filter_x,
-                                             int x_step_q4,
-                                             const int16_t* filter_y,
-                                             int y_step_q4,
-                                             int w,
-                                             int h,
-                                             const ConvolveParams* conv_params,
-                                             int bd);
-RTCD_EXTERN void (*av1_highbd_wiener_convolve_add_src)(
-    const uint8_t* src,
-    ptrdiff_t src_stride,
-    uint8_t* dst,
-    ptrdiff_t dst_stride,
-    const int16_t* filter_x,
-    int x_step_q4,
-    const int16_t* filter_y,
-    int y_step_q4,
-    int w,
-    int h,
-    const ConvolveParams* conv_params,
-    int bd);
-
 void av1_inv_txfm2d_add_16x16_c(const int32_t* input,
                                 uint16_t* output,
                                 int stride,
@@ -2730,56 +1613,6 @@
                                        int diff_stride,
                                        TxfmParam* txfm_param);
 
-int64_t av1_lowbd_pixel_proj_error_c(const uint8_t* src8,
-                                     int width,
-                                     int height,
-                                     int src_stride,
-                                     const uint8_t* dat8,
-                                     int dat_stride,
-                                     int32_t* flt0,
-                                     int flt0_stride,
-                                     int32_t* flt1,
-                                     int flt1_stride,
-                                     int xq[2],
-                                     const sgr_params_type* params);
-int64_t av1_lowbd_pixel_proj_error_sse4_1(const uint8_t* src8,
-                                          int width,
-                                          int height,
-                                          int src_stride,
-                                          const uint8_t* dat8,
-                                          int dat_stride,
-                                          int32_t* flt0,
-                                          int flt0_stride,
-                                          int32_t* flt1,
-                                          int flt1_stride,
-                                          int xq[2],
-                                          const sgr_params_type* params);
-int64_t av1_lowbd_pixel_proj_error_avx2(const uint8_t* src8,
-                                        int width,
-                                        int height,
-                                        int src_stride,
-                                        const uint8_t* dat8,
-                                        int dat_stride,
-                                        int32_t* flt0,
-                                        int flt0_stride,
-                                        int32_t* flt1,
-                                        int flt1_stride,
-                                        int xq[2],
-                                        const sgr_params_type* params);
-RTCD_EXTERN int64_t (*av1_lowbd_pixel_proj_error)(
-    const uint8_t* src8,
-    int width,
-    int height,
-    int src_stride,
-    const uint8_t* dat8,
-    int dat_stride,
-    int32_t* flt0,
-    int flt0_stride,
-    int32_t* flt1,
-    int flt1_stride,
-    int xq[2],
-    const sgr_params_type* params);
-
 void av1_nn_predict_c(const float* input_nodes,
                       const NN_CONFIG* const nn_config,
                       int reduce_prec,
@@ -2981,47 +1814,6 @@
 void av1_round_shift_array_sse4_1(int32_t* arr, int size, int bit);
 RTCD_EXTERN void (*av1_round_shift_array)(int32_t* arr, int size, int bit);
 
-int av1_selfguided_restoration_c(const uint8_t* dgd8,
-                                 int width,
-                                 int height,
-                                 int dgd_stride,
-                                 int32_t* flt0,
-                                 int32_t* flt1,
-                                 int flt_stride,
-                                 int sgr_params_idx,
-                                 int bit_depth,
-                                 int highbd);
-int av1_selfguided_restoration_sse4_1(const uint8_t* dgd8,
-                                      int width,
-                                      int height,
-                                      int dgd_stride,
-                                      int32_t* flt0,
-                                      int32_t* flt1,
-                                      int flt_stride,
-                                      int sgr_params_idx,
-                                      int bit_depth,
-                                      int highbd);
-int av1_selfguided_restoration_avx2(const uint8_t* dgd8,
-                                    int width,
-                                    int height,
-                                    int dgd_stride,
-                                    int32_t* flt0,
-                                    int32_t* flt1,
-                                    int flt_stride,
-                                    int sgr_params_idx,
-                                    int bit_depth,
-                                    int highbd);
-RTCD_EXTERN int (*av1_selfguided_restoration)(const uint8_t* dgd8,
-                                              int width,
-                                              int height,
-                                              int dgd_stride,
-                                              int32_t* flt0,
-                                              int32_t* flt1,
-                                              int flt_stride,
-                                              int sgr_params_idx,
-                                              int bit_depth,
-                                              int highbd);
-
 void av1_txb_init_levels_c(const tran_low_t* const coeff,
                            const int width,
                            const int height,
@@ -3047,79 +1839,6 @@
 void av1_upsample_intra_edge_high_sse4_1(uint16_t* p, int sz, int bd);
 RTCD_EXTERN void (*av1_upsample_intra_edge_high)(uint16_t* p, int sz, int bd);
 
-void av1_warp_affine_c(const int32_t* mat,
-                       const uint8_t* ref,
-                       int width,
-                       int height,
-                       int stride,
-                       uint8_t* pred,
-                       int p_col,
-                       int p_row,
-                       int p_width,
-                       int p_height,
-                       int p_stride,
-                       int subsampling_x,
-                       int subsampling_y,
-                       ConvolveParams* conv_params,
-                       int16_t alpha,
-                       int16_t beta,
-                       int16_t gamma,
-                       int16_t delta);
-void av1_warp_affine_sse4_1(const int32_t* mat,
-                            const uint8_t* ref,
-                            int width,
-                            int height,
-                            int stride,
-                            uint8_t* pred,
-                            int p_col,
-                            int p_row,
-                            int p_width,
-                            int p_height,
-                            int p_stride,
-                            int subsampling_x,
-                            int subsampling_y,
-                            ConvolveParams* conv_params,
-                            int16_t alpha,
-                            int16_t beta,
-                            int16_t gamma,
-                            int16_t delta);
-void av1_warp_affine_avx2(const int32_t* mat,
-                          const uint8_t* ref,
-                          int width,
-                          int height,
-                          int stride,
-                          uint8_t* pred,
-                          int p_col,
-                          int p_row,
-                          int p_width,
-                          int p_height,
-                          int p_stride,
-                          int subsampling_x,
-                          int subsampling_y,
-                          ConvolveParams* conv_params,
-                          int16_t alpha,
-                          int16_t beta,
-                          int16_t gamma,
-                          int16_t delta);
-RTCD_EXTERN void (*av1_warp_affine)(const int32_t* mat,
-                                    const uint8_t* ref,
-                                    int width,
-                                    int height,
-                                    int stride,
-                                    uint8_t* pred,
-                                    int p_col,
-                                    int p_row,
-                                    int p_width,
-                                    int p_height,
-                                    int p_stride,
-                                    int subsampling_x,
-                                    int subsampling_y,
-                                    ConvolveParams* conv_params,
-                                    int16_t alpha,
-                                    int16_t beta,
-                                    int16_t gamma,
-                                    int16_t delta);
-
 void av1_wedge_compute_delta_squares_c(int16_t* d,
                                        const int16_t* a,
                                        const int16_t* b,
@@ -3383,47 +2102,24 @@
                                  int32_t* var,
                                  int coeff_shift);
 
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_420_hbd_c(TX_SIZE tx_size);
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_420_hbd_ssse3(TX_SIZE tx_size);
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_420_hbd_avx2(TX_SIZE tx_size);
-RTCD_EXTERN cfl_subsample_hbd_fn (*cfl_get_luma_subsampling_420_hbd)(
-    TX_SIZE tx_size);
-
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_420_lbd_c(TX_SIZE tx_size);
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_420_lbd_ssse3(TX_SIZE tx_size);
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_420_lbd_avx2(TX_SIZE tx_size);
 RTCD_EXTERN cfl_subsample_lbd_fn (*cfl_get_luma_subsampling_420_lbd)(
     TX_SIZE tx_size);
 
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_422_hbd_c(TX_SIZE tx_size);
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_422_hbd_ssse3(TX_SIZE tx_size);
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_422_hbd_avx2(TX_SIZE tx_size);
-RTCD_EXTERN cfl_subsample_hbd_fn (*cfl_get_luma_subsampling_422_hbd)(
-    TX_SIZE tx_size);
-
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_422_lbd_c(TX_SIZE tx_size);
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_422_lbd_ssse3(TX_SIZE tx_size);
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_422_lbd_avx2(TX_SIZE tx_size);
 RTCD_EXTERN cfl_subsample_lbd_fn (*cfl_get_luma_subsampling_422_lbd)(
     TX_SIZE tx_size);
 
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_444_hbd_c(TX_SIZE tx_size);
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_444_hbd_ssse3(TX_SIZE tx_size);
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_444_hbd_avx2(TX_SIZE tx_size);
-RTCD_EXTERN cfl_subsample_hbd_fn (*cfl_get_luma_subsampling_444_hbd)(
-    TX_SIZE tx_size);
-
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_444_lbd_c(TX_SIZE tx_size);
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_444_lbd_ssse3(TX_SIZE tx_size);
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_444_lbd_avx2(TX_SIZE tx_size);
 RTCD_EXTERN cfl_subsample_lbd_fn (*cfl_get_luma_subsampling_444_lbd)(
     TX_SIZE tx_size);
 
-cfl_predict_hbd_fn cfl_get_predict_hbd_fn_c(TX_SIZE tx_size);
-cfl_predict_hbd_fn cfl_get_predict_hbd_fn_ssse3(TX_SIZE tx_size);
-cfl_predict_hbd_fn cfl_get_predict_hbd_fn_avx2(TX_SIZE tx_size);
-RTCD_EXTERN cfl_predict_hbd_fn (*cfl_get_predict_hbd_fn)(TX_SIZE tx_size);
-
 cfl_predict_lbd_fn cfl_get_predict_lbd_fn_c(TX_SIZE tx_size);
 cfl_predict_lbd_fn cfl_get_predict_lbd_fn_ssse3(TX_SIZE tx_size);
 cfl_predict_lbd_fn cfl_get_predict_lbd_fn_avx2(TX_SIZE tx_size);
@@ -3444,14 +2140,6 @@
 
   (void)flags;
 
-  av1_apply_selfguided_restoration = av1_apply_selfguided_restoration_c;
-  if (flags & HAS_SSE4_1)
-    av1_apply_selfguided_restoration = av1_apply_selfguided_restoration_sse4_1;
-  if (flags & HAS_AVX2)
-    av1_apply_selfguided_restoration = av1_apply_selfguided_restoration_avx2;
-  av1_apply_temporal_filter = av1_apply_temporal_filter_sse2;
-  if (flags & HAS_AVX2)
-    av1_apply_temporal_filter = av1_apply_temporal_filter_avx2;
   av1_block_error = av1_block_error_sse2;
   if (flags & HAS_AVX2)
     av1_block_error = av1_block_error_avx2;
@@ -3478,34 +2166,11 @@
   if (flags & HAS_AVX2)
     av1_build_compound_diffwtd_mask_highbd =
         av1_build_compound_diffwtd_mask_highbd_avx2;
-  av1_calc_frame_error = av1_calc_frame_error_sse2;
-  if (flags & HAS_AVX2)
-    av1_calc_frame_error = av1_calc_frame_error_avx2;
-  av1_calc_proj_params = av1_calc_proj_params_c;
-  if (flags & HAS_SSE4_1)
-    av1_calc_proj_params = av1_calc_proj_params_sse4_1;
-  if (flags & HAS_AVX2)
-    av1_calc_proj_params = av1_calc_proj_params_avx2;
-  av1_calc_proj_params_high_bd = av1_calc_proj_params_high_bd_c;
-  if (flags & HAS_SSE4_1)
-    av1_calc_proj_params_high_bd = av1_calc_proj_params_high_bd_sse4_1;
-  if (flags & HAS_AVX2)
-    av1_calc_proj_params_high_bd = av1_calc_proj_params_high_bd_avx2;
   av1_compute_cross_correlation = av1_compute_cross_correlation_c;
   if (flags & HAS_SSE4_1)
     av1_compute_cross_correlation = av1_compute_cross_correlation_sse4_1;
   if (flags & HAS_AVX2)
     av1_compute_cross_correlation = av1_compute_cross_correlation_avx2;
-  av1_compute_stats = av1_compute_stats_c;
-  if (flags & HAS_SSE4_1)
-    av1_compute_stats = av1_compute_stats_sse4_1;
-  if (flags & HAS_AVX2)
-    av1_compute_stats = av1_compute_stats_avx2;
-  av1_compute_stats_highbd = av1_compute_stats_highbd_c;
-  if (flags & HAS_SSE4_1)
-    av1_compute_stats_highbd = av1_compute_stats_highbd_sse4_1;
-  if (flags & HAS_AVX2)
-    av1_compute_stats_highbd = av1_compute_stats_highbd_avx2;
   av1_convolve_2d_scale = av1_convolve_2d_scale_c;
   if (flags & HAS_SSE4_1)
     av1_convolve_2d_scale = av1_convolve_2d_scale_sse4_1;
@@ -3630,64 +2295,6 @@
     av1_get_horver_correlation_full = av1_get_horver_correlation_full_sse4_1;
   if (flags & HAS_AVX2)
     av1_get_horver_correlation_full = av1_get_horver_correlation_full_avx2;
-  av1_highbd_apply_temporal_filter = av1_highbd_apply_temporal_filter_sse2;
-  if (flags & HAS_AVX2)
-    av1_highbd_apply_temporal_filter = av1_highbd_apply_temporal_filter_avx2;
-  av1_highbd_block_error = av1_highbd_block_error_sse2;
-  if (flags & HAS_AVX2)
-    av1_highbd_block_error = av1_highbd_block_error_avx2;
-  av1_highbd_convolve_2d_scale = av1_highbd_convolve_2d_scale_c;
-  if (flags & HAS_SSE4_1)
-    av1_highbd_convolve_2d_scale = av1_highbd_convolve_2d_scale_sse4_1;
-  av1_highbd_convolve_2d_sr = av1_highbd_convolve_2d_sr_c;
-  if (flags & HAS_SSSE3)
-    av1_highbd_convolve_2d_sr = av1_highbd_convolve_2d_sr_ssse3;
-  if (flags & HAS_AVX2)
-    av1_highbd_convolve_2d_sr = av1_highbd_convolve_2d_sr_avx2;
-  av1_highbd_convolve_horiz_rs = av1_highbd_convolve_horiz_rs_c;
-  if (flags & HAS_SSE4_1)
-    av1_highbd_convolve_horiz_rs = av1_highbd_convolve_horiz_rs_sse4_1;
-  av1_highbd_convolve_x_sr = av1_highbd_convolve_x_sr_c;
-  if (flags & HAS_SSSE3)
-    av1_highbd_convolve_x_sr = av1_highbd_convolve_x_sr_ssse3;
-  if (flags & HAS_AVX2)
-    av1_highbd_convolve_x_sr = av1_highbd_convolve_x_sr_avx2;
-  av1_highbd_convolve_y_sr = av1_highbd_convolve_y_sr_c;
-  if (flags & HAS_SSSE3)
-    av1_highbd_convolve_y_sr = av1_highbd_convolve_y_sr_ssse3;
-  if (flags & HAS_AVX2)
-    av1_highbd_convolve_y_sr = av1_highbd_convolve_y_sr_avx2;
-  av1_highbd_dist_wtd_convolve_2d = av1_highbd_dist_wtd_convolve_2d_c;
-  if (flags & HAS_SSE4_1)
-    av1_highbd_dist_wtd_convolve_2d = av1_highbd_dist_wtd_convolve_2d_sse4_1;
-  if (flags & HAS_AVX2)
-    av1_highbd_dist_wtd_convolve_2d = av1_highbd_dist_wtd_convolve_2d_avx2;
-  av1_highbd_dist_wtd_convolve_2d_copy = av1_highbd_dist_wtd_convolve_2d_copy_c;
-  if (flags & HAS_SSE4_1)
-    av1_highbd_dist_wtd_convolve_2d_copy =
-        av1_highbd_dist_wtd_convolve_2d_copy_sse4_1;
-  if (flags & HAS_AVX2)
-    av1_highbd_dist_wtd_convolve_2d_copy =
-        av1_highbd_dist_wtd_convolve_2d_copy_avx2;
-  av1_highbd_dist_wtd_convolve_x = av1_highbd_dist_wtd_convolve_x_c;
-  if (flags & HAS_SSE4_1)
-    av1_highbd_dist_wtd_convolve_x = av1_highbd_dist_wtd_convolve_x_sse4_1;
-  if (flags & HAS_AVX2)
-    av1_highbd_dist_wtd_convolve_x = av1_highbd_dist_wtd_convolve_x_avx2;
-  av1_highbd_dist_wtd_convolve_y = av1_highbd_dist_wtd_convolve_y_c;
-  if (flags & HAS_SSE4_1)
-    av1_highbd_dist_wtd_convolve_y = av1_highbd_dist_wtd_convolve_y_sse4_1;
-  if (flags & HAS_AVX2)
-    av1_highbd_dist_wtd_convolve_y = av1_highbd_dist_wtd_convolve_y_avx2;
-  av1_highbd_dr_prediction_z1 = av1_highbd_dr_prediction_z1_c;
-  if (flags & HAS_AVX2)
-    av1_highbd_dr_prediction_z1 = av1_highbd_dr_prediction_z1_avx2;
-  av1_highbd_dr_prediction_z2 = av1_highbd_dr_prediction_z2_c;
-  if (flags & HAS_AVX2)
-    av1_highbd_dr_prediction_z2 = av1_highbd_dr_prediction_z2_avx2;
-  av1_highbd_dr_prediction_z3 = av1_highbd_dr_prediction_z3_c;
-  if (flags & HAS_AVX2)
-    av1_highbd_dr_prediction_z3 = av1_highbd_dr_prediction_z3_avx2;
   av1_highbd_inv_txfm_add = av1_highbd_inv_txfm_add_c;
   if (flags & HAS_SSE4_1)
     av1_highbd_inv_txfm_add = av1_highbd_inv_txfm_add_sse4_1;
@@ -3711,28 +2318,6 @@
   av1_highbd_inv_txfm_add_8x8 = av1_highbd_inv_txfm_add_8x8_c;
   if (flags & HAS_SSE4_1)
     av1_highbd_inv_txfm_add_8x8 = av1_highbd_inv_txfm_add_8x8_sse4_1;
-  av1_highbd_pixel_proj_error = av1_highbd_pixel_proj_error_c;
-  if (flags & HAS_SSE4_1)
-    av1_highbd_pixel_proj_error = av1_highbd_pixel_proj_error_sse4_1;
-  if (flags & HAS_AVX2)
-    av1_highbd_pixel_proj_error = av1_highbd_pixel_proj_error_avx2;
-  av1_highbd_quantize_fp = av1_highbd_quantize_fp_c;
-  if (flags & HAS_SSE4_1)
-    av1_highbd_quantize_fp = av1_highbd_quantize_fp_sse4_1;
-  if (flags & HAS_AVX2)
-    av1_highbd_quantize_fp = av1_highbd_quantize_fp_avx2;
-  av1_highbd_warp_affine = av1_highbd_warp_affine_c;
-  if (flags & HAS_SSE4_1)
-    av1_highbd_warp_affine = av1_highbd_warp_affine_sse4_1;
-  if (flags & HAS_AVX2)
-    av1_highbd_warp_affine = av1_highbd_warp_affine_avx2;
-  av1_highbd_wiener_convolve_add_src = av1_highbd_wiener_convolve_add_src_c;
-  if (flags & HAS_SSSE3)
-    av1_highbd_wiener_convolve_add_src =
-        av1_highbd_wiener_convolve_add_src_ssse3;
-  if (flags & HAS_AVX2)
-    av1_highbd_wiener_convolve_add_src =
-        av1_highbd_wiener_convolve_add_src_avx2;
   av1_inv_txfm2d_add_4x4 = av1_inv_txfm2d_add_4x4_c;
   if (flags & HAS_SSE4_1)
     av1_inv_txfm2d_add_4x4 = av1_inv_txfm2d_add_4x4_sse4_1;
@@ -3749,11 +2334,6 @@
     av1_lowbd_fwd_txfm = av1_lowbd_fwd_txfm_sse4_1;
   if (flags & HAS_AVX2)
     av1_lowbd_fwd_txfm = av1_lowbd_fwd_txfm_avx2;
-  av1_lowbd_pixel_proj_error = av1_lowbd_pixel_proj_error_c;
-  if (flags & HAS_SSE4_1)
-    av1_lowbd_pixel_proj_error = av1_lowbd_pixel_proj_error_sse4_1;
-  if (flags & HAS_AVX2)
-    av1_lowbd_pixel_proj_error = av1_lowbd_pixel_proj_error_avx2;
   av1_nn_predict = av1_nn_predict_c;
   if (flags & HAS_SSE3)
     av1_nn_predict = av1_nn_predict_sse3;
@@ -3775,11 +2355,6 @@
   av1_round_shift_array = av1_round_shift_array_c;
   if (flags & HAS_SSE4_1)
     av1_round_shift_array = av1_round_shift_array_sse4_1;
-  av1_selfguided_restoration = av1_selfguided_restoration_c;
-  if (flags & HAS_SSE4_1)
-    av1_selfguided_restoration = av1_selfguided_restoration_sse4_1;
-  if (flags & HAS_AVX2)
-    av1_selfguided_restoration = av1_selfguided_restoration_avx2;
   av1_txb_init_levels = av1_txb_init_levels_c;
   if (flags & HAS_SSE4_1)
     av1_txb_init_levels = av1_txb_init_levels_sse4_1;
@@ -3791,11 +2366,6 @@
   av1_upsample_intra_edge_high = av1_upsample_intra_edge_high_c;
   if (flags & HAS_SSE4_1)
     av1_upsample_intra_edge_high = av1_upsample_intra_edge_high_sse4_1;
-  av1_warp_affine = av1_warp_affine_c;
-  if (flags & HAS_SSE4_1)
-    av1_warp_affine = av1_warp_affine_sse4_1;
-  if (flags & HAS_AVX2)
-    av1_warp_affine = av1_warp_affine_avx2;
   av1_wedge_compute_delta_squares = av1_wedge_compute_delta_squares_sse2;
   if (flags & HAS_AVX2)
     av1_wedge_compute_delta_squares = av1_wedge_compute_delta_squares_avx2;
@@ -3836,41 +2406,21 @@
     cdef_find_dir = cdef_find_dir_sse4_1;
   if (flags & HAS_AVX2)
     cdef_find_dir = cdef_find_dir_avx2;
-  cfl_get_luma_subsampling_420_hbd = cfl_get_luma_subsampling_420_hbd_c;
-  if (flags & HAS_SSSE3)
-    cfl_get_luma_subsampling_420_hbd = cfl_get_luma_subsampling_420_hbd_ssse3;
-  if (flags & HAS_AVX2)
-    cfl_get_luma_subsampling_420_hbd = cfl_get_luma_subsampling_420_hbd_avx2;
   cfl_get_luma_subsampling_420_lbd = cfl_get_luma_subsampling_420_lbd_c;
   if (flags & HAS_SSSE3)
     cfl_get_luma_subsampling_420_lbd = cfl_get_luma_subsampling_420_lbd_ssse3;
   if (flags & HAS_AVX2)
     cfl_get_luma_subsampling_420_lbd = cfl_get_luma_subsampling_420_lbd_avx2;
-  cfl_get_luma_subsampling_422_hbd = cfl_get_luma_subsampling_422_hbd_c;
-  if (flags & HAS_SSSE3)
-    cfl_get_luma_subsampling_422_hbd = cfl_get_luma_subsampling_422_hbd_ssse3;
-  if (flags & HAS_AVX2)
-    cfl_get_luma_subsampling_422_hbd = cfl_get_luma_subsampling_422_hbd_avx2;
   cfl_get_luma_subsampling_422_lbd = cfl_get_luma_subsampling_422_lbd_c;
   if (flags & HAS_SSSE3)
     cfl_get_luma_subsampling_422_lbd = cfl_get_luma_subsampling_422_lbd_ssse3;
   if (flags & HAS_AVX2)
     cfl_get_luma_subsampling_422_lbd = cfl_get_luma_subsampling_422_lbd_avx2;
-  cfl_get_luma_subsampling_444_hbd = cfl_get_luma_subsampling_444_hbd_c;
-  if (flags & HAS_SSSE3)
-    cfl_get_luma_subsampling_444_hbd = cfl_get_luma_subsampling_444_hbd_ssse3;
-  if (flags & HAS_AVX2)
-    cfl_get_luma_subsampling_444_hbd = cfl_get_luma_subsampling_444_hbd_avx2;
   cfl_get_luma_subsampling_444_lbd = cfl_get_luma_subsampling_444_lbd_c;
   if (flags & HAS_SSSE3)
     cfl_get_luma_subsampling_444_lbd = cfl_get_luma_subsampling_444_lbd_ssse3;
   if (flags & HAS_AVX2)
     cfl_get_luma_subsampling_444_lbd = cfl_get_luma_subsampling_444_lbd_avx2;
-  cfl_get_predict_hbd_fn = cfl_get_predict_hbd_fn_c;
-  if (flags & HAS_SSSE3)
-    cfl_get_predict_hbd_fn = cfl_get_predict_hbd_fn_ssse3;
-  if (flags & HAS_AVX2)
-    cfl_get_predict_hbd_fn = cfl_get_predict_hbd_fn_avx2;
   cfl_get_predict_lbd_fn = cfl_get_predict_lbd_fn_c;
   if (flags & HAS_SSSE3)
     cfl_get_predict_lbd_fn = cfl_get_predict_lbd_fn_ssse3;
diff --git a/third_party/libaom/source/config/win/x64/config/aom_config.asm b/third_party/libaom/source/config/win/x64/config/aom_config.asm
index b942908..36b02a9 100644
--- a/third_party/libaom/source/config/win/x64/config/aom_config.asm
+++ b/third_party/libaom/source/config/win/x64/config/aom_config.asm
@@ -7,7 +7,7 @@
 %define CONFIG_ANALYZER 0
 %define CONFIG_AV1_DECODER 1
 %define CONFIG_AV1_ENCODER 1
-%define CONFIG_AV1_HIGHBITDEPTH 1
+%define CONFIG_AV1_HIGHBITDEPTH 0
 %define CONFIG_AV1_TEMPORAL_DENOISING 0
 %define CONFIG_BIG_ENDIAN 0
 %define CONFIG_BITSTREAM_DEBUG 0
@@ -37,7 +37,7 @@
 %define CONFIG_OS_SUPPORT 1
 %define CONFIG_PIC 0
 %define CONFIG_RD_DEBUG 0
-%define CONFIG_REALTIME_ONLY 0
+%define CONFIG_REALTIME_ONLY 1
 %define CONFIG_RUNTIME_CPU_DETECT 1
 %define CONFIG_SHARED 0
 %define CONFIG_SHARP_SETTINGS 0
diff --git a/third_party/libaom/source/config/win/x64/config/aom_config.c b/third_party/libaom/source/config/win/x64/config/aom_config.c
index 42c09f1..daa831c 100644
--- a/third_party/libaom/source/config/win/x64/config/aom_config.c
+++ b/third_party/libaom/source/config/win/x64/config/aom_config.c
@@ -9,5 +9,5 @@
  * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
  */
 #include "aom/aom_codec.h"
-static const char* const cfg = "cmake ../source/libaom -G \"Unix Makefiles\" -DAOM_TARGET_CPU=x86_64 -DCONFIG_AV1_ENCODER=1 -DCONFIG_LIBYUV=0 -DCONFIG_MAX_DECODE_PROFILE=0 -DCONFIG_NORMAL_TILE_MODE=1 -DCONFIG_SIZE_LIMIT=1 -DDECODE_HEIGHT_LIMIT=16384 -DDECODE_WIDTH_LIMIT=16384";
+static const char* const cfg = "cmake ../source/libaom -G \"Unix Makefiles\" -DAOM_TARGET_CPU=x86_64 -DCONFIG_AV1_ENCODER=1 -DCONFIG_LIBYUV=0 -DCONFIG_MAX_DECODE_PROFILE=0 -DCONFIG_NORMAL_TILE_MODE=1 -DCONFIG_SIZE_LIMIT=1 -DDECODE_HEIGHT_LIMIT=16384 -DDECODE_WIDTH_LIMIT=16384 -DCONFIG_REALTIME_ONLY=1 -DCONFIG_AV1_HIGHBITDEPTH=0";
 const char *aom_codec_build_config(void) {return cfg;}
diff --git a/third_party/libaom/source/config/win/x64/config/aom_config.h b/third_party/libaom/source/config/win/x64/config/aom_config.h
index 91f46ec..1920d594 100644
--- a/third_party/libaom/source/config/win/x64/config/aom_config.h
+++ b/third_party/libaom/source/config/win/x64/config/aom_config.h
@@ -19,7 +19,7 @@
 #define CONFIG_ANALYZER 0
 #define CONFIG_AV1_DECODER 1
 #define CONFIG_AV1_ENCODER 1
-#define CONFIG_AV1_HIGHBITDEPTH 1
+#define CONFIG_AV1_HIGHBITDEPTH 0
 #define CONFIG_AV1_TEMPORAL_DENOISING 0
 #define CONFIG_BIG_ENDIAN 0
 #define CONFIG_BITSTREAM_DEBUG 0
@@ -49,7 +49,7 @@
 #define CONFIG_OS_SUPPORT 1
 #define CONFIG_PIC 0
 #define CONFIG_RD_DEBUG 0
-#define CONFIG_REALTIME_ONLY 0
+#define CONFIG_REALTIME_ONLY 1
 #define CONFIG_RUNTIME_CPU_DETECT 1
 #define CONFIG_SHARED 0
 #define CONFIG_SHARP_SETTINGS 0
diff --git a/third_party/libaom/source/config/win/x64/config/aom_dsp_rtcd.h b/third_party/libaom/source/config/win/x64/config/aom_dsp_rtcd.h
index df1d282..11188ae4 100644
--- a/third_party/libaom/source/config/win/x64/config/aom_dsp_rtcd.h
+++ b/third_party/libaom/source/config/win/x64/config/aom_dsp_rtcd.h
@@ -2911,14548 +2911,6 @@
                               int16_t* coeff);
 #define aom_hadamard_lp_8x8 aom_hadamard_lp_8x8_sse2
 
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x128 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x64 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x16 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x16_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x32 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x32_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x4 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x4_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x64 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x64_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x8 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x8_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x16 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x16_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x32 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x32_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x64 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x64_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x8 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x8_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x16 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x4 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x4_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x8 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x128 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x16 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x16_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x32 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x32_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x64 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x64_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x16 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x16_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x32 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x32_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x4 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x4_c
-
-uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x8 \
-  aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x8_c
-
-void aom_highbd_10_get16x16var_c(const uint8_t* src_ptr,
-                                 int source_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride,
-                                 unsigned int* sse,
-                                 int* sum);
-#define aom_highbd_10_get16x16var aom_highbd_10_get16x16var_c
-
-void aom_highbd_10_get8x8var_c(const uint8_t* src_ptr,
-                               int source_stride,
-                               const uint8_t* ref_ptr,
-                               int ref_stride,
-                               unsigned int* sse,
-                               int* sum);
-#define aom_highbd_10_get8x8var aom_highbd_10_get8x8var_c
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance128x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance128x128_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance128x128)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance128x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance128x64_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance128x64)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x16_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance16x16)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x32_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance16x32)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x4_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance16x4)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x64_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance16x64)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance16x8_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance16x8)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x16_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance32x16)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x32_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance32x32)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x64_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance32x64)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance32x8_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance32x8)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance4x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance4x16_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance4x16)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance4x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance4x4_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance4x4)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance4x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance4x8_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance4x8)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x128_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance64x128)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x16_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance64x16)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x32_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance64x32)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance64x64_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance64x64)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x16_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance8x16)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x32_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance8x32)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x4_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance8x4)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_10_masked_sub_pixel_variance8x8_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_masked_sub_pixel_variance8x8)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_mse16x16_c(const uint8_t* src_ptr,
-                                      int source_stride,
-                                      const uint8_t* ref_ptr,
-                                      int recon_stride,
-                                      unsigned int* sse);
-unsigned int aom_highbd_10_mse16x16_sse2(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int recon_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_mse16x16 aom_highbd_10_mse16x16_sse2
-
-unsigned int aom_highbd_10_mse16x8_c(const uint8_t* src_ptr,
-                                     int source_stride,
-                                     const uint8_t* ref_ptr,
-                                     int recon_stride,
-                                     unsigned int* sse);
-#define aom_highbd_10_mse16x8 aom_highbd_10_mse16x8_c
-
-unsigned int aom_highbd_10_mse8x16_c(const uint8_t* src_ptr,
-                                     int source_stride,
-                                     const uint8_t* ref_ptr,
-                                     int recon_stride,
-                                     unsigned int* sse);
-#define aom_highbd_10_mse8x16 aom_highbd_10_mse8x16_c
-
-unsigned int aom_highbd_10_mse8x8_c(const uint8_t* src_ptr,
-                                    int source_stride,
-                                    const uint8_t* ref_ptr,
-                                    int recon_stride,
-                                    unsigned int* sse);
-unsigned int aom_highbd_10_mse8x8_sse2(const uint8_t* src_ptr,
-                                       int source_stride,
-                                       const uint8_t* ref_ptr,
-                                       int recon_stride,
-                                       unsigned int* sse);
-#define aom_highbd_10_mse8x8 aom_highbd_10_mse8x8_sse2
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance128x128_c(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            int xoffset,
-                                                            int yoffset,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance128x128 \
-  aom_highbd_10_obmc_sub_pixel_variance128x128_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance128x64_c(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance128x64 \
-  aom_highbd_10_obmc_sub_pixel_variance128x64_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance16x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance16x16 \
-  aom_highbd_10_obmc_sub_pixel_variance16x16_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance16x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance16x32 \
-  aom_highbd_10_obmc_sub_pixel_variance16x32_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance16x4_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance16x4 \
-  aom_highbd_10_obmc_sub_pixel_variance16x4_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance16x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance16x64 \
-  aom_highbd_10_obmc_sub_pixel_variance16x64_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance16x8_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance16x8 \
-  aom_highbd_10_obmc_sub_pixel_variance16x8_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance32x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance32x16 \
-  aom_highbd_10_obmc_sub_pixel_variance32x16_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance32x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance32x32 \
-  aom_highbd_10_obmc_sub_pixel_variance32x32_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance32x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance32x64 \
-  aom_highbd_10_obmc_sub_pixel_variance32x64_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance32x8_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance32x8 \
-  aom_highbd_10_obmc_sub_pixel_variance32x8_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance4x16_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance4x16 \
-  aom_highbd_10_obmc_sub_pixel_variance4x16_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance4x4_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance4x4 \
-  aom_highbd_10_obmc_sub_pixel_variance4x4_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance4x8_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance4x8 \
-  aom_highbd_10_obmc_sub_pixel_variance4x8_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance64x128_c(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance64x128 \
-  aom_highbd_10_obmc_sub_pixel_variance64x128_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance64x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance64x16 \
-  aom_highbd_10_obmc_sub_pixel_variance64x16_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance64x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance64x32 \
-  aom_highbd_10_obmc_sub_pixel_variance64x32_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance64x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance64x64 \
-  aom_highbd_10_obmc_sub_pixel_variance64x64_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance8x16_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance8x16 \
-  aom_highbd_10_obmc_sub_pixel_variance8x16_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance8x32_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance8x32 \
-  aom_highbd_10_obmc_sub_pixel_variance8x32_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance8x4_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance8x4 \
-  aom_highbd_10_obmc_sub_pixel_variance8x4_c
-
-unsigned int aom_highbd_10_obmc_sub_pixel_variance8x8_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_10_obmc_sub_pixel_variance8x8 \
-  aom_highbd_10_obmc_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_10_obmc_variance128x128_c(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance128x128_sse4_1(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance128x128)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance128x64_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance128x64_sse4_1(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance128x64)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance16x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance16x16_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance16x16)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance16x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance16x32_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance16x32)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance16x4_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance16x4_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance16x4)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance16x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance16x64_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance16x64)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance16x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance16x8_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance16x8)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance32x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance32x16_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance32x16)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance32x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance32x32_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance32x32)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance32x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance32x64_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance32x64)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance32x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance32x8_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance32x8)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance4x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance4x16_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance4x16)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance4x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance4x4_sse4_1(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance4x4)(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance4x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance4x8_sse4_1(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance4x8)(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance64x128_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance64x128_sse4_1(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance64x128)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance64x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance64x16_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance64x16)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance64x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance64x32_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance64x32)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance64x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance64x64_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance64x64)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance8x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance8x16_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance8x16)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance8x32_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance8x32_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance8x32)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance8x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance8x4_sse4_1(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance8x4)(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-
-unsigned int aom_highbd_10_obmc_variance8x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-unsigned int aom_highbd_10_obmc_variance8x8_sse4_1(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_obmc_variance8x8)(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance128x128 \
-  aom_highbd_10_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance128x64 \
-  aom_highbd_10_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x16_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance16x16 \
-  aom_highbd_10_sub_pixel_avg_variance16x16_sse2
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x32_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance16x32 \
-  aom_highbd_10_sub_pixel_avg_variance16x32_sse2
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x4_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x4_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance16x4 \
-  aom_highbd_10_sub_pixel_avg_variance16x4_sse2
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x64_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance16x64 \
-  aom_highbd_10_sub_pixel_avg_variance16x64_sse2
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance16x8_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance16x8 \
-  aom_highbd_10_sub_pixel_avg_variance16x8_sse2
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x16_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance32x16 \
-  aom_highbd_10_sub_pixel_avg_variance32x16_sse2
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x32_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance32x32 \
-  aom_highbd_10_sub_pixel_avg_variance32x32_sse2
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x64_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance32x64 \
-  aom_highbd_10_sub_pixel_avg_variance32x64_sse2
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x8_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance32x8_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance32x8 \
-  aom_highbd_10_sub_pixel_avg_variance32x8_sse2
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance4x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance4x16 \
-  aom_highbd_10_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance4x4_sse4_1(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-RTCD_EXTERN uint32_t (*aom_highbd_10_sub_pixel_avg_variance4x4)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance4x8 \
-  aom_highbd_10_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance64x128 \
-  aom_highbd_10_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance64x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance64x16_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance64x16 \
-  aom_highbd_10_sub_pixel_avg_variance64x16_sse2
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance64x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance64x32_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance64x32 \
-  aom_highbd_10_sub_pixel_avg_variance64x32_sse2
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance64x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance64x64_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance64x64 \
-  aom_highbd_10_sub_pixel_avg_variance64x64_sse2
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x16_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance8x16 \
-  aom_highbd_10_sub_pixel_avg_variance8x16_sse2
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x32_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x32_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance8x32 \
-  aom_highbd_10_sub_pixel_avg_variance8x32_sse2
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x4_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance8x4 \
-  aom_highbd_10_sub_pixel_avg_variance8x4_sse2
-
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-uint32_t aom_highbd_10_sub_pixel_avg_variance8x8_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_10_sub_pixel_avg_variance8x8 \
-  aom_highbd_10_sub_pixel_avg_variance8x8_sse2
-
-uint32_t aom_highbd_10_sub_pixel_variance128x128_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance128x128_sse2(const uint8_t* src_ptr,
-                                                      int source_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const uint8_t* ref_ptr,
-                                                      int ref_stride,
-                                                      uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance128x128_avx2(const uint8_t* src_ptr,
-                                                      int source_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const uint8_t* ref_ptr,
-                                                      int ref_stride,
-                                                      uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_10_sub_pixel_variance128x128)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-uint32_t aom_highbd_10_sub_pixel_variance128x64_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance128x64_sse2(const uint8_t* src_ptr,
-                                                     int source_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const uint8_t* ref_ptr,
-                                                     int ref_stride,
-                                                     uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance128x64_avx2(const uint8_t* src_ptr,
-                                                     int source_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const uint8_t* ref_ptr,
-                                                     int ref_stride,
-                                                     uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_10_sub_pixel_variance128x64)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-uint32_t aom_highbd_10_sub_pixel_variance16x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance16x16_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance16x16_avx2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_10_sub_pixel_variance16x16)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-uint32_t aom_highbd_10_sub_pixel_variance16x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance16x32_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance16x32_avx2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_10_sub_pixel_variance16x32)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-uint32_t aom_highbd_10_sub_pixel_variance16x4_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance16x4_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance16x4 \
-  aom_highbd_10_sub_pixel_variance16x4_sse2
-
-uint32_t aom_highbd_10_sub_pixel_variance16x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance16x64_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance16x64 \
-  aom_highbd_10_sub_pixel_variance16x64_sse2
-
-uint32_t aom_highbd_10_sub_pixel_variance16x8_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance16x8_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance16x8_avx2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_10_sub_pixel_variance16x8)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-uint32_t aom_highbd_10_sub_pixel_variance32x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance32x16_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance32x16_avx2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_10_sub_pixel_variance32x16)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-uint32_t aom_highbd_10_sub_pixel_variance32x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance32x32_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance32x32_avx2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_10_sub_pixel_variance32x32)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-uint32_t aom_highbd_10_sub_pixel_variance32x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance32x64_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance32x64_avx2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_10_sub_pixel_variance32x64)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-uint32_t aom_highbd_10_sub_pixel_variance32x8_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance32x8_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance32x8 \
-  aom_highbd_10_sub_pixel_variance32x8_sse2
-
-uint32_t aom_highbd_10_sub_pixel_variance4x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance4x16 \
-  aom_highbd_10_sub_pixel_variance4x16_c
-
-uint32_t aom_highbd_10_sub_pixel_variance4x4_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance4x4_sse4_1(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_10_sub_pixel_variance4x4)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-uint32_t aom_highbd_10_sub_pixel_variance4x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance4x8 \
-  aom_highbd_10_sub_pixel_variance4x8_c
-
-uint32_t aom_highbd_10_sub_pixel_variance64x128_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance64x128_sse2(const uint8_t* src_ptr,
-                                                     int source_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const uint8_t* ref_ptr,
-                                                     int ref_stride,
-                                                     uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance64x128_avx2(const uint8_t* src_ptr,
-                                                     int source_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const uint8_t* ref_ptr,
-                                                     int ref_stride,
-                                                     uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_10_sub_pixel_variance64x128)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-uint32_t aom_highbd_10_sub_pixel_variance64x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance64x16_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance64x16 \
-  aom_highbd_10_sub_pixel_variance64x16_sse2
-
-uint32_t aom_highbd_10_sub_pixel_variance64x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance64x32_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance64x32_avx2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_10_sub_pixel_variance64x32)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-uint32_t aom_highbd_10_sub_pixel_variance64x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance64x64_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance64x64_avx2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_10_sub_pixel_variance64x64)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-uint32_t aom_highbd_10_sub_pixel_variance8x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance8x16_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance8x16_avx2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_10_sub_pixel_variance8x16)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-uint32_t aom_highbd_10_sub_pixel_variance8x32_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance8x32_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance8x32 \
-  aom_highbd_10_sub_pixel_variance8x32_sse2
-
-uint32_t aom_highbd_10_sub_pixel_variance8x4_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance8x4_sse2(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_10_sub_pixel_variance8x4 \
-  aom_highbd_10_sub_pixel_variance8x4_sse2
-
-uint32_t aom_highbd_10_sub_pixel_variance8x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance8x8_sse2(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-uint32_t aom_highbd_10_sub_pixel_variance8x8_avx2(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_10_sub_pixel_variance8x8)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-unsigned int aom_highbd_10_variance128x128_c(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-unsigned int aom_highbd_10_variance128x128_sse2(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                unsigned int* sse);
-unsigned int aom_highbd_10_variance128x128_avx2(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_variance128x128)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    unsigned int* sse);
-
-unsigned int aom_highbd_10_variance128x64_c(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-unsigned int aom_highbd_10_variance128x64_sse2(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               unsigned int* sse);
-unsigned int aom_highbd_10_variance128x64_avx2(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_variance128x64)(const uint8_t* src_ptr,
-                                                         int source_stride,
-                                                         const uint8_t* ref_ptr,
-                                                         int ref_stride,
-                                                         unsigned int* sse);
-
-unsigned int aom_highbd_10_variance16x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_10_variance16x16_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-unsigned int aom_highbd_10_variance16x16_avx2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_variance16x16)(const uint8_t* src_ptr,
-                                                        int source_stride,
-                                                        const uint8_t* ref_ptr,
-                                                        int ref_stride,
-                                                        unsigned int* sse);
-
-unsigned int aom_highbd_10_variance16x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_10_variance16x32_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-unsigned int aom_highbd_10_variance16x32_avx2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_variance16x32)(const uint8_t* src_ptr,
-                                                        int source_stride,
-                                                        const uint8_t* ref_ptr,
-                                                        int ref_stride,
-                                                        unsigned int* sse);
-
-unsigned int aom_highbd_10_variance16x4_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_10_variance16x4 aom_highbd_10_variance16x4_c
-
-unsigned int aom_highbd_10_variance16x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           uint32_t* sse);
-unsigned int aom_highbd_10_variance16x64_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-#define aom_highbd_10_variance16x64 aom_highbd_10_variance16x64_sse2
-
-unsigned int aom_highbd_10_variance16x8_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-unsigned int aom_highbd_10_variance16x8_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-unsigned int aom_highbd_10_variance16x8_avx2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_variance16x8)(const uint8_t* src_ptr,
-                                                       int source_stride,
-                                                       const uint8_t* ref_ptr,
-                                                       int ref_stride,
-                                                       unsigned int* sse);
-
-unsigned int aom_highbd_10_variance2x2_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance2x2 aom_highbd_10_variance2x2_c
-
-unsigned int aom_highbd_10_variance2x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance2x4 aom_highbd_10_variance2x4_c
-
-unsigned int aom_highbd_10_variance32x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_10_variance32x16_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-unsigned int aom_highbd_10_variance32x16_avx2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_variance32x16)(const uint8_t* src_ptr,
-                                                        int source_stride,
-                                                        const uint8_t* ref_ptr,
-                                                        int ref_stride,
-                                                        unsigned int* sse);
-
-unsigned int aom_highbd_10_variance32x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_10_variance32x32_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-unsigned int aom_highbd_10_variance32x32_avx2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_variance32x32)(const uint8_t* src_ptr,
-                                                        int source_stride,
-                                                        const uint8_t* ref_ptr,
-                                                        int ref_stride,
-                                                        unsigned int* sse);
-
-unsigned int aom_highbd_10_variance32x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_10_variance32x64_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-unsigned int aom_highbd_10_variance32x64_avx2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_variance32x64)(const uint8_t* src_ptr,
-                                                        int source_stride,
-                                                        const uint8_t* ref_ptr,
-                                                        int ref_stride,
-                                                        unsigned int* sse);
-
-unsigned int aom_highbd_10_variance32x8_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-unsigned int aom_highbd_10_variance32x8_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             uint32_t* sse);
-#define aom_highbd_10_variance32x8 aom_highbd_10_variance32x8_sse2
-
-unsigned int aom_highbd_10_variance4x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_10_variance4x16 aom_highbd_10_variance4x16_c
-
-unsigned int aom_highbd_10_variance4x2_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance4x2 aom_highbd_10_variance4x2_c
-
-unsigned int aom_highbd_10_variance4x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-unsigned int aom_highbd_10_variance4x4_sse4_1(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_variance4x4)(const uint8_t* src_ptr,
-                                                      int source_stride,
-                                                      const uint8_t* ref_ptr,
-                                                      int ref_stride,
-                                                      unsigned int* sse);
-
-unsigned int aom_highbd_10_variance4x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance4x8 aom_highbd_10_variance4x8_c
-
-unsigned int aom_highbd_10_variance64x128_c(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-unsigned int aom_highbd_10_variance64x128_sse2(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               unsigned int* sse);
-unsigned int aom_highbd_10_variance64x128_avx2(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_variance64x128)(const uint8_t* src_ptr,
-                                                         int source_stride,
-                                                         const uint8_t* ref_ptr,
-                                                         int ref_stride,
-                                                         unsigned int* sse);
-
-unsigned int aom_highbd_10_variance64x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           uint32_t* sse);
-unsigned int aom_highbd_10_variance64x16_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-#define aom_highbd_10_variance64x16 aom_highbd_10_variance64x16_sse2
-
-unsigned int aom_highbd_10_variance64x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_10_variance64x32_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-unsigned int aom_highbd_10_variance64x32_avx2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_variance64x32)(const uint8_t* src_ptr,
-                                                        int source_stride,
-                                                        const uint8_t* ref_ptr,
-                                                        int ref_stride,
-                                                        unsigned int* sse);
-
-unsigned int aom_highbd_10_variance64x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_10_variance64x64_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-unsigned int aom_highbd_10_variance64x64_avx2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_variance64x64)(const uint8_t* src_ptr,
-                                                        int source_stride,
-                                                        const uint8_t* ref_ptr,
-                                                        int ref_stride,
-                                                        unsigned int* sse);
-
-unsigned int aom_highbd_10_variance8x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-unsigned int aom_highbd_10_variance8x16_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-unsigned int aom_highbd_10_variance8x16_avx2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_variance8x16)(const uint8_t* src_ptr,
-                                                       int source_stride,
-                                                       const uint8_t* ref_ptr,
-                                                       int ref_stride,
-                                                       unsigned int* sse);
-
-unsigned int aom_highbd_10_variance8x32_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-unsigned int aom_highbd_10_variance8x32_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             uint32_t* sse);
-#define aom_highbd_10_variance8x32 aom_highbd_10_variance8x32_sse2
-
-unsigned int aom_highbd_10_variance8x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_10_variance8x4 aom_highbd_10_variance8x4_c
-
-unsigned int aom_highbd_10_variance8x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-unsigned int aom_highbd_10_variance8x8_sse2(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-unsigned int aom_highbd_10_variance8x8_avx2(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_10_variance8x8)(const uint8_t* src_ptr,
-                                                      int source_stride,
-                                                      const uint8_t* ref_ptr,
-                                                      int ref_stride,
-                                                      unsigned int* sse);
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x128 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x64 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x16 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x16_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x32 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x32_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x4 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x4_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x64 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x64_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x8 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x8_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x16 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x16_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x32 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x32_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x64 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x64_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x8 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x8_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x16 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x4 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x4_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x8 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x128 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x16 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x16_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x32 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x32_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x64 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x64_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x16 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x16_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x32 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x32_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x4 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x4_c
-
-uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x8 \
-  aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x8_c
-
-void aom_highbd_12_get16x16var_c(const uint8_t* src_ptr,
-                                 int source_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride,
-                                 unsigned int* sse,
-                                 int* sum);
-#define aom_highbd_12_get16x16var aom_highbd_12_get16x16var_c
-
-void aom_highbd_12_get8x8var_c(const uint8_t* src_ptr,
-                               int source_stride,
-                               const uint8_t* ref_ptr,
-                               int ref_stride,
-                               unsigned int* sse,
-                               int* sum);
-#define aom_highbd_12_get8x8var aom_highbd_12_get8x8var_c
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance128x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance128x128_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance128x128)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance128x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance128x64_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance128x64)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x16_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance16x16)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x32_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance16x32)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x4_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance16x4)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x64_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance16x64)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance16x8_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance16x8)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x16_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance32x16)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x32_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance32x32)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x64_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance32x64)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance32x8_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance32x8)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance4x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance4x16_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance4x16)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance4x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance4x4_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance4x4)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance4x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance4x8_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance4x8)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x128_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance64x128)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x16_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance64x16)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x32_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance64x32)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance64x64_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance64x64)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x16_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance8x16)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x32_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance8x32)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x4_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance8x4)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_12_masked_sub_pixel_variance8x8_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_masked_sub_pixel_variance8x8)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_mse16x16_c(const uint8_t* src_ptr,
-                                      int source_stride,
-                                      const uint8_t* ref_ptr,
-                                      int recon_stride,
-                                      unsigned int* sse);
-unsigned int aom_highbd_12_mse16x16_sse2(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int recon_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_mse16x16 aom_highbd_12_mse16x16_sse2
-
-unsigned int aom_highbd_12_mse16x8_c(const uint8_t* src_ptr,
-                                     int source_stride,
-                                     const uint8_t* ref_ptr,
-                                     int recon_stride,
-                                     unsigned int* sse);
-#define aom_highbd_12_mse16x8 aom_highbd_12_mse16x8_c
-
-unsigned int aom_highbd_12_mse8x16_c(const uint8_t* src_ptr,
-                                     int source_stride,
-                                     const uint8_t* ref_ptr,
-                                     int recon_stride,
-                                     unsigned int* sse);
-#define aom_highbd_12_mse8x16 aom_highbd_12_mse8x16_c
-
-unsigned int aom_highbd_12_mse8x8_c(const uint8_t* src_ptr,
-                                    int source_stride,
-                                    const uint8_t* ref_ptr,
-                                    int recon_stride,
-                                    unsigned int* sse);
-unsigned int aom_highbd_12_mse8x8_sse2(const uint8_t* src_ptr,
-                                       int source_stride,
-                                       const uint8_t* ref_ptr,
-                                       int recon_stride,
-                                       unsigned int* sse);
-#define aom_highbd_12_mse8x8 aom_highbd_12_mse8x8_sse2
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance128x128_c(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            int xoffset,
-                                                            int yoffset,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance128x128 \
-  aom_highbd_12_obmc_sub_pixel_variance128x128_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance128x64_c(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance128x64 \
-  aom_highbd_12_obmc_sub_pixel_variance128x64_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance16x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance16x16 \
-  aom_highbd_12_obmc_sub_pixel_variance16x16_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance16x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance16x32 \
-  aom_highbd_12_obmc_sub_pixel_variance16x32_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance16x4_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance16x4 \
-  aom_highbd_12_obmc_sub_pixel_variance16x4_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance16x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance16x64 \
-  aom_highbd_12_obmc_sub_pixel_variance16x64_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance16x8_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance16x8 \
-  aom_highbd_12_obmc_sub_pixel_variance16x8_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance32x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance32x16 \
-  aom_highbd_12_obmc_sub_pixel_variance32x16_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance32x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance32x32 \
-  aom_highbd_12_obmc_sub_pixel_variance32x32_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance32x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance32x64 \
-  aom_highbd_12_obmc_sub_pixel_variance32x64_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance32x8_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance32x8 \
-  aom_highbd_12_obmc_sub_pixel_variance32x8_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance4x16_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance4x16 \
-  aom_highbd_12_obmc_sub_pixel_variance4x16_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance4x4_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance4x4 \
-  aom_highbd_12_obmc_sub_pixel_variance4x4_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance4x8_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance4x8 \
-  aom_highbd_12_obmc_sub_pixel_variance4x8_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance64x128_c(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance64x128 \
-  aom_highbd_12_obmc_sub_pixel_variance64x128_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance64x16_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance64x16 \
-  aom_highbd_12_obmc_sub_pixel_variance64x16_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance64x32_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance64x32 \
-  aom_highbd_12_obmc_sub_pixel_variance64x32_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance64x64_c(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          int xoffset,
-                                                          int yoffset,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance64x64 \
-  aom_highbd_12_obmc_sub_pixel_variance64x64_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance8x16_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance8x16 \
-  aom_highbd_12_obmc_sub_pixel_variance8x16_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance8x32_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance8x32 \
-  aom_highbd_12_obmc_sub_pixel_variance8x32_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance8x4_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance8x4 \
-  aom_highbd_12_obmc_sub_pixel_variance8x4_c
-
-unsigned int aom_highbd_12_obmc_sub_pixel_variance8x8_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_12_obmc_sub_pixel_variance8x8 \
-  aom_highbd_12_obmc_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_12_obmc_variance128x128_c(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance128x128_sse4_1(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance128x128)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance128x64_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance128x64_sse4_1(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance128x64)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance16x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance16x16_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance16x16)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance16x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance16x32_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance16x32)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance16x4_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance16x4_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance16x4)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance16x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance16x64_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance16x64)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance16x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance16x8_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance16x8)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance32x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance32x16_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance32x16)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance32x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance32x32_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance32x32)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance32x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance32x64_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance32x64)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance32x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance32x8_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance32x8)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance4x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance4x16_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance4x16)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance4x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance4x4_sse4_1(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance4x4)(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance4x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance4x8_sse4_1(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance4x8)(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance64x128_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance64x128_sse4_1(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance64x128)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance64x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance64x16_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance64x16)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance64x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance64x32_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance64x32)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance64x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance64x64_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance64x64)(
-    const uint8_t* pre,
-    int pre_stride,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance8x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance8x16_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance8x16)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance8x32_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance8x32_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance8x32)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance8x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance8x4_sse4_1(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance8x4)(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-
-unsigned int aom_highbd_12_obmc_variance8x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-unsigned int aom_highbd_12_obmc_variance8x8_sse4_1(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_obmc_variance8x8)(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance128x128 \
-  aom_highbd_12_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance128x64 \
-  aom_highbd_12_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x16_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance16x16 \
-  aom_highbd_12_sub_pixel_avg_variance16x16_sse2
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x32_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance16x32 \
-  aom_highbd_12_sub_pixel_avg_variance16x32_sse2
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x4_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x4_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance16x4 \
-  aom_highbd_12_sub_pixel_avg_variance16x4_sse2
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x64_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance16x64 \
-  aom_highbd_12_sub_pixel_avg_variance16x64_sse2
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance16x8_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance16x8 \
-  aom_highbd_12_sub_pixel_avg_variance16x8_sse2
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x16_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance32x16 \
-  aom_highbd_12_sub_pixel_avg_variance32x16_sse2
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x32_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance32x32 \
-  aom_highbd_12_sub_pixel_avg_variance32x32_sse2
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x64_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance32x64 \
-  aom_highbd_12_sub_pixel_avg_variance32x64_sse2
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x8_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance32x8_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance32x8 \
-  aom_highbd_12_sub_pixel_avg_variance32x8_sse2
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance4x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance4x16 \
-  aom_highbd_12_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance4x4_sse4_1(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-RTCD_EXTERN uint32_t (*aom_highbd_12_sub_pixel_avg_variance4x4)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance4x8 \
-  aom_highbd_12_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance64x128 \
-  aom_highbd_12_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance64x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance64x16_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance64x16 \
-  aom_highbd_12_sub_pixel_avg_variance64x16_sse2
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance64x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance64x32_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance64x32 \
-  aom_highbd_12_sub_pixel_avg_variance64x32_sse2
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance64x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance64x64_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance64x64 \
-  aom_highbd_12_sub_pixel_avg_variance64x64_sse2
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x16_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance8x16 \
-  aom_highbd_12_sub_pixel_avg_variance8x16_sse2
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x32_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x32_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance8x32 \
-  aom_highbd_12_sub_pixel_avg_variance8x32_sse2
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x4_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance8x4 \
-  aom_highbd_12_sub_pixel_avg_variance8x4_sse2
-
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-uint32_t aom_highbd_12_sub_pixel_avg_variance8x8_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_12_sub_pixel_avg_variance8x8 \
-  aom_highbd_12_sub_pixel_avg_variance8x8_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance128x128_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance128x128_sse2(const uint8_t* src_ptr,
-                                                      int source_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const uint8_t* ref_ptr,
-                                                      int ref_stride,
-                                                      uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance128x128 \
-  aom_highbd_12_sub_pixel_variance128x128_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance128x64_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance128x64_sse2(const uint8_t* src_ptr,
-                                                     int source_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const uint8_t* ref_ptr,
-                                                     int ref_stride,
-                                                     uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance128x64 \
-  aom_highbd_12_sub_pixel_variance128x64_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance16x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance16x16_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance16x16 \
-  aom_highbd_12_sub_pixel_variance16x16_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance16x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance16x32_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance16x32 \
-  aom_highbd_12_sub_pixel_variance16x32_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance16x4_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance16x4_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance16x4 \
-  aom_highbd_12_sub_pixel_variance16x4_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance16x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance16x64_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance16x64 \
-  aom_highbd_12_sub_pixel_variance16x64_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance16x8_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance16x8_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance16x8 \
-  aom_highbd_12_sub_pixel_variance16x8_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance32x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance32x16_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance32x16 \
-  aom_highbd_12_sub_pixel_variance32x16_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance32x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance32x32_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance32x32 \
-  aom_highbd_12_sub_pixel_variance32x32_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance32x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance32x64_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance32x64 \
-  aom_highbd_12_sub_pixel_variance32x64_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance32x8_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance32x8_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance32x8 \
-  aom_highbd_12_sub_pixel_variance32x8_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance4x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance4x16 \
-  aom_highbd_12_sub_pixel_variance4x16_c
-
-uint32_t aom_highbd_12_sub_pixel_variance4x4_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance4x4_sse4_1(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_12_sub_pixel_variance4x4)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-uint32_t aom_highbd_12_sub_pixel_variance4x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance4x8 \
-  aom_highbd_12_sub_pixel_variance4x8_c
-
-uint32_t aom_highbd_12_sub_pixel_variance64x128_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance64x128_sse2(const uint8_t* src_ptr,
-                                                     int source_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const uint8_t* ref_ptr,
-                                                     int ref_stride,
-                                                     uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance64x128 \
-  aom_highbd_12_sub_pixel_variance64x128_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance64x16_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance64x16_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance64x16 \
-  aom_highbd_12_sub_pixel_variance64x16_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance64x32_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance64x32_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance64x32 \
-  aom_highbd_12_sub_pixel_variance64x32_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance64x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance64x64_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance64x64 \
-  aom_highbd_12_sub_pixel_variance64x64_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance8x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance8x16_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance8x16 \
-  aom_highbd_12_sub_pixel_variance8x16_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance8x32_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance8x32_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance8x32 \
-  aom_highbd_12_sub_pixel_variance8x32_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance8x4_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance8x4_sse2(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance8x4 \
-  aom_highbd_12_sub_pixel_variance8x4_sse2
-
-uint32_t aom_highbd_12_sub_pixel_variance8x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-uint32_t aom_highbd_12_sub_pixel_variance8x8_sse2(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_12_sub_pixel_variance8x8 \
-  aom_highbd_12_sub_pixel_variance8x8_sse2
-
-unsigned int aom_highbd_12_variance128x128_c(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-unsigned int aom_highbd_12_variance128x128_sse2(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                unsigned int* sse);
-#define aom_highbd_12_variance128x128 aom_highbd_12_variance128x128_sse2
-
-unsigned int aom_highbd_12_variance128x64_c(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-unsigned int aom_highbd_12_variance128x64_sse2(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               unsigned int* sse);
-#define aom_highbd_12_variance128x64 aom_highbd_12_variance128x64_sse2
-
-unsigned int aom_highbd_12_variance16x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_12_variance16x16_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-#define aom_highbd_12_variance16x16 aom_highbd_12_variance16x16_sse2
-
-unsigned int aom_highbd_12_variance16x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_12_variance16x32_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-#define aom_highbd_12_variance16x32 aom_highbd_12_variance16x32_sse2
-
-unsigned int aom_highbd_12_variance16x4_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_12_variance16x4 aom_highbd_12_variance16x4_c
-
-unsigned int aom_highbd_12_variance16x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           uint32_t* sse);
-unsigned int aom_highbd_12_variance16x64_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-#define aom_highbd_12_variance16x64 aom_highbd_12_variance16x64_sse2
-
-unsigned int aom_highbd_12_variance16x8_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-unsigned int aom_highbd_12_variance16x8_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-#define aom_highbd_12_variance16x8 aom_highbd_12_variance16x8_sse2
-
-unsigned int aom_highbd_12_variance2x2_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance2x2 aom_highbd_12_variance2x2_c
-
-unsigned int aom_highbd_12_variance2x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance2x4 aom_highbd_12_variance2x4_c
-
-unsigned int aom_highbd_12_variance32x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_12_variance32x16_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-#define aom_highbd_12_variance32x16 aom_highbd_12_variance32x16_sse2
-
-unsigned int aom_highbd_12_variance32x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_12_variance32x32_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-#define aom_highbd_12_variance32x32 aom_highbd_12_variance32x32_sse2
-
-unsigned int aom_highbd_12_variance32x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_12_variance32x64_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-#define aom_highbd_12_variance32x64 aom_highbd_12_variance32x64_sse2
-
-unsigned int aom_highbd_12_variance32x8_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-unsigned int aom_highbd_12_variance32x8_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             uint32_t* sse);
-#define aom_highbd_12_variance32x8 aom_highbd_12_variance32x8_sse2
-
-unsigned int aom_highbd_12_variance4x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-#define aom_highbd_12_variance4x16 aom_highbd_12_variance4x16_c
-
-unsigned int aom_highbd_12_variance4x2_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance4x2 aom_highbd_12_variance4x2_c
-
-unsigned int aom_highbd_12_variance4x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-unsigned int aom_highbd_12_variance4x4_sse4_1(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_12_variance4x4)(const uint8_t* src_ptr,
-                                                      int source_stride,
-                                                      const uint8_t* ref_ptr,
-                                                      int ref_stride,
-                                                      unsigned int* sse);
-
-unsigned int aom_highbd_12_variance4x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance4x8 aom_highbd_12_variance4x8_c
-
-unsigned int aom_highbd_12_variance64x128_c(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-unsigned int aom_highbd_12_variance64x128_sse2(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               unsigned int* sse);
-#define aom_highbd_12_variance64x128 aom_highbd_12_variance64x128_sse2
-
-unsigned int aom_highbd_12_variance64x16_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           uint32_t* sse);
-unsigned int aom_highbd_12_variance64x16_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-#define aom_highbd_12_variance64x16 aom_highbd_12_variance64x16_sse2
-
-unsigned int aom_highbd_12_variance64x32_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_12_variance64x32_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-#define aom_highbd_12_variance64x32 aom_highbd_12_variance64x32_sse2
-
-unsigned int aom_highbd_12_variance64x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_12_variance64x64_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-#define aom_highbd_12_variance64x64 aom_highbd_12_variance64x64_sse2
-
-unsigned int aom_highbd_12_variance8x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-unsigned int aom_highbd_12_variance8x16_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-#define aom_highbd_12_variance8x16 aom_highbd_12_variance8x16_sse2
-
-unsigned int aom_highbd_12_variance8x32_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-unsigned int aom_highbd_12_variance8x32_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             uint32_t* sse);
-#define aom_highbd_12_variance8x32 aom_highbd_12_variance8x32_sse2
-
-unsigned int aom_highbd_12_variance8x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-#define aom_highbd_12_variance8x4 aom_highbd_12_variance8x4_c
-
-unsigned int aom_highbd_12_variance8x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-unsigned int aom_highbd_12_variance8x8_sse2(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-#define aom_highbd_12_variance8x8 aom_highbd_12_variance8x8_sse2
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x128 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x64 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x16 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x16_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x32 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x32_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x4 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x4_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x64 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x64_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x8 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x8_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x16 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x16_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x32 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x32_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x64 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x64_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x8 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x8_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x16 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x4 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x4_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x8 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x128 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x16 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x16_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x32 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x32_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x64 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x64_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x16_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x16 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x16_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x32_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x32 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x32_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x4_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x4 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x4_c
-
-uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x8_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x8 \
-  aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x8_c
-
-void aom_highbd_8_get16x16var_c(const uint8_t* src_ptr,
-                                int source_stride,
-                                const uint8_t* ref_ptr,
-                                int ref_stride,
-                                unsigned int* sse,
-                                int* sum);
-#define aom_highbd_8_get16x16var aom_highbd_8_get16x16var_c
-
-void aom_highbd_8_get8x8var_c(const uint8_t* src_ptr,
-                              int source_stride,
-                              const uint8_t* ref_ptr,
-                              int ref_stride,
-                              unsigned int* sse,
-                              int* sum);
-#define aom_highbd_8_get8x8var aom_highbd_8_get8x8var_c
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance128x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance128x128_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance128x128)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance128x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance128x64_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance128x64)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x16_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance16x16)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x32_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance16x32)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x4_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance16x4)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x64_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance16x64)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance16x8_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance16x8)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x16_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance32x16)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x32_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance32x32)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x64_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance32x64)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance32x8_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance32x8)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance4x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance4x16_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance4x16)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance4x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance4x4_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance4x4)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance4x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance4x8_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance4x8)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x128_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x128_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance64x128)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x16_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance64x16)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x32_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance64x32)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x64_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance64x64_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance64x64)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x16_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x16_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance8x16)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x32_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x32_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance8x32)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x4_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x4_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance8x4)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x8_c(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-unsigned int aom_highbd_8_masked_sub_pixel_variance8x8_ssse3(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_masked_sub_pixel_variance8x8)(
-    const uint8_t* src,
-    int src_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask,
-    unsigned int* sse);
-
-unsigned int aom_highbd_8_mse16x16_c(const uint8_t* src_ptr,
-                                     int source_stride,
-                                     const uint8_t* ref_ptr,
-                                     int recon_stride,
-                                     unsigned int* sse);
-unsigned int aom_highbd_8_mse16x16_sse2(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int recon_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_mse16x16 aom_highbd_8_mse16x16_sse2
-
-unsigned int aom_highbd_8_mse16x8_c(const uint8_t* src_ptr,
-                                    int source_stride,
-                                    const uint8_t* ref_ptr,
-                                    int recon_stride,
-                                    unsigned int* sse);
-#define aom_highbd_8_mse16x8 aom_highbd_8_mse16x8_c
-
-unsigned int aom_highbd_8_mse8x16_c(const uint8_t* src_ptr,
-                                    int source_stride,
-                                    const uint8_t* ref_ptr,
-                                    int recon_stride,
-                                    unsigned int* sse);
-#define aom_highbd_8_mse8x16 aom_highbd_8_mse8x16_c
-
-unsigned int aom_highbd_8_mse8x8_c(const uint8_t* src_ptr,
-                                   int source_stride,
-                                   const uint8_t* ref_ptr,
-                                   int recon_stride,
-                                   unsigned int* sse);
-unsigned int aom_highbd_8_mse8x8_sse2(const uint8_t* src_ptr,
-                                      int source_stride,
-                                      const uint8_t* ref_ptr,
-                                      int recon_stride,
-                                      unsigned int* sse);
-#define aom_highbd_8_mse8x8 aom_highbd_8_mse8x8_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance128x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance128x128 \
-  aom_highbd_8_sub_pixel_avg_variance128x128_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance128x64_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance128x64 \
-  aom_highbd_8_sub_pixel_avg_variance128x64_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x16_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance16x16 \
-  aom_highbd_8_sub_pixel_avg_variance16x16_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x32_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x32_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance16x32 \
-  aom_highbd_8_sub_pixel_avg_variance16x32_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x4_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x4_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance16x4 \
-  aom_highbd_8_sub_pixel_avg_variance16x4_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x64_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x64_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance16x64 \
-  aom_highbd_8_sub_pixel_avg_variance16x64_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance16x8_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance16x8 \
-  aom_highbd_8_sub_pixel_avg_variance16x8_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x16_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance32x16 \
-  aom_highbd_8_sub_pixel_avg_variance32x16_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x32_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x32_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance32x32 \
-  aom_highbd_8_sub_pixel_avg_variance32x32_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x64_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x64_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance32x64 \
-  aom_highbd_8_sub_pixel_avg_variance32x64_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x8_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance32x8_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance32x8 \
-  aom_highbd_8_sub_pixel_avg_variance32x8_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance4x16_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance4x16 \
-  aom_highbd_8_sub_pixel_avg_variance4x16_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse,
-                                                  const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance4x4_sse4_1(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-RTCD_EXTERN uint32_t (*aom_highbd_8_sub_pixel_avg_variance4x4)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse,
-                                                  const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance4x8 \
-  aom_highbd_8_sub_pixel_avg_variance4x8_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance64x128_c(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance64x128 \
-  aom_highbd_8_sub_pixel_avg_variance64x128_c
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance64x16_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance64x16_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance64x16 \
-  aom_highbd_8_sub_pixel_avg_variance64x16_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance64x32_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance64x32_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance64x32 \
-  aom_highbd_8_sub_pixel_avg_variance64x32_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance64x64_c(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse,
-                                                    const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance64x64_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance64x64 \
-  aom_highbd_8_sub_pixel_avg_variance64x64_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x16_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance8x16 \
-  aom_highbd_8_sub_pixel_avg_variance8x16_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x32_c(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse,
-                                                   const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x32_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance8x32 \
-  aom_highbd_8_sub_pixel_avg_variance8x32_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse,
-                                                  const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x4_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance8x4 \
-  aom_highbd_8_sub_pixel_avg_variance8x4_sse2
-
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse,
-                                                  const uint8_t* second_pred);
-uint32_t aom_highbd_8_sub_pixel_avg_variance8x8_sse2(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse,
-    const uint8_t* second_pred);
-#define aom_highbd_8_sub_pixel_avg_variance8x8 \
-  aom_highbd_8_sub_pixel_avg_variance8x8_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance128x128_c(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance128x128_sse2(const uint8_t* src_ptr,
-                                                     int source_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const uint8_t* ref_ptr,
-                                                     int ref_stride,
-                                                     uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance128x128 \
-  aom_highbd_8_sub_pixel_variance128x128_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance128x64_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance128x64_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance128x64 \
-  aom_highbd_8_sub_pixel_variance128x64_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance16x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance16x16_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance16x16 \
-  aom_highbd_8_sub_pixel_variance16x16_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance16x32_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance16x32_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance16x32 \
-  aom_highbd_8_sub_pixel_variance16x32_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance16x4_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance16x4_sse2(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance16x4 \
-  aom_highbd_8_sub_pixel_variance16x4_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance16x64_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance16x64_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance16x64 \
-  aom_highbd_8_sub_pixel_variance16x64_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance16x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance16x8_sse2(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance16x8 \
-  aom_highbd_8_sub_pixel_variance16x8_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance32x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance32x16_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance32x16 \
-  aom_highbd_8_sub_pixel_variance32x16_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance32x32_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance32x32_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance32x32 \
-  aom_highbd_8_sub_pixel_variance32x32_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance32x64_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance32x64_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance32x64 \
-  aom_highbd_8_sub_pixel_variance32x64_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance32x8_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance32x8_sse2(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance32x8 \
-  aom_highbd_8_sub_pixel_variance32x8_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance4x16_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance4x16 \
-  aom_highbd_8_sub_pixel_variance4x16_c
-
-uint32_t aom_highbd_8_sub_pixel_variance4x4_c(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance4x4_sse4_1(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-RTCD_EXTERN uint32_t (*aom_highbd_8_sub_pixel_variance4x4)(
-    const uint8_t* src_ptr,
-    int source_stride,
-    int xoffset,
-    int yoffset,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    uint32_t* sse);
-
-uint32_t aom_highbd_8_sub_pixel_variance4x8_c(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance4x8 aom_highbd_8_sub_pixel_variance4x8_c
-
-uint32_t aom_highbd_8_sub_pixel_variance64x128_c(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance64x128_sse2(const uint8_t* src_ptr,
-                                                    int source_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance64x128 \
-  aom_highbd_8_sub_pixel_variance64x128_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance64x16_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance64x16_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance64x16 \
-  aom_highbd_8_sub_pixel_variance64x16_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance64x32_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance64x32_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance64x32 \
-  aom_highbd_8_sub_pixel_variance64x32_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance64x64_c(const uint8_t* src_ptr,
-                                                int source_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride,
-                                                uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance64x64_sse2(const uint8_t* src_ptr,
-                                                   int source_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance64x64 \
-  aom_highbd_8_sub_pixel_variance64x64_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance8x16_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance8x16_sse2(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance8x16 \
-  aom_highbd_8_sub_pixel_variance8x16_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance8x32_c(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance8x32_sse2(const uint8_t* src_ptr,
-                                                  int source_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride,
-                                                  uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance8x32 \
-  aom_highbd_8_sub_pixel_variance8x32_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance8x4_c(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance8x4_sse2(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance8x4 \
-  aom_highbd_8_sub_pixel_variance8x4_sse2
-
-uint32_t aom_highbd_8_sub_pixel_variance8x8_c(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              uint32_t* sse);
-uint32_t aom_highbd_8_sub_pixel_variance8x8_sse2(const uint8_t* src_ptr,
-                                                 int source_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride,
-                                                 uint32_t* sse);
-#define aom_highbd_8_sub_pixel_variance8x8 \
-  aom_highbd_8_sub_pixel_variance8x8_sse2
-
-unsigned int aom_highbd_8_variance128x128_c(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-unsigned int aom_highbd_8_variance128x128_sse2(const uint8_t* src_ptr,
-                                               int source_stride,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride,
-                                               unsigned int* sse);
-#define aom_highbd_8_variance128x128 aom_highbd_8_variance128x128_sse2
-
-unsigned int aom_highbd_8_variance128x64_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_8_variance128x64_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-#define aom_highbd_8_variance128x64 aom_highbd_8_variance128x64_sse2
-
-unsigned int aom_highbd_8_variance16x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-unsigned int aom_highbd_8_variance16x16_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-#define aom_highbd_8_variance16x16 aom_highbd_8_variance16x16_sse2
-
-unsigned int aom_highbd_8_variance16x32_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-unsigned int aom_highbd_8_variance16x32_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-#define aom_highbd_8_variance16x32 aom_highbd_8_variance16x32_sse2
-
-unsigned int aom_highbd_8_variance16x4_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         uint32_t* sse);
-#define aom_highbd_8_variance16x4 aom_highbd_8_variance16x4_c
-
-unsigned int aom_highbd_8_variance16x64_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-unsigned int aom_highbd_8_variance16x64_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             uint32_t* sse);
-#define aom_highbd_8_variance16x64 aom_highbd_8_variance16x64_sse2
-
-unsigned int aom_highbd_8_variance16x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-unsigned int aom_highbd_8_variance16x8_sse2(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-#define aom_highbd_8_variance16x8 aom_highbd_8_variance16x8_sse2
-
-unsigned int aom_highbd_8_variance2x2_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance2x2 aom_highbd_8_variance2x2_c
-
-unsigned int aom_highbd_8_variance2x4_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance2x4 aom_highbd_8_variance2x4_c
-
-unsigned int aom_highbd_8_variance32x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-unsigned int aom_highbd_8_variance32x16_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-#define aom_highbd_8_variance32x16 aom_highbd_8_variance32x16_sse2
-
-unsigned int aom_highbd_8_variance32x32_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-unsigned int aom_highbd_8_variance32x32_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-#define aom_highbd_8_variance32x32 aom_highbd_8_variance32x32_sse2
-
-unsigned int aom_highbd_8_variance32x64_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-unsigned int aom_highbd_8_variance32x64_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-#define aom_highbd_8_variance32x64 aom_highbd_8_variance32x64_sse2
-
-unsigned int aom_highbd_8_variance32x8_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         uint32_t* sse);
-unsigned int aom_highbd_8_variance32x8_sse2(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            uint32_t* sse);
-#define aom_highbd_8_variance32x8 aom_highbd_8_variance32x8_sse2
-
-unsigned int aom_highbd_8_variance4x16_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         uint32_t* sse);
-#define aom_highbd_8_variance4x16 aom_highbd_8_variance4x16_c
-
-unsigned int aom_highbd_8_variance4x2_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance4x2 aom_highbd_8_variance4x2_c
-
-unsigned int aom_highbd_8_variance4x4_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-unsigned int aom_highbd_8_variance4x4_sse4_1(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_8_variance4x4)(const uint8_t* src_ptr,
-                                                     int source_stride,
-                                                     const uint8_t* ref_ptr,
-                                                     int ref_stride,
-                                                     unsigned int* sse);
-
-unsigned int aom_highbd_8_variance4x8_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance4x8 aom_highbd_8_variance4x8_c
-
-unsigned int aom_highbd_8_variance64x128_c(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-unsigned int aom_highbd_8_variance64x128_sse2(const uint8_t* src_ptr,
-                                              int source_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride,
-                                              unsigned int* sse);
-#define aom_highbd_8_variance64x128 aom_highbd_8_variance64x128_sse2
-
-unsigned int aom_highbd_8_variance64x16_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          uint32_t* sse);
-unsigned int aom_highbd_8_variance64x16_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             uint32_t* sse);
-#define aom_highbd_8_variance64x16 aom_highbd_8_variance64x16_sse2
-
-unsigned int aom_highbd_8_variance64x32_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-unsigned int aom_highbd_8_variance64x32_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-#define aom_highbd_8_variance64x32 aom_highbd_8_variance64x32_sse2
-
-unsigned int aom_highbd_8_variance64x64_c(const uint8_t* src_ptr,
-                                          int source_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          unsigned int* sse);
-unsigned int aom_highbd_8_variance64x64_sse2(const uint8_t* src_ptr,
-                                             int source_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride,
-                                             unsigned int* sse);
-#define aom_highbd_8_variance64x64 aom_highbd_8_variance64x64_sse2
-
-unsigned int aom_highbd_8_variance8x16_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         unsigned int* sse);
-unsigned int aom_highbd_8_variance8x16_sse2(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            unsigned int* sse);
-#define aom_highbd_8_variance8x16 aom_highbd_8_variance8x16_sse2
-
-unsigned int aom_highbd_8_variance8x32_c(const uint8_t* src_ptr,
-                                         int source_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         uint32_t* sse);
-unsigned int aom_highbd_8_variance8x32_sse2(const uint8_t* src_ptr,
-                                            int source_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            uint32_t* sse);
-#define aom_highbd_8_variance8x32 aom_highbd_8_variance8x32_sse2
-
-unsigned int aom_highbd_8_variance8x4_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-#define aom_highbd_8_variance8x4 aom_highbd_8_variance8x4_c
-
-unsigned int aom_highbd_8_variance8x8_c(const uint8_t* src_ptr,
-                                        int source_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        unsigned int* sse);
-unsigned int aom_highbd_8_variance8x8_sse2(const uint8_t* src_ptr,
-                                           int source_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           unsigned int* sse);
-#define aom_highbd_8_variance8x8 aom_highbd_8_variance8x8_sse2
-
-unsigned int aom_highbd_avg_4x4_c(const uint8_t*, int p);
-#define aom_highbd_avg_4x4 aom_highbd_avg_4x4_c
-
-unsigned int aom_highbd_avg_8x8_c(const uint8_t*, int p);
-#define aom_highbd_avg_8x8 aom_highbd_avg_8x8_c
-
-void aom_highbd_blend_a64_d16_mask_c(uint8_t* dst,
-                                     uint32_t dst_stride,
-                                     const CONV_BUF_TYPE* src0,
-                                     uint32_t src0_stride,
-                                     const CONV_BUF_TYPE* src1,
-                                     uint32_t src1_stride,
-                                     const uint8_t* mask,
-                                     uint32_t mask_stride,
-                                     int w,
-                                     int h,
-                                     int subw,
-                                     int subh,
-                                     ConvolveParams* conv_params,
-                                     const int bd);
-void aom_highbd_blend_a64_d16_mask_sse4_1(uint8_t* dst,
-                                          uint32_t dst_stride,
-                                          const CONV_BUF_TYPE* src0,
-                                          uint32_t src0_stride,
-                                          const CONV_BUF_TYPE* src1,
-                                          uint32_t src1_stride,
-                                          const uint8_t* mask,
-                                          uint32_t mask_stride,
-                                          int w,
-                                          int h,
-                                          int subw,
-                                          int subh,
-                                          ConvolveParams* conv_params,
-                                          const int bd);
-void aom_highbd_blend_a64_d16_mask_avx2(uint8_t* dst,
-                                        uint32_t dst_stride,
-                                        const CONV_BUF_TYPE* src0,
-                                        uint32_t src0_stride,
-                                        const CONV_BUF_TYPE* src1,
-                                        uint32_t src1_stride,
-                                        const uint8_t* mask,
-                                        uint32_t mask_stride,
-                                        int w,
-                                        int h,
-                                        int subw,
-                                        int subh,
-                                        ConvolveParams* conv_params,
-                                        const int bd);
-RTCD_EXTERN void (*aom_highbd_blend_a64_d16_mask)(uint8_t* dst,
-                                                  uint32_t dst_stride,
-                                                  const CONV_BUF_TYPE* src0,
-                                                  uint32_t src0_stride,
-                                                  const CONV_BUF_TYPE* src1,
-                                                  uint32_t src1_stride,
-                                                  const uint8_t* mask,
-                                                  uint32_t mask_stride,
-                                                  int w,
-                                                  int h,
-                                                  int subw,
-                                                  int subh,
-                                                  ConvolveParams* conv_params,
-                                                  const int bd);
-
-void aom_highbd_blend_a64_hmask_c(uint8_t* dst,
-                                  uint32_t dst_stride,
-                                  const uint8_t* src0,
-                                  uint32_t src0_stride,
-                                  const uint8_t* src1,
-                                  uint32_t src1_stride,
-                                  const uint8_t* mask,
-                                  int w,
-                                  int h,
-                                  int bd);
-void aom_highbd_blend_a64_hmask_sse4_1(uint8_t* dst,
-                                       uint32_t dst_stride,
-                                       const uint8_t* src0,
-                                       uint32_t src0_stride,
-                                       const uint8_t* src1,
-                                       uint32_t src1_stride,
-                                       const uint8_t* mask,
-                                       int w,
-                                       int h,
-                                       int bd);
-RTCD_EXTERN void (*aom_highbd_blend_a64_hmask)(uint8_t* dst,
-                                               uint32_t dst_stride,
-                                               const uint8_t* src0,
-                                               uint32_t src0_stride,
-                                               const uint8_t* src1,
-                                               uint32_t src1_stride,
-                                               const uint8_t* mask,
-                                               int w,
-                                               int h,
-                                               int bd);
-
-void aom_highbd_blend_a64_mask_c(uint8_t* dst,
-                                 uint32_t dst_stride,
-                                 const uint8_t* src0,
-                                 uint32_t src0_stride,
-                                 const uint8_t* src1,
-                                 uint32_t src1_stride,
-                                 const uint8_t* mask,
-                                 uint32_t mask_stride,
-                                 int w,
-                                 int h,
-                                 int subw,
-                                 int subh,
-                                 int bd);
-void aom_highbd_blend_a64_mask_sse4_1(uint8_t* dst,
-                                      uint32_t dst_stride,
-                                      const uint8_t* src0,
-                                      uint32_t src0_stride,
-                                      const uint8_t* src1,
-                                      uint32_t src1_stride,
-                                      const uint8_t* mask,
-                                      uint32_t mask_stride,
-                                      int w,
-                                      int h,
-                                      int subw,
-                                      int subh,
-                                      int bd);
-RTCD_EXTERN void (*aom_highbd_blend_a64_mask)(uint8_t* dst,
-                                              uint32_t dst_stride,
-                                              const uint8_t* src0,
-                                              uint32_t src0_stride,
-                                              const uint8_t* src1,
-                                              uint32_t src1_stride,
-                                              const uint8_t* mask,
-                                              uint32_t mask_stride,
-                                              int w,
-                                              int h,
-                                              int subw,
-                                              int subh,
-                                              int bd);
-
-void aom_highbd_blend_a64_vmask_c(uint8_t* dst,
-                                  uint32_t dst_stride,
-                                  const uint8_t* src0,
-                                  uint32_t src0_stride,
-                                  const uint8_t* src1,
-                                  uint32_t src1_stride,
-                                  const uint8_t* mask,
-                                  int w,
-                                  int h,
-                                  int bd);
-void aom_highbd_blend_a64_vmask_sse4_1(uint8_t* dst,
-                                       uint32_t dst_stride,
-                                       const uint8_t* src0,
-                                       uint32_t src0_stride,
-                                       const uint8_t* src1,
-                                       uint32_t src1_stride,
-                                       const uint8_t* mask,
-                                       int w,
-                                       int h,
-                                       int bd);
-RTCD_EXTERN void (*aom_highbd_blend_a64_vmask)(uint8_t* dst,
-                                               uint32_t dst_stride,
-                                               const uint8_t* src0,
-                                               uint32_t src0_stride,
-                                               const uint8_t* src1,
-                                               uint32_t src1_stride,
-                                               const uint8_t* mask,
-                                               int w,
-                                               int h,
-                                               int bd);
-
-void aom_highbd_comp_avg_pred_c(uint8_t* comp_pred8,
-                                const uint8_t* pred8,
-                                int width,
-                                int height,
-                                const uint8_t* ref8,
-                                int ref_stride);
-#define aom_highbd_comp_avg_pred aom_highbd_comp_avg_pred_c
-
-void aom_highbd_comp_avg_upsampled_pred_c(MACROBLOCKD* xd,
-                                          const struct AV1Common* const cm,
-                                          int mi_row,
-                                          int mi_col,
-                                          const MV* const mv,
-                                          uint8_t* comp_pred8,
-                                          const uint8_t* pred8,
-                                          int width,
-                                          int height,
-                                          int subpel_x_q3,
-                                          int subpel_y_q3,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          int bd,
-                                          int subpel_search);
-void aom_highbd_comp_avg_upsampled_pred_sse2(MACROBLOCKD* xd,
-                                             const struct AV1Common* const cm,
-                                             int mi_row,
-                                             int mi_col,
-                                             const MV* const mv,
-                                             uint8_t* comp_pred8,
-                                             const uint8_t* pred8,
-                                             int width,
-                                             int height,
-                                             int subpel_x_q3,
-                                             int subpel_y_q3,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             int bd,
-                                             int subpel_search);
-#define aom_highbd_comp_avg_upsampled_pred \
-  aom_highbd_comp_avg_upsampled_pred_sse2
-
-void aom_highbd_comp_mask_pred_c(uint8_t* comp_pred,
-                                 const uint8_t* pred8,
-                                 int width,
-                                 int height,
-                                 const uint8_t* ref8,
-                                 int ref_stride,
-                                 const uint8_t* mask,
-                                 int mask_stride,
-                                 int invert_mask);
-void aom_highbd_comp_mask_pred_sse2(uint8_t* comp_pred,
-                                    const uint8_t* pred8,
-                                    int width,
-                                    int height,
-                                    const uint8_t* ref8,
-                                    int ref_stride,
-                                    const uint8_t* mask,
-                                    int mask_stride,
-                                    int invert_mask);
-void aom_highbd_comp_mask_pred_avx2(uint8_t* comp_pred,
-                                    const uint8_t* pred8,
-                                    int width,
-                                    int height,
-                                    const uint8_t* ref8,
-                                    int ref_stride,
-                                    const uint8_t* mask,
-                                    int mask_stride,
-                                    int invert_mask);
-RTCD_EXTERN void (*aom_highbd_comp_mask_pred)(uint8_t* comp_pred,
-                                              const uint8_t* pred8,
-                                              int width,
-                                              int height,
-                                              const uint8_t* ref8,
-                                              int ref_stride,
-                                              const uint8_t* mask,
-                                              int mask_stride,
-                                              int invert_mask);
-
-void aom_highbd_convolve8_horiz_c(const uint8_t* src,
-                                  ptrdiff_t src_stride,
-                                  uint8_t* dst,
-                                  ptrdiff_t dst_stride,
-                                  const int16_t* filter_x,
-                                  int x_step_q4,
-                                  const int16_t* filter_y,
-                                  int y_step_q4,
-                                  int w,
-                                  int h,
-                                  int bd);
-void aom_highbd_convolve8_horiz_sse2(const uint8_t* src,
-                                     ptrdiff_t src_stride,
-                                     uint8_t* dst,
-                                     ptrdiff_t dst_stride,
-                                     const int16_t* filter_x,
-                                     int x_step_q4,
-                                     const int16_t* filter_y,
-                                     int y_step_q4,
-                                     int w,
-                                     int h,
-                                     int bd);
-void aom_highbd_convolve8_horiz_avx2(const uint8_t* src,
-                                     ptrdiff_t src_stride,
-                                     uint8_t* dst,
-                                     ptrdiff_t dst_stride,
-                                     const int16_t* filter_x,
-                                     int x_step_q4,
-                                     const int16_t* filter_y,
-                                     int y_step_q4,
-                                     int w,
-                                     int h,
-                                     int bd);
-RTCD_EXTERN void (*aom_highbd_convolve8_horiz)(const uint8_t* src,
-                                               ptrdiff_t src_stride,
-                                               uint8_t* dst,
-                                               ptrdiff_t dst_stride,
-                                               const int16_t* filter_x,
-                                               int x_step_q4,
-                                               const int16_t* filter_y,
-                                               int y_step_q4,
-                                               int w,
-                                               int h,
-                                               int bd);
-
-void aom_highbd_convolve8_vert_c(const uint8_t* src,
-                                 ptrdiff_t src_stride,
-                                 uint8_t* dst,
-                                 ptrdiff_t dst_stride,
-                                 const int16_t* filter_x,
-                                 int x_step_q4,
-                                 const int16_t* filter_y,
-                                 int y_step_q4,
-                                 int w,
-                                 int h,
-                                 int bd);
-void aom_highbd_convolve8_vert_sse2(const uint8_t* src,
-                                    ptrdiff_t src_stride,
-                                    uint8_t* dst,
-                                    ptrdiff_t dst_stride,
-                                    const int16_t* filter_x,
-                                    int x_step_q4,
-                                    const int16_t* filter_y,
-                                    int y_step_q4,
-                                    int w,
-                                    int h,
-                                    int bd);
-void aom_highbd_convolve8_vert_avx2(const uint8_t* src,
-                                    ptrdiff_t src_stride,
-                                    uint8_t* dst,
-                                    ptrdiff_t dst_stride,
-                                    const int16_t* filter_x,
-                                    int x_step_q4,
-                                    const int16_t* filter_y,
-                                    int y_step_q4,
-                                    int w,
-                                    int h,
-                                    int bd);
-RTCD_EXTERN void (*aom_highbd_convolve8_vert)(const uint8_t* src,
-                                              ptrdiff_t src_stride,
-                                              uint8_t* dst,
-                                              ptrdiff_t dst_stride,
-                                              const int16_t* filter_x,
-                                              int x_step_q4,
-                                              const int16_t* filter_y,
-                                              int y_step_q4,
-                                              int w,
-                                              int h,
-                                              int bd);
-
-void aom_highbd_convolve_copy_c(const uint16_t* src,
-                                ptrdiff_t src_stride,
-                                uint16_t* dst,
-                                ptrdiff_t dst_stride,
-                                int w,
-                                int h);
-void aom_highbd_convolve_copy_sse2(const uint16_t* src,
-                                   ptrdiff_t src_stride,
-                                   uint16_t* dst,
-                                   ptrdiff_t dst_stride,
-                                   int w,
-                                   int h);
-void aom_highbd_convolve_copy_avx2(const uint16_t* src,
-                                   ptrdiff_t src_stride,
-                                   uint16_t* dst,
-                                   ptrdiff_t dst_stride,
-                                   int w,
-                                   int h);
-RTCD_EXTERN void (*aom_highbd_convolve_copy)(const uint16_t* src,
-                                             ptrdiff_t src_stride,
-                                             uint16_t* dst,
-                                             ptrdiff_t dst_stride,
-                                             int w,
-                                             int h);
-
-void aom_highbd_dc_128_predictor_16x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-void aom_highbd_dc_128_predictor_16x16_sse2(uint16_t* dst,
-                                            ptrdiff_t y_stride,
-                                            const uint16_t* above,
-                                            const uint16_t* left,
-                                            int bd);
-#define aom_highbd_dc_128_predictor_16x16 aom_highbd_dc_128_predictor_16x16_sse2
-
-void aom_highbd_dc_128_predictor_16x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-void aom_highbd_dc_128_predictor_16x32_sse2(uint16_t* dst,
-                                            ptrdiff_t y_stride,
-                                            const uint16_t* above,
-                                            const uint16_t* left,
-                                            int bd);
-#define aom_highbd_dc_128_predictor_16x32 aom_highbd_dc_128_predictor_16x32_sse2
-
-void aom_highbd_dc_128_predictor_16x4_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_16x4 aom_highbd_dc_128_predictor_16x4_c
-
-void aom_highbd_dc_128_predictor_16x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_16x64 aom_highbd_dc_128_predictor_16x64_c
-
-void aom_highbd_dc_128_predictor_16x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-void aom_highbd_dc_128_predictor_16x8_sse2(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_dc_128_predictor_16x8 aom_highbd_dc_128_predictor_16x8_sse2
-
-void aom_highbd_dc_128_predictor_2x2_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_128_predictor_2x2 aom_highbd_dc_128_predictor_2x2_c
-
-void aom_highbd_dc_128_predictor_32x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-void aom_highbd_dc_128_predictor_32x16_sse2(uint16_t* dst,
-                                            ptrdiff_t y_stride,
-                                            const uint16_t* above,
-                                            const uint16_t* left,
-                                            int bd);
-#define aom_highbd_dc_128_predictor_32x16 aom_highbd_dc_128_predictor_32x16_sse2
-
-void aom_highbd_dc_128_predictor_32x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-void aom_highbd_dc_128_predictor_32x32_sse2(uint16_t* dst,
-                                            ptrdiff_t y_stride,
-                                            const uint16_t* above,
-                                            const uint16_t* left,
-                                            int bd);
-#define aom_highbd_dc_128_predictor_32x32 aom_highbd_dc_128_predictor_32x32_sse2
-
-void aom_highbd_dc_128_predictor_32x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_32x64 aom_highbd_dc_128_predictor_32x64_c
-
-void aom_highbd_dc_128_predictor_32x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_32x8 aom_highbd_dc_128_predictor_32x8_c
-
-void aom_highbd_dc_128_predictor_4x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_4x16 aom_highbd_dc_128_predictor_4x16_c
-
-void aom_highbd_dc_128_predictor_4x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-void aom_highbd_dc_128_predictor_4x4_sse2(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_128_predictor_4x4 aom_highbd_dc_128_predictor_4x4_sse2
-
-void aom_highbd_dc_128_predictor_4x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-void aom_highbd_dc_128_predictor_4x8_sse2(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_128_predictor_4x8 aom_highbd_dc_128_predictor_4x8_sse2
-
-void aom_highbd_dc_128_predictor_64x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_64x16 aom_highbd_dc_128_predictor_64x16_c
-
-void aom_highbd_dc_128_predictor_64x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_64x32 aom_highbd_dc_128_predictor_64x32_c
-
-void aom_highbd_dc_128_predictor_64x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_128_predictor_64x64 aom_highbd_dc_128_predictor_64x64_c
-
-void aom_highbd_dc_128_predictor_8x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-void aom_highbd_dc_128_predictor_8x16_sse2(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_dc_128_predictor_8x16 aom_highbd_dc_128_predictor_8x16_sse2
-
-void aom_highbd_dc_128_predictor_8x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_128_predictor_8x32 aom_highbd_dc_128_predictor_8x32_c
-
-void aom_highbd_dc_128_predictor_8x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-void aom_highbd_dc_128_predictor_8x4_sse2(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_128_predictor_8x4 aom_highbd_dc_128_predictor_8x4_sse2
-
-void aom_highbd_dc_128_predictor_8x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-void aom_highbd_dc_128_predictor_8x8_sse2(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_128_predictor_8x8 aom_highbd_dc_128_predictor_8x8_sse2
-
-void aom_highbd_dc_left_predictor_16x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-void aom_highbd_dc_left_predictor_16x16_sse2(uint16_t* dst,
-                                             ptrdiff_t y_stride,
-                                             const uint16_t* above,
-                                             const uint16_t* left,
-                                             int bd);
-#define aom_highbd_dc_left_predictor_16x16 \
-  aom_highbd_dc_left_predictor_16x16_sse2
-
-void aom_highbd_dc_left_predictor_16x32_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-void aom_highbd_dc_left_predictor_16x32_sse2(uint16_t* dst,
-                                             ptrdiff_t y_stride,
-                                             const uint16_t* above,
-                                             const uint16_t* left,
-                                             int bd);
-#define aom_highbd_dc_left_predictor_16x32 \
-  aom_highbd_dc_left_predictor_16x32_sse2
-
-void aom_highbd_dc_left_predictor_16x4_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_16x4 aom_highbd_dc_left_predictor_16x4_c
-
-void aom_highbd_dc_left_predictor_16x64_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_16x64 aom_highbd_dc_left_predictor_16x64_c
-
-void aom_highbd_dc_left_predictor_16x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-void aom_highbd_dc_left_predictor_16x8_sse2(uint16_t* dst,
-                                            ptrdiff_t y_stride,
-                                            const uint16_t* above,
-                                            const uint16_t* left,
-                                            int bd);
-#define aom_highbd_dc_left_predictor_16x8 aom_highbd_dc_left_predictor_16x8_sse2
-
-void aom_highbd_dc_left_predictor_2x2_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_left_predictor_2x2 aom_highbd_dc_left_predictor_2x2_c
-
-void aom_highbd_dc_left_predictor_32x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-void aom_highbd_dc_left_predictor_32x16_sse2(uint16_t* dst,
-                                             ptrdiff_t y_stride,
-                                             const uint16_t* above,
-                                             const uint16_t* left,
-                                             int bd);
-#define aom_highbd_dc_left_predictor_32x16 \
-  aom_highbd_dc_left_predictor_32x16_sse2
-
-void aom_highbd_dc_left_predictor_32x32_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-void aom_highbd_dc_left_predictor_32x32_sse2(uint16_t* dst,
-                                             ptrdiff_t y_stride,
-                                             const uint16_t* above,
-                                             const uint16_t* left,
-                                             int bd);
-#define aom_highbd_dc_left_predictor_32x32 \
-  aom_highbd_dc_left_predictor_32x32_sse2
-
-void aom_highbd_dc_left_predictor_32x64_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_32x64 aom_highbd_dc_left_predictor_32x64_c
-
-void aom_highbd_dc_left_predictor_32x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_32x8 aom_highbd_dc_left_predictor_32x8_c
-
-void aom_highbd_dc_left_predictor_4x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_4x16 aom_highbd_dc_left_predictor_4x16_c
-
-void aom_highbd_dc_left_predictor_4x4_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-void aom_highbd_dc_left_predictor_4x4_sse2(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_dc_left_predictor_4x4 aom_highbd_dc_left_predictor_4x4_sse2
-
-void aom_highbd_dc_left_predictor_4x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-void aom_highbd_dc_left_predictor_4x8_sse2(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_dc_left_predictor_4x8 aom_highbd_dc_left_predictor_4x8_sse2
-
-void aom_highbd_dc_left_predictor_64x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_64x16 aom_highbd_dc_left_predictor_64x16_c
-
-void aom_highbd_dc_left_predictor_64x32_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_64x32 aom_highbd_dc_left_predictor_64x32_c
-
-void aom_highbd_dc_left_predictor_64x64_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_left_predictor_64x64 aom_highbd_dc_left_predictor_64x64_c
-
-void aom_highbd_dc_left_predictor_8x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-void aom_highbd_dc_left_predictor_8x16_sse2(uint16_t* dst,
-                                            ptrdiff_t y_stride,
-                                            const uint16_t* above,
-                                            const uint16_t* left,
-                                            int bd);
-#define aom_highbd_dc_left_predictor_8x16 aom_highbd_dc_left_predictor_8x16_sse2
-
-void aom_highbd_dc_left_predictor_8x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_left_predictor_8x32 aom_highbd_dc_left_predictor_8x32_c
-
-void aom_highbd_dc_left_predictor_8x4_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-void aom_highbd_dc_left_predictor_8x4_sse2(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_dc_left_predictor_8x4 aom_highbd_dc_left_predictor_8x4_sse2
-
-void aom_highbd_dc_left_predictor_8x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-void aom_highbd_dc_left_predictor_8x8_sse2(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_dc_left_predictor_8x8 aom_highbd_dc_left_predictor_8x8_sse2
-
-void aom_highbd_dc_predictor_16x16_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-void aom_highbd_dc_predictor_16x16_sse2(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_predictor_16x16 aom_highbd_dc_predictor_16x16_sse2
-
-void aom_highbd_dc_predictor_16x32_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-void aom_highbd_dc_predictor_16x32_sse2(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_predictor_16x32 aom_highbd_dc_predictor_16x32_sse2
-
-void aom_highbd_dc_predictor_16x4_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_16x4 aom_highbd_dc_predictor_16x4_c
-
-void aom_highbd_dc_predictor_16x64_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_16x64 aom_highbd_dc_predictor_16x64_c
-
-void aom_highbd_dc_predictor_16x8_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-void aom_highbd_dc_predictor_16x8_sse2(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_predictor_16x8 aom_highbd_dc_predictor_16x8_sse2
-
-void aom_highbd_dc_predictor_2x2_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_dc_predictor_2x2 aom_highbd_dc_predictor_2x2_c
-
-void aom_highbd_dc_predictor_32x16_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-void aom_highbd_dc_predictor_32x16_sse2(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_predictor_32x16 aom_highbd_dc_predictor_32x16_sse2
-
-void aom_highbd_dc_predictor_32x32_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-void aom_highbd_dc_predictor_32x32_sse2(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_predictor_32x32 aom_highbd_dc_predictor_32x32_sse2
-
-void aom_highbd_dc_predictor_32x64_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_32x64 aom_highbd_dc_predictor_32x64_c
-
-void aom_highbd_dc_predictor_32x8_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_32x8 aom_highbd_dc_predictor_32x8_c
-
-void aom_highbd_dc_predictor_4x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_4x16 aom_highbd_dc_predictor_4x16_c
-
-void aom_highbd_dc_predictor_4x4_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-void aom_highbd_dc_predictor_4x4_sse2(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_dc_predictor_4x4 aom_highbd_dc_predictor_4x4_sse2
-
-void aom_highbd_dc_predictor_4x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-void aom_highbd_dc_predictor_4x8_sse2(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_dc_predictor_4x8 aom_highbd_dc_predictor_4x8_sse2
-
-void aom_highbd_dc_predictor_64x16_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_64x16 aom_highbd_dc_predictor_64x16_c
-
-void aom_highbd_dc_predictor_64x32_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_64x32 aom_highbd_dc_predictor_64x32_c
-
-void aom_highbd_dc_predictor_64x64_c(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_dc_predictor_64x64 aom_highbd_dc_predictor_64x64_c
-
-void aom_highbd_dc_predictor_8x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-void aom_highbd_dc_predictor_8x16_sse2(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_predictor_8x16 aom_highbd_dc_predictor_8x16_sse2
-
-void aom_highbd_dc_predictor_8x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_dc_predictor_8x32 aom_highbd_dc_predictor_8x32_c
-
-void aom_highbd_dc_predictor_8x4_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-void aom_highbd_dc_predictor_8x4_sse2(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_dc_predictor_8x4 aom_highbd_dc_predictor_8x4_sse2
-
-void aom_highbd_dc_predictor_8x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-void aom_highbd_dc_predictor_8x8_sse2(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_dc_predictor_8x8 aom_highbd_dc_predictor_8x8_sse2
-
-void aom_highbd_dc_top_predictor_16x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-void aom_highbd_dc_top_predictor_16x16_sse2(uint16_t* dst,
-                                            ptrdiff_t y_stride,
-                                            const uint16_t* above,
-                                            const uint16_t* left,
-                                            int bd);
-#define aom_highbd_dc_top_predictor_16x16 aom_highbd_dc_top_predictor_16x16_sse2
-
-void aom_highbd_dc_top_predictor_16x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-void aom_highbd_dc_top_predictor_16x32_sse2(uint16_t* dst,
-                                            ptrdiff_t y_stride,
-                                            const uint16_t* above,
-                                            const uint16_t* left,
-                                            int bd);
-#define aom_highbd_dc_top_predictor_16x32 aom_highbd_dc_top_predictor_16x32_sse2
-
-void aom_highbd_dc_top_predictor_16x4_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_16x4 aom_highbd_dc_top_predictor_16x4_c
-
-void aom_highbd_dc_top_predictor_16x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_16x64 aom_highbd_dc_top_predictor_16x64_c
-
-void aom_highbd_dc_top_predictor_16x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-void aom_highbd_dc_top_predictor_16x8_sse2(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_dc_top_predictor_16x8 aom_highbd_dc_top_predictor_16x8_sse2
-
-void aom_highbd_dc_top_predictor_2x2_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_dc_top_predictor_2x2 aom_highbd_dc_top_predictor_2x2_c
-
-void aom_highbd_dc_top_predictor_32x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-void aom_highbd_dc_top_predictor_32x16_sse2(uint16_t* dst,
-                                            ptrdiff_t y_stride,
-                                            const uint16_t* above,
-                                            const uint16_t* left,
-                                            int bd);
-#define aom_highbd_dc_top_predictor_32x16 aom_highbd_dc_top_predictor_32x16_sse2
-
-void aom_highbd_dc_top_predictor_32x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-void aom_highbd_dc_top_predictor_32x32_sse2(uint16_t* dst,
-                                            ptrdiff_t y_stride,
-                                            const uint16_t* above,
-                                            const uint16_t* left,
-                                            int bd);
-#define aom_highbd_dc_top_predictor_32x32 aom_highbd_dc_top_predictor_32x32_sse2
-
-void aom_highbd_dc_top_predictor_32x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_32x64 aom_highbd_dc_top_predictor_32x64_c
-
-void aom_highbd_dc_top_predictor_32x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_32x8 aom_highbd_dc_top_predictor_32x8_c
-
-void aom_highbd_dc_top_predictor_4x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_4x16 aom_highbd_dc_top_predictor_4x16_c
-
-void aom_highbd_dc_top_predictor_4x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-void aom_highbd_dc_top_predictor_4x4_sse2(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_top_predictor_4x4 aom_highbd_dc_top_predictor_4x4_sse2
-
-void aom_highbd_dc_top_predictor_4x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-void aom_highbd_dc_top_predictor_4x8_sse2(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_top_predictor_4x8 aom_highbd_dc_top_predictor_4x8_sse2
-
-void aom_highbd_dc_top_predictor_64x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_64x16 aom_highbd_dc_top_predictor_64x16_c
-
-void aom_highbd_dc_top_predictor_64x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_64x32 aom_highbd_dc_top_predictor_64x32_c
-
-void aom_highbd_dc_top_predictor_64x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_dc_top_predictor_64x64 aom_highbd_dc_top_predictor_64x64_c
-
-void aom_highbd_dc_top_predictor_8x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-void aom_highbd_dc_top_predictor_8x16_sse2(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_dc_top_predictor_8x16 aom_highbd_dc_top_predictor_8x16_sse2
-
-void aom_highbd_dc_top_predictor_8x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_dc_top_predictor_8x32 aom_highbd_dc_top_predictor_8x32_c
-
-void aom_highbd_dc_top_predictor_8x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-void aom_highbd_dc_top_predictor_8x4_sse2(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_top_predictor_8x4 aom_highbd_dc_top_predictor_8x4_sse2
-
-void aom_highbd_dc_top_predictor_8x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-void aom_highbd_dc_top_predictor_8x8_sse2(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_dc_top_predictor_8x8 aom_highbd_dc_top_predictor_8x8_sse2
-
-void aom_highbd_dist_wtd_comp_avg_pred_c(uint8_t* comp_pred8,
-                                         const uint8_t* pred8,
-                                         int width,
-                                         int height,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const DIST_WTD_COMP_PARAMS* jcp_param);
-void aom_highbd_dist_wtd_comp_avg_pred_sse2(
-    uint8_t* comp_pred8,
-    const uint8_t* pred8,
-    int width,
-    int height,
-    const uint8_t* ref8,
-    int ref_stride,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_comp_avg_pred aom_highbd_dist_wtd_comp_avg_pred_sse2
-
-void aom_highbd_dist_wtd_comp_avg_upsampled_pred_c(
-    MACROBLOCKD* xd,
-    const struct AV1Common* const cm,
-    int mi_row,
-    int mi_col,
-    const MV* const mv,
-    uint8_t* comp_pred8,
-    const uint8_t* pred8,
-    int width,
-    int height,
-    int subpel_x_q3,
-    int subpel_y_q3,
-    const uint8_t* ref8,
-    int ref_stride,
-    int bd,
-    const DIST_WTD_COMP_PARAMS* jcp_param,
-    int subpel_search);
-void aom_highbd_dist_wtd_comp_avg_upsampled_pred_sse2(
-    MACROBLOCKD* xd,
-    const struct AV1Common* const cm,
-    int mi_row,
-    int mi_col,
-    const MV* const mv,
-    uint8_t* comp_pred8,
-    const uint8_t* pred8,
-    int width,
-    int height,
-    int subpel_x_q3,
-    int subpel_y_q3,
-    const uint8_t* ref8,
-    int ref_stride,
-    int bd,
-    const DIST_WTD_COMP_PARAMS* jcp_param,
-    int subpel_search);
-#define aom_highbd_dist_wtd_comp_avg_upsampled_pred \
-  aom_highbd_dist_wtd_comp_avg_upsampled_pred_sse2
-
-unsigned int aom_highbd_dist_wtd_sad128x128_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad128x128_avg aom_highbd_dist_wtd_sad128x128_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad128x64_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad128x64_avg aom_highbd_dist_wtd_sad128x64_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad16x16_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad16x16_avg aom_highbd_dist_wtd_sad16x16_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad16x32_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad16x32_avg aom_highbd_dist_wtd_sad16x32_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad16x4_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad16x4_avg aom_highbd_dist_wtd_sad16x4_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad16x64_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad16x64_avg aom_highbd_dist_wtd_sad16x64_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad16x8_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad16x8_avg aom_highbd_dist_wtd_sad16x8_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad32x16_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad32x16_avg aom_highbd_dist_wtd_sad32x16_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad32x32_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad32x32_avg aom_highbd_dist_wtd_sad32x32_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad32x64_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad32x64_avg aom_highbd_dist_wtd_sad32x64_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad32x8_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad32x8_avg aom_highbd_dist_wtd_sad32x8_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad4x16_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad4x16_avg aom_highbd_dist_wtd_sad4x16_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad4x4_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad4x4_avg aom_highbd_dist_wtd_sad4x4_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad4x8_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad4x8_avg aom_highbd_dist_wtd_sad4x8_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad64x128_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad64x128_avg aom_highbd_dist_wtd_sad64x128_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad64x16_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad64x16_avg aom_highbd_dist_wtd_sad64x16_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad64x32_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad64x32_avg aom_highbd_dist_wtd_sad64x32_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad64x64_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad64x64_avg aom_highbd_dist_wtd_sad64x64_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad8x16_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad8x16_avg aom_highbd_dist_wtd_sad8x16_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad8x32_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad8x32_avg aom_highbd_dist_wtd_sad8x32_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad8x4_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad8x4_avg aom_highbd_dist_wtd_sad8x4_avg_c
-
-unsigned int aom_highbd_dist_wtd_sad8x8_avg_c(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred,
-    const DIST_WTD_COMP_PARAMS* jcp_param);
-#define aom_highbd_dist_wtd_sad8x8_avg aom_highbd_dist_wtd_sad8x8_avg_c
-
-void aom_highbd_fdct8x8_c(const int16_t* input, tran_low_t* output, int stride);
-void aom_highbd_fdct8x8_sse2(const int16_t* input,
-                             tran_low_t* output,
-                             int stride);
-#define aom_highbd_fdct8x8 aom_highbd_fdct8x8_sse2
-
-void aom_highbd_h_predictor_16x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-void aom_highbd_h_predictor_16x16_sse2(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_h_predictor_16x16 aom_highbd_h_predictor_16x16_sse2
-
-void aom_highbd_h_predictor_16x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-void aom_highbd_h_predictor_16x32_sse2(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_h_predictor_16x32 aom_highbd_h_predictor_16x32_sse2
-
-void aom_highbd_h_predictor_16x4_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_16x4 aom_highbd_h_predictor_16x4_c
-
-void aom_highbd_h_predictor_16x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_16x64 aom_highbd_h_predictor_16x64_c
-
-void aom_highbd_h_predictor_16x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-void aom_highbd_h_predictor_16x8_sse2(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_h_predictor_16x8 aom_highbd_h_predictor_16x8_sse2
-
-void aom_highbd_h_predictor_2x2_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_h_predictor_2x2 aom_highbd_h_predictor_2x2_c
-
-void aom_highbd_h_predictor_32x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-void aom_highbd_h_predictor_32x16_sse2(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_h_predictor_32x16 aom_highbd_h_predictor_32x16_sse2
-
-void aom_highbd_h_predictor_32x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-void aom_highbd_h_predictor_32x32_sse2(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_h_predictor_32x32 aom_highbd_h_predictor_32x32_sse2
-
-void aom_highbd_h_predictor_32x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_32x64 aom_highbd_h_predictor_32x64_c
-
-void aom_highbd_h_predictor_32x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_32x8 aom_highbd_h_predictor_32x8_c
-
-void aom_highbd_h_predictor_4x16_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_4x16 aom_highbd_h_predictor_4x16_c
-
-void aom_highbd_h_predictor_4x4_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-void aom_highbd_h_predictor_4x4_sse2(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_h_predictor_4x4 aom_highbd_h_predictor_4x4_sse2
-
-void aom_highbd_h_predictor_4x8_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-void aom_highbd_h_predictor_4x8_sse2(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_h_predictor_4x8 aom_highbd_h_predictor_4x8_sse2
-
-void aom_highbd_h_predictor_64x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_64x16 aom_highbd_h_predictor_64x16_c
-
-void aom_highbd_h_predictor_64x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_64x32 aom_highbd_h_predictor_64x32_c
-
-void aom_highbd_h_predictor_64x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_h_predictor_64x64 aom_highbd_h_predictor_64x64_c
-
-void aom_highbd_h_predictor_8x16_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-void aom_highbd_h_predictor_8x16_sse2(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_h_predictor_8x16 aom_highbd_h_predictor_8x16_sse2
-
-void aom_highbd_h_predictor_8x32_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_h_predictor_8x32 aom_highbd_h_predictor_8x32_c
-
-void aom_highbd_h_predictor_8x4_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-void aom_highbd_h_predictor_8x4_sse2(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_h_predictor_8x4 aom_highbd_h_predictor_8x4_sse2
-
-void aom_highbd_h_predictor_8x8_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-void aom_highbd_h_predictor_8x8_sse2(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_h_predictor_8x8 aom_highbd_h_predictor_8x8_sse2
-
-void aom_highbd_hadamard_16x16_c(const int16_t* src_diff,
-                                 ptrdiff_t src_stride,
-                                 tran_low_t* coeff);
-void aom_highbd_hadamard_16x16_avx2(const int16_t* src_diff,
-                                    ptrdiff_t src_stride,
-                                    tran_low_t* coeff);
-RTCD_EXTERN void (*aom_highbd_hadamard_16x16)(const int16_t* src_diff,
-                                              ptrdiff_t src_stride,
-                                              tran_low_t* coeff);
-
-void aom_highbd_hadamard_32x32_c(const int16_t* src_diff,
-                                 ptrdiff_t src_stride,
-                                 tran_low_t* coeff);
-void aom_highbd_hadamard_32x32_avx2(const int16_t* src_diff,
-                                    ptrdiff_t src_stride,
-                                    tran_low_t* coeff);
-RTCD_EXTERN void (*aom_highbd_hadamard_32x32)(const int16_t* src_diff,
-                                              ptrdiff_t src_stride,
-                                              tran_low_t* coeff);
-
-void aom_highbd_hadamard_8x8_c(const int16_t* src_diff,
-                               ptrdiff_t src_stride,
-                               tran_low_t* coeff);
-void aom_highbd_hadamard_8x8_avx2(const int16_t* src_diff,
-                                  ptrdiff_t src_stride,
-                                  tran_low_t* coeff);
-RTCD_EXTERN void (*aom_highbd_hadamard_8x8)(const int16_t* src_diff,
-                                            ptrdiff_t src_stride,
-                                            tran_low_t* coeff);
-
-void aom_highbd_lpf_horizontal_14_c(uint16_t* s,
-                                    int pitch,
-                                    const uint8_t* blimit,
-                                    const uint8_t* limit,
-                                    const uint8_t* thresh,
-                                    int bd);
-void aom_highbd_lpf_horizontal_14_sse2(uint16_t* s,
-                                       int pitch,
-                                       const uint8_t* blimit,
-                                       const uint8_t* limit,
-                                       const uint8_t* thresh,
-                                       int bd);
-#define aom_highbd_lpf_horizontal_14 aom_highbd_lpf_horizontal_14_sse2
-
-void aom_highbd_lpf_horizontal_14_dual_c(uint16_t* s,
-                                         int pitch,
-                                         const uint8_t* blimit0,
-                                         const uint8_t* limit0,
-                                         const uint8_t* thresh0,
-                                         const uint8_t* blimit1,
-                                         const uint8_t* limit1,
-                                         const uint8_t* thresh1,
-                                         int bd);
-void aom_highbd_lpf_horizontal_14_dual_sse2(uint16_t* s,
-                                            int pitch,
-                                            const uint8_t* blimit0,
-                                            const uint8_t* limit0,
-                                            const uint8_t* thresh0,
-                                            const uint8_t* blimit1,
-                                            const uint8_t* limit1,
-                                            const uint8_t* thresh1,
-                                            int bd);
-void aom_highbd_lpf_horizontal_14_dual_avx2(uint16_t* s,
-                                            int pitch,
-                                            const uint8_t* blimit0,
-                                            const uint8_t* limit0,
-                                            const uint8_t* thresh0,
-                                            const uint8_t* blimit1,
-                                            const uint8_t* limit1,
-                                            const uint8_t* thresh1,
-                                            int bd);
-RTCD_EXTERN void (*aom_highbd_lpf_horizontal_14_dual)(uint16_t* s,
-                                                      int pitch,
-                                                      const uint8_t* blimit0,
-                                                      const uint8_t* limit0,
-                                                      const uint8_t* thresh0,
-                                                      const uint8_t* blimit1,
-                                                      const uint8_t* limit1,
-                                                      const uint8_t* thresh1,
-                                                      int bd);
-
-void aom_highbd_lpf_horizontal_4_c(uint16_t* s,
-                                   int pitch,
-                                   const uint8_t* blimit,
-                                   const uint8_t* limit,
-                                   const uint8_t* thresh,
-                                   int bd);
-void aom_highbd_lpf_horizontal_4_sse2(uint16_t* s,
-                                      int pitch,
-                                      const uint8_t* blimit,
-                                      const uint8_t* limit,
-                                      const uint8_t* thresh,
-                                      int bd);
-#define aom_highbd_lpf_horizontal_4 aom_highbd_lpf_horizontal_4_sse2
-
-void aom_highbd_lpf_horizontal_4_dual_c(uint16_t* s,
-                                        int pitch,
-                                        const uint8_t* blimit0,
-                                        const uint8_t* limit0,
-                                        const uint8_t* thresh0,
-                                        const uint8_t* blimit1,
-                                        const uint8_t* limit1,
-                                        const uint8_t* thresh1,
-                                        int bd);
-void aom_highbd_lpf_horizontal_4_dual_sse2(uint16_t* s,
-                                           int pitch,
-                                           const uint8_t* blimit0,
-                                           const uint8_t* limit0,
-                                           const uint8_t* thresh0,
-                                           const uint8_t* blimit1,
-                                           const uint8_t* limit1,
-                                           const uint8_t* thresh1,
-                                           int bd);
-void aom_highbd_lpf_horizontal_4_dual_avx2(uint16_t* s,
-                                           int pitch,
-                                           const uint8_t* blimit0,
-                                           const uint8_t* limit0,
-                                           const uint8_t* thresh0,
-                                           const uint8_t* blimit1,
-                                           const uint8_t* limit1,
-                                           const uint8_t* thresh1,
-                                           int bd);
-RTCD_EXTERN void (*aom_highbd_lpf_horizontal_4_dual)(uint16_t* s,
-                                                     int pitch,
-                                                     const uint8_t* blimit0,
-                                                     const uint8_t* limit0,
-                                                     const uint8_t* thresh0,
-                                                     const uint8_t* blimit1,
-                                                     const uint8_t* limit1,
-                                                     const uint8_t* thresh1,
-                                                     int bd);
-
-void aom_highbd_lpf_horizontal_6_c(uint16_t* s,
-                                   int pitch,
-                                   const uint8_t* blimit,
-                                   const uint8_t* limit,
-                                   const uint8_t* thresh,
-                                   int bd);
-void aom_highbd_lpf_horizontal_6_sse2(uint16_t* s,
-                                      int pitch,
-                                      const uint8_t* blimit,
-                                      const uint8_t* limit,
-                                      const uint8_t* thresh,
-                                      int bd);
-#define aom_highbd_lpf_horizontal_6 aom_highbd_lpf_horizontal_6_sse2
-
-void aom_highbd_lpf_horizontal_6_dual_c(uint16_t* s,
-                                        int pitch,
-                                        const uint8_t* blimit0,
-                                        const uint8_t* limit0,
-                                        const uint8_t* thresh0,
-                                        const uint8_t* blimit1,
-                                        const uint8_t* limit1,
-                                        const uint8_t* thresh1,
-                                        int bd);
-void aom_highbd_lpf_horizontal_6_dual_sse2(uint16_t* s,
-                                           int pitch,
-                                           const uint8_t* blimit0,
-                                           const uint8_t* limit0,
-                                           const uint8_t* thresh0,
-                                           const uint8_t* blimit1,
-                                           const uint8_t* limit1,
-                                           const uint8_t* thresh1,
-                                           int bd);
-#define aom_highbd_lpf_horizontal_6_dual aom_highbd_lpf_horizontal_6_dual_sse2
-
-void aom_highbd_lpf_horizontal_8_c(uint16_t* s,
-                                   int pitch,
-                                   const uint8_t* blimit,
-                                   const uint8_t* limit,
-                                   const uint8_t* thresh,
-                                   int bd);
-void aom_highbd_lpf_horizontal_8_sse2(uint16_t* s,
-                                      int pitch,
-                                      const uint8_t* blimit,
-                                      const uint8_t* limit,
-                                      const uint8_t* thresh,
-                                      int bd);
-#define aom_highbd_lpf_horizontal_8 aom_highbd_lpf_horizontal_8_sse2
-
-void aom_highbd_lpf_horizontal_8_dual_c(uint16_t* s,
-                                        int pitch,
-                                        const uint8_t* blimit0,
-                                        const uint8_t* limit0,
-                                        const uint8_t* thresh0,
-                                        const uint8_t* blimit1,
-                                        const uint8_t* limit1,
-                                        const uint8_t* thresh1,
-                                        int bd);
-void aom_highbd_lpf_horizontal_8_dual_sse2(uint16_t* s,
-                                           int pitch,
-                                           const uint8_t* blimit0,
-                                           const uint8_t* limit0,
-                                           const uint8_t* thresh0,
-                                           const uint8_t* blimit1,
-                                           const uint8_t* limit1,
-                                           const uint8_t* thresh1,
-                                           int bd);
-void aom_highbd_lpf_horizontal_8_dual_avx2(uint16_t* s,
-                                           int pitch,
-                                           const uint8_t* blimit0,
-                                           const uint8_t* limit0,
-                                           const uint8_t* thresh0,
-                                           const uint8_t* blimit1,
-                                           const uint8_t* limit1,
-                                           const uint8_t* thresh1,
-                                           int bd);
-RTCD_EXTERN void (*aom_highbd_lpf_horizontal_8_dual)(uint16_t* s,
-                                                     int pitch,
-                                                     const uint8_t* blimit0,
-                                                     const uint8_t* limit0,
-                                                     const uint8_t* thresh0,
-                                                     const uint8_t* blimit1,
-                                                     const uint8_t* limit1,
-                                                     const uint8_t* thresh1,
-                                                     int bd);
-
-void aom_highbd_lpf_vertical_14_c(uint16_t* s,
-                                  int pitch,
-                                  const uint8_t* blimit,
-                                  const uint8_t* limit,
-                                  const uint8_t* thresh,
-                                  int bd);
-void aom_highbd_lpf_vertical_14_sse2(uint16_t* s,
-                                     int pitch,
-                                     const uint8_t* blimit,
-                                     const uint8_t* limit,
-                                     const uint8_t* thresh,
-                                     int bd);
-#define aom_highbd_lpf_vertical_14 aom_highbd_lpf_vertical_14_sse2
-
-void aom_highbd_lpf_vertical_14_dual_c(uint16_t* s,
-                                       int pitch,
-                                       const uint8_t* blimit0,
-                                       const uint8_t* limit0,
-                                       const uint8_t* thresh0,
-                                       const uint8_t* blimit1,
-                                       const uint8_t* limit1,
-                                       const uint8_t* thresh1,
-                                       int bd);
-void aom_highbd_lpf_vertical_14_dual_sse2(uint16_t* s,
-                                          int pitch,
-                                          const uint8_t* blimit0,
-                                          const uint8_t* limit0,
-                                          const uint8_t* thresh0,
-                                          const uint8_t* blimit1,
-                                          const uint8_t* limit1,
-                                          const uint8_t* thresh1,
-                                          int bd);
-void aom_highbd_lpf_vertical_14_dual_avx2(uint16_t* s,
-                                          int pitch,
-                                          const uint8_t* blimit0,
-                                          const uint8_t* limit0,
-                                          const uint8_t* thresh0,
-                                          const uint8_t* blimit1,
-                                          const uint8_t* limit1,
-                                          const uint8_t* thresh1,
-                                          int bd);
-RTCD_EXTERN void (*aom_highbd_lpf_vertical_14_dual)(uint16_t* s,
-                                                    int pitch,
-                                                    const uint8_t* blimit0,
-                                                    const uint8_t* limit0,
-                                                    const uint8_t* thresh0,
-                                                    const uint8_t* blimit1,
-                                                    const uint8_t* limit1,
-                                                    const uint8_t* thresh1,
-                                                    int bd);
-
-void aom_highbd_lpf_vertical_4_c(uint16_t* s,
-                                 int pitch,
-                                 const uint8_t* blimit,
-                                 const uint8_t* limit,
-                                 const uint8_t* thresh,
-                                 int bd);
-void aom_highbd_lpf_vertical_4_sse2(uint16_t* s,
-                                    int pitch,
-                                    const uint8_t* blimit,
-                                    const uint8_t* limit,
-                                    const uint8_t* thresh,
-                                    int bd);
-#define aom_highbd_lpf_vertical_4 aom_highbd_lpf_vertical_4_sse2
-
-void aom_highbd_lpf_vertical_4_dual_c(uint16_t* s,
-                                      int pitch,
-                                      const uint8_t* blimit0,
-                                      const uint8_t* limit0,
-                                      const uint8_t* thresh0,
-                                      const uint8_t* blimit1,
-                                      const uint8_t* limit1,
-                                      const uint8_t* thresh1,
-                                      int bd);
-void aom_highbd_lpf_vertical_4_dual_sse2(uint16_t* s,
-                                         int pitch,
-                                         const uint8_t* blimit0,
-                                         const uint8_t* limit0,
-                                         const uint8_t* thresh0,
-                                         const uint8_t* blimit1,
-                                         const uint8_t* limit1,
-                                         const uint8_t* thresh1,
-                                         int bd);
-void aom_highbd_lpf_vertical_4_dual_avx2(uint16_t* s,
-                                         int pitch,
-                                         const uint8_t* blimit0,
-                                         const uint8_t* limit0,
-                                         const uint8_t* thresh0,
-                                         const uint8_t* blimit1,
-                                         const uint8_t* limit1,
-                                         const uint8_t* thresh1,
-                                         int bd);
-RTCD_EXTERN void (*aom_highbd_lpf_vertical_4_dual)(uint16_t* s,
-                                                   int pitch,
-                                                   const uint8_t* blimit0,
-                                                   const uint8_t* limit0,
-                                                   const uint8_t* thresh0,
-                                                   const uint8_t* blimit1,
-                                                   const uint8_t* limit1,
-                                                   const uint8_t* thresh1,
-                                                   int bd);
-
-void aom_highbd_lpf_vertical_6_c(uint16_t* s,
-                                 int pitch,
-                                 const uint8_t* blimit,
-                                 const uint8_t* limit,
-                                 const uint8_t* thresh,
-                                 int bd);
-void aom_highbd_lpf_vertical_6_sse2(uint16_t* s,
-                                    int pitch,
-                                    const uint8_t* blimit,
-                                    const uint8_t* limit,
-                                    const uint8_t* thresh,
-                                    int bd);
-#define aom_highbd_lpf_vertical_6 aom_highbd_lpf_vertical_6_sse2
-
-void aom_highbd_lpf_vertical_6_dual_c(uint16_t* s,
-                                      int pitch,
-                                      const uint8_t* blimit0,
-                                      const uint8_t* limit0,
-                                      const uint8_t* thresh0,
-                                      const uint8_t* blimit1,
-                                      const uint8_t* limit1,
-                                      const uint8_t* thresh1,
-                                      int bd);
-void aom_highbd_lpf_vertical_6_dual_sse2(uint16_t* s,
-                                         int pitch,
-                                         const uint8_t* blimit0,
-                                         const uint8_t* limit0,
-                                         const uint8_t* thresh0,
-                                         const uint8_t* blimit1,
-                                         const uint8_t* limit1,
-                                         const uint8_t* thresh1,
-                                         int bd);
-#define aom_highbd_lpf_vertical_6_dual aom_highbd_lpf_vertical_6_dual_sse2
-
-void aom_highbd_lpf_vertical_8_c(uint16_t* s,
-                                 int pitch,
-                                 const uint8_t* blimit,
-                                 const uint8_t* limit,
-                                 const uint8_t* thresh,
-                                 int bd);
-void aom_highbd_lpf_vertical_8_sse2(uint16_t* s,
-                                    int pitch,
-                                    const uint8_t* blimit,
-                                    const uint8_t* limit,
-                                    const uint8_t* thresh,
-                                    int bd);
-#define aom_highbd_lpf_vertical_8 aom_highbd_lpf_vertical_8_sse2
-
-void aom_highbd_lpf_vertical_8_dual_c(uint16_t* s,
-                                      int pitch,
-                                      const uint8_t* blimit0,
-                                      const uint8_t* limit0,
-                                      const uint8_t* thresh0,
-                                      const uint8_t* blimit1,
-                                      const uint8_t* limit1,
-                                      const uint8_t* thresh1,
-                                      int bd);
-void aom_highbd_lpf_vertical_8_dual_sse2(uint16_t* s,
-                                         int pitch,
-                                         const uint8_t* blimit0,
-                                         const uint8_t* limit0,
-                                         const uint8_t* thresh0,
-                                         const uint8_t* blimit1,
-                                         const uint8_t* limit1,
-                                         const uint8_t* thresh1,
-                                         int bd);
-void aom_highbd_lpf_vertical_8_dual_avx2(uint16_t* s,
-                                         int pitch,
-                                         const uint8_t* blimit0,
-                                         const uint8_t* limit0,
-                                         const uint8_t* thresh0,
-                                         const uint8_t* blimit1,
-                                         const uint8_t* limit1,
-                                         const uint8_t* thresh1,
-                                         int bd);
-RTCD_EXTERN void (*aom_highbd_lpf_vertical_8_dual)(uint16_t* s,
-                                                   int pitch,
-                                                   const uint8_t* blimit0,
-                                                   const uint8_t* limit0,
-                                                   const uint8_t* thresh0,
-                                                   const uint8_t* blimit1,
-                                                   const uint8_t* limit1,
-                                                   const uint8_t* thresh1,
-                                                   int bd);
-
-unsigned int aom_highbd_masked_sad128x128_c(const uint8_t* src8,
-                                            int src_stride,
-                                            const uint8_t* ref8,
-                                            int ref_stride,
-                                            const uint8_t* second_pred8,
-                                            const uint8_t* msk,
-                                            int msk_stride,
-                                            int invert_mask);
-unsigned int aom_highbd_masked_sad128x128_ssse3(const uint8_t* src8,
-                                                int src_stride,
-                                                const uint8_t* ref8,
-                                                int ref_stride,
-                                                const uint8_t* second_pred8,
-                                                const uint8_t* msk,
-                                                int msk_stride,
-                                                int invert_mask);
-unsigned int aom_highbd_masked_sad128x128_avx2(const uint8_t* src8,
-                                               int src_stride,
-                                               const uint8_t* ref8,
-                                               int ref_stride,
-                                               const uint8_t* second_pred8,
-                                               const uint8_t* msk,
-                                               int msk_stride,
-                                               int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad128x128)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad128x64_c(const uint8_t* src8,
-                                           int src_stride,
-                                           const uint8_t* ref8,
-                                           int ref_stride,
-                                           const uint8_t* second_pred8,
-                                           const uint8_t* msk,
-                                           int msk_stride,
-                                           int invert_mask);
-unsigned int aom_highbd_masked_sad128x64_ssse3(const uint8_t* src8,
-                                               int src_stride,
-                                               const uint8_t* ref8,
-                                               int ref_stride,
-                                               const uint8_t* second_pred8,
-                                               const uint8_t* msk,
-                                               int msk_stride,
-                                               int invert_mask);
-unsigned int aom_highbd_masked_sad128x64_avx2(const uint8_t* src8,
-                                              int src_stride,
-                                              const uint8_t* ref8,
-                                              int ref_stride,
-                                              const uint8_t* second_pred8,
-                                              const uint8_t* msk,
-                                              int msk_stride,
-                                              int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad128x64)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad16x16_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-unsigned int aom_highbd_masked_sad16x16_ssse3(const uint8_t* src8,
-                                              int src_stride,
-                                              const uint8_t* ref8,
-                                              int ref_stride,
-                                              const uint8_t* second_pred8,
-                                              const uint8_t* msk,
-                                              int msk_stride,
-                                              int invert_mask);
-unsigned int aom_highbd_masked_sad16x16_avx2(const uint8_t* src8,
-                                             int src_stride,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             const uint8_t* second_pred8,
-                                             const uint8_t* msk,
-                                             int msk_stride,
-                                             int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad16x16)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad16x32_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-unsigned int aom_highbd_masked_sad16x32_ssse3(const uint8_t* src8,
-                                              int src_stride,
-                                              const uint8_t* ref8,
-                                              int ref_stride,
-                                              const uint8_t* second_pred8,
-                                              const uint8_t* msk,
-                                              int msk_stride,
-                                              int invert_mask);
-unsigned int aom_highbd_masked_sad16x32_avx2(const uint8_t* src8,
-                                             int src_stride,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             const uint8_t* second_pred8,
-                                             const uint8_t* msk,
-                                             int msk_stride,
-                                             int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad16x32)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad16x4_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-unsigned int aom_highbd_masked_sad16x4_ssse3(const uint8_t* src8,
-                                             int src_stride,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             const uint8_t* second_pred8,
-                                             const uint8_t* msk,
-                                             int msk_stride,
-                                             int invert_mask);
-unsigned int aom_highbd_masked_sad16x4_avx2(const uint8_t* src8,
-                                            int src_stride,
-                                            const uint8_t* ref8,
-                                            int ref_stride,
-                                            const uint8_t* second_pred8,
-                                            const uint8_t* msk,
-                                            int msk_stride,
-                                            int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad16x4)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad16x64_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-unsigned int aom_highbd_masked_sad16x64_ssse3(const uint8_t* src8,
-                                              int src_stride,
-                                              const uint8_t* ref8,
-                                              int ref_stride,
-                                              const uint8_t* second_pred8,
-                                              const uint8_t* msk,
-                                              int msk_stride,
-                                              int invert_mask);
-unsigned int aom_highbd_masked_sad16x64_avx2(const uint8_t* src8,
-                                             int src_stride,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             const uint8_t* second_pred8,
-                                             const uint8_t* msk,
-                                             int msk_stride,
-                                             int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad16x64)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad16x8_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-unsigned int aom_highbd_masked_sad16x8_ssse3(const uint8_t* src8,
-                                             int src_stride,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             const uint8_t* second_pred8,
-                                             const uint8_t* msk,
-                                             int msk_stride,
-                                             int invert_mask);
-unsigned int aom_highbd_masked_sad16x8_avx2(const uint8_t* src8,
-                                            int src_stride,
-                                            const uint8_t* ref8,
-                                            int ref_stride,
-                                            const uint8_t* second_pred8,
-                                            const uint8_t* msk,
-                                            int msk_stride,
-                                            int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad16x8)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad32x16_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-unsigned int aom_highbd_masked_sad32x16_ssse3(const uint8_t* src8,
-                                              int src_stride,
-                                              const uint8_t* ref8,
-                                              int ref_stride,
-                                              const uint8_t* second_pred8,
-                                              const uint8_t* msk,
-                                              int msk_stride,
-                                              int invert_mask);
-unsigned int aom_highbd_masked_sad32x16_avx2(const uint8_t* src8,
-                                             int src_stride,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             const uint8_t* second_pred8,
-                                             const uint8_t* msk,
-                                             int msk_stride,
-                                             int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad32x16)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad32x32_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-unsigned int aom_highbd_masked_sad32x32_ssse3(const uint8_t* src8,
-                                              int src_stride,
-                                              const uint8_t* ref8,
-                                              int ref_stride,
-                                              const uint8_t* second_pred8,
-                                              const uint8_t* msk,
-                                              int msk_stride,
-                                              int invert_mask);
-unsigned int aom_highbd_masked_sad32x32_avx2(const uint8_t* src8,
-                                             int src_stride,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             const uint8_t* second_pred8,
-                                             const uint8_t* msk,
-                                             int msk_stride,
-                                             int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad32x32)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad32x64_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-unsigned int aom_highbd_masked_sad32x64_ssse3(const uint8_t* src8,
-                                              int src_stride,
-                                              const uint8_t* ref8,
-                                              int ref_stride,
-                                              const uint8_t* second_pred8,
-                                              const uint8_t* msk,
-                                              int msk_stride,
-                                              int invert_mask);
-unsigned int aom_highbd_masked_sad32x64_avx2(const uint8_t* src8,
-                                             int src_stride,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             const uint8_t* second_pred8,
-                                             const uint8_t* msk,
-                                             int msk_stride,
-                                             int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad32x64)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad32x8_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-unsigned int aom_highbd_masked_sad32x8_ssse3(const uint8_t* src8,
-                                             int src_stride,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             const uint8_t* second_pred8,
-                                             const uint8_t* msk,
-                                             int msk_stride,
-                                             int invert_mask);
-unsigned int aom_highbd_masked_sad32x8_avx2(const uint8_t* src8,
-                                            int src_stride,
-                                            const uint8_t* ref8,
-                                            int ref_stride,
-                                            const uint8_t* second_pred8,
-                                            const uint8_t* msk,
-                                            int msk_stride,
-                                            int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad32x8)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad4x16_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-unsigned int aom_highbd_masked_sad4x16_ssse3(const uint8_t* src8,
-                                             int src_stride,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             const uint8_t* second_pred8,
-                                             const uint8_t* msk,
-                                             int msk_stride,
-                                             int invert_mask);
-unsigned int aom_highbd_masked_sad4x16_avx2(const uint8_t* src8,
-                                            int src_stride,
-                                            const uint8_t* ref8,
-                                            int ref_stride,
-                                            const uint8_t* second_pred8,
-                                            const uint8_t* msk,
-                                            int msk_stride,
-                                            int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad4x16)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad4x4_c(const uint8_t* src8,
-                                        int src_stride,
-                                        const uint8_t* ref8,
-                                        int ref_stride,
-                                        const uint8_t* second_pred8,
-                                        const uint8_t* msk,
-                                        int msk_stride,
-                                        int invert_mask);
-unsigned int aom_highbd_masked_sad4x4_ssse3(const uint8_t* src8,
-                                            int src_stride,
-                                            const uint8_t* ref8,
-                                            int ref_stride,
-                                            const uint8_t* second_pred8,
-                                            const uint8_t* msk,
-                                            int msk_stride,
-                                            int invert_mask);
-unsigned int aom_highbd_masked_sad4x4_avx2(const uint8_t* src8,
-                                           int src_stride,
-                                           const uint8_t* ref8,
-                                           int ref_stride,
-                                           const uint8_t* second_pred8,
-                                           const uint8_t* msk,
-                                           int msk_stride,
-                                           int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad4x4)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad4x8_c(const uint8_t* src8,
-                                        int src_stride,
-                                        const uint8_t* ref8,
-                                        int ref_stride,
-                                        const uint8_t* second_pred8,
-                                        const uint8_t* msk,
-                                        int msk_stride,
-                                        int invert_mask);
-unsigned int aom_highbd_masked_sad4x8_ssse3(const uint8_t* src8,
-                                            int src_stride,
-                                            const uint8_t* ref8,
-                                            int ref_stride,
-                                            const uint8_t* second_pred8,
-                                            const uint8_t* msk,
-                                            int msk_stride,
-                                            int invert_mask);
-unsigned int aom_highbd_masked_sad4x8_avx2(const uint8_t* src8,
-                                           int src_stride,
-                                           const uint8_t* ref8,
-                                           int ref_stride,
-                                           const uint8_t* second_pred8,
-                                           const uint8_t* msk,
-                                           int msk_stride,
-                                           int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad4x8)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad64x128_c(const uint8_t* src8,
-                                           int src_stride,
-                                           const uint8_t* ref8,
-                                           int ref_stride,
-                                           const uint8_t* second_pred8,
-                                           const uint8_t* msk,
-                                           int msk_stride,
-                                           int invert_mask);
-unsigned int aom_highbd_masked_sad64x128_ssse3(const uint8_t* src8,
-                                               int src_stride,
-                                               const uint8_t* ref8,
-                                               int ref_stride,
-                                               const uint8_t* second_pred8,
-                                               const uint8_t* msk,
-                                               int msk_stride,
-                                               int invert_mask);
-unsigned int aom_highbd_masked_sad64x128_avx2(const uint8_t* src8,
-                                              int src_stride,
-                                              const uint8_t* ref8,
-                                              int ref_stride,
-                                              const uint8_t* second_pred8,
-                                              const uint8_t* msk,
-                                              int msk_stride,
-                                              int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad64x128)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad64x16_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-unsigned int aom_highbd_masked_sad64x16_ssse3(const uint8_t* src8,
-                                              int src_stride,
-                                              const uint8_t* ref8,
-                                              int ref_stride,
-                                              const uint8_t* second_pred8,
-                                              const uint8_t* msk,
-                                              int msk_stride,
-                                              int invert_mask);
-unsigned int aom_highbd_masked_sad64x16_avx2(const uint8_t* src8,
-                                             int src_stride,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             const uint8_t* second_pred8,
-                                             const uint8_t* msk,
-                                             int msk_stride,
-                                             int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad64x16)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad64x32_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-unsigned int aom_highbd_masked_sad64x32_ssse3(const uint8_t* src8,
-                                              int src_stride,
-                                              const uint8_t* ref8,
-                                              int ref_stride,
-                                              const uint8_t* second_pred8,
-                                              const uint8_t* msk,
-                                              int msk_stride,
-                                              int invert_mask);
-unsigned int aom_highbd_masked_sad64x32_avx2(const uint8_t* src8,
-                                             int src_stride,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             const uint8_t* second_pred8,
-                                             const uint8_t* msk,
-                                             int msk_stride,
-                                             int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad64x32)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad64x64_c(const uint8_t* src8,
-                                          int src_stride,
-                                          const uint8_t* ref8,
-                                          int ref_stride,
-                                          const uint8_t* second_pred8,
-                                          const uint8_t* msk,
-                                          int msk_stride,
-                                          int invert_mask);
-unsigned int aom_highbd_masked_sad64x64_ssse3(const uint8_t* src8,
-                                              int src_stride,
-                                              const uint8_t* ref8,
-                                              int ref_stride,
-                                              const uint8_t* second_pred8,
-                                              const uint8_t* msk,
-                                              int msk_stride,
-                                              int invert_mask);
-unsigned int aom_highbd_masked_sad64x64_avx2(const uint8_t* src8,
-                                             int src_stride,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             const uint8_t* second_pred8,
-                                             const uint8_t* msk,
-                                             int msk_stride,
-                                             int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad64x64)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad8x16_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-unsigned int aom_highbd_masked_sad8x16_ssse3(const uint8_t* src8,
-                                             int src_stride,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             const uint8_t* second_pred8,
-                                             const uint8_t* msk,
-                                             int msk_stride,
-                                             int invert_mask);
-unsigned int aom_highbd_masked_sad8x16_avx2(const uint8_t* src8,
-                                            int src_stride,
-                                            const uint8_t* ref8,
-                                            int ref_stride,
-                                            const uint8_t* second_pred8,
-                                            const uint8_t* msk,
-                                            int msk_stride,
-                                            int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad8x16)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad8x32_c(const uint8_t* src8,
-                                         int src_stride,
-                                         const uint8_t* ref8,
-                                         int ref_stride,
-                                         const uint8_t* second_pred8,
-                                         const uint8_t* msk,
-                                         int msk_stride,
-                                         int invert_mask);
-unsigned int aom_highbd_masked_sad8x32_ssse3(const uint8_t* src8,
-                                             int src_stride,
-                                             const uint8_t* ref8,
-                                             int ref_stride,
-                                             const uint8_t* second_pred8,
-                                             const uint8_t* msk,
-                                             int msk_stride,
-                                             int invert_mask);
-unsigned int aom_highbd_masked_sad8x32_avx2(const uint8_t* src8,
-                                            int src_stride,
-                                            const uint8_t* ref8,
-                                            int ref_stride,
-                                            const uint8_t* second_pred8,
-                                            const uint8_t* msk,
-                                            int msk_stride,
-                                            int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad8x32)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad8x4_c(const uint8_t* src8,
-                                        int src_stride,
-                                        const uint8_t* ref8,
-                                        int ref_stride,
-                                        const uint8_t* second_pred8,
-                                        const uint8_t* msk,
-                                        int msk_stride,
-                                        int invert_mask);
-unsigned int aom_highbd_masked_sad8x4_ssse3(const uint8_t* src8,
-                                            int src_stride,
-                                            const uint8_t* ref8,
-                                            int ref_stride,
-                                            const uint8_t* second_pred8,
-                                            const uint8_t* msk,
-                                            int msk_stride,
-                                            int invert_mask);
-unsigned int aom_highbd_masked_sad8x4_avx2(const uint8_t* src8,
-                                           int src_stride,
-                                           const uint8_t* ref8,
-                                           int ref_stride,
-                                           const uint8_t* second_pred8,
-                                           const uint8_t* msk,
-                                           int msk_stride,
-                                           int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad8x4)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-unsigned int aom_highbd_masked_sad8x8_c(const uint8_t* src8,
-                                        int src_stride,
-                                        const uint8_t* ref8,
-                                        int ref_stride,
-                                        const uint8_t* second_pred8,
-                                        const uint8_t* msk,
-                                        int msk_stride,
-                                        int invert_mask);
-unsigned int aom_highbd_masked_sad8x8_ssse3(const uint8_t* src8,
-                                            int src_stride,
-                                            const uint8_t* ref8,
-                                            int ref_stride,
-                                            const uint8_t* second_pred8,
-                                            const uint8_t* msk,
-                                            int msk_stride,
-                                            int invert_mask);
-unsigned int aom_highbd_masked_sad8x8_avx2(const uint8_t* src8,
-                                           int src_stride,
-                                           const uint8_t* ref8,
-                                           int ref_stride,
-                                           const uint8_t* second_pred8,
-                                           const uint8_t* msk,
-                                           int msk_stride,
-                                           int invert_mask);
-RTCD_EXTERN unsigned int (*aom_highbd_masked_sad8x8)(
-    const uint8_t* src8,
-    int src_stride,
-    const uint8_t* ref8,
-    int ref_stride,
-    const uint8_t* second_pred8,
-    const uint8_t* msk,
-    int msk_stride,
-    int invert_mask);
-
-void aom_highbd_minmax_8x8_c(const uint8_t* s,
-                             int p,
-                             const uint8_t* d,
-                             int dp,
-                             int* min,
-                             int* max);
-#define aom_highbd_minmax_8x8 aom_highbd_minmax_8x8_c
-
-unsigned int aom_highbd_obmc_sad128x128_c(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask);
-unsigned int aom_highbd_obmc_sad128x128_sse4_1(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask);
-unsigned int aom_highbd_obmc_sad128x128_avx2(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad128x128)(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad128x64_c(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask);
-unsigned int aom_highbd_obmc_sad128x64_sse4_1(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask);
-unsigned int aom_highbd_obmc_sad128x64_avx2(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad128x64)(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad16x16_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-unsigned int aom_highbd_obmc_sad16x16_sse4_1(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-unsigned int aom_highbd_obmc_sad16x16_avx2(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad16x16)(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad16x32_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-unsigned int aom_highbd_obmc_sad16x32_sse4_1(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-unsigned int aom_highbd_obmc_sad16x32_avx2(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad16x32)(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad16x4_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-unsigned int aom_highbd_obmc_sad16x4_sse4_1(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask);
-unsigned int aom_highbd_obmc_sad16x4_avx2(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad16x4)(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad16x64_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-unsigned int aom_highbd_obmc_sad16x64_sse4_1(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-unsigned int aom_highbd_obmc_sad16x64_avx2(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad16x64)(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad16x8_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-unsigned int aom_highbd_obmc_sad16x8_sse4_1(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask);
-unsigned int aom_highbd_obmc_sad16x8_avx2(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad16x8)(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad32x16_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-unsigned int aom_highbd_obmc_sad32x16_sse4_1(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-unsigned int aom_highbd_obmc_sad32x16_avx2(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad32x16)(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad32x32_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-unsigned int aom_highbd_obmc_sad32x32_sse4_1(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-unsigned int aom_highbd_obmc_sad32x32_avx2(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad32x32)(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad32x64_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-unsigned int aom_highbd_obmc_sad32x64_sse4_1(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-unsigned int aom_highbd_obmc_sad32x64_avx2(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad32x64)(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad32x8_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-unsigned int aom_highbd_obmc_sad32x8_sse4_1(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask);
-unsigned int aom_highbd_obmc_sad32x8_avx2(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad32x8)(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad4x16_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-unsigned int aom_highbd_obmc_sad4x16_sse4_1(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask);
-unsigned int aom_highbd_obmc_sad4x16_avx2(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad4x16)(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad4x4_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-unsigned int aom_highbd_obmc_sad4x4_sse4_1(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask);
-unsigned int aom_highbd_obmc_sad4x4_avx2(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad4x4)(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad4x8_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-unsigned int aom_highbd_obmc_sad4x8_sse4_1(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask);
-unsigned int aom_highbd_obmc_sad4x8_avx2(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad4x8)(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad64x128_c(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask);
-unsigned int aom_highbd_obmc_sad64x128_sse4_1(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask);
-unsigned int aom_highbd_obmc_sad64x128_avx2(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad64x128)(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad64x16_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-unsigned int aom_highbd_obmc_sad64x16_sse4_1(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-unsigned int aom_highbd_obmc_sad64x16_avx2(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad64x16)(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad64x32_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-unsigned int aom_highbd_obmc_sad64x32_sse4_1(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-unsigned int aom_highbd_obmc_sad64x32_avx2(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad64x32)(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad64x64_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-unsigned int aom_highbd_obmc_sad64x64_sse4_1(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-unsigned int aom_highbd_obmc_sad64x64_avx2(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad64x64)(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad8x16_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-unsigned int aom_highbd_obmc_sad8x16_sse4_1(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask);
-unsigned int aom_highbd_obmc_sad8x16_avx2(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad8x16)(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad8x32_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-unsigned int aom_highbd_obmc_sad8x32_sse4_1(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask);
-unsigned int aom_highbd_obmc_sad8x32_avx2(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad8x32)(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad8x4_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-unsigned int aom_highbd_obmc_sad8x4_sse4_1(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask);
-unsigned int aom_highbd_obmc_sad8x4_avx2(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad8x4)(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sad8x8_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-unsigned int aom_highbd_obmc_sad8x8_sse4_1(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask);
-unsigned int aom_highbd_obmc_sad8x8_avx2(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_sad8x8)(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask);
-
-unsigned int aom_highbd_obmc_sub_pixel_variance128x128_c(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         int xoffset,
-                                                         int yoffset,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance128x128 \
-  aom_highbd_obmc_sub_pixel_variance128x128_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance128x64_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance128x64 \
-  aom_highbd_obmc_sub_pixel_variance128x64_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance16x16_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance16x16 \
-  aom_highbd_obmc_sub_pixel_variance16x16_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance16x32_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance16x32 \
-  aom_highbd_obmc_sub_pixel_variance16x32_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance16x4_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance16x4 \
-  aom_highbd_obmc_sub_pixel_variance16x4_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance16x64_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance16x64 \
-  aom_highbd_obmc_sub_pixel_variance16x64_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance16x8_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance16x8 \
-  aom_highbd_obmc_sub_pixel_variance16x8_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance32x16_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance32x16 \
-  aom_highbd_obmc_sub_pixel_variance32x16_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance32x32_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance32x32 \
-  aom_highbd_obmc_sub_pixel_variance32x32_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance32x64_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance32x64 \
-  aom_highbd_obmc_sub_pixel_variance32x64_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance32x8_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance32x8 \
-  aom_highbd_obmc_sub_pixel_variance32x8_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance4x16_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance4x16 \
-  aom_highbd_obmc_sub_pixel_variance4x16_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance4x4_c(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance4x4 \
-  aom_highbd_obmc_sub_pixel_variance4x4_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance4x8_c(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance4x8 \
-  aom_highbd_obmc_sub_pixel_variance4x8_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance64x128_c(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        int xoffset,
-                                                        int yoffset,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance64x128 \
-  aom_highbd_obmc_sub_pixel_variance64x128_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance64x16_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance64x16 \
-  aom_highbd_obmc_sub_pixel_variance64x16_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance64x32_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance64x32 \
-  aom_highbd_obmc_sub_pixel_variance64x32_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance64x64_c(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance64x64 \
-  aom_highbd_obmc_sub_pixel_variance64x64_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance8x16_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance8x16 \
-  aom_highbd_obmc_sub_pixel_variance8x16_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance8x32_c(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance8x32 \
-  aom_highbd_obmc_sub_pixel_variance8x32_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance8x4_c(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance8x4 \
-  aom_highbd_obmc_sub_pixel_variance8x4_c
-
-unsigned int aom_highbd_obmc_sub_pixel_variance8x8_c(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-#define aom_highbd_obmc_sub_pixel_variance8x8 \
-  aom_highbd_obmc_sub_pixel_variance8x8_c
-
-unsigned int aom_highbd_obmc_variance128x128_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_highbd_obmc_variance128x128_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance128x128)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance128x64_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-unsigned int aom_highbd_obmc_variance128x64_sse4_1(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance128x64)(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance16x16_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-unsigned int aom_highbd_obmc_variance16x16_sse4_1(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance16x16)(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance16x32_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-unsigned int aom_highbd_obmc_variance16x32_sse4_1(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance16x32)(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance16x4_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-unsigned int aom_highbd_obmc_variance16x4_sse4_1(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance16x4)(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance16x64_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-unsigned int aom_highbd_obmc_variance16x64_sse4_1(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance16x64)(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance16x8_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-unsigned int aom_highbd_obmc_variance16x8_sse4_1(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance16x8)(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance32x16_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-unsigned int aom_highbd_obmc_variance32x16_sse4_1(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance32x16)(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance32x32_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-unsigned int aom_highbd_obmc_variance32x32_sse4_1(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance32x32)(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance32x64_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-unsigned int aom_highbd_obmc_variance32x64_sse4_1(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance32x64)(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance32x8_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-unsigned int aom_highbd_obmc_variance32x8_sse4_1(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance32x8)(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance4x16_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-unsigned int aom_highbd_obmc_variance4x16_sse4_1(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance4x16)(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance4x4_c(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-unsigned int aom_highbd_obmc_variance4x4_sse4_1(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance4x4)(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance4x8_c(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-unsigned int aom_highbd_obmc_variance4x8_sse4_1(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance4x8)(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance64x128_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-unsigned int aom_highbd_obmc_variance64x128_sse4_1(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance64x128)(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance64x16_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-unsigned int aom_highbd_obmc_variance64x16_sse4_1(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance64x16)(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance64x32_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-unsigned int aom_highbd_obmc_variance64x32_sse4_1(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance64x32)(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance64x64_c(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-unsigned int aom_highbd_obmc_variance64x64_sse4_1(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance64x64)(const uint8_t* pre,
-                                                          int pre_stride,
-                                                          const int32_t* wsrc,
-                                                          const int32_t* mask,
-                                                          unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance8x16_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-unsigned int aom_highbd_obmc_variance8x16_sse4_1(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance8x16)(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance8x32_c(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-unsigned int aom_highbd_obmc_variance8x32_sse4_1(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance8x32)(const uint8_t* pre,
-                                                         int pre_stride,
-                                                         const int32_t* wsrc,
-                                                         const int32_t* mask,
-                                                         unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance8x4_c(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-unsigned int aom_highbd_obmc_variance8x4_sse4_1(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance8x4)(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-
-unsigned int aom_highbd_obmc_variance8x8_c(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-unsigned int aom_highbd_obmc_variance8x8_sse4_1(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_highbd_obmc_variance8x8)(const uint8_t* pre,
-                                                        int pre_stride,
-                                                        const int32_t* wsrc,
-                                                        const int32_t* mask,
-                                                        unsigned int* sse);
-
-void aom_highbd_paeth_predictor_16x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_16x16 aom_highbd_paeth_predictor_16x16_c
-
-void aom_highbd_paeth_predictor_16x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_16x32 aom_highbd_paeth_predictor_16x32_c
-
-void aom_highbd_paeth_predictor_16x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_16x4 aom_highbd_paeth_predictor_16x4_c
-
-void aom_highbd_paeth_predictor_16x64_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_16x64 aom_highbd_paeth_predictor_16x64_c
-
-void aom_highbd_paeth_predictor_16x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_16x8 aom_highbd_paeth_predictor_16x8_c
-
-void aom_highbd_paeth_predictor_2x2_c(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_paeth_predictor_2x2 aom_highbd_paeth_predictor_2x2_c
-
-void aom_highbd_paeth_predictor_32x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_32x16 aom_highbd_paeth_predictor_32x16_c
-
-void aom_highbd_paeth_predictor_32x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_32x32 aom_highbd_paeth_predictor_32x32_c
-
-void aom_highbd_paeth_predictor_32x64_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_32x64 aom_highbd_paeth_predictor_32x64_c
-
-void aom_highbd_paeth_predictor_32x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_32x8 aom_highbd_paeth_predictor_32x8_c
-
-void aom_highbd_paeth_predictor_4x16_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_4x16 aom_highbd_paeth_predictor_4x16_c
-
-void aom_highbd_paeth_predictor_4x4_c(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_paeth_predictor_4x4 aom_highbd_paeth_predictor_4x4_c
-
-void aom_highbd_paeth_predictor_4x8_c(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_paeth_predictor_4x8 aom_highbd_paeth_predictor_4x8_c
-
-void aom_highbd_paeth_predictor_64x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_64x16 aom_highbd_paeth_predictor_64x16_c
-
-void aom_highbd_paeth_predictor_64x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_64x32 aom_highbd_paeth_predictor_64x32_c
-
-void aom_highbd_paeth_predictor_64x64_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_paeth_predictor_64x64 aom_highbd_paeth_predictor_64x64_c
-
-void aom_highbd_paeth_predictor_8x16_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_8x16 aom_highbd_paeth_predictor_8x16_c
-
-void aom_highbd_paeth_predictor_8x32_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_paeth_predictor_8x32 aom_highbd_paeth_predictor_8x32_c
-
-void aom_highbd_paeth_predictor_8x4_c(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_paeth_predictor_8x4 aom_highbd_paeth_predictor_8x4_c
-
-void aom_highbd_paeth_predictor_8x8_c(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_paeth_predictor_8x8 aom_highbd_paeth_predictor_8x8_c
-
-void aom_highbd_quantize_b_c(const tran_low_t* coeff_ptr,
-                             intptr_t n_coeffs,
-                             const int16_t* zbin_ptr,
-                             const int16_t* round_ptr,
-                             const int16_t* quant_ptr,
-                             const int16_t* quant_shift_ptr,
-                             tran_low_t* qcoeff_ptr,
-                             tran_low_t* dqcoeff_ptr,
-                             const int16_t* dequant_ptr,
-                             uint16_t* eob_ptr,
-                             const int16_t* scan,
-                             const int16_t* iscan);
-void aom_highbd_quantize_b_sse2(const tran_low_t* coeff_ptr,
-                                intptr_t n_coeffs,
-                                const int16_t* zbin_ptr,
-                                const int16_t* round_ptr,
-                                const int16_t* quant_ptr,
-                                const int16_t* quant_shift_ptr,
-                                tran_low_t* qcoeff_ptr,
-                                tran_low_t* dqcoeff_ptr,
-                                const int16_t* dequant_ptr,
-                                uint16_t* eob_ptr,
-                                const int16_t* scan,
-                                const int16_t* iscan);
-void aom_highbd_quantize_b_avx2(const tran_low_t* coeff_ptr,
-                                intptr_t n_coeffs,
-                                const int16_t* zbin_ptr,
-                                const int16_t* round_ptr,
-                                const int16_t* quant_ptr,
-                                const int16_t* quant_shift_ptr,
-                                tran_low_t* qcoeff_ptr,
-                                tran_low_t* dqcoeff_ptr,
-                                const int16_t* dequant_ptr,
-                                uint16_t* eob_ptr,
-                                const int16_t* scan,
-                                const int16_t* iscan);
-RTCD_EXTERN void (*aom_highbd_quantize_b)(const tran_low_t* coeff_ptr,
-                                          intptr_t n_coeffs,
-                                          const int16_t* zbin_ptr,
-                                          const int16_t* round_ptr,
-                                          const int16_t* quant_ptr,
-                                          const int16_t* quant_shift_ptr,
-                                          tran_low_t* qcoeff_ptr,
-                                          tran_low_t* dqcoeff_ptr,
-                                          const int16_t* dequant_ptr,
-                                          uint16_t* eob_ptr,
-                                          const int16_t* scan,
-                                          const int16_t* iscan);
-
-void aom_highbd_quantize_b_32x32_c(const tran_low_t* coeff_ptr,
-                                   intptr_t n_coeffs,
-                                   const int16_t* zbin_ptr,
-                                   const int16_t* round_ptr,
-                                   const int16_t* quant_ptr,
-                                   const int16_t* quant_shift_ptr,
-                                   tran_low_t* qcoeff_ptr,
-                                   tran_low_t* dqcoeff_ptr,
-                                   const int16_t* dequant_ptr,
-                                   uint16_t* eob_ptr,
-                                   const int16_t* scan,
-                                   const int16_t* iscan);
-void aom_highbd_quantize_b_32x32_sse2(const tran_low_t* coeff_ptr,
-                                      intptr_t n_coeffs,
-                                      const int16_t* zbin_ptr,
-                                      const int16_t* round_ptr,
-                                      const int16_t* quant_ptr,
-                                      const int16_t* quant_shift_ptr,
-                                      tran_low_t* qcoeff_ptr,
-                                      tran_low_t* dqcoeff_ptr,
-                                      const int16_t* dequant_ptr,
-                                      uint16_t* eob_ptr,
-                                      const int16_t* scan,
-                                      const int16_t* iscan);
-#define aom_highbd_quantize_b_32x32 aom_highbd_quantize_b_32x32_sse2
-
-void aom_highbd_quantize_b_32x32_adaptive_c(const tran_low_t* coeff_ptr,
-                                            intptr_t n_coeffs,
-                                            const int16_t* zbin_ptr,
-                                            const int16_t* round_ptr,
-                                            const int16_t* quant_ptr,
-                                            const int16_t* quant_shift_ptr,
-                                            tran_low_t* qcoeff_ptr,
-                                            tran_low_t* dqcoeff_ptr,
-                                            const int16_t* dequant_ptr,
-                                            uint16_t* eob_ptr,
-                                            const int16_t* scan,
-                                            const int16_t* iscan);
-void aom_highbd_quantize_b_32x32_adaptive_sse2(const tran_low_t* coeff_ptr,
-                                               intptr_t n_coeffs,
-                                               const int16_t* zbin_ptr,
-                                               const int16_t* round_ptr,
-                                               const int16_t* quant_ptr,
-                                               const int16_t* quant_shift_ptr,
-                                               tran_low_t* qcoeff_ptr,
-                                               tran_low_t* dqcoeff_ptr,
-                                               const int16_t* dequant_ptr,
-                                               uint16_t* eob_ptr,
-                                               const int16_t* scan,
-                                               const int16_t* iscan);
-void aom_highbd_quantize_b_32x32_adaptive_avx2(const tran_low_t* coeff_ptr,
-                                               intptr_t n_coeffs,
-                                               const int16_t* zbin_ptr,
-                                               const int16_t* round_ptr,
-                                               const int16_t* quant_ptr,
-                                               const int16_t* quant_shift_ptr,
-                                               tran_low_t* qcoeff_ptr,
-                                               tran_low_t* dqcoeff_ptr,
-                                               const int16_t* dequant_ptr,
-                                               uint16_t* eob_ptr,
-                                               const int16_t* scan,
-                                               const int16_t* iscan);
-RTCD_EXTERN void (*aom_highbd_quantize_b_32x32_adaptive)(
-    const tran_low_t* coeff_ptr,
-    intptr_t n_coeffs,
-    const int16_t* zbin_ptr,
-    const int16_t* round_ptr,
-    const int16_t* quant_ptr,
-    const int16_t* quant_shift_ptr,
-    tran_low_t* qcoeff_ptr,
-    tran_low_t* dqcoeff_ptr,
-    const int16_t* dequant_ptr,
-    uint16_t* eob_ptr,
-    const int16_t* scan,
-    const int16_t* iscan);
-
-void aom_highbd_quantize_b_64x64_c(const tran_low_t* coeff_ptr,
-                                   intptr_t n_coeffs,
-                                   const int16_t* zbin_ptr,
-                                   const int16_t* round_ptr,
-                                   const int16_t* quant_ptr,
-                                   const int16_t* quant_shift_ptr,
-                                   tran_low_t* qcoeff_ptr,
-                                   tran_low_t* dqcoeff_ptr,
-                                   const int16_t* dequant_ptr,
-                                   uint16_t* eob_ptr,
-                                   const int16_t* scan,
-                                   const int16_t* iscan);
-void aom_highbd_quantize_b_64x64_sse2(const tran_low_t* coeff_ptr,
-                                      intptr_t n_coeffs,
-                                      const int16_t* zbin_ptr,
-                                      const int16_t* round_ptr,
-                                      const int16_t* quant_ptr,
-                                      const int16_t* quant_shift_ptr,
-                                      tran_low_t* qcoeff_ptr,
-                                      tran_low_t* dqcoeff_ptr,
-                                      const int16_t* dequant_ptr,
-                                      uint16_t* eob_ptr,
-                                      const int16_t* scan,
-                                      const int16_t* iscan);
-#define aom_highbd_quantize_b_64x64 aom_highbd_quantize_b_64x64_sse2
-
-void aom_highbd_quantize_b_64x64_adaptive_c(const tran_low_t* coeff_ptr,
-                                            intptr_t n_coeffs,
-                                            const int16_t* zbin_ptr,
-                                            const int16_t* round_ptr,
-                                            const int16_t* quant_ptr,
-                                            const int16_t* quant_shift_ptr,
-                                            tran_low_t* qcoeff_ptr,
-                                            tran_low_t* dqcoeff_ptr,
-                                            const int16_t* dequant_ptr,
-                                            uint16_t* eob_ptr,
-                                            const int16_t* scan,
-                                            const int16_t* iscan);
-void aom_highbd_quantize_b_64x64_adaptive_sse2(const tran_low_t* coeff_ptr,
-                                               intptr_t n_coeffs,
-                                               const int16_t* zbin_ptr,
-                                               const int16_t* round_ptr,
-                                               const int16_t* quant_ptr,
-                                               const int16_t* quant_shift_ptr,
-                                               tran_low_t* qcoeff_ptr,
-                                               tran_low_t* dqcoeff_ptr,
-                                               const int16_t* dequant_ptr,
-                                               uint16_t* eob_ptr,
-                                               const int16_t* scan,
-                                               const int16_t* iscan);
-#define aom_highbd_quantize_b_64x64_adaptive \
-  aom_highbd_quantize_b_64x64_adaptive_sse2
-
-void aom_highbd_quantize_b_adaptive_c(const tran_low_t* coeff_ptr,
-                                      intptr_t n_coeffs,
-                                      const int16_t* zbin_ptr,
-                                      const int16_t* round_ptr,
-                                      const int16_t* quant_ptr,
-                                      const int16_t* quant_shift_ptr,
-                                      tran_low_t* qcoeff_ptr,
-                                      tran_low_t* dqcoeff_ptr,
-                                      const int16_t* dequant_ptr,
-                                      uint16_t* eob_ptr,
-                                      const int16_t* scan,
-                                      const int16_t* iscan);
-void aom_highbd_quantize_b_adaptive_sse2(const tran_low_t* coeff_ptr,
-                                         intptr_t n_coeffs,
-                                         const int16_t* zbin_ptr,
-                                         const int16_t* round_ptr,
-                                         const int16_t* quant_ptr,
-                                         const int16_t* quant_shift_ptr,
-                                         tran_low_t* qcoeff_ptr,
-                                         tran_low_t* dqcoeff_ptr,
-                                         const int16_t* dequant_ptr,
-                                         uint16_t* eob_ptr,
-                                         const int16_t* scan,
-                                         const int16_t* iscan);
-void aom_highbd_quantize_b_adaptive_avx2(const tran_low_t* coeff_ptr,
-                                         intptr_t n_coeffs,
-                                         const int16_t* zbin_ptr,
-                                         const int16_t* round_ptr,
-                                         const int16_t* quant_ptr,
-                                         const int16_t* quant_shift_ptr,
-                                         tran_low_t* qcoeff_ptr,
-                                         tran_low_t* dqcoeff_ptr,
-                                         const int16_t* dequant_ptr,
-                                         uint16_t* eob_ptr,
-                                         const int16_t* scan,
-                                         const int16_t* iscan);
-RTCD_EXTERN void (*aom_highbd_quantize_b_adaptive)(
-    const tran_low_t* coeff_ptr,
-    intptr_t n_coeffs,
-    const int16_t* zbin_ptr,
-    const int16_t* round_ptr,
-    const int16_t* quant_ptr,
-    const int16_t* quant_shift_ptr,
-    tran_low_t* qcoeff_ptr,
-    tran_low_t* dqcoeff_ptr,
-    const int16_t* dequant_ptr,
-    uint16_t* eob_ptr,
-    const int16_t* scan,
-    const int16_t* iscan);
-
-unsigned int aom_highbd_sad128x128_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride);
-unsigned int aom_highbd_sad128x128_avx2(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad128x128)(const uint8_t* src_ptr,
-                                                  int src_stride,
-                                                  const uint8_t* ref_ptr,
-                                                  int ref_stride);
-
-unsigned int aom_highbd_sad128x128_avg_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         const uint8_t* second_pred);
-unsigned int aom_highbd_sad128x128_avg_avx2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride,
-                                            const uint8_t* second_pred);
-RTCD_EXTERN unsigned int (*aom_highbd_sad128x128_avg)(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred);
-
-void aom_highbd_sad128x128x4d_c(const uint8_t* src_ptr,
-                                int src_stride,
-                                const uint8_t* const ref_ptr[],
-                                int ref_stride,
-                                uint32_t* sad_array);
-void aom_highbd_sad128x128x4d_avx2(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad128x128x4d)(const uint8_t* src_ptr,
-                                             int src_stride,
-                                             const uint8_t* const ref_ptr[],
-                                             int ref_stride,
-                                             uint32_t* sad_array);
-
-unsigned int aom_highbd_sad128x64_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* ref_ptr,
-                                    int ref_stride);
-unsigned int aom_highbd_sad128x64_avx2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad128x64)(const uint8_t* src_ptr,
-                                                 int src_stride,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride);
-
-unsigned int aom_highbd_sad128x64_avg_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        const uint8_t* second_pred);
-unsigned int aom_highbd_sad128x64_avg_avx2(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           const uint8_t* second_pred);
-RTCD_EXTERN unsigned int (*aom_highbd_sad128x64_avg)(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred);
-
-void aom_highbd_sad128x64x4d_c(const uint8_t* src_ptr,
-                               int src_stride,
-                               const uint8_t* const ref_ptr[],
-                               int ref_stride,
-                               uint32_t* sad_array);
-void aom_highbd_sad128x64x4d_avx2(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* const ref_ptr[],
-                                  int ref_stride,
-                                  uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad128x64x4d)(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* const ref_ptr[],
-                                            int ref_stride,
-                                            uint32_t* sad_array);
-
-unsigned int aom_highbd_sad16x16_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-unsigned int aom_highbd_sad16x16_sse2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-unsigned int aom_highbd_sad16x16_avx2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad16x16)(const uint8_t* src_ptr,
-                                                int src_stride,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride);
-
-unsigned int aom_highbd_sad16x16_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-unsigned int aom_highbd_sad16x16_avg_sse2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-unsigned int aom_highbd_sad16x16_avg_avx2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-RTCD_EXTERN unsigned int (*aom_highbd_sad16x16_avg)(const uint8_t* src_ptr,
-                                                    int src_stride,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    const uint8_t* second_pred);
-
-void aom_highbd_sad16x16x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-void aom_highbd_sad16x16x4d_sse2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-void aom_highbd_sad16x16x4d_avx2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad16x16x4d)(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* const ref_ptr[],
-                                           int ref_stride,
-                                           uint32_t* sad_array);
-
-unsigned int aom_highbd_sad16x32_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-unsigned int aom_highbd_sad16x32_sse2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-unsigned int aom_highbd_sad16x32_avx2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad16x32)(const uint8_t* src_ptr,
-                                                int src_stride,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride);
-
-unsigned int aom_highbd_sad16x32_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-unsigned int aom_highbd_sad16x32_avg_sse2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-unsigned int aom_highbd_sad16x32_avg_avx2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-RTCD_EXTERN unsigned int (*aom_highbd_sad16x32_avg)(const uint8_t* src_ptr,
-                                                    int src_stride,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    const uint8_t* second_pred);
-
-void aom_highbd_sad16x32x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-void aom_highbd_sad16x32x4d_sse2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-void aom_highbd_sad16x32x4d_avx2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad16x32x4d)(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* const ref_ptr[],
-                                           int ref_stride,
-                                           uint32_t* sad_array);
-
-unsigned int aom_highbd_sad16x4_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-unsigned int aom_highbd_sad16x4_sse2(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride);
-unsigned int aom_highbd_sad16x4_avx2(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad16x4)(const uint8_t* src_ptr,
-                                               int src_stride,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride);
-
-unsigned int aom_highbd_sad16x4_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-unsigned int aom_highbd_sad16x4_avg_sse2(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         const uint8_t* second_pred);
-unsigned int aom_highbd_sad16x4_avg_avx2(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         const uint8_t* second_pred);
-RTCD_EXTERN unsigned int (*aom_highbd_sad16x4_avg)(const uint8_t* src_ptr,
-                                                   int src_stride,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   const uint8_t* second_pred);
-
-void aom_highbd_sad16x4x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-void aom_highbd_sad16x4x4d_sse2(const uint8_t* src_ptr,
-                                int src_stride,
-                                const uint8_t* const ref_ptr[],
-                                int ref_stride,
-                                uint32_t* sad_array);
-void aom_highbd_sad16x4x4d_avx2(const uint8_t* src_ptr,
-                                int src_stride,
-                                const uint8_t* const ref_ptr[],
-                                int ref_stride,
-                                uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad16x4x4d)(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* const ref_ptr[],
-                                          int ref_stride,
-                                          uint32_t* sad_array);
-
-unsigned int aom_highbd_sad16x64_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-unsigned int aom_highbd_sad16x64_sse2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-unsigned int aom_highbd_sad16x64_avx2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad16x64)(const uint8_t* src_ptr,
-                                                int src_stride,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride);
-
-unsigned int aom_highbd_sad16x64_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-unsigned int aom_highbd_sad16x64_avg_sse2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-unsigned int aom_highbd_sad16x64_avg_avx2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-RTCD_EXTERN unsigned int (*aom_highbd_sad16x64_avg)(const uint8_t* src_ptr,
-                                                    int src_stride,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    const uint8_t* second_pred);
-
-void aom_highbd_sad16x64x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-void aom_highbd_sad16x64x4d_sse2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-void aom_highbd_sad16x64x4d_avx2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad16x64x4d)(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* const ref_ptr[],
-                                           int ref_stride,
-                                           uint32_t* sad_array);
-
-unsigned int aom_highbd_sad16x8_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-unsigned int aom_highbd_sad16x8_sse2(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride);
-unsigned int aom_highbd_sad16x8_avx2(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad16x8)(const uint8_t* src_ptr,
-                                               int src_stride,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride);
-
-unsigned int aom_highbd_sad16x8_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-unsigned int aom_highbd_sad16x8_avg_sse2(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         const uint8_t* second_pred);
-unsigned int aom_highbd_sad16x8_avg_avx2(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         const uint8_t* second_pred);
-RTCD_EXTERN unsigned int (*aom_highbd_sad16x8_avg)(const uint8_t* src_ptr,
-                                                   int src_stride,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   const uint8_t* second_pred);
-
-void aom_highbd_sad16x8x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-void aom_highbd_sad16x8x4d_sse2(const uint8_t* src_ptr,
-                                int src_stride,
-                                const uint8_t* const ref_ptr[],
-                                int ref_stride,
-                                uint32_t* sad_array);
-void aom_highbd_sad16x8x4d_avx2(const uint8_t* src_ptr,
-                                int src_stride,
-                                const uint8_t* const ref_ptr[],
-                                int ref_stride,
-                                uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad16x8x4d)(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* const ref_ptr[],
-                                          int ref_stride,
-                                          uint32_t* sad_array);
-
-unsigned int aom_highbd_sad32x16_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-unsigned int aom_highbd_sad32x16_sse2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-unsigned int aom_highbd_sad32x16_avx2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad32x16)(const uint8_t* src_ptr,
-                                                int src_stride,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride);
-
-unsigned int aom_highbd_sad32x16_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-unsigned int aom_highbd_sad32x16_avg_sse2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-unsigned int aom_highbd_sad32x16_avg_avx2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-RTCD_EXTERN unsigned int (*aom_highbd_sad32x16_avg)(const uint8_t* src_ptr,
-                                                    int src_stride,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    const uint8_t* second_pred);
-
-void aom_highbd_sad32x16x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-void aom_highbd_sad32x16x4d_sse2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-void aom_highbd_sad32x16x4d_avx2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad32x16x4d)(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* const ref_ptr[],
-                                           int ref_stride,
-                                           uint32_t* sad_array);
-
-unsigned int aom_highbd_sad32x32_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-unsigned int aom_highbd_sad32x32_sse2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-unsigned int aom_highbd_sad32x32_avx2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad32x32)(const uint8_t* src_ptr,
-                                                int src_stride,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride);
-
-unsigned int aom_highbd_sad32x32_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-unsigned int aom_highbd_sad32x32_avg_sse2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-unsigned int aom_highbd_sad32x32_avg_avx2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-RTCD_EXTERN unsigned int (*aom_highbd_sad32x32_avg)(const uint8_t* src_ptr,
-                                                    int src_stride,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    const uint8_t* second_pred);
-
-void aom_highbd_sad32x32x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-void aom_highbd_sad32x32x4d_sse2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-void aom_highbd_sad32x32x4d_avx2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad32x32x4d)(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* const ref_ptr[],
-                                           int ref_stride,
-                                           uint32_t* sad_array);
-
-unsigned int aom_highbd_sad32x64_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-unsigned int aom_highbd_sad32x64_sse2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-unsigned int aom_highbd_sad32x64_avx2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad32x64)(const uint8_t* src_ptr,
-                                                int src_stride,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride);
-
-unsigned int aom_highbd_sad32x64_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-unsigned int aom_highbd_sad32x64_avg_sse2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-unsigned int aom_highbd_sad32x64_avg_avx2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-RTCD_EXTERN unsigned int (*aom_highbd_sad32x64_avg)(const uint8_t* src_ptr,
-                                                    int src_stride,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    const uint8_t* second_pred);
-
-void aom_highbd_sad32x64x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-void aom_highbd_sad32x64x4d_sse2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-void aom_highbd_sad32x64x4d_avx2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad32x64x4d)(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* const ref_ptr[],
-                                           int ref_stride,
-                                           uint32_t* sad_array);
-
-unsigned int aom_highbd_sad32x8_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-unsigned int aom_highbd_sad32x8_sse2(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride);
-unsigned int aom_highbd_sad32x8_avx2(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad32x8)(const uint8_t* src_ptr,
-                                               int src_stride,
-                                               const uint8_t* ref_ptr,
-                                               int ref_stride);
-
-unsigned int aom_highbd_sad32x8_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-unsigned int aom_highbd_sad32x8_avg_sse2(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         const uint8_t* second_pred);
-unsigned int aom_highbd_sad32x8_avg_avx2(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         const uint8_t* second_pred);
-RTCD_EXTERN unsigned int (*aom_highbd_sad32x8_avg)(const uint8_t* src_ptr,
-                                                   int src_stride,
-                                                   const uint8_t* ref_ptr,
-                                                   int ref_stride,
-                                                   const uint8_t* second_pred);
-
-void aom_highbd_sad32x8x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-void aom_highbd_sad32x8x4d_sse2(const uint8_t* src_ptr,
-                                int src_stride,
-                                const uint8_t* const ref_ptr[],
-                                int ref_stride,
-                                uint32_t* sad_array);
-void aom_highbd_sad32x8x4d_avx2(const uint8_t* src_ptr,
-                                int src_stride,
-                                const uint8_t* const ref_ptr[],
-                                int ref_stride,
-                                uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad32x8x4d)(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* const ref_ptr[],
-                                          int ref_stride,
-                                          uint32_t* sad_array);
-
-unsigned int aom_highbd_sad4x16_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-unsigned int aom_highbd_sad4x16_sse2(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride);
-#define aom_highbd_sad4x16 aom_highbd_sad4x16_sse2
-
-unsigned int aom_highbd_sad4x16_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-unsigned int aom_highbd_sad4x16_avg_sse2(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         const uint8_t* second_pred);
-#define aom_highbd_sad4x16_avg aom_highbd_sad4x16_avg_sse2
-
-void aom_highbd_sad4x16x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-void aom_highbd_sad4x16x4d_sse2(const uint8_t* src_ptr,
-                                int src_stride,
-                                const uint8_t* const ref_ptr[],
-                                int ref_stride,
-                                uint32_t* sad_array);
-#define aom_highbd_sad4x16x4d aom_highbd_sad4x16x4d_sse2
-
-unsigned int aom_highbd_sad4x4_c(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride);
-unsigned int aom_highbd_sad4x4_sse2(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* ref_ptr,
-                                    int ref_stride);
-#define aom_highbd_sad4x4 aom_highbd_sad4x4_sse2
-
-unsigned int aom_highbd_sad4x4_avg_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride,
-                                     const uint8_t* second_pred);
-unsigned int aom_highbd_sad4x4_avg_sse2(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        const uint8_t* second_pred);
-#define aom_highbd_sad4x4_avg aom_highbd_sad4x4_avg_sse2
-
-void aom_highbd_sad4x4x4d_c(const uint8_t* src_ptr,
-                            int src_stride,
-                            const uint8_t* const ref_ptr[],
-                            int ref_stride,
-                            uint32_t* sad_array);
-void aom_highbd_sad4x4x4d_sse2(const uint8_t* src_ptr,
-                               int src_stride,
-                               const uint8_t* const ref_ptr[],
-                               int ref_stride,
-                               uint32_t* sad_array);
-#define aom_highbd_sad4x4x4d aom_highbd_sad4x4x4d_sse2
-
-unsigned int aom_highbd_sad4x8_c(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride);
-unsigned int aom_highbd_sad4x8_sse2(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* ref_ptr,
-                                    int ref_stride);
-#define aom_highbd_sad4x8 aom_highbd_sad4x8_sse2
-
-unsigned int aom_highbd_sad4x8_avg_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride,
-                                     const uint8_t* second_pred);
-unsigned int aom_highbd_sad4x8_avg_sse2(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        const uint8_t* second_pred);
-#define aom_highbd_sad4x8_avg aom_highbd_sad4x8_avg_sse2
-
-void aom_highbd_sad4x8x4d_c(const uint8_t* src_ptr,
-                            int src_stride,
-                            const uint8_t* const ref_ptr[],
-                            int ref_stride,
-                            uint32_t* sad_array);
-void aom_highbd_sad4x8x4d_sse2(const uint8_t* src_ptr,
-                               int src_stride,
-                               const uint8_t* const ref_ptr[],
-                               int ref_stride,
-                               uint32_t* sad_array);
-#define aom_highbd_sad4x8x4d aom_highbd_sad4x8x4d_sse2
-
-unsigned int aom_highbd_sad64x128_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* ref_ptr,
-                                    int ref_stride);
-unsigned int aom_highbd_sad64x128_avx2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad64x128)(const uint8_t* src_ptr,
-                                                 int src_stride,
-                                                 const uint8_t* ref_ptr,
-                                                 int ref_stride);
-
-unsigned int aom_highbd_sad64x128_avg_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        const uint8_t* second_pred);
-unsigned int aom_highbd_sad64x128_avg_avx2(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride,
-                                           const uint8_t* second_pred);
-RTCD_EXTERN unsigned int (*aom_highbd_sad64x128_avg)(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* ref_ptr,
-    int ref_stride,
-    const uint8_t* second_pred);
-
-void aom_highbd_sad64x128x4d_c(const uint8_t* src_ptr,
-                               int src_stride,
-                               const uint8_t* const ref_ptr[],
-                               int ref_stride,
-                               uint32_t* sad_array);
-void aom_highbd_sad64x128x4d_avx2(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* const ref_ptr[],
-                                  int ref_stride,
-                                  uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad64x128x4d)(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* const ref_ptr[],
-                                            int ref_stride,
-                                            uint32_t* sad_array);
-
-unsigned int aom_highbd_sad64x16_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-unsigned int aom_highbd_sad64x16_sse2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-unsigned int aom_highbd_sad64x16_avx2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad64x16)(const uint8_t* src_ptr,
-                                                int src_stride,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride);
-
-unsigned int aom_highbd_sad64x16_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-unsigned int aom_highbd_sad64x16_avg_sse2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-unsigned int aom_highbd_sad64x16_avg_avx2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-RTCD_EXTERN unsigned int (*aom_highbd_sad64x16_avg)(const uint8_t* src_ptr,
-                                                    int src_stride,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    const uint8_t* second_pred);
-
-void aom_highbd_sad64x16x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-void aom_highbd_sad64x16x4d_sse2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-void aom_highbd_sad64x16x4d_avx2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad64x16x4d)(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* const ref_ptr[],
-                                           int ref_stride,
-                                           uint32_t* sad_array);
-
-unsigned int aom_highbd_sad64x32_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-unsigned int aom_highbd_sad64x32_sse2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-unsigned int aom_highbd_sad64x32_avx2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad64x32)(const uint8_t* src_ptr,
-                                                int src_stride,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride);
-
-unsigned int aom_highbd_sad64x32_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-unsigned int aom_highbd_sad64x32_avg_sse2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-unsigned int aom_highbd_sad64x32_avg_avx2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-RTCD_EXTERN unsigned int (*aom_highbd_sad64x32_avg)(const uint8_t* src_ptr,
-                                                    int src_stride,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    const uint8_t* second_pred);
-
-void aom_highbd_sad64x32x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-void aom_highbd_sad64x32x4d_sse2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-void aom_highbd_sad64x32x4d_avx2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad64x32x4d)(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* const ref_ptr[],
-                                           int ref_stride,
-                                           uint32_t* sad_array);
-
-unsigned int aom_highbd_sad64x64_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* ref_ptr,
-                                   int ref_stride);
-unsigned int aom_highbd_sad64x64_sse2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-unsigned int aom_highbd_sad64x64_avx2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad64x64)(const uint8_t* src_ptr,
-                                                int src_stride,
-                                                const uint8_t* ref_ptr,
-                                                int ref_stride);
-
-unsigned int aom_highbd_sad64x64_avg_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride,
-                                       const uint8_t* second_pred);
-unsigned int aom_highbd_sad64x64_avg_sse2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-unsigned int aom_highbd_sad64x64_avg_avx2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride,
-                                          const uint8_t* second_pred);
-RTCD_EXTERN unsigned int (*aom_highbd_sad64x64_avg)(const uint8_t* src_ptr,
-                                                    int src_stride,
-                                                    const uint8_t* ref_ptr,
-                                                    int ref_stride,
-                                                    const uint8_t* second_pred);
-
-void aom_highbd_sad64x64x4d_c(const uint8_t* src_ptr,
-                              int src_stride,
-                              const uint8_t* const ref_ptr[],
-                              int ref_stride,
-                              uint32_t* sad_array);
-void aom_highbd_sad64x64x4d_sse2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-void aom_highbd_sad64x64x4d_avx2(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* const ref_ptr[],
-                                 int ref_stride,
-                                 uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad64x64x4d)(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* const ref_ptr[],
-                                           int ref_stride,
-                                           uint32_t* sad_array);
-
-unsigned int aom_highbd_sad8x16_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-unsigned int aom_highbd_sad8x16_sse2(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride);
-#define aom_highbd_sad8x16 aom_highbd_sad8x16_sse2
-
-unsigned int aom_highbd_sad8x16_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-unsigned int aom_highbd_sad8x16_avg_sse2(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         const uint8_t* second_pred);
-#define aom_highbd_sad8x16_avg aom_highbd_sad8x16_avg_sse2
-
-void aom_highbd_sad8x16x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-void aom_highbd_sad8x16x4d_sse2(const uint8_t* src_ptr,
-                                int src_stride,
-                                const uint8_t* const ref_ptr[],
-                                int ref_stride,
-                                uint32_t* sad_array);
-#define aom_highbd_sad8x16x4d aom_highbd_sad8x16x4d_sse2
-
-unsigned int aom_highbd_sad8x32_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* ref_ptr,
-                                  int ref_stride);
-unsigned int aom_highbd_sad8x32_sse2(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride);
-#define aom_highbd_sad8x32 aom_highbd_sad8x32_sse2
-
-unsigned int aom_highbd_sad8x32_avg_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* ref_ptr,
-                                      int ref_stride,
-                                      const uint8_t* second_pred);
-unsigned int aom_highbd_sad8x32_avg_sse2(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride,
-                                         const uint8_t* second_pred);
-#define aom_highbd_sad8x32_avg aom_highbd_sad8x32_avg_sse2
-
-void aom_highbd_sad8x32x4d_c(const uint8_t* src_ptr,
-                             int src_stride,
-                             const uint8_t* const ref_ptr[],
-                             int ref_stride,
-                             uint32_t* sad_array);
-void aom_highbd_sad8x32x4d_sse2(const uint8_t* src_ptr,
-                                int src_stride,
-                                const uint8_t* const ref_ptr[],
-                                int ref_stride,
-                                uint32_t* sad_array);
-#define aom_highbd_sad8x32x4d aom_highbd_sad8x32x4d_sse2
-
-unsigned int aom_highbd_sad8x4_c(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride);
-unsigned int aom_highbd_sad8x4_sse2(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* ref_ptr,
-                                    int ref_stride);
-#define aom_highbd_sad8x4 aom_highbd_sad8x4_sse2
-
-unsigned int aom_highbd_sad8x4_avg_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride,
-                                     const uint8_t* second_pred);
-unsigned int aom_highbd_sad8x4_avg_sse2(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        const uint8_t* second_pred);
-#define aom_highbd_sad8x4_avg aom_highbd_sad8x4_avg_sse2
-
-void aom_highbd_sad8x4x4d_c(const uint8_t* src_ptr,
-                            int src_stride,
-                            const uint8_t* const ref_ptr[],
-                            int ref_stride,
-                            uint32_t* sad_array);
-void aom_highbd_sad8x4x4d_sse2(const uint8_t* src_ptr,
-                               int src_stride,
-                               const uint8_t* const ref_ptr[],
-                               int ref_stride,
-                               uint32_t* sad_array);
-#define aom_highbd_sad8x4x4d aom_highbd_sad8x4x4d_sse2
-
-unsigned int aom_highbd_sad8x8_c(const uint8_t* src_ptr,
-                                 int src_stride,
-                                 const uint8_t* ref_ptr,
-                                 int ref_stride);
-unsigned int aom_highbd_sad8x8_sse2(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* ref_ptr,
-                                    int ref_stride);
-#define aom_highbd_sad8x8 aom_highbd_sad8x8_sse2
-
-unsigned int aom_highbd_sad8x8_avg_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* ref_ptr,
-                                     int ref_stride,
-                                     const uint8_t* second_pred);
-unsigned int aom_highbd_sad8x8_avg_sse2(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride,
-                                        const uint8_t* second_pred);
-#define aom_highbd_sad8x8_avg aom_highbd_sad8x8_avg_sse2
-
-void aom_highbd_sad8x8x4d_c(const uint8_t* src_ptr,
-                            int src_stride,
-                            const uint8_t* const ref_ptr[],
-                            int ref_stride,
-                            uint32_t* sad_array);
-void aom_highbd_sad8x8x4d_sse2(const uint8_t* src_ptr,
-                               int src_stride,
-                               const uint8_t* const ref_ptr[],
-                               int ref_stride,
-                               uint32_t* sad_array);
-#define aom_highbd_sad8x8x4d aom_highbd_sad8x8x4d_sse2
-
-unsigned int aom_highbd_sad_skip_128x128_c(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride);
-unsigned int aom_highbd_sad_skip_128x128_avx2(const uint8_t* src_ptr,
-                                              int src_stride,
-                                              const uint8_t* ref_ptr,
-                                              int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad_skip_128x128)(const uint8_t* src_ptr,
-                                                        int src_stride,
-                                                        const uint8_t* ref_ptr,
-                                                        int ref_stride);
-
-void aom_highbd_sad_skip_128x128x4d_c(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* const ref_ptr[],
-                                      int ref_stride,
-                                      uint32_t* sad_array);
-void aom_highbd_sad_skip_128x128x4d_avx2(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* const ref_ptr[],
-                                         int ref_stride,
-                                         uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad_skip_128x128x4d)(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* const ref_ptr[],
-    int ref_stride,
-    uint32_t* sad_array);
-
-unsigned int aom_highbd_sad_skip_128x64_c(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride);
-unsigned int aom_highbd_sad_skip_128x64_avx2(const uint8_t* src_ptr,
-                                             int src_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad_skip_128x64)(const uint8_t* src_ptr,
-                                                       int src_stride,
-                                                       const uint8_t* ref_ptr,
-                                                       int ref_stride);
-
-void aom_highbd_sad_skip_128x64x4d_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* const ref_ptr[],
-                                     int ref_stride,
-                                     uint32_t* sad_array);
-void aom_highbd_sad_skip_128x64x4d_avx2(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* const ref_ptr[],
-                                        int ref_stride,
-                                        uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad_skip_128x64x4d)(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* const ref_ptr[],
-    int ref_stride,
-    uint32_t* sad_array);
-
-unsigned int aom_highbd_sad_skip_16x16_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-unsigned int aom_highbd_sad_skip_16x16_sse2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-unsigned int aom_highbd_sad_skip_16x16_avx2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad_skip_16x16)(const uint8_t* src_ptr,
-                                                      int src_stride,
-                                                      const uint8_t* ref_ptr,
-                                                      int ref_stride);
-
-void aom_highbd_sad_skip_16x16x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-void aom_highbd_sad_skip_16x16x4d_sse2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-void aom_highbd_sad_skip_16x16x4d_avx2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad_skip_16x16x4d)(const uint8_t* src_ptr,
-                                                 int src_stride,
-                                                 const uint8_t* const ref_ptr[],
-                                                 int ref_stride,
-                                                 uint32_t* sad_array);
-
-unsigned int aom_highbd_sad_skip_16x32_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-unsigned int aom_highbd_sad_skip_16x32_sse2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-unsigned int aom_highbd_sad_skip_16x32_avx2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad_skip_16x32)(const uint8_t* src_ptr,
-                                                      int src_stride,
-                                                      const uint8_t* ref_ptr,
-                                                      int ref_stride);
-
-void aom_highbd_sad_skip_16x32x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-void aom_highbd_sad_skip_16x32x4d_sse2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-void aom_highbd_sad_skip_16x32x4d_avx2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad_skip_16x32x4d)(const uint8_t* src_ptr,
-                                                 int src_stride,
-                                                 const uint8_t* const ref_ptr[],
-                                                 int ref_stride,
-                                                 uint32_t* sad_array);
-
-unsigned int aom_highbd_sad_skip_16x4_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-#define aom_highbd_sad_skip_16x4 aom_highbd_sad_skip_16x4_c
-
-void aom_highbd_sad_skip_16x4x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-#define aom_highbd_sad_skip_16x4x4d aom_highbd_sad_skip_16x4x4d_c
-
-unsigned int aom_highbd_sad_skip_16x64_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-unsigned int aom_highbd_sad_skip_16x64_sse2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-unsigned int aom_highbd_sad_skip_16x64_avx2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad_skip_16x64)(const uint8_t* src_ptr,
-                                                      int src_stride,
-                                                      const uint8_t* ref_ptr,
-                                                      int ref_stride);
-
-void aom_highbd_sad_skip_16x64x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-void aom_highbd_sad_skip_16x64x4d_sse2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-void aom_highbd_sad_skip_16x64x4d_avx2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad_skip_16x64x4d)(const uint8_t* src_ptr,
-                                                 int src_stride,
-                                                 const uint8_t* const ref_ptr[],
-                                                 int ref_stride,
-                                                 uint32_t* sad_array);
-
-unsigned int aom_highbd_sad_skip_16x8_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-unsigned int aom_highbd_sad_skip_16x8_sse2(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride);
-unsigned int aom_highbd_sad_skip_16x8_avx2(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad_skip_16x8)(const uint8_t* src_ptr,
-                                                     int src_stride,
-                                                     const uint8_t* ref_ptr,
-                                                     int ref_stride);
-
-void aom_highbd_sad_skip_16x8x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-void aom_highbd_sad_skip_16x8x4d_sse2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* const ref_ptr[],
-                                      int ref_stride,
-                                      uint32_t* sad_array);
-void aom_highbd_sad_skip_16x8x4d_avx2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* const ref_ptr[],
-                                      int ref_stride,
-                                      uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad_skip_16x8x4d)(const uint8_t* src_ptr,
-                                                int src_stride,
-                                                const uint8_t* const ref_ptr[],
-                                                int ref_stride,
-                                                uint32_t* sad_array);
-
-unsigned int aom_highbd_sad_skip_32x16_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-unsigned int aom_highbd_sad_skip_32x16_sse2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-unsigned int aom_highbd_sad_skip_32x16_avx2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad_skip_32x16)(const uint8_t* src_ptr,
-                                                      int src_stride,
-                                                      const uint8_t* ref_ptr,
-                                                      int ref_stride);
-
-void aom_highbd_sad_skip_32x16x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-void aom_highbd_sad_skip_32x16x4d_sse2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-void aom_highbd_sad_skip_32x16x4d_avx2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad_skip_32x16x4d)(const uint8_t* src_ptr,
-                                                 int src_stride,
-                                                 const uint8_t* const ref_ptr[],
-                                                 int ref_stride,
-                                                 uint32_t* sad_array);
-
-unsigned int aom_highbd_sad_skip_32x32_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-unsigned int aom_highbd_sad_skip_32x32_sse2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-unsigned int aom_highbd_sad_skip_32x32_avx2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad_skip_32x32)(const uint8_t* src_ptr,
-                                                      int src_stride,
-                                                      const uint8_t* ref_ptr,
-                                                      int ref_stride);
-
-void aom_highbd_sad_skip_32x32x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-void aom_highbd_sad_skip_32x32x4d_sse2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-void aom_highbd_sad_skip_32x32x4d_avx2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad_skip_32x32x4d)(const uint8_t* src_ptr,
-                                                 int src_stride,
-                                                 const uint8_t* const ref_ptr[],
-                                                 int ref_stride,
-                                                 uint32_t* sad_array);
-
-unsigned int aom_highbd_sad_skip_32x64_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-unsigned int aom_highbd_sad_skip_32x64_sse2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-unsigned int aom_highbd_sad_skip_32x64_avx2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad_skip_32x64)(const uint8_t* src_ptr,
-                                                      int src_stride,
-                                                      const uint8_t* ref_ptr,
-                                                      int ref_stride);
-
-void aom_highbd_sad_skip_32x64x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-void aom_highbd_sad_skip_32x64x4d_sse2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-void aom_highbd_sad_skip_32x64x4d_avx2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad_skip_32x64x4d)(const uint8_t* src_ptr,
-                                                 int src_stride,
-                                                 const uint8_t* const ref_ptr[],
-                                                 int ref_stride,
-                                                 uint32_t* sad_array);
-
-unsigned int aom_highbd_sad_skip_32x8_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-unsigned int aom_highbd_sad_skip_32x8_sse2(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride);
-unsigned int aom_highbd_sad_skip_32x8_avx2(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad_skip_32x8)(const uint8_t* src_ptr,
-                                                     int src_stride,
-                                                     const uint8_t* ref_ptr,
-                                                     int ref_stride);
-
-void aom_highbd_sad_skip_32x8x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-void aom_highbd_sad_skip_32x8x4d_sse2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* const ref_ptr[],
-                                      int ref_stride,
-                                      uint32_t* sad_array);
-void aom_highbd_sad_skip_32x8x4d_avx2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* const ref_ptr[],
-                                      int ref_stride,
-                                      uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad_skip_32x8x4d)(const uint8_t* src_ptr,
-                                                int src_stride,
-                                                const uint8_t* const ref_ptr[],
-                                                int ref_stride,
-                                                uint32_t* sad_array);
-
-unsigned int aom_highbd_sad_skip_4x16_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-unsigned int aom_highbd_sad_skip_4x16_sse2(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride);
-#define aom_highbd_sad_skip_4x16 aom_highbd_sad_skip_4x16_sse2
-
-void aom_highbd_sad_skip_4x16x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-void aom_highbd_sad_skip_4x16x4d_sse2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* const ref_ptr[],
-                                      int ref_stride,
-                                      uint32_t* sad_array);
-#define aom_highbd_sad_skip_4x16x4d aom_highbd_sad_skip_4x16x4d_sse2
-
-unsigned int aom_highbd_sad_skip_4x4_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride);
-#define aom_highbd_sad_skip_4x4 aom_highbd_sad_skip_4x4_c
-
-void aom_highbd_sad_skip_4x4x4d_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* const ref_ptr[],
-                                  int ref_stride,
-                                  uint32_t* sad_array);
-#define aom_highbd_sad_skip_4x4x4d aom_highbd_sad_skip_4x4x4d_c
-
-unsigned int aom_highbd_sad_skip_4x8_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride);
-unsigned int aom_highbd_sad_skip_4x8_sse2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride);
-#define aom_highbd_sad_skip_4x8 aom_highbd_sad_skip_4x8_sse2
-
-void aom_highbd_sad_skip_4x8x4d_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* const ref_ptr[],
-                                  int ref_stride,
-                                  uint32_t* sad_array);
-void aom_highbd_sad_skip_4x8x4d_sse2(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* const ref_ptr[],
-                                     int ref_stride,
-                                     uint32_t* sad_array);
-#define aom_highbd_sad_skip_4x8x4d aom_highbd_sad_skip_4x8x4d_sse2
-
-unsigned int aom_highbd_sad_skip_64x128_c(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride);
-unsigned int aom_highbd_sad_skip_64x128_avx2(const uint8_t* src_ptr,
-                                             int src_stride,
-                                             const uint8_t* ref_ptr,
-                                             int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad_skip_64x128)(const uint8_t* src_ptr,
-                                                       int src_stride,
-                                                       const uint8_t* ref_ptr,
-                                                       int ref_stride);
-
-void aom_highbd_sad_skip_64x128x4d_c(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* const ref_ptr[],
-                                     int ref_stride,
-                                     uint32_t* sad_array);
-void aom_highbd_sad_skip_64x128x4d_avx2(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* const ref_ptr[],
-                                        int ref_stride,
-                                        uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad_skip_64x128x4d)(
-    const uint8_t* src_ptr,
-    int src_stride,
-    const uint8_t* const ref_ptr[],
-    int ref_stride,
-    uint32_t* sad_array);
-
-unsigned int aom_highbd_sad_skip_64x16_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-unsigned int aom_highbd_sad_skip_64x16_sse2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-unsigned int aom_highbd_sad_skip_64x16_avx2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad_skip_64x16)(const uint8_t* src_ptr,
-                                                      int src_stride,
-                                                      const uint8_t* ref_ptr,
-                                                      int ref_stride);
-
-void aom_highbd_sad_skip_64x16x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-void aom_highbd_sad_skip_64x16x4d_sse2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-void aom_highbd_sad_skip_64x16x4d_avx2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad_skip_64x16x4d)(const uint8_t* src_ptr,
-                                                 int src_stride,
-                                                 const uint8_t* const ref_ptr[],
-                                                 int ref_stride,
-                                                 uint32_t* sad_array);
-
-unsigned int aom_highbd_sad_skip_64x32_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-unsigned int aom_highbd_sad_skip_64x32_sse2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-unsigned int aom_highbd_sad_skip_64x32_avx2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad_skip_64x32)(const uint8_t* src_ptr,
-                                                      int src_stride,
-                                                      const uint8_t* ref_ptr,
-                                                      int ref_stride);
-
-void aom_highbd_sad_skip_64x32x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-void aom_highbd_sad_skip_64x32x4d_sse2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-void aom_highbd_sad_skip_64x32x4d_avx2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad_skip_64x32x4d)(const uint8_t* src_ptr,
-                                                 int src_stride,
-                                                 const uint8_t* const ref_ptr[],
-                                                 int ref_stride,
-                                                 uint32_t* sad_array);
-
-unsigned int aom_highbd_sad_skip_64x64_c(const uint8_t* src_ptr,
-                                         int src_stride,
-                                         const uint8_t* ref_ptr,
-                                         int ref_stride);
-unsigned int aom_highbd_sad_skip_64x64_sse2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-unsigned int aom_highbd_sad_skip_64x64_avx2(const uint8_t* src_ptr,
-                                            int src_stride,
-                                            const uint8_t* ref_ptr,
-                                            int ref_stride);
-RTCD_EXTERN unsigned int (*aom_highbd_sad_skip_64x64)(const uint8_t* src_ptr,
-                                                      int src_stride,
-                                                      const uint8_t* ref_ptr,
-                                                      int ref_stride);
-
-void aom_highbd_sad_skip_64x64x4d_c(const uint8_t* src_ptr,
-                                    int src_stride,
-                                    const uint8_t* const ref_ptr[],
-                                    int ref_stride,
-                                    uint32_t* sad_array);
-void aom_highbd_sad_skip_64x64x4d_sse2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-void aom_highbd_sad_skip_64x64x4d_avx2(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* const ref_ptr[],
-                                       int ref_stride,
-                                       uint32_t* sad_array);
-RTCD_EXTERN void (*aom_highbd_sad_skip_64x64x4d)(const uint8_t* src_ptr,
-                                                 int src_stride,
-                                                 const uint8_t* const ref_ptr[],
-                                                 int ref_stride,
-                                                 uint32_t* sad_array);
-
-unsigned int aom_highbd_sad_skip_8x16_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-unsigned int aom_highbd_sad_skip_8x16_sse2(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride);
-#define aom_highbd_sad_skip_8x16 aom_highbd_sad_skip_8x16_sse2
-
-void aom_highbd_sad_skip_8x16x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-void aom_highbd_sad_skip_8x16x4d_sse2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* const ref_ptr[],
-                                      int ref_stride,
-                                      uint32_t* sad_array);
-#define aom_highbd_sad_skip_8x16x4d aom_highbd_sad_skip_8x16x4d_sse2
-
-unsigned int aom_highbd_sad_skip_8x32_c(const uint8_t* src_ptr,
-                                        int src_stride,
-                                        const uint8_t* ref_ptr,
-                                        int ref_stride);
-unsigned int aom_highbd_sad_skip_8x32_sse2(const uint8_t* src_ptr,
-                                           int src_stride,
-                                           const uint8_t* ref_ptr,
-                                           int ref_stride);
-#define aom_highbd_sad_skip_8x32 aom_highbd_sad_skip_8x32_sse2
-
-void aom_highbd_sad_skip_8x32x4d_c(const uint8_t* src_ptr,
-                                   int src_stride,
-                                   const uint8_t* const ref_ptr[],
-                                   int ref_stride,
-                                   uint32_t* sad_array);
-void aom_highbd_sad_skip_8x32x4d_sse2(const uint8_t* src_ptr,
-                                      int src_stride,
-                                      const uint8_t* const ref_ptr[],
-                                      int ref_stride,
-                                      uint32_t* sad_array);
-#define aom_highbd_sad_skip_8x32x4d aom_highbd_sad_skip_8x32x4d_sse2
-
-unsigned int aom_highbd_sad_skip_8x4_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride);
-#define aom_highbd_sad_skip_8x4 aom_highbd_sad_skip_8x4_c
-
-void aom_highbd_sad_skip_8x4x4d_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* const ref_ptr[],
-                                  int ref_stride,
-                                  uint32_t* sad_array);
-#define aom_highbd_sad_skip_8x4x4d aom_highbd_sad_skip_8x4x4d_c
-
-unsigned int aom_highbd_sad_skip_8x8_c(const uint8_t* src_ptr,
-                                       int src_stride,
-                                       const uint8_t* ref_ptr,
-                                       int ref_stride);
-unsigned int aom_highbd_sad_skip_8x8_sse2(const uint8_t* src_ptr,
-                                          int src_stride,
-                                          const uint8_t* ref_ptr,
-                                          int ref_stride);
-#define aom_highbd_sad_skip_8x8 aom_highbd_sad_skip_8x8_sse2
-
-void aom_highbd_sad_skip_8x8x4d_c(const uint8_t* src_ptr,
-                                  int src_stride,
-                                  const uint8_t* const ref_ptr[],
-                                  int ref_stride,
-                                  uint32_t* sad_array);
-void aom_highbd_sad_skip_8x8x4d_sse2(const uint8_t* src_ptr,
-                                     int src_stride,
-                                     const uint8_t* const ref_ptr[],
-                                     int ref_stride,
-                                     uint32_t* sad_array);
-#define aom_highbd_sad_skip_8x8x4d aom_highbd_sad_skip_8x8x4d_sse2
-
-void aom_highbd_smooth_h_predictor_16x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_16x16 \
-  aom_highbd_smooth_h_predictor_16x16_c
-
-void aom_highbd_smooth_h_predictor_16x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_16x32 \
-  aom_highbd_smooth_h_predictor_16x32_c
-
-void aom_highbd_smooth_h_predictor_16x4_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_16x4 aom_highbd_smooth_h_predictor_16x4_c
-
-void aom_highbd_smooth_h_predictor_16x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_16x64 \
-  aom_highbd_smooth_h_predictor_16x64_c
-
-void aom_highbd_smooth_h_predictor_16x8_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_16x8 aom_highbd_smooth_h_predictor_16x8_c
-
-void aom_highbd_smooth_h_predictor_2x2_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_h_predictor_2x2 aom_highbd_smooth_h_predictor_2x2_c
-
-void aom_highbd_smooth_h_predictor_32x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_32x16 \
-  aom_highbd_smooth_h_predictor_32x16_c
-
-void aom_highbd_smooth_h_predictor_32x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_32x32 \
-  aom_highbd_smooth_h_predictor_32x32_c
-
-void aom_highbd_smooth_h_predictor_32x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_32x64 \
-  aom_highbd_smooth_h_predictor_32x64_c
-
-void aom_highbd_smooth_h_predictor_32x8_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_32x8 aom_highbd_smooth_h_predictor_32x8_c
-
-void aom_highbd_smooth_h_predictor_4x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_4x16 aom_highbd_smooth_h_predictor_4x16_c
-
-void aom_highbd_smooth_h_predictor_4x4_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_h_predictor_4x4 aom_highbd_smooth_h_predictor_4x4_c
-
-void aom_highbd_smooth_h_predictor_4x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_h_predictor_4x8 aom_highbd_smooth_h_predictor_4x8_c
-
-void aom_highbd_smooth_h_predictor_64x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_64x16 \
-  aom_highbd_smooth_h_predictor_64x16_c
-
-void aom_highbd_smooth_h_predictor_64x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_64x32 \
-  aom_highbd_smooth_h_predictor_64x32_c
-
-void aom_highbd_smooth_h_predictor_64x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_h_predictor_64x64 \
-  aom_highbd_smooth_h_predictor_64x64_c
-
-void aom_highbd_smooth_h_predictor_8x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_8x16 aom_highbd_smooth_h_predictor_8x16_c
-
-void aom_highbd_smooth_h_predictor_8x32_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_h_predictor_8x32 aom_highbd_smooth_h_predictor_8x32_c
-
-void aom_highbd_smooth_h_predictor_8x4_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_h_predictor_8x4 aom_highbd_smooth_h_predictor_8x4_c
-
-void aom_highbd_smooth_h_predictor_8x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_h_predictor_8x8 aom_highbd_smooth_h_predictor_8x8_c
-
-void aom_highbd_smooth_predictor_16x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_16x16 aom_highbd_smooth_predictor_16x16_c
-
-void aom_highbd_smooth_predictor_16x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_16x32 aom_highbd_smooth_predictor_16x32_c
-
-void aom_highbd_smooth_predictor_16x4_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_16x4 aom_highbd_smooth_predictor_16x4_c
-
-void aom_highbd_smooth_predictor_16x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_16x64 aom_highbd_smooth_predictor_16x64_c
-
-void aom_highbd_smooth_predictor_16x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_16x8 aom_highbd_smooth_predictor_16x8_c
-
-void aom_highbd_smooth_predictor_2x2_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_smooth_predictor_2x2 aom_highbd_smooth_predictor_2x2_c
-
-void aom_highbd_smooth_predictor_32x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_32x16 aom_highbd_smooth_predictor_32x16_c
-
-void aom_highbd_smooth_predictor_32x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_32x32 aom_highbd_smooth_predictor_32x32_c
-
-void aom_highbd_smooth_predictor_32x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_32x64 aom_highbd_smooth_predictor_32x64_c
-
-void aom_highbd_smooth_predictor_32x8_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_32x8 aom_highbd_smooth_predictor_32x8_c
-
-void aom_highbd_smooth_predictor_4x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_4x16 aom_highbd_smooth_predictor_4x16_c
-
-void aom_highbd_smooth_predictor_4x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_smooth_predictor_4x4 aom_highbd_smooth_predictor_4x4_c
-
-void aom_highbd_smooth_predictor_4x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_smooth_predictor_4x8 aom_highbd_smooth_predictor_4x8_c
-
-void aom_highbd_smooth_predictor_64x16_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_64x16 aom_highbd_smooth_predictor_64x16_c
-
-void aom_highbd_smooth_predictor_64x32_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_64x32 aom_highbd_smooth_predictor_64x32_c
-
-void aom_highbd_smooth_predictor_64x64_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_predictor_64x64 aom_highbd_smooth_predictor_64x64_c
-
-void aom_highbd_smooth_predictor_8x16_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_8x16 aom_highbd_smooth_predictor_8x16_c
-
-void aom_highbd_smooth_predictor_8x32_c(uint16_t* dst,
-                                        ptrdiff_t y_stride,
-                                        const uint16_t* above,
-                                        const uint16_t* left,
-                                        int bd);
-#define aom_highbd_smooth_predictor_8x32 aom_highbd_smooth_predictor_8x32_c
-
-void aom_highbd_smooth_predictor_8x4_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_smooth_predictor_8x4 aom_highbd_smooth_predictor_8x4_c
-
-void aom_highbd_smooth_predictor_8x8_c(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_smooth_predictor_8x8 aom_highbd_smooth_predictor_8x8_c
-
-void aom_highbd_smooth_v_predictor_16x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_16x16 \
-  aom_highbd_smooth_v_predictor_16x16_c
-
-void aom_highbd_smooth_v_predictor_16x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_16x32 \
-  aom_highbd_smooth_v_predictor_16x32_c
-
-void aom_highbd_smooth_v_predictor_16x4_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_16x4 aom_highbd_smooth_v_predictor_16x4_c
-
-void aom_highbd_smooth_v_predictor_16x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_16x64 \
-  aom_highbd_smooth_v_predictor_16x64_c
-
-void aom_highbd_smooth_v_predictor_16x8_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_16x8 aom_highbd_smooth_v_predictor_16x8_c
-
-void aom_highbd_smooth_v_predictor_2x2_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_v_predictor_2x2 aom_highbd_smooth_v_predictor_2x2_c
-
-void aom_highbd_smooth_v_predictor_32x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_32x16 \
-  aom_highbd_smooth_v_predictor_32x16_c
-
-void aom_highbd_smooth_v_predictor_32x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_32x32 \
-  aom_highbd_smooth_v_predictor_32x32_c
-
-void aom_highbd_smooth_v_predictor_32x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_32x64 \
-  aom_highbd_smooth_v_predictor_32x64_c
-
-void aom_highbd_smooth_v_predictor_32x8_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_32x8 aom_highbd_smooth_v_predictor_32x8_c
-
-void aom_highbd_smooth_v_predictor_4x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_4x16 aom_highbd_smooth_v_predictor_4x16_c
-
-void aom_highbd_smooth_v_predictor_4x4_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_v_predictor_4x4 aom_highbd_smooth_v_predictor_4x4_c
-
-void aom_highbd_smooth_v_predictor_4x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_v_predictor_4x8 aom_highbd_smooth_v_predictor_4x8_c
-
-void aom_highbd_smooth_v_predictor_64x16_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_64x16 \
-  aom_highbd_smooth_v_predictor_64x16_c
-
-void aom_highbd_smooth_v_predictor_64x32_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_64x32 \
-  aom_highbd_smooth_v_predictor_64x32_c
-
-void aom_highbd_smooth_v_predictor_64x64_c(uint16_t* dst,
-                                           ptrdiff_t y_stride,
-                                           const uint16_t* above,
-                                           const uint16_t* left,
-                                           int bd);
-#define aom_highbd_smooth_v_predictor_64x64 \
-  aom_highbd_smooth_v_predictor_64x64_c
-
-void aom_highbd_smooth_v_predictor_8x16_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_8x16 aom_highbd_smooth_v_predictor_8x16_c
-
-void aom_highbd_smooth_v_predictor_8x32_c(uint16_t* dst,
-                                          ptrdiff_t y_stride,
-                                          const uint16_t* above,
-                                          const uint16_t* left,
-                                          int bd);
-#define aom_highbd_smooth_v_predictor_8x32 aom_highbd_smooth_v_predictor_8x32_c
-
-void aom_highbd_smooth_v_predictor_8x4_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_v_predictor_8x4 aom_highbd_smooth_v_predictor_8x4_c
-
-void aom_highbd_smooth_v_predictor_8x8_c(uint16_t* dst,
-                                         ptrdiff_t y_stride,
-                                         const uint16_t* above,
-                                         const uint16_t* left,
-                                         int bd);
-#define aom_highbd_smooth_v_predictor_8x8 aom_highbd_smooth_v_predictor_8x8_c
-
-int64_t aom_highbd_sse_c(const uint8_t* a8,
-                         int a_stride,
-                         const uint8_t* b8,
-                         int b_stride,
-                         int width,
-                         int height);
-int64_t aom_highbd_sse_sse4_1(const uint8_t* a8,
-                              int a_stride,
-                              const uint8_t* b8,
-                              int b_stride,
-                              int width,
-                              int height);
-int64_t aom_highbd_sse_avx2(const uint8_t* a8,
-                            int a_stride,
-                            const uint8_t* b8,
-                            int b_stride,
-                            int width,
-                            int height);
-RTCD_EXTERN int64_t (*aom_highbd_sse)(const uint8_t* a8,
-                                      int a_stride,
-                                      const uint8_t* b8,
-                                      int b_stride,
-                                      int width,
-                                      int height);
-
-void aom_highbd_subtract_block_c(int rows,
-                                 int cols,
-                                 int16_t* diff_ptr,
-                                 ptrdiff_t diff_stride,
-                                 const uint8_t* src_ptr,
-                                 ptrdiff_t src_stride,
-                                 const uint8_t* pred_ptr,
-                                 ptrdiff_t pred_stride,
-                                 int bd);
-void aom_highbd_subtract_block_sse2(int rows,
-                                    int cols,
-                                    int16_t* diff_ptr,
-                                    ptrdiff_t diff_stride,
-                                    const uint8_t* src_ptr,
-                                    ptrdiff_t src_stride,
-                                    const uint8_t* pred_ptr,
-                                    ptrdiff_t pred_stride,
-                                    int bd);
-#define aom_highbd_subtract_block aom_highbd_subtract_block_sse2
-
-void aom_highbd_upsampled_pred_c(MACROBLOCKD* xd,
-                                 const struct AV1Common* const cm,
-                                 int mi_row,
-                                 int mi_col,
-                                 const MV* const mv,
-                                 uint8_t* comp_pred8,
-                                 int width,
-                                 int height,
-                                 int subpel_x_q3,
-                                 int subpel_y_q3,
-                                 const uint8_t* ref8,
-                                 int ref_stride,
-                                 int bd,
-                                 int subpel_search);
-void aom_highbd_upsampled_pred_sse2(MACROBLOCKD* xd,
-                                    const struct AV1Common* const cm,
-                                    int mi_row,
-                                    int mi_col,
-                                    const MV* const mv,
-                                    uint8_t* comp_pred8,
-                                    int width,
-                                    int height,
-                                    int subpel_x_q3,
-                                    int subpel_y_q3,
-                                    const uint8_t* ref8,
-                                    int ref_stride,
-                                    int bd,
-                                    int subpel_search);
-#define aom_highbd_upsampled_pred aom_highbd_upsampled_pred_sse2
-
-void aom_highbd_v_predictor_16x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-void aom_highbd_v_predictor_16x16_sse2(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_v_predictor_16x16 aom_highbd_v_predictor_16x16_sse2
-
-void aom_highbd_v_predictor_16x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-void aom_highbd_v_predictor_16x32_sse2(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_v_predictor_16x32 aom_highbd_v_predictor_16x32_sse2
-
-void aom_highbd_v_predictor_16x4_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_16x4 aom_highbd_v_predictor_16x4_c
-
-void aom_highbd_v_predictor_16x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_16x64 aom_highbd_v_predictor_16x64_c
-
-void aom_highbd_v_predictor_16x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-void aom_highbd_v_predictor_16x8_sse2(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_v_predictor_16x8 aom_highbd_v_predictor_16x8_sse2
-
-void aom_highbd_v_predictor_2x2_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-#define aom_highbd_v_predictor_2x2 aom_highbd_v_predictor_2x2_c
-
-void aom_highbd_v_predictor_32x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-void aom_highbd_v_predictor_32x16_sse2(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_v_predictor_32x16 aom_highbd_v_predictor_32x16_sse2
-
-void aom_highbd_v_predictor_32x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-void aom_highbd_v_predictor_32x32_sse2(uint16_t* dst,
-                                       ptrdiff_t y_stride,
-                                       const uint16_t* above,
-                                       const uint16_t* left,
-                                       int bd);
-#define aom_highbd_v_predictor_32x32 aom_highbd_v_predictor_32x32_sse2
-
-void aom_highbd_v_predictor_32x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_32x64 aom_highbd_v_predictor_32x64_c
-
-void aom_highbd_v_predictor_32x8_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_32x8 aom_highbd_v_predictor_32x8_c
-
-void aom_highbd_v_predictor_4x16_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_4x16 aom_highbd_v_predictor_4x16_c
-
-void aom_highbd_v_predictor_4x4_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-void aom_highbd_v_predictor_4x4_sse2(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_v_predictor_4x4 aom_highbd_v_predictor_4x4_sse2
-
-void aom_highbd_v_predictor_4x8_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-void aom_highbd_v_predictor_4x8_sse2(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_v_predictor_4x8 aom_highbd_v_predictor_4x8_sse2
-
-void aom_highbd_v_predictor_64x16_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_64x16 aom_highbd_v_predictor_64x16_c
-
-void aom_highbd_v_predictor_64x32_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_64x32 aom_highbd_v_predictor_64x32_c
-
-void aom_highbd_v_predictor_64x64_c(uint16_t* dst,
-                                    ptrdiff_t y_stride,
-                                    const uint16_t* above,
-                                    const uint16_t* left,
-                                    int bd);
-#define aom_highbd_v_predictor_64x64 aom_highbd_v_predictor_64x64_c
-
-void aom_highbd_v_predictor_8x16_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-void aom_highbd_v_predictor_8x16_sse2(uint16_t* dst,
-                                      ptrdiff_t y_stride,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int bd);
-#define aom_highbd_v_predictor_8x16 aom_highbd_v_predictor_8x16_sse2
-
-void aom_highbd_v_predictor_8x32_c(uint16_t* dst,
-                                   ptrdiff_t y_stride,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int bd);
-#define aom_highbd_v_predictor_8x32 aom_highbd_v_predictor_8x32_c
-
-void aom_highbd_v_predictor_8x4_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-void aom_highbd_v_predictor_8x4_sse2(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_v_predictor_8x4 aom_highbd_v_predictor_8x4_sse2
-
-void aom_highbd_v_predictor_8x8_c(uint16_t* dst,
-                                  ptrdiff_t y_stride,
-                                  const uint16_t* above,
-                                  const uint16_t* left,
-                                  int bd);
-void aom_highbd_v_predictor_8x8_sse2(uint16_t* dst,
-                                     ptrdiff_t y_stride,
-                                     const uint16_t* above,
-                                     const uint16_t* left,
-                                     int bd);
-#define aom_highbd_v_predictor_8x8 aom_highbd_v_predictor_8x8_sse2
-
 void aom_ifft16x16_float_c(const float* input, float* temp, float* output);
 void aom_ifft16x16_float_sse2(const float* input, float* temp, float* output);
 void aom_ifft16x16_float_avx2(const float* input, float* temp, float* output);
@@ -20008,1363 +5466,6 @@
                                           int w,
                                           int h);
 
-uint64_t aom_mse_wxh_16bit_highbd_c(uint16_t* dst,
-                                    int dstride,
-                                    uint16_t* src,
-                                    int sstride,
-                                    int w,
-                                    int h);
-uint64_t aom_mse_wxh_16bit_highbd_sse2(uint16_t* dst,
-                                       int dstride,
-                                       uint16_t* src,
-                                       int sstride,
-                                       int w,
-                                       int h);
-uint64_t aom_mse_wxh_16bit_highbd_avx2(uint16_t* dst,
-                                       int dstride,
-                                       uint16_t* src,
-                                       int sstride,
-                                       int w,
-                                       int h);
-RTCD_EXTERN uint64_t (*aom_mse_wxh_16bit_highbd)(uint16_t* dst,
-                                                 int dstride,
-                                                 uint16_t* src,
-                                                 int sstride,
-                                                 int w,
-                                                 int h);
-
-unsigned int aom_obmc_sad128x128_c(const uint8_t* pre,
-                                   int pre_stride,
-                                   const int32_t* wsrc,
-                                   const int32_t* mask);
-unsigned int aom_obmc_sad128x128_sse4_1(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask);
-unsigned int aom_obmc_sad128x128_avx2(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad128x128)(const uint8_t* pre,
-                                                int pre_stride,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask);
-
-unsigned int aom_obmc_sad128x64_c(const uint8_t* pre,
-                                  int pre_stride,
-                                  const int32_t* wsrc,
-                                  const int32_t* mask);
-unsigned int aom_obmc_sad128x64_sse4_1(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-unsigned int aom_obmc_sad128x64_avx2(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad128x64)(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask);
-
-unsigned int aom_obmc_sad16x16_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-unsigned int aom_obmc_sad16x16_sse4_1(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-unsigned int aom_obmc_sad16x16_avx2(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad16x16)(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask);
-
-unsigned int aom_obmc_sad16x32_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-unsigned int aom_obmc_sad16x32_sse4_1(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-unsigned int aom_obmc_sad16x32_avx2(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad16x32)(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask);
-
-unsigned int aom_obmc_sad16x4_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-unsigned int aom_obmc_sad16x4_sse4_1(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask);
-unsigned int aom_obmc_sad16x4_avx2(const uint8_t* pre,
-                                   int pre_stride,
-                                   const int32_t* wsrc,
-                                   const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad16x4)(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-
-unsigned int aom_obmc_sad16x64_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-unsigned int aom_obmc_sad16x64_sse4_1(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-unsigned int aom_obmc_sad16x64_avx2(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad16x64)(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask);
-
-unsigned int aom_obmc_sad16x8_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-unsigned int aom_obmc_sad16x8_sse4_1(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask);
-unsigned int aom_obmc_sad16x8_avx2(const uint8_t* pre,
-                                   int pre_stride,
-                                   const int32_t* wsrc,
-                                   const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad16x8)(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-
-unsigned int aom_obmc_sad32x16_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-unsigned int aom_obmc_sad32x16_sse4_1(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-unsigned int aom_obmc_sad32x16_avx2(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad32x16)(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask);
-
-unsigned int aom_obmc_sad32x32_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-unsigned int aom_obmc_sad32x32_sse4_1(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-unsigned int aom_obmc_sad32x32_avx2(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad32x32)(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask);
-
-unsigned int aom_obmc_sad32x64_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-unsigned int aom_obmc_sad32x64_sse4_1(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-unsigned int aom_obmc_sad32x64_avx2(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad32x64)(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask);
-
-unsigned int aom_obmc_sad32x8_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-unsigned int aom_obmc_sad32x8_sse4_1(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask);
-unsigned int aom_obmc_sad32x8_avx2(const uint8_t* pre,
-                                   int pre_stride,
-                                   const int32_t* wsrc,
-                                   const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad32x8)(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-
-unsigned int aom_obmc_sad4x16_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-unsigned int aom_obmc_sad4x16_sse4_1(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask);
-unsigned int aom_obmc_sad4x16_avx2(const uint8_t* pre,
-                                   int pre_stride,
-                                   const int32_t* wsrc,
-                                   const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad4x16)(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-
-unsigned int aom_obmc_sad4x4_c(const uint8_t* pre,
-                               int pre_stride,
-                               const int32_t* wsrc,
-                               const int32_t* mask);
-unsigned int aom_obmc_sad4x4_sse4_1(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask);
-unsigned int aom_obmc_sad4x4_avx2(const uint8_t* pre,
-                                  int pre_stride,
-                                  const int32_t* wsrc,
-                                  const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad4x4)(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask);
-
-unsigned int aom_obmc_sad4x8_c(const uint8_t* pre,
-                               int pre_stride,
-                               const int32_t* wsrc,
-                               const int32_t* mask);
-unsigned int aom_obmc_sad4x8_sse4_1(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask);
-unsigned int aom_obmc_sad4x8_avx2(const uint8_t* pre,
-                                  int pre_stride,
-                                  const int32_t* wsrc,
-                                  const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad4x8)(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask);
-
-unsigned int aom_obmc_sad64x128_c(const uint8_t* pre,
-                                  int pre_stride,
-                                  const int32_t* wsrc,
-                                  const int32_t* mask);
-unsigned int aom_obmc_sad64x128_sse4_1(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask);
-unsigned int aom_obmc_sad64x128_avx2(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad64x128)(const uint8_t* pre,
-                                               int pre_stride,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask);
-
-unsigned int aom_obmc_sad64x16_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-unsigned int aom_obmc_sad64x16_sse4_1(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-unsigned int aom_obmc_sad64x16_avx2(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad64x16)(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask);
-
-unsigned int aom_obmc_sad64x32_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-unsigned int aom_obmc_sad64x32_sse4_1(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-unsigned int aom_obmc_sad64x32_avx2(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad64x32)(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask);
-
-unsigned int aom_obmc_sad64x64_c(const uint8_t* pre,
-                                 int pre_stride,
-                                 const int32_t* wsrc,
-                                 const int32_t* mask);
-unsigned int aom_obmc_sad64x64_sse4_1(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask);
-unsigned int aom_obmc_sad64x64_avx2(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad64x64)(const uint8_t* pre,
-                                              int pre_stride,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask);
-
-unsigned int aom_obmc_sad8x16_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-unsigned int aom_obmc_sad8x16_sse4_1(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask);
-unsigned int aom_obmc_sad8x16_avx2(const uint8_t* pre,
-                                   int pre_stride,
-                                   const int32_t* wsrc,
-                                   const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad8x16)(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-
-unsigned int aom_obmc_sad8x32_c(const uint8_t* pre,
-                                int pre_stride,
-                                const int32_t* wsrc,
-                                const int32_t* mask);
-unsigned int aom_obmc_sad8x32_sse4_1(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask);
-unsigned int aom_obmc_sad8x32_avx2(const uint8_t* pre,
-                                   int pre_stride,
-                                   const int32_t* wsrc,
-                                   const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad8x32)(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask);
-
-unsigned int aom_obmc_sad8x4_c(const uint8_t* pre,
-                               int pre_stride,
-                               const int32_t* wsrc,
-                               const int32_t* mask);
-unsigned int aom_obmc_sad8x4_sse4_1(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask);
-unsigned int aom_obmc_sad8x4_avx2(const uint8_t* pre,
-                                  int pre_stride,
-                                  const int32_t* wsrc,
-                                  const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad8x4)(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask);
-
-unsigned int aom_obmc_sad8x8_c(const uint8_t* pre,
-                               int pre_stride,
-                               const int32_t* wsrc,
-                               const int32_t* mask);
-unsigned int aom_obmc_sad8x8_sse4_1(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask);
-unsigned int aom_obmc_sad8x8_avx2(const uint8_t* pre,
-                                  int pre_stride,
-                                  const int32_t* wsrc,
-                                  const int32_t* mask);
-RTCD_EXTERN unsigned int (*aom_obmc_sad8x8)(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask);
-
-unsigned int aom_obmc_sub_pixel_variance128x128_c(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  int xoffset,
-                                                  int yoffset,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance128x128_sse4_1(const uint8_t* pre,
-                                                       int pre_stride,
-                                                       int xoffset,
-                                                       int yoffset,
-                                                       const int32_t* wsrc,
-                                                       const int32_t* mask,
-                                                       unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance128x128)(
-    const uint8_t* pre,
-    int pre_stride,
-    int xoffset,
-    int yoffset,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance128x64_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance128x64_sse4_1(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance128x64)(
-    const uint8_t* pre,
-    int pre_stride,
-    int xoffset,
-    int yoffset,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance16x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance16x16_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance16x16)(
-    const uint8_t* pre,
-    int pre_stride,
-    int xoffset,
-    int yoffset,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance16x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance16x32_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance16x32)(
-    const uint8_t* pre,
-    int pre_stride,
-    int xoffset,
-    int yoffset,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance16x4_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance16x4_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance16x4)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            int xoffset,
-                                                            int yoffset,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance16x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance16x64_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance16x64)(
-    const uint8_t* pre,
-    int pre_stride,
-    int xoffset,
-    int yoffset,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance16x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance16x8_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance16x8)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            int xoffset,
-                                                            int yoffset,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance32x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance32x16_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance32x16)(
-    const uint8_t* pre,
-    int pre_stride,
-    int xoffset,
-    int yoffset,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance32x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance32x32_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance32x32)(
-    const uint8_t* pre,
-    int pre_stride,
-    int xoffset,
-    int yoffset,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance32x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance32x64_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance32x64)(
-    const uint8_t* pre,
-    int pre_stride,
-    int xoffset,
-    int yoffset,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance32x8_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance32x8_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance32x8)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            int xoffset,
-                                                            int yoffset,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance4x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance4x16_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance4x16)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            int xoffset,
-                                                            int yoffset,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance4x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance4x4_sse4_1(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance4x4)(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance4x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance4x8_sse4_1(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance4x8)(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance64x128_c(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 int xoffset,
-                                                 int yoffset,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance64x128_sse4_1(const uint8_t* pre,
-                                                      int pre_stride,
-                                                      int xoffset,
-                                                      int yoffset,
-                                                      const int32_t* wsrc,
-                                                      const int32_t* mask,
-                                                      unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance64x128)(
-    const uint8_t* pre,
-    int pre_stride,
-    int xoffset,
-    int yoffset,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance64x16_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance64x16_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance64x16)(
-    const uint8_t* pre,
-    int pre_stride,
-    int xoffset,
-    int yoffset,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance64x32_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance64x32_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance64x32)(
-    const uint8_t* pre,
-    int pre_stride,
-    int xoffset,
-    int yoffset,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance64x64_c(const uint8_t* pre,
-                                                int pre_stride,
-                                                int xoffset,
-                                                int yoffset,
-                                                const int32_t* wsrc,
-                                                const int32_t* mask,
-                                                unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance64x64_sse4_1(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     int xoffset,
-                                                     int yoffset,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance64x64)(
-    const uint8_t* pre,
-    int pre_stride,
-    int xoffset,
-    int yoffset,
-    const int32_t* wsrc,
-    const int32_t* mask,
-    unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance8x16_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance8x16_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance8x16)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            int xoffset,
-                                                            int yoffset,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance8x32_c(const uint8_t* pre,
-                                               int pre_stride,
-                                               int xoffset,
-                                               int yoffset,
-                                               const int32_t* wsrc,
-                                               const int32_t* mask,
-                                               unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance8x32_sse4_1(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    int xoffset,
-                                                    int yoffset,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance8x32)(const uint8_t* pre,
-                                                            int pre_stride,
-                                                            int xoffset,
-                                                            int yoffset,
-                                                            const int32_t* wsrc,
-                                                            const int32_t* mask,
-                                                            unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance8x4_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance8x4_sse4_1(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance8x4)(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-
-unsigned int aom_obmc_sub_pixel_variance8x8_c(const uint8_t* pre,
-                                              int pre_stride,
-                                              int xoffset,
-                                              int yoffset,
-                                              const int32_t* wsrc,
-                                              const int32_t* mask,
-                                              unsigned int* sse);
-unsigned int aom_obmc_sub_pixel_variance8x8_sse4_1(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   int xoffset,
-                                                   int yoffset,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_sub_pixel_variance8x8)(const uint8_t* pre,
-                                                           int pre_stride,
-                                                           int xoffset,
-                                                           int yoffset,
-                                                           const int32_t* wsrc,
-                                                           const int32_t* mask,
-                                                           unsigned int* sse);
-
-unsigned int aom_obmc_variance128x128_c(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask,
-                                        unsigned int* sse);
-unsigned int aom_obmc_variance128x128_sse4_1(const uint8_t* pre,
-                                             int pre_stride,
-                                             const int32_t* wsrc,
-                                             const int32_t* mask,
-                                             unsigned int* sse);
-unsigned int aom_obmc_variance128x128_avx2(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance128x128)(const uint8_t* pre,
-                                                     int pre_stride,
-                                                     const int32_t* wsrc,
-                                                     const int32_t* mask,
-                                                     unsigned int* sse);
-
-unsigned int aom_obmc_variance128x64_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask,
-                                       unsigned int* sse);
-unsigned int aom_obmc_variance128x64_sse4_1(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-unsigned int aom_obmc_variance128x64_avx2(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask,
-                                          unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance128x64)(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-
-unsigned int aom_obmc_variance16x16_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-unsigned int aom_obmc_variance16x16_sse4_1(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-unsigned int aom_obmc_variance16x16_avx2(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask,
-                                         unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance16x16)(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-
-unsigned int aom_obmc_variance16x32_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-unsigned int aom_obmc_variance16x32_sse4_1(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-unsigned int aom_obmc_variance16x32_avx2(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask,
-                                         unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance16x32)(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-
-unsigned int aom_obmc_variance16x4_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-unsigned int aom_obmc_variance16x4_sse4_1(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask,
-                                          unsigned int* sse);
-unsigned int aom_obmc_variance16x4_avx2(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask,
-                                        unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance16x4)(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-
-unsigned int aom_obmc_variance16x64_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-unsigned int aom_obmc_variance16x64_sse4_1(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-unsigned int aom_obmc_variance16x64_avx2(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask,
-                                         unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance16x64)(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-
-unsigned int aom_obmc_variance16x8_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-unsigned int aom_obmc_variance16x8_sse4_1(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask,
-                                          unsigned int* sse);
-unsigned int aom_obmc_variance16x8_avx2(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask,
-                                        unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance16x8)(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-
-unsigned int aom_obmc_variance32x16_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-unsigned int aom_obmc_variance32x16_sse4_1(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-unsigned int aom_obmc_variance32x16_avx2(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask,
-                                         unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance32x16)(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-
-unsigned int aom_obmc_variance32x32_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-unsigned int aom_obmc_variance32x32_sse4_1(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-unsigned int aom_obmc_variance32x32_avx2(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask,
-                                         unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance32x32)(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-
-unsigned int aom_obmc_variance32x64_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-unsigned int aom_obmc_variance32x64_sse4_1(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-unsigned int aom_obmc_variance32x64_avx2(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask,
-                                         unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance32x64)(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-
-unsigned int aom_obmc_variance32x8_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-unsigned int aom_obmc_variance32x8_sse4_1(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask,
-                                          unsigned int* sse);
-unsigned int aom_obmc_variance32x8_avx2(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask,
-                                        unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance32x8)(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-
-unsigned int aom_obmc_variance4x16_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-unsigned int aom_obmc_variance4x16_sse4_1(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask,
-                                          unsigned int* sse);
-unsigned int aom_obmc_variance4x16_avx2(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask,
-                                        unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance4x16)(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-
-unsigned int aom_obmc_variance4x4_c(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask,
-                                    unsigned int* sse);
-unsigned int aom_obmc_variance4x4_sse4_1(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask,
-                                         unsigned int* sse);
-unsigned int aom_obmc_variance4x4_avx2(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask,
-                                       unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance4x4)(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-
-unsigned int aom_obmc_variance4x8_c(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask,
-                                    unsigned int* sse);
-unsigned int aom_obmc_variance4x8_sse4_1(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask,
-                                         unsigned int* sse);
-unsigned int aom_obmc_variance4x8_avx2(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask,
-                                       unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance4x8)(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-
-unsigned int aom_obmc_variance64x128_c(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask,
-                                       unsigned int* sse);
-unsigned int aom_obmc_variance64x128_sse4_1(const uint8_t* pre,
-                                            int pre_stride,
-                                            const int32_t* wsrc,
-                                            const int32_t* mask,
-                                            unsigned int* sse);
-unsigned int aom_obmc_variance64x128_avx2(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask,
-                                          unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance64x128)(const uint8_t* pre,
-                                                    int pre_stride,
-                                                    const int32_t* wsrc,
-                                                    const int32_t* mask,
-                                                    unsigned int* sse);
-
-unsigned int aom_obmc_variance64x16_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-unsigned int aom_obmc_variance64x16_sse4_1(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-unsigned int aom_obmc_variance64x16_avx2(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask,
-                                         unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance64x16)(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-
-unsigned int aom_obmc_variance64x32_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-unsigned int aom_obmc_variance64x32_sse4_1(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-unsigned int aom_obmc_variance64x32_avx2(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask,
-                                         unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance64x32)(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-
-unsigned int aom_obmc_variance64x64_c(const uint8_t* pre,
-                                      int pre_stride,
-                                      const int32_t* wsrc,
-                                      const int32_t* mask,
-                                      unsigned int* sse);
-unsigned int aom_obmc_variance64x64_sse4_1(const uint8_t* pre,
-                                           int pre_stride,
-                                           const int32_t* wsrc,
-                                           const int32_t* mask,
-                                           unsigned int* sse);
-unsigned int aom_obmc_variance64x64_avx2(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask,
-                                         unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance64x64)(const uint8_t* pre,
-                                                   int pre_stride,
-                                                   const int32_t* wsrc,
-                                                   const int32_t* mask,
-                                                   unsigned int* sse);
-
-unsigned int aom_obmc_variance8x16_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-unsigned int aom_obmc_variance8x16_sse4_1(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask,
-                                          unsigned int* sse);
-unsigned int aom_obmc_variance8x16_avx2(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask,
-                                        unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance8x16)(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-
-unsigned int aom_obmc_variance8x32_c(const uint8_t* pre,
-                                     int pre_stride,
-                                     const int32_t* wsrc,
-                                     const int32_t* mask,
-                                     unsigned int* sse);
-unsigned int aom_obmc_variance8x32_sse4_1(const uint8_t* pre,
-                                          int pre_stride,
-                                          const int32_t* wsrc,
-                                          const int32_t* mask,
-                                          unsigned int* sse);
-unsigned int aom_obmc_variance8x32_avx2(const uint8_t* pre,
-                                        int pre_stride,
-                                        const int32_t* wsrc,
-                                        const int32_t* mask,
-                                        unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance8x32)(const uint8_t* pre,
-                                                  int pre_stride,
-                                                  const int32_t* wsrc,
-                                                  const int32_t* mask,
-                                                  unsigned int* sse);
-
-unsigned int aom_obmc_variance8x4_c(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask,
-                                    unsigned int* sse);
-unsigned int aom_obmc_variance8x4_sse4_1(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask,
-                                         unsigned int* sse);
-unsigned int aom_obmc_variance8x4_avx2(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask,
-                                       unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance8x4)(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-
-unsigned int aom_obmc_variance8x8_c(const uint8_t* pre,
-                                    int pre_stride,
-                                    const int32_t* wsrc,
-                                    const int32_t* mask,
-                                    unsigned int* sse);
-unsigned int aom_obmc_variance8x8_sse4_1(const uint8_t* pre,
-                                         int pre_stride,
-                                         const int32_t* wsrc,
-                                         const int32_t* mask,
-                                         unsigned int* sse);
-unsigned int aom_obmc_variance8x8_avx2(const uint8_t* pre,
-                                       int pre_stride,
-                                       const int32_t* wsrc,
-                                       const int32_t* mask,
-                                       unsigned int* sse);
-RTCD_EXTERN unsigned int (*aom_obmc_variance8x8)(const uint8_t* pre,
-                                                 int pre_stride,
-                                                 const int32_t* wsrc,
-                                                 const int32_t* mask,
-                                                 unsigned int* sse);
-
 void aom_paeth_predictor_16x16_c(uint8_t* dst,
                                  ptrdiff_t y_stride,
                                  const uint8_t* above,
@@ -27346,1188 +11447,6 @@
   aom_hadamard_lp_16x16 = aom_hadamard_lp_16x16_c;
   if (flags & HAS_AVX2)
     aom_hadamard_lp_16x16 = aom_hadamard_lp_16x16_avx2;
-  aom_highbd_10_masked_sub_pixel_variance128x128 =
-      aom_highbd_10_masked_sub_pixel_variance128x128_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance128x128 =
-        aom_highbd_10_masked_sub_pixel_variance128x128_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance128x64 =
-      aom_highbd_10_masked_sub_pixel_variance128x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance128x64 =
-        aom_highbd_10_masked_sub_pixel_variance128x64_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance16x16 =
-      aom_highbd_10_masked_sub_pixel_variance16x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance16x16 =
-        aom_highbd_10_masked_sub_pixel_variance16x16_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance16x32 =
-      aom_highbd_10_masked_sub_pixel_variance16x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance16x32 =
-        aom_highbd_10_masked_sub_pixel_variance16x32_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance16x4 =
-      aom_highbd_10_masked_sub_pixel_variance16x4_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance16x4 =
-        aom_highbd_10_masked_sub_pixel_variance16x4_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance16x64 =
-      aom_highbd_10_masked_sub_pixel_variance16x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance16x64 =
-        aom_highbd_10_masked_sub_pixel_variance16x64_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance16x8 =
-      aom_highbd_10_masked_sub_pixel_variance16x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance16x8 =
-        aom_highbd_10_masked_sub_pixel_variance16x8_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance32x16 =
-      aom_highbd_10_masked_sub_pixel_variance32x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance32x16 =
-        aom_highbd_10_masked_sub_pixel_variance32x16_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance32x32 =
-      aom_highbd_10_masked_sub_pixel_variance32x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance32x32 =
-        aom_highbd_10_masked_sub_pixel_variance32x32_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance32x64 =
-      aom_highbd_10_masked_sub_pixel_variance32x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance32x64 =
-        aom_highbd_10_masked_sub_pixel_variance32x64_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance32x8 =
-      aom_highbd_10_masked_sub_pixel_variance32x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance32x8 =
-        aom_highbd_10_masked_sub_pixel_variance32x8_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance4x16 =
-      aom_highbd_10_masked_sub_pixel_variance4x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance4x16 =
-        aom_highbd_10_masked_sub_pixel_variance4x16_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance4x4 =
-      aom_highbd_10_masked_sub_pixel_variance4x4_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance4x4 =
-        aom_highbd_10_masked_sub_pixel_variance4x4_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance4x8 =
-      aom_highbd_10_masked_sub_pixel_variance4x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance4x8 =
-        aom_highbd_10_masked_sub_pixel_variance4x8_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance64x128 =
-      aom_highbd_10_masked_sub_pixel_variance64x128_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance64x128 =
-        aom_highbd_10_masked_sub_pixel_variance64x128_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance64x16 =
-      aom_highbd_10_masked_sub_pixel_variance64x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance64x16 =
-        aom_highbd_10_masked_sub_pixel_variance64x16_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance64x32 =
-      aom_highbd_10_masked_sub_pixel_variance64x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance64x32 =
-        aom_highbd_10_masked_sub_pixel_variance64x32_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance64x64 =
-      aom_highbd_10_masked_sub_pixel_variance64x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance64x64 =
-        aom_highbd_10_masked_sub_pixel_variance64x64_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance8x16 =
-      aom_highbd_10_masked_sub_pixel_variance8x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance8x16 =
-        aom_highbd_10_masked_sub_pixel_variance8x16_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance8x32 =
-      aom_highbd_10_masked_sub_pixel_variance8x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance8x32 =
-        aom_highbd_10_masked_sub_pixel_variance8x32_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance8x4 =
-      aom_highbd_10_masked_sub_pixel_variance8x4_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance8x4 =
-        aom_highbd_10_masked_sub_pixel_variance8x4_ssse3;
-  aom_highbd_10_masked_sub_pixel_variance8x8 =
-      aom_highbd_10_masked_sub_pixel_variance8x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_10_masked_sub_pixel_variance8x8 =
-        aom_highbd_10_masked_sub_pixel_variance8x8_ssse3;
-  aom_highbd_10_obmc_variance128x128 = aom_highbd_10_obmc_variance128x128_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance128x128 =
-        aom_highbd_10_obmc_variance128x128_sse4_1;
-  aom_highbd_10_obmc_variance128x64 = aom_highbd_10_obmc_variance128x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance128x64 =
-        aom_highbd_10_obmc_variance128x64_sse4_1;
-  aom_highbd_10_obmc_variance16x16 = aom_highbd_10_obmc_variance16x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance16x16 = aom_highbd_10_obmc_variance16x16_sse4_1;
-  aom_highbd_10_obmc_variance16x32 = aom_highbd_10_obmc_variance16x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance16x32 = aom_highbd_10_obmc_variance16x32_sse4_1;
-  aom_highbd_10_obmc_variance16x4 = aom_highbd_10_obmc_variance16x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance16x4 = aom_highbd_10_obmc_variance16x4_sse4_1;
-  aom_highbd_10_obmc_variance16x64 = aom_highbd_10_obmc_variance16x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance16x64 = aom_highbd_10_obmc_variance16x64_sse4_1;
-  aom_highbd_10_obmc_variance16x8 = aom_highbd_10_obmc_variance16x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance16x8 = aom_highbd_10_obmc_variance16x8_sse4_1;
-  aom_highbd_10_obmc_variance32x16 = aom_highbd_10_obmc_variance32x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance32x16 = aom_highbd_10_obmc_variance32x16_sse4_1;
-  aom_highbd_10_obmc_variance32x32 = aom_highbd_10_obmc_variance32x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance32x32 = aom_highbd_10_obmc_variance32x32_sse4_1;
-  aom_highbd_10_obmc_variance32x64 = aom_highbd_10_obmc_variance32x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance32x64 = aom_highbd_10_obmc_variance32x64_sse4_1;
-  aom_highbd_10_obmc_variance32x8 = aom_highbd_10_obmc_variance32x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance32x8 = aom_highbd_10_obmc_variance32x8_sse4_1;
-  aom_highbd_10_obmc_variance4x16 = aom_highbd_10_obmc_variance4x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance4x16 = aom_highbd_10_obmc_variance4x16_sse4_1;
-  aom_highbd_10_obmc_variance4x4 = aom_highbd_10_obmc_variance4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance4x4 = aom_highbd_10_obmc_variance4x4_sse4_1;
-  aom_highbd_10_obmc_variance4x8 = aom_highbd_10_obmc_variance4x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance4x8 = aom_highbd_10_obmc_variance4x8_sse4_1;
-  aom_highbd_10_obmc_variance64x128 = aom_highbd_10_obmc_variance64x128_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance64x128 =
-        aom_highbd_10_obmc_variance64x128_sse4_1;
-  aom_highbd_10_obmc_variance64x16 = aom_highbd_10_obmc_variance64x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance64x16 = aom_highbd_10_obmc_variance64x16_sse4_1;
-  aom_highbd_10_obmc_variance64x32 = aom_highbd_10_obmc_variance64x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance64x32 = aom_highbd_10_obmc_variance64x32_sse4_1;
-  aom_highbd_10_obmc_variance64x64 = aom_highbd_10_obmc_variance64x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance64x64 = aom_highbd_10_obmc_variance64x64_sse4_1;
-  aom_highbd_10_obmc_variance8x16 = aom_highbd_10_obmc_variance8x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance8x16 = aom_highbd_10_obmc_variance8x16_sse4_1;
-  aom_highbd_10_obmc_variance8x32 = aom_highbd_10_obmc_variance8x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance8x32 = aom_highbd_10_obmc_variance8x32_sse4_1;
-  aom_highbd_10_obmc_variance8x4 = aom_highbd_10_obmc_variance8x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance8x4 = aom_highbd_10_obmc_variance8x4_sse4_1;
-  aom_highbd_10_obmc_variance8x8 = aom_highbd_10_obmc_variance8x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_obmc_variance8x8 = aom_highbd_10_obmc_variance8x8_sse4_1;
-  aom_highbd_10_sub_pixel_avg_variance4x4 =
-      aom_highbd_10_sub_pixel_avg_variance4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_sub_pixel_avg_variance4x4 =
-        aom_highbd_10_sub_pixel_avg_variance4x4_sse4_1;
-  aom_highbd_10_sub_pixel_variance128x128 =
-      aom_highbd_10_sub_pixel_variance128x128_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_sub_pixel_variance128x128 =
-        aom_highbd_10_sub_pixel_variance128x128_avx2;
-  aom_highbd_10_sub_pixel_variance128x64 =
-      aom_highbd_10_sub_pixel_variance128x64_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_sub_pixel_variance128x64 =
-        aom_highbd_10_sub_pixel_variance128x64_avx2;
-  aom_highbd_10_sub_pixel_variance16x16 =
-      aom_highbd_10_sub_pixel_variance16x16_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_sub_pixel_variance16x16 =
-        aom_highbd_10_sub_pixel_variance16x16_avx2;
-  aom_highbd_10_sub_pixel_variance16x32 =
-      aom_highbd_10_sub_pixel_variance16x32_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_sub_pixel_variance16x32 =
-        aom_highbd_10_sub_pixel_variance16x32_avx2;
-  aom_highbd_10_sub_pixel_variance16x8 =
-      aom_highbd_10_sub_pixel_variance16x8_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_sub_pixel_variance16x8 =
-        aom_highbd_10_sub_pixel_variance16x8_avx2;
-  aom_highbd_10_sub_pixel_variance32x16 =
-      aom_highbd_10_sub_pixel_variance32x16_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_sub_pixel_variance32x16 =
-        aom_highbd_10_sub_pixel_variance32x16_avx2;
-  aom_highbd_10_sub_pixel_variance32x32 =
-      aom_highbd_10_sub_pixel_variance32x32_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_sub_pixel_variance32x32 =
-        aom_highbd_10_sub_pixel_variance32x32_avx2;
-  aom_highbd_10_sub_pixel_variance32x64 =
-      aom_highbd_10_sub_pixel_variance32x64_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_sub_pixel_variance32x64 =
-        aom_highbd_10_sub_pixel_variance32x64_avx2;
-  aom_highbd_10_sub_pixel_variance4x4 = aom_highbd_10_sub_pixel_variance4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_sub_pixel_variance4x4 =
-        aom_highbd_10_sub_pixel_variance4x4_sse4_1;
-  aom_highbd_10_sub_pixel_variance64x128 =
-      aom_highbd_10_sub_pixel_variance64x128_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_sub_pixel_variance64x128 =
-        aom_highbd_10_sub_pixel_variance64x128_avx2;
-  aom_highbd_10_sub_pixel_variance64x32 =
-      aom_highbd_10_sub_pixel_variance64x32_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_sub_pixel_variance64x32 =
-        aom_highbd_10_sub_pixel_variance64x32_avx2;
-  aom_highbd_10_sub_pixel_variance64x64 =
-      aom_highbd_10_sub_pixel_variance64x64_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_sub_pixel_variance64x64 =
-        aom_highbd_10_sub_pixel_variance64x64_avx2;
-  aom_highbd_10_sub_pixel_variance8x16 =
-      aom_highbd_10_sub_pixel_variance8x16_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_sub_pixel_variance8x16 =
-        aom_highbd_10_sub_pixel_variance8x16_avx2;
-  aom_highbd_10_sub_pixel_variance8x8 =
-      aom_highbd_10_sub_pixel_variance8x8_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_sub_pixel_variance8x8 =
-        aom_highbd_10_sub_pixel_variance8x8_avx2;
-  aom_highbd_10_variance128x128 = aom_highbd_10_variance128x128_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_variance128x128 = aom_highbd_10_variance128x128_avx2;
-  aom_highbd_10_variance128x64 = aom_highbd_10_variance128x64_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_variance128x64 = aom_highbd_10_variance128x64_avx2;
-  aom_highbd_10_variance16x16 = aom_highbd_10_variance16x16_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_variance16x16 = aom_highbd_10_variance16x16_avx2;
-  aom_highbd_10_variance16x32 = aom_highbd_10_variance16x32_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_variance16x32 = aom_highbd_10_variance16x32_avx2;
-  aom_highbd_10_variance16x8 = aom_highbd_10_variance16x8_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_variance16x8 = aom_highbd_10_variance16x8_avx2;
-  aom_highbd_10_variance32x16 = aom_highbd_10_variance32x16_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_variance32x16 = aom_highbd_10_variance32x16_avx2;
-  aom_highbd_10_variance32x32 = aom_highbd_10_variance32x32_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_variance32x32 = aom_highbd_10_variance32x32_avx2;
-  aom_highbd_10_variance32x64 = aom_highbd_10_variance32x64_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_variance32x64 = aom_highbd_10_variance32x64_avx2;
-  aom_highbd_10_variance4x4 = aom_highbd_10_variance4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_10_variance4x4 = aom_highbd_10_variance4x4_sse4_1;
-  aom_highbd_10_variance64x128 = aom_highbd_10_variance64x128_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_variance64x128 = aom_highbd_10_variance64x128_avx2;
-  aom_highbd_10_variance64x32 = aom_highbd_10_variance64x32_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_variance64x32 = aom_highbd_10_variance64x32_avx2;
-  aom_highbd_10_variance64x64 = aom_highbd_10_variance64x64_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_variance64x64 = aom_highbd_10_variance64x64_avx2;
-  aom_highbd_10_variance8x16 = aom_highbd_10_variance8x16_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_variance8x16 = aom_highbd_10_variance8x16_avx2;
-  aom_highbd_10_variance8x8 = aom_highbd_10_variance8x8_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_10_variance8x8 = aom_highbd_10_variance8x8_avx2;
-  aom_highbd_12_masked_sub_pixel_variance128x128 =
-      aom_highbd_12_masked_sub_pixel_variance128x128_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance128x128 =
-        aom_highbd_12_masked_sub_pixel_variance128x128_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance128x64 =
-      aom_highbd_12_masked_sub_pixel_variance128x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance128x64 =
-        aom_highbd_12_masked_sub_pixel_variance128x64_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance16x16 =
-      aom_highbd_12_masked_sub_pixel_variance16x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance16x16 =
-        aom_highbd_12_masked_sub_pixel_variance16x16_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance16x32 =
-      aom_highbd_12_masked_sub_pixel_variance16x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance16x32 =
-        aom_highbd_12_masked_sub_pixel_variance16x32_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance16x4 =
-      aom_highbd_12_masked_sub_pixel_variance16x4_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance16x4 =
-        aom_highbd_12_masked_sub_pixel_variance16x4_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance16x64 =
-      aom_highbd_12_masked_sub_pixel_variance16x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance16x64 =
-        aom_highbd_12_masked_sub_pixel_variance16x64_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance16x8 =
-      aom_highbd_12_masked_sub_pixel_variance16x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance16x8 =
-        aom_highbd_12_masked_sub_pixel_variance16x8_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance32x16 =
-      aom_highbd_12_masked_sub_pixel_variance32x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance32x16 =
-        aom_highbd_12_masked_sub_pixel_variance32x16_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance32x32 =
-      aom_highbd_12_masked_sub_pixel_variance32x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance32x32 =
-        aom_highbd_12_masked_sub_pixel_variance32x32_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance32x64 =
-      aom_highbd_12_masked_sub_pixel_variance32x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance32x64 =
-        aom_highbd_12_masked_sub_pixel_variance32x64_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance32x8 =
-      aom_highbd_12_masked_sub_pixel_variance32x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance32x8 =
-        aom_highbd_12_masked_sub_pixel_variance32x8_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance4x16 =
-      aom_highbd_12_masked_sub_pixel_variance4x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance4x16 =
-        aom_highbd_12_masked_sub_pixel_variance4x16_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance4x4 =
-      aom_highbd_12_masked_sub_pixel_variance4x4_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance4x4 =
-        aom_highbd_12_masked_sub_pixel_variance4x4_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance4x8 =
-      aom_highbd_12_masked_sub_pixel_variance4x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance4x8 =
-        aom_highbd_12_masked_sub_pixel_variance4x8_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance64x128 =
-      aom_highbd_12_masked_sub_pixel_variance64x128_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance64x128 =
-        aom_highbd_12_masked_sub_pixel_variance64x128_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance64x16 =
-      aom_highbd_12_masked_sub_pixel_variance64x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance64x16 =
-        aom_highbd_12_masked_sub_pixel_variance64x16_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance64x32 =
-      aom_highbd_12_masked_sub_pixel_variance64x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance64x32 =
-        aom_highbd_12_masked_sub_pixel_variance64x32_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance64x64 =
-      aom_highbd_12_masked_sub_pixel_variance64x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance64x64 =
-        aom_highbd_12_masked_sub_pixel_variance64x64_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance8x16 =
-      aom_highbd_12_masked_sub_pixel_variance8x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance8x16 =
-        aom_highbd_12_masked_sub_pixel_variance8x16_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance8x32 =
-      aom_highbd_12_masked_sub_pixel_variance8x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance8x32 =
-        aom_highbd_12_masked_sub_pixel_variance8x32_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance8x4 =
-      aom_highbd_12_masked_sub_pixel_variance8x4_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance8x4 =
-        aom_highbd_12_masked_sub_pixel_variance8x4_ssse3;
-  aom_highbd_12_masked_sub_pixel_variance8x8 =
-      aom_highbd_12_masked_sub_pixel_variance8x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_12_masked_sub_pixel_variance8x8 =
-        aom_highbd_12_masked_sub_pixel_variance8x8_ssse3;
-  aom_highbd_12_obmc_variance128x128 = aom_highbd_12_obmc_variance128x128_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance128x128 =
-        aom_highbd_12_obmc_variance128x128_sse4_1;
-  aom_highbd_12_obmc_variance128x64 = aom_highbd_12_obmc_variance128x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance128x64 =
-        aom_highbd_12_obmc_variance128x64_sse4_1;
-  aom_highbd_12_obmc_variance16x16 = aom_highbd_12_obmc_variance16x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance16x16 = aom_highbd_12_obmc_variance16x16_sse4_1;
-  aom_highbd_12_obmc_variance16x32 = aom_highbd_12_obmc_variance16x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance16x32 = aom_highbd_12_obmc_variance16x32_sse4_1;
-  aom_highbd_12_obmc_variance16x4 = aom_highbd_12_obmc_variance16x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance16x4 = aom_highbd_12_obmc_variance16x4_sse4_1;
-  aom_highbd_12_obmc_variance16x64 = aom_highbd_12_obmc_variance16x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance16x64 = aom_highbd_12_obmc_variance16x64_sse4_1;
-  aom_highbd_12_obmc_variance16x8 = aom_highbd_12_obmc_variance16x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance16x8 = aom_highbd_12_obmc_variance16x8_sse4_1;
-  aom_highbd_12_obmc_variance32x16 = aom_highbd_12_obmc_variance32x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance32x16 = aom_highbd_12_obmc_variance32x16_sse4_1;
-  aom_highbd_12_obmc_variance32x32 = aom_highbd_12_obmc_variance32x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance32x32 = aom_highbd_12_obmc_variance32x32_sse4_1;
-  aom_highbd_12_obmc_variance32x64 = aom_highbd_12_obmc_variance32x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance32x64 = aom_highbd_12_obmc_variance32x64_sse4_1;
-  aom_highbd_12_obmc_variance32x8 = aom_highbd_12_obmc_variance32x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance32x8 = aom_highbd_12_obmc_variance32x8_sse4_1;
-  aom_highbd_12_obmc_variance4x16 = aom_highbd_12_obmc_variance4x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance4x16 = aom_highbd_12_obmc_variance4x16_sse4_1;
-  aom_highbd_12_obmc_variance4x4 = aom_highbd_12_obmc_variance4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance4x4 = aom_highbd_12_obmc_variance4x4_sse4_1;
-  aom_highbd_12_obmc_variance4x8 = aom_highbd_12_obmc_variance4x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance4x8 = aom_highbd_12_obmc_variance4x8_sse4_1;
-  aom_highbd_12_obmc_variance64x128 = aom_highbd_12_obmc_variance64x128_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance64x128 =
-        aom_highbd_12_obmc_variance64x128_sse4_1;
-  aom_highbd_12_obmc_variance64x16 = aom_highbd_12_obmc_variance64x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance64x16 = aom_highbd_12_obmc_variance64x16_sse4_1;
-  aom_highbd_12_obmc_variance64x32 = aom_highbd_12_obmc_variance64x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance64x32 = aom_highbd_12_obmc_variance64x32_sse4_1;
-  aom_highbd_12_obmc_variance64x64 = aom_highbd_12_obmc_variance64x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance64x64 = aom_highbd_12_obmc_variance64x64_sse4_1;
-  aom_highbd_12_obmc_variance8x16 = aom_highbd_12_obmc_variance8x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance8x16 = aom_highbd_12_obmc_variance8x16_sse4_1;
-  aom_highbd_12_obmc_variance8x32 = aom_highbd_12_obmc_variance8x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance8x32 = aom_highbd_12_obmc_variance8x32_sse4_1;
-  aom_highbd_12_obmc_variance8x4 = aom_highbd_12_obmc_variance8x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance8x4 = aom_highbd_12_obmc_variance8x4_sse4_1;
-  aom_highbd_12_obmc_variance8x8 = aom_highbd_12_obmc_variance8x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_obmc_variance8x8 = aom_highbd_12_obmc_variance8x8_sse4_1;
-  aom_highbd_12_sub_pixel_avg_variance4x4 =
-      aom_highbd_12_sub_pixel_avg_variance4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_sub_pixel_avg_variance4x4 =
-        aom_highbd_12_sub_pixel_avg_variance4x4_sse4_1;
-  aom_highbd_12_sub_pixel_variance4x4 = aom_highbd_12_sub_pixel_variance4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_sub_pixel_variance4x4 =
-        aom_highbd_12_sub_pixel_variance4x4_sse4_1;
-  aom_highbd_12_variance4x4 = aom_highbd_12_variance4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_12_variance4x4 = aom_highbd_12_variance4x4_sse4_1;
-  aom_highbd_8_masked_sub_pixel_variance128x128 =
-      aom_highbd_8_masked_sub_pixel_variance128x128_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance128x128 =
-        aom_highbd_8_masked_sub_pixel_variance128x128_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance128x64 =
-      aom_highbd_8_masked_sub_pixel_variance128x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance128x64 =
-        aom_highbd_8_masked_sub_pixel_variance128x64_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance16x16 =
-      aom_highbd_8_masked_sub_pixel_variance16x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance16x16 =
-        aom_highbd_8_masked_sub_pixel_variance16x16_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance16x32 =
-      aom_highbd_8_masked_sub_pixel_variance16x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance16x32 =
-        aom_highbd_8_masked_sub_pixel_variance16x32_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance16x4 =
-      aom_highbd_8_masked_sub_pixel_variance16x4_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance16x4 =
-        aom_highbd_8_masked_sub_pixel_variance16x4_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance16x64 =
-      aom_highbd_8_masked_sub_pixel_variance16x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance16x64 =
-        aom_highbd_8_masked_sub_pixel_variance16x64_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance16x8 =
-      aom_highbd_8_masked_sub_pixel_variance16x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance16x8 =
-        aom_highbd_8_masked_sub_pixel_variance16x8_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance32x16 =
-      aom_highbd_8_masked_sub_pixel_variance32x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance32x16 =
-        aom_highbd_8_masked_sub_pixel_variance32x16_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance32x32 =
-      aom_highbd_8_masked_sub_pixel_variance32x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance32x32 =
-        aom_highbd_8_masked_sub_pixel_variance32x32_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance32x64 =
-      aom_highbd_8_masked_sub_pixel_variance32x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance32x64 =
-        aom_highbd_8_masked_sub_pixel_variance32x64_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance32x8 =
-      aom_highbd_8_masked_sub_pixel_variance32x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance32x8 =
-        aom_highbd_8_masked_sub_pixel_variance32x8_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance4x16 =
-      aom_highbd_8_masked_sub_pixel_variance4x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance4x16 =
-        aom_highbd_8_masked_sub_pixel_variance4x16_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance4x4 =
-      aom_highbd_8_masked_sub_pixel_variance4x4_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance4x4 =
-        aom_highbd_8_masked_sub_pixel_variance4x4_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance4x8 =
-      aom_highbd_8_masked_sub_pixel_variance4x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance4x8 =
-        aom_highbd_8_masked_sub_pixel_variance4x8_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance64x128 =
-      aom_highbd_8_masked_sub_pixel_variance64x128_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance64x128 =
-        aom_highbd_8_masked_sub_pixel_variance64x128_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance64x16 =
-      aom_highbd_8_masked_sub_pixel_variance64x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance64x16 =
-        aom_highbd_8_masked_sub_pixel_variance64x16_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance64x32 =
-      aom_highbd_8_masked_sub_pixel_variance64x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance64x32 =
-        aom_highbd_8_masked_sub_pixel_variance64x32_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance64x64 =
-      aom_highbd_8_masked_sub_pixel_variance64x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance64x64 =
-        aom_highbd_8_masked_sub_pixel_variance64x64_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance8x16 =
-      aom_highbd_8_masked_sub_pixel_variance8x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance8x16 =
-        aom_highbd_8_masked_sub_pixel_variance8x16_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance8x32 =
-      aom_highbd_8_masked_sub_pixel_variance8x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance8x32 =
-        aom_highbd_8_masked_sub_pixel_variance8x32_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance8x4 =
-      aom_highbd_8_masked_sub_pixel_variance8x4_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance8x4 =
-        aom_highbd_8_masked_sub_pixel_variance8x4_ssse3;
-  aom_highbd_8_masked_sub_pixel_variance8x8 =
-      aom_highbd_8_masked_sub_pixel_variance8x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_8_masked_sub_pixel_variance8x8 =
-        aom_highbd_8_masked_sub_pixel_variance8x8_ssse3;
-  aom_highbd_8_sub_pixel_avg_variance4x4 =
-      aom_highbd_8_sub_pixel_avg_variance4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_8_sub_pixel_avg_variance4x4 =
-        aom_highbd_8_sub_pixel_avg_variance4x4_sse4_1;
-  aom_highbd_8_sub_pixel_variance4x4 = aom_highbd_8_sub_pixel_variance4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_8_sub_pixel_variance4x4 =
-        aom_highbd_8_sub_pixel_variance4x4_sse4_1;
-  aom_highbd_8_variance4x4 = aom_highbd_8_variance4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_8_variance4x4 = aom_highbd_8_variance4x4_sse4_1;
-  aom_highbd_blend_a64_d16_mask = aom_highbd_blend_a64_d16_mask_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_blend_a64_d16_mask = aom_highbd_blend_a64_d16_mask_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_blend_a64_d16_mask = aom_highbd_blend_a64_d16_mask_avx2;
-  aom_highbd_blend_a64_hmask = aom_highbd_blend_a64_hmask_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_blend_a64_hmask = aom_highbd_blend_a64_hmask_sse4_1;
-  aom_highbd_blend_a64_mask = aom_highbd_blend_a64_mask_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_blend_a64_mask = aom_highbd_blend_a64_mask_sse4_1;
-  aom_highbd_blend_a64_vmask = aom_highbd_blend_a64_vmask_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_blend_a64_vmask = aom_highbd_blend_a64_vmask_sse4_1;
-  aom_highbd_comp_mask_pred = aom_highbd_comp_mask_pred_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_comp_mask_pred = aom_highbd_comp_mask_pred_avx2;
-  aom_highbd_convolve8_horiz = aom_highbd_convolve8_horiz_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_convolve8_horiz = aom_highbd_convolve8_horiz_avx2;
-  aom_highbd_convolve8_vert = aom_highbd_convolve8_vert_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_convolve8_vert = aom_highbd_convolve8_vert_avx2;
-  aom_highbd_convolve_copy = aom_highbd_convolve_copy_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_convolve_copy = aom_highbd_convolve_copy_avx2;
-  aom_highbd_hadamard_16x16 = aom_highbd_hadamard_16x16_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_hadamard_16x16 = aom_highbd_hadamard_16x16_avx2;
-  aom_highbd_hadamard_32x32 = aom_highbd_hadamard_32x32_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_hadamard_32x32 = aom_highbd_hadamard_32x32_avx2;
-  aom_highbd_hadamard_8x8 = aom_highbd_hadamard_8x8_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_hadamard_8x8 = aom_highbd_hadamard_8x8_avx2;
-  aom_highbd_lpf_horizontal_14_dual = aom_highbd_lpf_horizontal_14_dual_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_lpf_horizontal_14_dual = aom_highbd_lpf_horizontal_14_dual_avx2;
-  aom_highbd_lpf_horizontal_4_dual = aom_highbd_lpf_horizontal_4_dual_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_lpf_horizontal_4_dual = aom_highbd_lpf_horizontal_4_dual_avx2;
-  aom_highbd_lpf_horizontal_8_dual = aom_highbd_lpf_horizontal_8_dual_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_lpf_horizontal_8_dual = aom_highbd_lpf_horizontal_8_dual_avx2;
-  aom_highbd_lpf_vertical_14_dual = aom_highbd_lpf_vertical_14_dual_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_lpf_vertical_14_dual = aom_highbd_lpf_vertical_14_dual_avx2;
-  aom_highbd_lpf_vertical_4_dual = aom_highbd_lpf_vertical_4_dual_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_lpf_vertical_4_dual = aom_highbd_lpf_vertical_4_dual_avx2;
-  aom_highbd_lpf_vertical_8_dual = aom_highbd_lpf_vertical_8_dual_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_lpf_vertical_8_dual = aom_highbd_lpf_vertical_8_dual_avx2;
-  aom_highbd_masked_sad128x128 = aom_highbd_masked_sad128x128_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad128x128 = aom_highbd_masked_sad128x128_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad128x128 = aom_highbd_masked_sad128x128_avx2;
-  aom_highbd_masked_sad128x64 = aom_highbd_masked_sad128x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad128x64 = aom_highbd_masked_sad128x64_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad128x64 = aom_highbd_masked_sad128x64_avx2;
-  aom_highbd_masked_sad16x16 = aom_highbd_masked_sad16x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad16x16 = aom_highbd_masked_sad16x16_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad16x16 = aom_highbd_masked_sad16x16_avx2;
-  aom_highbd_masked_sad16x32 = aom_highbd_masked_sad16x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad16x32 = aom_highbd_masked_sad16x32_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad16x32 = aom_highbd_masked_sad16x32_avx2;
-  aom_highbd_masked_sad16x4 = aom_highbd_masked_sad16x4_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad16x4 = aom_highbd_masked_sad16x4_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad16x4 = aom_highbd_masked_sad16x4_avx2;
-  aom_highbd_masked_sad16x64 = aom_highbd_masked_sad16x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad16x64 = aom_highbd_masked_sad16x64_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad16x64 = aom_highbd_masked_sad16x64_avx2;
-  aom_highbd_masked_sad16x8 = aom_highbd_masked_sad16x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad16x8 = aom_highbd_masked_sad16x8_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad16x8 = aom_highbd_masked_sad16x8_avx2;
-  aom_highbd_masked_sad32x16 = aom_highbd_masked_sad32x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad32x16 = aom_highbd_masked_sad32x16_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad32x16 = aom_highbd_masked_sad32x16_avx2;
-  aom_highbd_masked_sad32x32 = aom_highbd_masked_sad32x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad32x32 = aom_highbd_masked_sad32x32_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad32x32 = aom_highbd_masked_sad32x32_avx2;
-  aom_highbd_masked_sad32x64 = aom_highbd_masked_sad32x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad32x64 = aom_highbd_masked_sad32x64_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad32x64 = aom_highbd_masked_sad32x64_avx2;
-  aom_highbd_masked_sad32x8 = aom_highbd_masked_sad32x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad32x8 = aom_highbd_masked_sad32x8_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad32x8 = aom_highbd_masked_sad32x8_avx2;
-  aom_highbd_masked_sad4x16 = aom_highbd_masked_sad4x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad4x16 = aom_highbd_masked_sad4x16_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad4x16 = aom_highbd_masked_sad4x16_avx2;
-  aom_highbd_masked_sad4x4 = aom_highbd_masked_sad4x4_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad4x4 = aom_highbd_masked_sad4x4_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad4x4 = aom_highbd_masked_sad4x4_avx2;
-  aom_highbd_masked_sad4x8 = aom_highbd_masked_sad4x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad4x8 = aom_highbd_masked_sad4x8_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad4x8 = aom_highbd_masked_sad4x8_avx2;
-  aom_highbd_masked_sad64x128 = aom_highbd_masked_sad64x128_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad64x128 = aom_highbd_masked_sad64x128_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad64x128 = aom_highbd_masked_sad64x128_avx2;
-  aom_highbd_masked_sad64x16 = aom_highbd_masked_sad64x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad64x16 = aom_highbd_masked_sad64x16_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad64x16 = aom_highbd_masked_sad64x16_avx2;
-  aom_highbd_masked_sad64x32 = aom_highbd_masked_sad64x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad64x32 = aom_highbd_masked_sad64x32_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad64x32 = aom_highbd_masked_sad64x32_avx2;
-  aom_highbd_masked_sad64x64 = aom_highbd_masked_sad64x64_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad64x64 = aom_highbd_masked_sad64x64_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad64x64 = aom_highbd_masked_sad64x64_avx2;
-  aom_highbd_masked_sad8x16 = aom_highbd_masked_sad8x16_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad8x16 = aom_highbd_masked_sad8x16_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad8x16 = aom_highbd_masked_sad8x16_avx2;
-  aom_highbd_masked_sad8x32 = aom_highbd_masked_sad8x32_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad8x32 = aom_highbd_masked_sad8x32_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad8x32 = aom_highbd_masked_sad8x32_avx2;
-  aom_highbd_masked_sad8x4 = aom_highbd_masked_sad8x4_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad8x4 = aom_highbd_masked_sad8x4_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad8x4 = aom_highbd_masked_sad8x4_avx2;
-  aom_highbd_masked_sad8x8 = aom_highbd_masked_sad8x8_c;
-  if (flags & HAS_SSSE3)
-    aom_highbd_masked_sad8x8 = aom_highbd_masked_sad8x8_ssse3;
-  if (flags & HAS_AVX2)
-    aom_highbd_masked_sad8x8 = aom_highbd_masked_sad8x8_avx2;
-  aom_highbd_obmc_sad128x128 = aom_highbd_obmc_sad128x128_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad128x128 = aom_highbd_obmc_sad128x128_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad128x128 = aom_highbd_obmc_sad128x128_avx2;
-  aom_highbd_obmc_sad128x64 = aom_highbd_obmc_sad128x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad128x64 = aom_highbd_obmc_sad128x64_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad128x64 = aom_highbd_obmc_sad128x64_avx2;
-  aom_highbd_obmc_sad16x16 = aom_highbd_obmc_sad16x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad16x16 = aom_highbd_obmc_sad16x16_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad16x16 = aom_highbd_obmc_sad16x16_avx2;
-  aom_highbd_obmc_sad16x32 = aom_highbd_obmc_sad16x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad16x32 = aom_highbd_obmc_sad16x32_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad16x32 = aom_highbd_obmc_sad16x32_avx2;
-  aom_highbd_obmc_sad16x4 = aom_highbd_obmc_sad16x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad16x4 = aom_highbd_obmc_sad16x4_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad16x4 = aom_highbd_obmc_sad16x4_avx2;
-  aom_highbd_obmc_sad16x64 = aom_highbd_obmc_sad16x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad16x64 = aom_highbd_obmc_sad16x64_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad16x64 = aom_highbd_obmc_sad16x64_avx2;
-  aom_highbd_obmc_sad16x8 = aom_highbd_obmc_sad16x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad16x8 = aom_highbd_obmc_sad16x8_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad16x8 = aom_highbd_obmc_sad16x8_avx2;
-  aom_highbd_obmc_sad32x16 = aom_highbd_obmc_sad32x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad32x16 = aom_highbd_obmc_sad32x16_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad32x16 = aom_highbd_obmc_sad32x16_avx2;
-  aom_highbd_obmc_sad32x32 = aom_highbd_obmc_sad32x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad32x32 = aom_highbd_obmc_sad32x32_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad32x32 = aom_highbd_obmc_sad32x32_avx2;
-  aom_highbd_obmc_sad32x64 = aom_highbd_obmc_sad32x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad32x64 = aom_highbd_obmc_sad32x64_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad32x64 = aom_highbd_obmc_sad32x64_avx2;
-  aom_highbd_obmc_sad32x8 = aom_highbd_obmc_sad32x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad32x8 = aom_highbd_obmc_sad32x8_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad32x8 = aom_highbd_obmc_sad32x8_avx2;
-  aom_highbd_obmc_sad4x16 = aom_highbd_obmc_sad4x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad4x16 = aom_highbd_obmc_sad4x16_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad4x16 = aom_highbd_obmc_sad4x16_avx2;
-  aom_highbd_obmc_sad4x4 = aom_highbd_obmc_sad4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad4x4 = aom_highbd_obmc_sad4x4_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad4x4 = aom_highbd_obmc_sad4x4_avx2;
-  aom_highbd_obmc_sad4x8 = aom_highbd_obmc_sad4x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad4x8 = aom_highbd_obmc_sad4x8_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad4x8 = aom_highbd_obmc_sad4x8_avx2;
-  aom_highbd_obmc_sad64x128 = aom_highbd_obmc_sad64x128_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad64x128 = aom_highbd_obmc_sad64x128_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad64x128 = aom_highbd_obmc_sad64x128_avx2;
-  aom_highbd_obmc_sad64x16 = aom_highbd_obmc_sad64x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad64x16 = aom_highbd_obmc_sad64x16_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad64x16 = aom_highbd_obmc_sad64x16_avx2;
-  aom_highbd_obmc_sad64x32 = aom_highbd_obmc_sad64x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad64x32 = aom_highbd_obmc_sad64x32_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad64x32 = aom_highbd_obmc_sad64x32_avx2;
-  aom_highbd_obmc_sad64x64 = aom_highbd_obmc_sad64x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad64x64 = aom_highbd_obmc_sad64x64_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad64x64 = aom_highbd_obmc_sad64x64_avx2;
-  aom_highbd_obmc_sad8x16 = aom_highbd_obmc_sad8x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad8x16 = aom_highbd_obmc_sad8x16_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad8x16 = aom_highbd_obmc_sad8x16_avx2;
-  aom_highbd_obmc_sad8x32 = aom_highbd_obmc_sad8x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad8x32 = aom_highbd_obmc_sad8x32_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad8x32 = aom_highbd_obmc_sad8x32_avx2;
-  aom_highbd_obmc_sad8x4 = aom_highbd_obmc_sad8x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad8x4 = aom_highbd_obmc_sad8x4_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad8x4 = aom_highbd_obmc_sad8x4_avx2;
-  aom_highbd_obmc_sad8x8 = aom_highbd_obmc_sad8x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_sad8x8 = aom_highbd_obmc_sad8x8_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_obmc_sad8x8 = aom_highbd_obmc_sad8x8_avx2;
-  aom_highbd_obmc_variance128x128 = aom_highbd_obmc_variance128x128_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance128x128 = aom_highbd_obmc_variance128x128_sse4_1;
-  aom_highbd_obmc_variance128x64 = aom_highbd_obmc_variance128x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance128x64 = aom_highbd_obmc_variance128x64_sse4_1;
-  aom_highbd_obmc_variance16x16 = aom_highbd_obmc_variance16x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance16x16 = aom_highbd_obmc_variance16x16_sse4_1;
-  aom_highbd_obmc_variance16x32 = aom_highbd_obmc_variance16x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance16x32 = aom_highbd_obmc_variance16x32_sse4_1;
-  aom_highbd_obmc_variance16x4 = aom_highbd_obmc_variance16x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance16x4 = aom_highbd_obmc_variance16x4_sse4_1;
-  aom_highbd_obmc_variance16x64 = aom_highbd_obmc_variance16x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance16x64 = aom_highbd_obmc_variance16x64_sse4_1;
-  aom_highbd_obmc_variance16x8 = aom_highbd_obmc_variance16x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance16x8 = aom_highbd_obmc_variance16x8_sse4_1;
-  aom_highbd_obmc_variance32x16 = aom_highbd_obmc_variance32x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance32x16 = aom_highbd_obmc_variance32x16_sse4_1;
-  aom_highbd_obmc_variance32x32 = aom_highbd_obmc_variance32x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance32x32 = aom_highbd_obmc_variance32x32_sse4_1;
-  aom_highbd_obmc_variance32x64 = aom_highbd_obmc_variance32x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance32x64 = aom_highbd_obmc_variance32x64_sse4_1;
-  aom_highbd_obmc_variance32x8 = aom_highbd_obmc_variance32x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance32x8 = aom_highbd_obmc_variance32x8_sse4_1;
-  aom_highbd_obmc_variance4x16 = aom_highbd_obmc_variance4x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance4x16 = aom_highbd_obmc_variance4x16_sse4_1;
-  aom_highbd_obmc_variance4x4 = aom_highbd_obmc_variance4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance4x4 = aom_highbd_obmc_variance4x4_sse4_1;
-  aom_highbd_obmc_variance4x8 = aom_highbd_obmc_variance4x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance4x8 = aom_highbd_obmc_variance4x8_sse4_1;
-  aom_highbd_obmc_variance64x128 = aom_highbd_obmc_variance64x128_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance64x128 = aom_highbd_obmc_variance64x128_sse4_1;
-  aom_highbd_obmc_variance64x16 = aom_highbd_obmc_variance64x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance64x16 = aom_highbd_obmc_variance64x16_sse4_1;
-  aom_highbd_obmc_variance64x32 = aom_highbd_obmc_variance64x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance64x32 = aom_highbd_obmc_variance64x32_sse4_1;
-  aom_highbd_obmc_variance64x64 = aom_highbd_obmc_variance64x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance64x64 = aom_highbd_obmc_variance64x64_sse4_1;
-  aom_highbd_obmc_variance8x16 = aom_highbd_obmc_variance8x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance8x16 = aom_highbd_obmc_variance8x16_sse4_1;
-  aom_highbd_obmc_variance8x32 = aom_highbd_obmc_variance8x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance8x32 = aom_highbd_obmc_variance8x32_sse4_1;
-  aom_highbd_obmc_variance8x4 = aom_highbd_obmc_variance8x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance8x4 = aom_highbd_obmc_variance8x4_sse4_1;
-  aom_highbd_obmc_variance8x8 = aom_highbd_obmc_variance8x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_obmc_variance8x8 = aom_highbd_obmc_variance8x8_sse4_1;
-  aom_highbd_quantize_b = aom_highbd_quantize_b_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_quantize_b = aom_highbd_quantize_b_avx2;
-  aom_highbd_quantize_b_32x32_adaptive =
-      aom_highbd_quantize_b_32x32_adaptive_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_quantize_b_32x32_adaptive =
-        aom_highbd_quantize_b_32x32_adaptive_avx2;
-  aom_highbd_quantize_b_adaptive = aom_highbd_quantize_b_adaptive_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_quantize_b_adaptive = aom_highbd_quantize_b_adaptive_avx2;
-  aom_highbd_sad128x128 = aom_highbd_sad128x128_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad128x128 = aom_highbd_sad128x128_avx2;
-  aom_highbd_sad128x128_avg = aom_highbd_sad128x128_avg_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad128x128_avg = aom_highbd_sad128x128_avg_avx2;
-  aom_highbd_sad128x128x4d = aom_highbd_sad128x128x4d_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad128x128x4d = aom_highbd_sad128x128x4d_avx2;
-  aom_highbd_sad128x64 = aom_highbd_sad128x64_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad128x64 = aom_highbd_sad128x64_avx2;
-  aom_highbd_sad128x64_avg = aom_highbd_sad128x64_avg_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad128x64_avg = aom_highbd_sad128x64_avg_avx2;
-  aom_highbd_sad128x64x4d = aom_highbd_sad128x64x4d_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad128x64x4d = aom_highbd_sad128x64x4d_avx2;
-  aom_highbd_sad16x16 = aom_highbd_sad16x16_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad16x16 = aom_highbd_sad16x16_avx2;
-  aom_highbd_sad16x16_avg = aom_highbd_sad16x16_avg_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad16x16_avg = aom_highbd_sad16x16_avg_avx2;
-  aom_highbd_sad16x16x4d = aom_highbd_sad16x16x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad16x16x4d = aom_highbd_sad16x16x4d_avx2;
-  aom_highbd_sad16x32 = aom_highbd_sad16x32_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad16x32 = aom_highbd_sad16x32_avx2;
-  aom_highbd_sad16x32_avg = aom_highbd_sad16x32_avg_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad16x32_avg = aom_highbd_sad16x32_avg_avx2;
-  aom_highbd_sad16x32x4d = aom_highbd_sad16x32x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad16x32x4d = aom_highbd_sad16x32x4d_avx2;
-  aom_highbd_sad16x4 = aom_highbd_sad16x4_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad16x4 = aom_highbd_sad16x4_avx2;
-  aom_highbd_sad16x4_avg = aom_highbd_sad16x4_avg_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad16x4_avg = aom_highbd_sad16x4_avg_avx2;
-  aom_highbd_sad16x4x4d = aom_highbd_sad16x4x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad16x4x4d = aom_highbd_sad16x4x4d_avx2;
-  aom_highbd_sad16x64 = aom_highbd_sad16x64_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad16x64 = aom_highbd_sad16x64_avx2;
-  aom_highbd_sad16x64_avg = aom_highbd_sad16x64_avg_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad16x64_avg = aom_highbd_sad16x64_avg_avx2;
-  aom_highbd_sad16x64x4d = aom_highbd_sad16x64x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad16x64x4d = aom_highbd_sad16x64x4d_avx2;
-  aom_highbd_sad16x8 = aom_highbd_sad16x8_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad16x8 = aom_highbd_sad16x8_avx2;
-  aom_highbd_sad16x8_avg = aom_highbd_sad16x8_avg_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad16x8_avg = aom_highbd_sad16x8_avg_avx2;
-  aom_highbd_sad16x8x4d = aom_highbd_sad16x8x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad16x8x4d = aom_highbd_sad16x8x4d_avx2;
-  aom_highbd_sad32x16 = aom_highbd_sad32x16_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad32x16 = aom_highbd_sad32x16_avx2;
-  aom_highbd_sad32x16_avg = aom_highbd_sad32x16_avg_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad32x16_avg = aom_highbd_sad32x16_avg_avx2;
-  aom_highbd_sad32x16x4d = aom_highbd_sad32x16x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad32x16x4d = aom_highbd_sad32x16x4d_avx2;
-  aom_highbd_sad32x32 = aom_highbd_sad32x32_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad32x32 = aom_highbd_sad32x32_avx2;
-  aom_highbd_sad32x32_avg = aom_highbd_sad32x32_avg_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad32x32_avg = aom_highbd_sad32x32_avg_avx2;
-  aom_highbd_sad32x32x4d = aom_highbd_sad32x32x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad32x32x4d = aom_highbd_sad32x32x4d_avx2;
-  aom_highbd_sad32x64 = aom_highbd_sad32x64_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad32x64 = aom_highbd_sad32x64_avx2;
-  aom_highbd_sad32x64_avg = aom_highbd_sad32x64_avg_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad32x64_avg = aom_highbd_sad32x64_avg_avx2;
-  aom_highbd_sad32x64x4d = aom_highbd_sad32x64x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad32x64x4d = aom_highbd_sad32x64x4d_avx2;
-  aom_highbd_sad32x8 = aom_highbd_sad32x8_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad32x8 = aom_highbd_sad32x8_avx2;
-  aom_highbd_sad32x8_avg = aom_highbd_sad32x8_avg_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad32x8_avg = aom_highbd_sad32x8_avg_avx2;
-  aom_highbd_sad32x8x4d = aom_highbd_sad32x8x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad32x8x4d = aom_highbd_sad32x8x4d_avx2;
-  aom_highbd_sad64x128 = aom_highbd_sad64x128_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad64x128 = aom_highbd_sad64x128_avx2;
-  aom_highbd_sad64x128_avg = aom_highbd_sad64x128_avg_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad64x128_avg = aom_highbd_sad64x128_avg_avx2;
-  aom_highbd_sad64x128x4d = aom_highbd_sad64x128x4d_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad64x128x4d = aom_highbd_sad64x128x4d_avx2;
-  aom_highbd_sad64x16 = aom_highbd_sad64x16_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad64x16 = aom_highbd_sad64x16_avx2;
-  aom_highbd_sad64x16_avg = aom_highbd_sad64x16_avg_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad64x16_avg = aom_highbd_sad64x16_avg_avx2;
-  aom_highbd_sad64x16x4d = aom_highbd_sad64x16x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad64x16x4d = aom_highbd_sad64x16x4d_avx2;
-  aom_highbd_sad64x32 = aom_highbd_sad64x32_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad64x32 = aom_highbd_sad64x32_avx2;
-  aom_highbd_sad64x32_avg = aom_highbd_sad64x32_avg_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad64x32_avg = aom_highbd_sad64x32_avg_avx2;
-  aom_highbd_sad64x32x4d = aom_highbd_sad64x32x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad64x32x4d = aom_highbd_sad64x32x4d_avx2;
-  aom_highbd_sad64x64 = aom_highbd_sad64x64_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad64x64 = aom_highbd_sad64x64_avx2;
-  aom_highbd_sad64x64_avg = aom_highbd_sad64x64_avg_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad64x64_avg = aom_highbd_sad64x64_avg_avx2;
-  aom_highbd_sad64x64x4d = aom_highbd_sad64x64x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad64x64x4d = aom_highbd_sad64x64x4d_avx2;
-  aom_highbd_sad_skip_128x128 = aom_highbd_sad_skip_128x128_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_128x128 = aom_highbd_sad_skip_128x128_avx2;
-  aom_highbd_sad_skip_128x128x4d = aom_highbd_sad_skip_128x128x4d_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_128x128x4d = aom_highbd_sad_skip_128x128x4d_avx2;
-  aom_highbd_sad_skip_128x64 = aom_highbd_sad_skip_128x64_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_128x64 = aom_highbd_sad_skip_128x64_avx2;
-  aom_highbd_sad_skip_128x64x4d = aom_highbd_sad_skip_128x64x4d_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_128x64x4d = aom_highbd_sad_skip_128x64x4d_avx2;
-  aom_highbd_sad_skip_16x16 = aom_highbd_sad_skip_16x16_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_16x16 = aom_highbd_sad_skip_16x16_avx2;
-  aom_highbd_sad_skip_16x16x4d = aom_highbd_sad_skip_16x16x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_16x16x4d = aom_highbd_sad_skip_16x16x4d_avx2;
-  aom_highbd_sad_skip_16x32 = aom_highbd_sad_skip_16x32_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_16x32 = aom_highbd_sad_skip_16x32_avx2;
-  aom_highbd_sad_skip_16x32x4d = aom_highbd_sad_skip_16x32x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_16x32x4d = aom_highbd_sad_skip_16x32x4d_avx2;
-  aom_highbd_sad_skip_16x64 = aom_highbd_sad_skip_16x64_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_16x64 = aom_highbd_sad_skip_16x64_avx2;
-  aom_highbd_sad_skip_16x64x4d = aom_highbd_sad_skip_16x64x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_16x64x4d = aom_highbd_sad_skip_16x64x4d_avx2;
-  aom_highbd_sad_skip_16x8 = aom_highbd_sad_skip_16x8_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_16x8 = aom_highbd_sad_skip_16x8_avx2;
-  aom_highbd_sad_skip_16x8x4d = aom_highbd_sad_skip_16x8x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_16x8x4d = aom_highbd_sad_skip_16x8x4d_avx2;
-  aom_highbd_sad_skip_32x16 = aom_highbd_sad_skip_32x16_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_32x16 = aom_highbd_sad_skip_32x16_avx2;
-  aom_highbd_sad_skip_32x16x4d = aom_highbd_sad_skip_32x16x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_32x16x4d = aom_highbd_sad_skip_32x16x4d_avx2;
-  aom_highbd_sad_skip_32x32 = aom_highbd_sad_skip_32x32_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_32x32 = aom_highbd_sad_skip_32x32_avx2;
-  aom_highbd_sad_skip_32x32x4d = aom_highbd_sad_skip_32x32x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_32x32x4d = aom_highbd_sad_skip_32x32x4d_avx2;
-  aom_highbd_sad_skip_32x64 = aom_highbd_sad_skip_32x64_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_32x64 = aom_highbd_sad_skip_32x64_avx2;
-  aom_highbd_sad_skip_32x64x4d = aom_highbd_sad_skip_32x64x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_32x64x4d = aom_highbd_sad_skip_32x64x4d_avx2;
-  aom_highbd_sad_skip_32x8 = aom_highbd_sad_skip_32x8_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_32x8 = aom_highbd_sad_skip_32x8_avx2;
-  aom_highbd_sad_skip_32x8x4d = aom_highbd_sad_skip_32x8x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_32x8x4d = aom_highbd_sad_skip_32x8x4d_avx2;
-  aom_highbd_sad_skip_64x128 = aom_highbd_sad_skip_64x128_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_64x128 = aom_highbd_sad_skip_64x128_avx2;
-  aom_highbd_sad_skip_64x128x4d = aom_highbd_sad_skip_64x128x4d_c;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_64x128x4d = aom_highbd_sad_skip_64x128x4d_avx2;
-  aom_highbd_sad_skip_64x16 = aom_highbd_sad_skip_64x16_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_64x16 = aom_highbd_sad_skip_64x16_avx2;
-  aom_highbd_sad_skip_64x16x4d = aom_highbd_sad_skip_64x16x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_64x16x4d = aom_highbd_sad_skip_64x16x4d_avx2;
-  aom_highbd_sad_skip_64x32 = aom_highbd_sad_skip_64x32_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_64x32 = aom_highbd_sad_skip_64x32_avx2;
-  aom_highbd_sad_skip_64x32x4d = aom_highbd_sad_skip_64x32x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_64x32x4d = aom_highbd_sad_skip_64x32x4d_avx2;
-  aom_highbd_sad_skip_64x64 = aom_highbd_sad_skip_64x64_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_64x64 = aom_highbd_sad_skip_64x64_avx2;
-  aom_highbd_sad_skip_64x64x4d = aom_highbd_sad_skip_64x64x4d_sse2;
-  if (flags & HAS_AVX2)
-    aom_highbd_sad_skip_64x64x4d = aom_highbd_sad_skip_64x64x4d_avx2;
-  aom_highbd_sse = aom_highbd_sse_c;
-  if (flags & HAS_SSE4_1)
-    aom_highbd_sse = aom_highbd_sse_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_highbd_sse = aom_highbd_sse_avx2;
   aom_ifft16x16_float = aom_ifft16x16_float_sse2;
   if (flags & HAS_AVX2)
     aom_ifft16x16_float = aom_ifft16x16_float_avx2;
@@ -28802,298 +11721,6 @@
   aom_mse_wxh_16bit = aom_mse_wxh_16bit_sse2;
   if (flags & HAS_AVX2)
     aom_mse_wxh_16bit = aom_mse_wxh_16bit_avx2;
-  aom_mse_wxh_16bit_highbd = aom_mse_wxh_16bit_highbd_sse2;
-  if (flags & HAS_AVX2)
-    aom_mse_wxh_16bit_highbd = aom_mse_wxh_16bit_highbd_avx2;
-  aom_obmc_sad128x128 = aom_obmc_sad128x128_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad128x128 = aom_obmc_sad128x128_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad128x128 = aom_obmc_sad128x128_avx2;
-  aom_obmc_sad128x64 = aom_obmc_sad128x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad128x64 = aom_obmc_sad128x64_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad128x64 = aom_obmc_sad128x64_avx2;
-  aom_obmc_sad16x16 = aom_obmc_sad16x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad16x16 = aom_obmc_sad16x16_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad16x16 = aom_obmc_sad16x16_avx2;
-  aom_obmc_sad16x32 = aom_obmc_sad16x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad16x32 = aom_obmc_sad16x32_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad16x32 = aom_obmc_sad16x32_avx2;
-  aom_obmc_sad16x4 = aom_obmc_sad16x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad16x4 = aom_obmc_sad16x4_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad16x4 = aom_obmc_sad16x4_avx2;
-  aom_obmc_sad16x64 = aom_obmc_sad16x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad16x64 = aom_obmc_sad16x64_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad16x64 = aom_obmc_sad16x64_avx2;
-  aom_obmc_sad16x8 = aom_obmc_sad16x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad16x8 = aom_obmc_sad16x8_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad16x8 = aom_obmc_sad16x8_avx2;
-  aom_obmc_sad32x16 = aom_obmc_sad32x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad32x16 = aom_obmc_sad32x16_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad32x16 = aom_obmc_sad32x16_avx2;
-  aom_obmc_sad32x32 = aom_obmc_sad32x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad32x32 = aom_obmc_sad32x32_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad32x32 = aom_obmc_sad32x32_avx2;
-  aom_obmc_sad32x64 = aom_obmc_sad32x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad32x64 = aom_obmc_sad32x64_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad32x64 = aom_obmc_sad32x64_avx2;
-  aom_obmc_sad32x8 = aom_obmc_sad32x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad32x8 = aom_obmc_sad32x8_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad32x8 = aom_obmc_sad32x8_avx2;
-  aom_obmc_sad4x16 = aom_obmc_sad4x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad4x16 = aom_obmc_sad4x16_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad4x16 = aom_obmc_sad4x16_avx2;
-  aom_obmc_sad4x4 = aom_obmc_sad4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad4x4 = aom_obmc_sad4x4_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad4x4 = aom_obmc_sad4x4_avx2;
-  aom_obmc_sad4x8 = aom_obmc_sad4x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad4x8 = aom_obmc_sad4x8_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad4x8 = aom_obmc_sad4x8_avx2;
-  aom_obmc_sad64x128 = aom_obmc_sad64x128_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad64x128 = aom_obmc_sad64x128_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad64x128 = aom_obmc_sad64x128_avx2;
-  aom_obmc_sad64x16 = aom_obmc_sad64x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad64x16 = aom_obmc_sad64x16_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad64x16 = aom_obmc_sad64x16_avx2;
-  aom_obmc_sad64x32 = aom_obmc_sad64x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad64x32 = aom_obmc_sad64x32_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad64x32 = aom_obmc_sad64x32_avx2;
-  aom_obmc_sad64x64 = aom_obmc_sad64x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad64x64 = aom_obmc_sad64x64_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad64x64 = aom_obmc_sad64x64_avx2;
-  aom_obmc_sad8x16 = aom_obmc_sad8x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad8x16 = aom_obmc_sad8x16_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad8x16 = aom_obmc_sad8x16_avx2;
-  aom_obmc_sad8x32 = aom_obmc_sad8x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad8x32 = aom_obmc_sad8x32_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad8x32 = aom_obmc_sad8x32_avx2;
-  aom_obmc_sad8x4 = aom_obmc_sad8x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad8x4 = aom_obmc_sad8x4_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad8x4 = aom_obmc_sad8x4_avx2;
-  aom_obmc_sad8x8 = aom_obmc_sad8x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sad8x8 = aom_obmc_sad8x8_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_sad8x8 = aom_obmc_sad8x8_avx2;
-  aom_obmc_sub_pixel_variance128x128 = aom_obmc_sub_pixel_variance128x128_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance128x128 =
-        aom_obmc_sub_pixel_variance128x128_sse4_1;
-  aom_obmc_sub_pixel_variance128x64 = aom_obmc_sub_pixel_variance128x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance128x64 =
-        aom_obmc_sub_pixel_variance128x64_sse4_1;
-  aom_obmc_sub_pixel_variance16x16 = aom_obmc_sub_pixel_variance16x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance16x16 = aom_obmc_sub_pixel_variance16x16_sse4_1;
-  aom_obmc_sub_pixel_variance16x32 = aom_obmc_sub_pixel_variance16x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance16x32 = aom_obmc_sub_pixel_variance16x32_sse4_1;
-  aom_obmc_sub_pixel_variance16x4 = aom_obmc_sub_pixel_variance16x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance16x4 = aom_obmc_sub_pixel_variance16x4_sse4_1;
-  aom_obmc_sub_pixel_variance16x64 = aom_obmc_sub_pixel_variance16x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance16x64 = aom_obmc_sub_pixel_variance16x64_sse4_1;
-  aom_obmc_sub_pixel_variance16x8 = aom_obmc_sub_pixel_variance16x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance16x8 = aom_obmc_sub_pixel_variance16x8_sse4_1;
-  aom_obmc_sub_pixel_variance32x16 = aom_obmc_sub_pixel_variance32x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance32x16 = aom_obmc_sub_pixel_variance32x16_sse4_1;
-  aom_obmc_sub_pixel_variance32x32 = aom_obmc_sub_pixel_variance32x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance32x32 = aom_obmc_sub_pixel_variance32x32_sse4_1;
-  aom_obmc_sub_pixel_variance32x64 = aom_obmc_sub_pixel_variance32x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance32x64 = aom_obmc_sub_pixel_variance32x64_sse4_1;
-  aom_obmc_sub_pixel_variance32x8 = aom_obmc_sub_pixel_variance32x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance32x8 = aom_obmc_sub_pixel_variance32x8_sse4_1;
-  aom_obmc_sub_pixel_variance4x16 = aom_obmc_sub_pixel_variance4x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance4x16 = aom_obmc_sub_pixel_variance4x16_sse4_1;
-  aom_obmc_sub_pixel_variance4x4 = aom_obmc_sub_pixel_variance4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance4x4 = aom_obmc_sub_pixel_variance4x4_sse4_1;
-  aom_obmc_sub_pixel_variance4x8 = aom_obmc_sub_pixel_variance4x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance4x8 = aom_obmc_sub_pixel_variance4x8_sse4_1;
-  aom_obmc_sub_pixel_variance64x128 = aom_obmc_sub_pixel_variance64x128_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance64x128 =
-        aom_obmc_sub_pixel_variance64x128_sse4_1;
-  aom_obmc_sub_pixel_variance64x16 = aom_obmc_sub_pixel_variance64x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance64x16 = aom_obmc_sub_pixel_variance64x16_sse4_1;
-  aom_obmc_sub_pixel_variance64x32 = aom_obmc_sub_pixel_variance64x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance64x32 = aom_obmc_sub_pixel_variance64x32_sse4_1;
-  aom_obmc_sub_pixel_variance64x64 = aom_obmc_sub_pixel_variance64x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance64x64 = aom_obmc_sub_pixel_variance64x64_sse4_1;
-  aom_obmc_sub_pixel_variance8x16 = aom_obmc_sub_pixel_variance8x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance8x16 = aom_obmc_sub_pixel_variance8x16_sse4_1;
-  aom_obmc_sub_pixel_variance8x32 = aom_obmc_sub_pixel_variance8x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance8x32 = aom_obmc_sub_pixel_variance8x32_sse4_1;
-  aom_obmc_sub_pixel_variance8x4 = aom_obmc_sub_pixel_variance8x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance8x4 = aom_obmc_sub_pixel_variance8x4_sse4_1;
-  aom_obmc_sub_pixel_variance8x8 = aom_obmc_sub_pixel_variance8x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_sub_pixel_variance8x8 = aom_obmc_sub_pixel_variance8x8_sse4_1;
-  aom_obmc_variance128x128 = aom_obmc_variance128x128_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance128x128 = aom_obmc_variance128x128_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance128x128 = aom_obmc_variance128x128_avx2;
-  aom_obmc_variance128x64 = aom_obmc_variance128x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance128x64 = aom_obmc_variance128x64_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance128x64 = aom_obmc_variance128x64_avx2;
-  aom_obmc_variance16x16 = aom_obmc_variance16x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance16x16 = aom_obmc_variance16x16_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance16x16 = aom_obmc_variance16x16_avx2;
-  aom_obmc_variance16x32 = aom_obmc_variance16x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance16x32 = aom_obmc_variance16x32_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance16x32 = aom_obmc_variance16x32_avx2;
-  aom_obmc_variance16x4 = aom_obmc_variance16x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance16x4 = aom_obmc_variance16x4_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance16x4 = aom_obmc_variance16x4_avx2;
-  aom_obmc_variance16x64 = aom_obmc_variance16x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance16x64 = aom_obmc_variance16x64_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance16x64 = aom_obmc_variance16x64_avx2;
-  aom_obmc_variance16x8 = aom_obmc_variance16x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance16x8 = aom_obmc_variance16x8_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance16x8 = aom_obmc_variance16x8_avx2;
-  aom_obmc_variance32x16 = aom_obmc_variance32x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance32x16 = aom_obmc_variance32x16_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance32x16 = aom_obmc_variance32x16_avx2;
-  aom_obmc_variance32x32 = aom_obmc_variance32x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance32x32 = aom_obmc_variance32x32_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance32x32 = aom_obmc_variance32x32_avx2;
-  aom_obmc_variance32x64 = aom_obmc_variance32x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance32x64 = aom_obmc_variance32x64_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance32x64 = aom_obmc_variance32x64_avx2;
-  aom_obmc_variance32x8 = aom_obmc_variance32x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance32x8 = aom_obmc_variance32x8_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance32x8 = aom_obmc_variance32x8_avx2;
-  aom_obmc_variance4x16 = aom_obmc_variance4x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance4x16 = aom_obmc_variance4x16_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance4x16 = aom_obmc_variance4x16_avx2;
-  aom_obmc_variance4x4 = aom_obmc_variance4x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance4x4 = aom_obmc_variance4x4_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance4x4 = aom_obmc_variance4x4_avx2;
-  aom_obmc_variance4x8 = aom_obmc_variance4x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance4x8 = aom_obmc_variance4x8_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance4x8 = aom_obmc_variance4x8_avx2;
-  aom_obmc_variance64x128 = aom_obmc_variance64x128_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance64x128 = aom_obmc_variance64x128_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance64x128 = aom_obmc_variance64x128_avx2;
-  aom_obmc_variance64x16 = aom_obmc_variance64x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance64x16 = aom_obmc_variance64x16_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance64x16 = aom_obmc_variance64x16_avx2;
-  aom_obmc_variance64x32 = aom_obmc_variance64x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance64x32 = aom_obmc_variance64x32_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance64x32 = aom_obmc_variance64x32_avx2;
-  aom_obmc_variance64x64 = aom_obmc_variance64x64_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance64x64 = aom_obmc_variance64x64_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance64x64 = aom_obmc_variance64x64_avx2;
-  aom_obmc_variance8x16 = aom_obmc_variance8x16_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance8x16 = aom_obmc_variance8x16_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance8x16 = aom_obmc_variance8x16_avx2;
-  aom_obmc_variance8x32 = aom_obmc_variance8x32_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance8x32 = aom_obmc_variance8x32_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance8x32 = aom_obmc_variance8x32_avx2;
-  aom_obmc_variance8x4 = aom_obmc_variance8x4_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance8x4 = aom_obmc_variance8x4_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance8x4 = aom_obmc_variance8x4_avx2;
-  aom_obmc_variance8x8 = aom_obmc_variance8x8_c;
-  if (flags & HAS_SSE4_1)
-    aom_obmc_variance8x8 = aom_obmc_variance8x8_sse4_1;
-  if (flags & HAS_AVX2)
-    aom_obmc_variance8x8 = aom_obmc_variance8x8_avx2;
   aom_paeth_predictor_16x16 = aom_paeth_predictor_16x16_c;
   if (flags & HAS_SSSE3)
     aom_paeth_predictor_16x16 = aom_paeth_predictor_16x16_ssse3;
diff --git a/third_party/libaom/source/config/win/x64/config/av1_rtcd.h b/third_party/libaom/source/config/win/x64/config/av1_rtcd.h
index 647f0ed..e29d732 100644
--- a/third_party/libaom/source/config/win/x64/config/av1_rtcd.h
+++ b/third_party/libaom/source/config/win/x64/config/av1_rtcd.h
@@ -99,109 +99,6 @@
                              const int log_scale);
 #define aom_quantize_b_helper aom_quantize_b_helper_c
 
-void av1_apply_selfguided_restoration_c(const uint8_t* dat,
-                                        int width,
-                                        int height,
-                                        int stride,
-                                        int eps,
-                                        const int* xqd,
-                                        uint8_t* dst,
-                                        int dst_stride,
-                                        int32_t* tmpbuf,
-                                        int bit_depth,
-                                        int highbd);
-void av1_apply_selfguided_restoration_sse4_1(const uint8_t* dat,
-                                             int width,
-                                             int height,
-                                             int stride,
-                                             int eps,
-                                             const int* xqd,
-                                             uint8_t* dst,
-                                             int dst_stride,
-                                             int32_t* tmpbuf,
-                                             int bit_depth,
-                                             int highbd);
-void av1_apply_selfguided_restoration_avx2(const uint8_t* dat,
-                                           int width,
-                                           int height,
-                                           int stride,
-                                           int eps,
-                                           const int* xqd,
-                                           uint8_t* dst,
-                                           int dst_stride,
-                                           int32_t* tmpbuf,
-                                           int bit_depth,
-                                           int highbd);
-RTCD_EXTERN void (*av1_apply_selfguided_restoration)(const uint8_t* dat,
-                                                     int width,
-                                                     int height,
-                                                     int stride,
-                                                     int eps,
-                                                     const int* xqd,
-                                                     uint8_t* dst,
-                                                     int dst_stride,
-                                                     int32_t* tmpbuf,
-                                                     int bit_depth,
-                                                     int highbd);
-
-void av1_apply_temporal_filter_c(const struct yv12_buffer_config* ref_frame,
-                                 const struct macroblockd* mbd,
-                                 const BLOCK_SIZE block_size,
-                                 const int mb_row,
-                                 const int mb_col,
-                                 const int num_planes,
-                                 const double* noise_levels,
-                                 const MV* subblock_mvs,
-                                 const int* subblock_mses,
-                                 const int q_factor,
-                                 const int filter_strength,
-                                 const uint8_t* pred,
-                                 uint32_t* accum,
-                                 uint16_t* count);
-void av1_apply_temporal_filter_sse2(const struct yv12_buffer_config* ref_frame,
-                                    const struct macroblockd* mbd,
-                                    const BLOCK_SIZE block_size,
-                                    const int mb_row,
-                                    const int mb_col,
-                                    const int num_planes,
-                                    const double* noise_levels,
-                                    const MV* subblock_mvs,
-                                    const int* subblock_mses,
-                                    const int q_factor,
-                                    const int filter_strength,
-                                    const uint8_t* pred,
-                                    uint32_t* accum,
-                                    uint16_t* count);
-void av1_apply_temporal_filter_avx2(const struct yv12_buffer_config* ref_frame,
-                                    const struct macroblockd* mbd,
-                                    const BLOCK_SIZE block_size,
-                                    const int mb_row,
-                                    const int mb_col,
-                                    const int num_planes,
-                                    const double* noise_levels,
-                                    const MV* subblock_mvs,
-                                    const int* subblock_mses,
-                                    const int q_factor,
-                                    const int filter_strength,
-                                    const uint8_t* pred,
-                                    uint32_t* accum,
-                                    uint16_t* count);
-RTCD_EXTERN void (*av1_apply_temporal_filter)(
-    const struct yv12_buffer_config* ref_frame,
-    const struct macroblockd* mbd,
-    const BLOCK_SIZE block_size,
-    const int mb_row,
-    const int mb_col,
-    const int num_planes,
-    const double* noise_levels,
-    const MV* subblock_mvs,
-    const int* subblock_mses,
-    const int q_factor,
-    const int filter_strength,
-    const uint8_t* pred,
-    uint32_t* accum,
-    uint16_t* count);
-
 int64_t av1_block_error_c(const tran_low_t* coeff,
                           const tran_low_t* dqcoeff,
                           intptr_t block_size,
@@ -342,137 +239,6 @@
     int w,
     int bd);
 
-int64_t av1_calc_frame_error_c(const uint8_t* const ref,
-                               int stride,
-                               const uint8_t* const dst,
-                               int p_width,
-                               int p_height,
-                               int p_stride);
-int64_t av1_calc_frame_error_sse2(const uint8_t* const ref,
-                                  int stride,
-                                  const uint8_t* const dst,
-                                  int p_width,
-                                  int p_height,
-                                  int p_stride);
-int64_t av1_calc_frame_error_avx2(const uint8_t* const ref,
-                                  int stride,
-                                  const uint8_t* const dst,
-                                  int p_width,
-                                  int p_height,
-                                  int p_stride);
-RTCD_EXTERN int64_t (*av1_calc_frame_error)(const uint8_t* const ref,
-                                            int stride,
-                                            const uint8_t* const dst,
-                                            int p_width,
-                                            int p_height,
-                                            int p_stride);
-
-void av1_calc_proj_params_c(const uint8_t* src8,
-                            int width,
-                            int height,
-                            int src_stride,
-                            const uint8_t* dat8,
-                            int dat_stride,
-                            int32_t* flt0,
-                            int flt0_stride,
-                            int32_t* flt1,
-                            int flt1_stride,
-                            int64_t H[2][2],
-                            int64_t C[2],
-                            const sgr_params_type* params);
-void av1_calc_proj_params_sse4_1(const uint8_t* src8,
-                                 int width,
-                                 int height,
-                                 int src_stride,
-                                 const uint8_t* dat8,
-                                 int dat_stride,
-                                 int32_t* flt0,
-                                 int flt0_stride,
-                                 int32_t* flt1,
-                                 int flt1_stride,
-                                 int64_t H[2][2],
-                                 int64_t C[2],
-                                 const sgr_params_type* params);
-void av1_calc_proj_params_avx2(const uint8_t* src8,
-                               int width,
-                               int height,
-                               int src_stride,
-                               const uint8_t* dat8,
-                               int dat_stride,
-                               int32_t* flt0,
-                               int flt0_stride,
-                               int32_t* flt1,
-                               int flt1_stride,
-                               int64_t H[2][2],
-                               int64_t C[2],
-                               const sgr_params_type* params);
-RTCD_EXTERN void (*av1_calc_proj_params)(const uint8_t* src8,
-                                         int width,
-                                         int height,
-                                         int src_stride,
-                                         const uint8_t* dat8,
-                                         int dat_stride,
-                                         int32_t* flt0,
-                                         int flt0_stride,
-                                         int32_t* flt1,
-                                         int flt1_stride,
-                                         int64_t H[2][2],
-                                         int64_t C[2],
-                                         const sgr_params_type* params);
-
-void av1_calc_proj_params_high_bd_c(const uint8_t* src8,
-                                    int width,
-                                    int height,
-                                    int src_stride,
-                                    const uint8_t* dat8,
-                                    int dat_stride,
-                                    int32_t* flt0,
-                                    int flt0_stride,
-                                    int32_t* flt1,
-                                    int flt1_stride,
-                                    int64_t H[2][2],
-                                    int64_t C[2],
-                                    const sgr_params_type* params);
-void av1_calc_proj_params_high_bd_sse4_1(const uint8_t* src8,
-                                         int width,
-                                         int height,
-                                         int src_stride,
-                                         const uint8_t* dat8,
-                                         int dat_stride,
-                                         int32_t* flt0,
-                                         int flt0_stride,
-                                         int32_t* flt1,
-                                         int flt1_stride,
-                                         int64_t H[2][2],
-                                         int64_t C[2],
-                                         const sgr_params_type* params);
-void av1_calc_proj_params_high_bd_avx2(const uint8_t* src8,
-                                       int width,
-                                       int height,
-                                       int src_stride,
-                                       const uint8_t* dat8,
-                                       int dat_stride,
-                                       int32_t* flt0,
-                                       int flt0_stride,
-                                       int32_t* flt1,
-                                       int flt1_stride,
-                                       int64_t H[2][2],
-                                       int64_t C[2],
-                                       const sgr_params_type* params);
-RTCD_EXTERN void (*av1_calc_proj_params_high_bd)(const uint8_t* src8,
-                                                 int width,
-                                                 int height,
-                                                 int src_stride,
-                                                 const uint8_t* dat8,
-                                                 int dat_stride,
-                                                 int32_t* flt0,
-                                                 int flt0_stride,
-                                                 int32_t* flt1,
-                                                 int flt1_stride,
-                                                 int64_t H[2][2],
-                                                 int64_t C[2],
-                                                 const sgr_params_type* params);
-
 void av1_cnn_activate_c(float** input,
                         int channels,
                         int width,
@@ -562,100 +328,6 @@
                                                     int x2,
                                                     int y2);
 
-void av1_compute_stats_c(int wiener_win,
-                         const uint8_t* dgd8,
-                         const uint8_t* src8,
-                         int h_start,
-                         int h_end,
-                         int v_start,
-                         int v_end,
-                         int dgd_stride,
-                         int src_stride,
-                         int64_t* M,
-                         int64_t* H);
-void av1_compute_stats_sse4_1(int wiener_win,
-                              const uint8_t* dgd8,
-                              const uint8_t* src8,
-                              int h_start,
-                              int h_end,
-                              int v_start,
-                              int v_end,
-                              int dgd_stride,
-                              int src_stride,
-                              int64_t* M,
-                              int64_t* H);
-void av1_compute_stats_avx2(int wiener_win,
-                            const uint8_t* dgd8,
-                            const uint8_t* src8,
-                            int h_start,
-                            int h_end,
-                            int v_start,
-                            int v_end,
-                            int dgd_stride,
-                            int src_stride,
-                            int64_t* M,
-                            int64_t* H);
-RTCD_EXTERN void (*av1_compute_stats)(int wiener_win,
-                                      const uint8_t* dgd8,
-                                      const uint8_t* src8,
-                                      int h_start,
-                                      int h_end,
-                                      int v_start,
-                                      int v_end,
-                                      int dgd_stride,
-                                      int src_stride,
-                                      int64_t* M,
-                                      int64_t* H);
-
-void av1_compute_stats_highbd_c(int wiener_win,
-                                const uint8_t* dgd8,
-                                const uint8_t* src8,
-                                int h_start,
-                                int h_end,
-                                int v_start,
-                                int v_end,
-                                int dgd_stride,
-                                int src_stride,
-                                int64_t* M,
-                                int64_t* H,
-                                aom_bit_depth_t bit_depth);
-void av1_compute_stats_highbd_sse4_1(int wiener_win,
-                                     const uint8_t* dgd8,
-                                     const uint8_t* src8,
-                                     int h_start,
-                                     int h_end,
-                                     int v_start,
-                                     int v_end,
-                                     int dgd_stride,
-                                     int src_stride,
-                                     int64_t* M,
-                                     int64_t* H,
-                                     aom_bit_depth_t bit_depth);
-void av1_compute_stats_highbd_avx2(int wiener_win,
-                                   const uint8_t* dgd8,
-                                   const uint8_t* src8,
-                                   int h_start,
-                                   int h_end,
-                                   int v_start,
-                                   int v_end,
-                                   int dgd_stride,
-                                   int src_stride,
-                                   int64_t* M,
-                                   int64_t* H,
-                                   aom_bit_depth_t bit_depth);
-RTCD_EXTERN void (*av1_compute_stats_highbd)(int wiener_win,
-                                             const uint8_t* dgd8,
-                                             const uint8_t* src8,
-                                             int h_start,
-                                             int h_end,
-                                             int v_start,
-                                             int v_end,
-                                             int dgd_stride,
-                                             int src_stride,
-                                             int64_t* M,
-                                             int64_t* H,
-                                             aom_bit_depth_t bit_depth);
-
 void av1_convolve_2d_scale_c(const uint8_t* src,
                              int src_stride,
                              uint8_t* dst,
@@ -1505,88 +1177,6 @@
                                   int8_t* const coeff_contexts);
 #define av1_get_nz_map_contexts av1_get_nz_map_contexts_sse2
 
-void av1_highbd_apply_temporal_filter_c(
-    const struct yv12_buffer_config* ref_frame,
-    const struct macroblockd* mbd,
-    const BLOCK_SIZE block_size,
-    const int mb_row,
-    const int mb_col,
-    const int num_planes,
-    const double* noise_levels,
-    const MV* subblock_mvs,
-    const int* subblock_mses,
-    const int q_factor,
-    const int filter_strength,
-    const uint8_t* pred,
-    uint32_t* accum,
-    uint16_t* count);
-void av1_highbd_apply_temporal_filter_sse2(
-    const struct yv12_buffer_config* ref_frame,
-    const struct macroblockd* mbd,
-    const BLOCK_SIZE block_size,
-    const int mb_row,
-    const int mb_col,
-    const int num_planes,
-    const double* noise_levels,
-    const MV* subblock_mvs,
-    const int* subblock_mses,
-    const int q_factor,
-    const int filter_strength,
-    const uint8_t* pred,
-    uint32_t* accum,
-    uint16_t* count);
-void av1_highbd_apply_temporal_filter_avx2(
-    const struct yv12_buffer_config* ref_frame,
-    const struct macroblockd* mbd,
-    const BLOCK_SIZE block_size,
-    const int mb_row,
-    const int mb_col,
-    const int num_planes,
-    const double* noise_levels,
-    const MV* subblock_mvs,
-    const int* subblock_mses,
-    const int q_factor,
-    const int filter_strength,
-    const uint8_t* pred,
-    uint32_t* accum,
-    uint16_t* count);
-RTCD_EXTERN void (*av1_highbd_apply_temporal_filter)(
-    const struct yv12_buffer_config* ref_frame,
-    const struct macroblockd* mbd,
-    const BLOCK_SIZE block_size,
-    const int mb_row,
-    const int mb_col,
-    const int num_planes,
-    const double* noise_levels,
-    const MV* subblock_mvs,
-    const int* subblock_mses,
-    const int q_factor,
-    const int filter_strength,
-    const uint8_t* pred,
-    uint32_t* accum,
-    uint16_t* count);
-
-int64_t av1_highbd_block_error_c(const tran_low_t* coeff,
-                                 const tran_low_t* dqcoeff,
-                                 intptr_t block_size,
-                                 int64_t* ssz,
-                                 int bd);
-int64_t av1_highbd_block_error_sse2(const tran_low_t* coeff,
-                                    const tran_low_t* dqcoeff,
-                                    intptr_t block_size,
-                                    int64_t* ssz,
-                                    int bd);
-int64_t av1_highbd_block_error_avx2(const tran_low_t* coeff,
-                                    const tran_low_t* dqcoeff,
-                                    intptr_t block_size,
-                                    int64_t* ssz,
-                                    int bd);
-RTCD_EXTERN int64_t (*av1_highbd_block_error)(const tran_low_t* coeff,
-                                              const tran_low_t* dqcoeff,
-                                              intptr_t block_size,
-                                              int64_t* ssz,
-                                              int bd);
-
 void av1_highbd_convolve8_c(const uint8_t* src,
                             ptrdiff_t src_stride,
                             uint8_t* dst,
@@ -1659,101 +1249,6 @@
                                     int bps);
 #define av1_highbd_convolve8_vert av1_highbd_convolve8_vert_sse2
 
-void av1_highbd_convolve_2d_scale_c(const uint16_t* src,
-                                    int src_stride,
-                                    uint16_t* dst,
-                                    int dst_stride,
-                                    int w,
-                                    int h,
-                                    const InterpFilterParams* filter_params_x,
-                                    const InterpFilterParams* filter_params_y,
-                                    const int subpel_x_qn,
-                                    const int x_step_qn,
-                                    const int subpel_y_qn,
-                                    const int y_step_qn,
-                                    ConvolveParams* conv_params,
-                                    int bd);
-void av1_highbd_convolve_2d_scale_sse4_1(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_x,
-    const InterpFilterParams* filter_params_y,
-    const int subpel_x_qn,
-    const int x_step_qn,
-    const int subpel_y_qn,
-    const int y_step_qn,
-    ConvolveParams* conv_params,
-    int bd);
-RTCD_EXTERN void (*av1_highbd_convolve_2d_scale)(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_x,
-    const InterpFilterParams* filter_params_y,
-    const int subpel_x_qn,
-    const int x_step_qn,
-    const int subpel_y_qn,
-    const int y_step_qn,
-    ConvolveParams* conv_params,
-    int bd);
-
-void av1_highbd_convolve_2d_sr_c(const uint16_t* src,
-                                 int src_stride,
-                                 uint16_t* dst,
-                                 int dst_stride,
-                                 int w,
-                                 int h,
-                                 const InterpFilterParams* filter_params_x,
-                                 const InterpFilterParams* filter_params_y,
-                                 const int subpel_x_qn,
-                                 const int subpel_y_qn,
-                                 ConvolveParams* conv_params,
-                                 int bd);
-void av1_highbd_convolve_2d_sr_ssse3(const uint16_t* src,
-                                     int src_stride,
-                                     uint16_t* dst,
-                                     int dst_stride,
-                                     int w,
-                                     int h,
-                                     const InterpFilterParams* filter_params_x,
-                                     const InterpFilterParams* filter_params_y,
-                                     const int subpel_x_qn,
-                                     const int subpel_y_qn,
-                                     ConvolveParams* conv_params,
-                                     int bd);
-void av1_highbd_convolve_2d_sr_avx2(const uint16_t* src,
-                                    int src_stride,
-                                    uint16_t* dst,
-                                    int dst_stride,
-                                    int w,
-                                    int h,
-                                    const InterpFilterParams* filter_params_x,
-                                    const InterpFilterParams* filter_params_y,
-                                    const int subpel_x_qn,
-                                    const int subpel_y_qn,
-                                    ConvolveParams* conv_params,
-                                    int bd);
-RTCD_EXTERN void (*av1_highbd_convolve_2d_sr)(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_x,
-    const InterpFilterParams* filter_params_y,
-    const int subpel_x_qn,
-    const int subpel_y_qn,
-    ConvolveParams* conv_params,
-    int bd);
-
 void av1_highbd_convolve_avg_c(const uint8_t* src,
                                ptrdiff_t src_stride,
                                uint8_t* dst,
@@ -1780,388 +1275,6 @@
                                 int bps);
 #define av1_highbd_convolve_copy av1_highbd_convolve_copy_c
 
-void av1_highbd_convolve_horiz_rs_c(const uint16_t* src,
-                                    int src_stride,
-                                    uint16_t* dst,
-                                    int dst_stride,
-                                    int w,
-                                    int h,
-                                    const int16_t* x_filters,
-                                    int x0_qn,
-                                    int x_step_qn,
-                                    int bd);
-void av1_highbd_convolve_horiz_rs_sse4_1(const uint16_t* src,
-                                         int src_stride,
-                                         uint16_t* dst,
-                                         int dst_stride,
-                                         int w,
-                                         int h,
-                                         const int16_t* x_filters,
-                                         int x0_qn,
-                                         int x_step_qn,
-                                         int bd);
-RTCD_EXTERN void (*av1_highbd_convolve_horiz_rs)(const uint16_t* src,
-                                                 int src_stride,
-                                                 uint16_t* dst,
-                                                 int dst_stride,
-                                                 int w,
-                                                 int h,
-                                                 const int16_t* x_filters,
-                                                 int x0_qn,
-                                                 int x_step_qn,
-                                                 int bd);
-
-void av1_highbd_convolve_x_sr_c(const uint16_t* src,
-                                int src_stride,
-                                uint16_t* dst,
-                                int dst_stride,
-                                int w,
-                                int h,
-                                const InterpFilterParams* filter_params_x,
-                                const int subpel_x_qn,
-                                ConvolveParams* conv_params,
-                                int bd);
-void av1_highbd_convolve_x_sr_ssse3(const uint16_t* src,
-                                    int src_stride,
-                                    uint16_t* dst,
-                                    int dst_stride,
-                                    int w,
-                                    int h,
-                                    const InterpFilterParams* filter_params_x,
-                                    const int subpel_x_qn,
-                                    ConvolveParams* conv_params,
-                                    int bd);
-void av1_highbd_convolve_x_sr_avx2(const uint16_t* src,
-                                   int src_stride,
-                                   uint16_t* dst,
-                                   int dst_stride,
-                                   int w,
-                                   int h,
-                                   const InterpFilterParams* filter_params_x,
-                                   const int subpel_x_qn,
-                                   ConvolveParams* conv_params,
-                                   int bd);
-RTCD_EXTERN void (*av1_highbd_convolve_x_sr)(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_x,
-    const int subpel_x_qn,
-    ConvolveParams* conv_params,
-    int bd);
-
-void av1_highbd_convolve_y_sr_c(const uint16_t* src,
-                                int src_stride,
-                                uint16_t* dst,
-                                int dst_stride,
-                                int w,
-                                int h,
-                                const InterpFilterParams* filter_params_y,
-                                const int subpel_y_qn,
-                                int bd);
-void av1_highbd_convolve_y_sr_ssse3(const uint16_t* src,
-                                    int src_stride,
-                                    uint16_t* dst,
-                                    int dst_stride,
-                                    int w,
-                                    int h,
-                                    const InterpFilterParams* filter_params_y,
-                                    const int subpel_y_qn,
-                                    int bd);
-void av1_highbd_convolve_y_sr_avx2(const uint16_t* src,
-                                   int src_stride,
-                                   uint16_t* dst,
-                                   int dst_stride,
-                                   int w,
-                                   int h,
-                                   const InterpFilterParams* filter_params_y,
-                                   const int subpel_y_qn,
-                                   int bd);
-RTCD_EXTERN void (*av1_highbd_convolve_y_sr)(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_y,
-    const int subpel_y_qn,
-    int bd);
-
-void av1_highbd_dist_wtd_convolve_2d_c(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_x,
-    const InterpFilterParams* filter_params_y,
-    const int subpel_x_qn,
-    const int subpel_y_qn,
-    ConvolveParams* conv_params,
-    int bd);
-void av1_highbd_dist_wtd_convolve_2d_sse4_1(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_x,
-    const InterpFilterParams* filter_params_y,
-    const int subpel_x_qn,
-    const int subpel_y_qn,
-    ConvolveParams* conv_params,
-    int bd);
-void av1_highbd_dist_wtd_convolve_2d_avx2(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_x,
-    const InterpFilterParams* filter_params_y,
-    const int subpel_x_qn,
-    const int subpel_y_qn,
-    ConvolveParams* conv_params,
-    int bd);
-RTCD_EXTERN void (*av1_highbd_dist_wtd_convolve_2d)(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_x,
-    const InterpFilterParams* filter_params_y,
-    const int subpel_x_qn,
-    const int subpel_y_qn,
-    ConvolveParams* conv_params,
-    int bd);
-
-void av1_highbd_dist_wtd_convolve_2d_copy_c(const uint16_t* src,
-                                            int src_stride,
-                                            uint16_t* dst,
-                                            int dst_stride,
-                                            int w,
-                                            int h,
-                                            ConvolveParams* conv_params,
-                                            int bd);
-void av1_highbd_dist_wtd_convolve_2d_copy_sse4_1(const uint16_t* src,
-                                                 int src_stride,
-                                                 uint16_t* dst,
-                                                 int dst_stride,
-                                                 int w,
-                                                 int h,
-                                                 ConvolveParams* conv_params,
-                                                 int bd);
-void av1_highbd_dist_wtd_convolve_2d_copy_avx2(const uint16_t* src,
-                                               int src_stride,
-                                               uint16_t* dst,
-                                               int dst_stride,
-                                               int w,
-                                               int h,
-                                               ConvolveParams* conv_params,
-                                               int bd);
-RTCD_EXTERN void (*av1_highbd_dist_wtd_convolve_2d_copy)(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    ConvolveParams* conv_params,
-    int bd);
-
-void av1_highbd_dist_wtd_convolve_x_c(const uint16_t* src,
-                                      int src_stride,
-                                      uint16_t* dst,
-                                      int dst_stride,
-                                      int w,
-                                      int h,
-                                      const InterpFilterParams* filter_params_x,
-                                      const int subpel_x_qn,
-                                      ConvolveParams* conv_params,
-                                      int bd);
-void av1_highbd_dist_wtd_convolve_x_sse4_1(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_x,
-    const int subpel_x_qn,
-    ConvolveParams* conv_params,
-    int bd);
-void av1_highbd_dist_wtd_convolve_x_avx2(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_x,
-    const int subpel_x_qn,
-    ConvolveParams* conv_params,
-    int bd);
-RTCD_EXTERN void (*av1_highbd_dist_wtd_convolve_x)(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_x,
-    const int subpel_x_qn,
-    ConvolveParams* conv_params,
-    int bd);
-
-void av1_highbd_dist_wtd_convolve_y_c(const uint16_t* src,
-                                      int src_stride,
-                                      uint16_t* dst,
-                                      int dst_stride,
-                                      int w,
-                                      int h,
-                                      const InterpFilterParams* filter_params_y,
-                                      const int subpel_y_qn,
-                                      ConvolveParams* conv_params,
-                                      int bd);
-void av1_highbd_dist_wtd_convolve_y_sse4_1(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_y,
-    const int subpel_y_qn,
-    ConvolveParams* conv_params,
-    int bd);
-void av1_highbd_dist_wtd_convolve_y_avx2(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_y,
-    const int subpel_y_qn,
-    ConvolveParams* conv_params,
-    int bd);
-RTCD_EXTERN void (*av1_highbd_dist_wtd_convolve_y)(
-    const uint16_t* src,
-    int src_stride,
-    uint16_t* dst,
-    int dst_stride,
-    int w,
-    int h,
-    const InterpFilterParams* filter_params_y,
-    const int subpel_y_qn,
-    ConvolveParams* conv_params,
-    int bd);
-
-void av1_highbd_dr_prediction_z1_c(uint16_t* dst,
-                                   ptrdiff_t stride,
-                                   int bw,
-                                   int bh,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int upsample_above,
-                                   int dx,
-                                   int dy,
-                                   int bd);
-void av1_highbd_dr_prediction_z1_avx2(uint16_t* dst,
-                                      ptrdiff_t stride,
-                                      int bw,
-                                      int bh,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int upsample_above,
-                                      int dx,
-                                      int dy,
-                                      int bd);
-RTCD_EXTERN void (*av1_highbd_dr_prediction_z1)(uint16_t* dst,
-                                                ptrdiff_t stride,
-                                                int bw,
-                                                int bh,
-                                                const uint16_t* above,
-                                                const uint16_t* left,
-                                                int upsample_above,
-                                                int dx,
-                                                int dy,
-                                                int bd);
-
-void av1_highbd_dr_prediction_z2_c(uint16_t* dst,
-                                   ptrdiff_t stride,
-                                   int bw,
-                                   int bh,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int upsample_above,
-                                   int upsample_left,
-                                   int dx,
-                                   int dy,
-                                   int bd);
-void av1_highbd_dr_prediction_z2_avx2(uint16_t* dst,
-                                      ptrdiff_t stride,
-                                      int bw,
-                                      int bh,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int upsample_above,
-                                      int upsample_left,
-                                      int dx,
-                                      int dy,
-                                      int bd);
-RTCD_EXTERN void (*av1_highbd_dr_prediction_z2)(uint16_t* dst,
-                                                ptrdiff_t stride,
-                                                int bw,
-                                                int bh,
-                                                const uint16_t* above,
-                                                const uint16_t* left,
-                                                int upsample_above,
-                                                int upsample_left,
-                                                int dx,
-                                                int dy,
-                                                int bd);
-
-void av1_highbd_dr_prediction_z3_c(uint16_t* dst,
-                                   ptrdiff_t stride,
-                                   int bw,
-                                   int bh,
-                                   const uint16_t* above,
-                                   const uint16_t* left,
-                                   int upsample_left,
-                                   int dx,
-                                   int dy,
-                                   int bd);
-void av1_highbd_dr_prediction_z3_avx2(uint16_t* dst,
-                                      ptrdiff_t stride,
-                                      int bw,
-                                      int bh,
-                                      const uint16_t* above,
-                                      const uint16_t* left,
-                                      int upsample_left,
-                                      int dx,
-                                      int dy,
-                                      int bd);
-RTCD_EXTERN void (*av1_highbd_dr_prediction_z3)(uint16_t* dst,
-                                                ptrdiff_t stride,
-                                                int bw,
-                                                int bh,
-                                                const uint16_t* above,
-                                                const uint16_t* left,
-                                                int upsample_left,
-                                                int dx,
-                                                int dy,
-                                                int bd);
-
 void av1_highbd_fwht4x4_c(const int16_t* input, tran_low_t* output, int stride);
 #define av1_highbd_fwht4x4 av1_highbd_fwht4x4_c
 
@@ -2344,236 +1457,6 @@
                                 int bd);
 #define av1_highbd_iwht4x4_1_add av1_highbd_iwht4x4_1_add_c
 
-int64_t av1_highbd_pixel_proj_error_c(const uint8_t* src8,
-                                      int width,
-                                      int height,
-                                      int src_stride,
-                                      const uint8_t* dat8,
-                                      int dat_stride,
-                                      int32_t* flt0,
-                                      int flt0_stride,
-                                      int32_t* flt1,
-                                      int flt1_stride,
-                                      int xq[2],
-                                      const sgr_params_type* params);
-int64_t av1_highbd_pixel_proj_error_sse4_1(const uint8_t* src8,
-                                           int width,
-                                           int height,
-                                           int src_stride,
-                                           const uint8_t* dat8,
-                                           int dat_stride,
-                                           int32_t* flt0,
-                                           int flt0_stride,
-                                           int32_t* flt1,
-                                           int flt1_stride,
-                                           int xq[2],
-                                           const sgr_params_type* params);
-int64_t av1_highbd_pixel_proj_error_avx2(const uint8_t* src8,
-                                         int width,
-                                         int height,
-                                         int src_stride,
-                                         const uint8_t* dat8,
-                                         int dat_stride,
-                                         int32_t* flt0,
-                                         int flt0_stride,
-                                         int32_t* flt1,
-                                         int flt1_stride,
-                                         int xq[2],
-                                         const sgr_params_type* params);
-RTCD_EXTERN int64_t (*av1_highbd_pixel_proj_error)(
-    const uint8_t* src8,
-    int width,
-    int height,
-    int src_stride,
-    const uint8_t* dat8,
-    int dat_stride,
-    int32_t* flt0,
-    int flt0_stride,
-    int32_t* flt1,
-    int flt1_stride,
-    int xq[2],
-    const sgr_params_type* params);
-
-void av1_highbd_quantize_fp_c(const tran_low_t* coeff_ptr,
-                              intptr_t n_coeffs,
-                              const int16_t* zbin_ptr,
-                              const int16_t* round_ptr,
-                              const int16_t* quant_ptr,
-                              const int16_t* quant_shift_ptr,
-                              tran_low_t* qcoeff_ptr,
-                              tran_low_t* dqcoeff_ptr,
-                              const int16_t* dequant_ptr,
-                              uint16_t* eob_ptr,
-                              const int16_t* scan,
-                              const int16_t* iscan,
-                              int log_scale);
-void av1_highbd_quantize_fp_sse4_1(const tran_low_t* coeff_ptr,
-                                   intptr_t n_coeffs,
-                                   const int16_t* zbin_ptr,
-                                   const int16_t* round_ptr,
-                                   const int16_t* quant_ptr,
-                                   const int16_t* quant_shift_ptr,
-                                   tran_low_t* qcoeff_ptr,
-                                   tran_low_t* dqcoeff_ptr,
-                                   const int16_t* dequant_ptr,
-                                   uint16_t* eob_ptr,
-                                   const int16_t* scan,
-                                   const int16_t* iscan,
-                                   int log_scale);
-void av1_highbd_quantize_fp_avx2(const tran_low_t* coeff_ptr,
-                                 intptr_t n_coeffs,
-                                 const int16_t* zbin_ptr,
-                                 const int16_t* round_ptr,
-                                 const int16_t* quant_ptr,
-                                 const int16_t* quant_shift_ptr,
-                                 tran_low_t* qcoeff_ptr,
-                                 tran_low_t* dqcoeff_ptr,
-                                 const int16_t* dequant_ptr,
-                                 uint16_t* eob_ptr,
-                                 const int16_t* scan,
-                                 const int16_t* iscan,
-                                 int log_scale);
-RTCD_EXTERN void (*av1_highbd_quantize_fp)(const tran_low_t* coeff_ptr,
-                                           intptr_t n_coeffs,
-                                           const int16_t* zbin_ptr,
-                                           const int16_t* round_ptr,
-                                           const int16_t* quant_ptr,
-                                           const int16_t* quant_shift_ptr,
-                                           tran_low_t* qcoeff_ptr,
-                                           tran_low_t* dqcoeff_ptr,
-                                           const int16_t* dequant_ptr,
-                                           uint16_t* eob_ptr,
-                                           const int16_t* scan,
-                                           const int16_t* iscan,
-                                           int log_scale);
-
-void av1_highbd_warp_affine_c(const int32_t* mat,
-                              const uint16_t* ref,
-                              int width,
-                              int height,
-                              int stride,
-                              uint16_t* pred,
-                              int p_col,
-                              int p_row,
-                              int p_width,
-                              int p_height,
-                              int p_stride,
-                              int subsampling_x,
-                              int subsampling_y,
-                              int bd,
-                              ConvolveParams* conv_params,
-                              int16_t alpha,
-                              int16_t beta,
-                              int16_t gamma,
-                              int16_t delta);
-void av1_highbd_warp_affine_sse4_1(const int32_t* mat,
-                                   const uint16_t* ref,
-                                   int width,
-                                   int height,
-                                   int stride,
-                                   uint16_t* pred,
-                                   int p_col,
-                                   int p_row,
-                                   int p_width,
-                                   int p_height,
-                                   int p_stride,
-                                   int subsampling_x,
-                                   int subsampling_y,
-                                   int bd,
-                                   ConvolveParams* conv_params,
-                                   int16_t alpha,
-                                   int16_t beta,
-                                   int16_t gamma,
-                                   int16_t delta);
-void av1_highbd_warp_affine_avx2(const int32_t* mat,
-                                 const uint16_t* ref,
-                                 int width,
-                                 int height,
-                                 int stride,
-                                 uint16_t* pred,
-                                 int p_col,
-                                 int p_row,
-                                 int p_width,
-                                 int p_height,
-                                 int p_stride,
-                                 int subsampling_x,
-                                 int subsampling_y,
-                                 int bd,
-                                 ConvolveParams* conv_params,
-                                 int16_t alpha,
-                                 int16_t beta,
-                                 int16_t gamma,
-                                 int16_t delta);
-RTCD_EXTERN void (*av1_highbd_warp_affine)(const int32_t* mat,
-                                           const uint16_t* ref,
-                                           int width,
-                                           int height,
-                                           int stride,
-                                           uint16_t* pred,
-                                           int p_col,
-                                           int p_row,
-                                           int p_width,
-                                           int p_height,
-                                           int p_stride,
-                                           int subsampling_x,
-                                           int subsampling_y,
-                                           int bd,
-                                           ConvolveParams* conv_params,
-                                           int16_t alpha,
-                                           int16_t beta,
-                                           int16_t gamma,
-                                           int16_t delta);
-
-void av1_highbd_wiener_convolve_add_src_c(const uint8_t* src,
-                                          ptrdiff_t src_stride,
-                                          uint8_t* dst,
-                                          ptrdiff_t dst_stride,
-                                          const int16_t* filter_x,
-                                          int x_step_q4,
-                                          const int16_t* filter_y,
-                                          int y_step_q4,
-                                          int w,
-                                          int h,
-                                          const ConvolveParams* conv_params,
-                                          int bd);
-void av1_highbd_wiener_convolve_add_src_ssse3(const uint8_t* src,
-                                              ptrdiff_t src_stride,
-                                              uint8_t* dst,
-                                              ptrdiff_t dst_stride,
-                                              const int16_t* filter_x,
-                                              int x_step_q4,
-                                              const int16_t* filter_y,
-                                              int y_step_q4,
-                                              int w,
-                                              int h,
-                                              const ConvolveParams* conv_params,
-                                              int bd);
-void av1_highbd_wiener_convolve_add_src_avx2(const uint8_t* src,
-                                             ptrdiff_t src_stride,
-                                             uint8_t* dst,
-                                             ptrdiff_t dst_stride,
-                                             const int16_t* filter_x,
-                                             int x_step_q4,
-                                             const int16_t* filter_y,
-                                             int y_step_q4,
-                                             int w,
-                                             int h,
-                                             const ConvolveParams* conv_params,
-                                             int bd);
-RTCD_EXTERN void (*av1_highbd_wiener_convolve_add_src)(
-    const uint8_t* src,
-    ptrdiff_t src_stride,
-    uint8_t* dst,
-    ptrdiff_t dst_stride,
-    const int16_t* filter_x,
-    int x_step_q4,
-    const int16_t* filter_y,
-    int y_step_q4,
-    int w,
-    int h,
-    const ConvolveParams* conv_params,
-    int bd);
-
 void av1_inv_txfm2d_add_16x16_c(const int32_t* input,
                                 uint16_t* output,
                                 int stride,
@@ -2763,56 +1646,6 @@
                                        int diff_stride,
                                        TxfmParam* txfm_param);
 
-int64_t av1_lowbd_pixel_proj_error_c(const uint8_t* src8,
-                                     int width,
-                                     int height,
-                                     int src_stride,
-                                     const uint8_t* dat8,
-                                     int dat_stride,
-                                     int32_t* flt0,
-                                     int flt0_stride,
-                                     int32_t* flt1,
-                                     int flt1_stride,
-                                     int xq[2],
-                                     const sgr_params_type* params);
-int64_t av1_lowbd_pixel_proj_error_sse4_1(const uint8_t* src8,
-                                          int width,
-                                          int height,
-                                          int src_stride,
-                                          const uint8_t* dat8,
-                                          int dat_stride,
-                                          int32_t* flt0,
-                                          int flt0_stride,
-                                          int32_t* flt1,
-                                          int flt1_stride,
-                                          int xq[2],
-                                          const sgr_params_type* params);
-int64_t av1_lowbd_pixel_proj_error_avx2(const uint8_t* src8,
-                                        int width,
-                                        int height,
-                                        int src_stride,
-                                        const uint8_t* dat8,
-                                        int dat_stride,
-                                        int32_t* flt0,
-                                        int flt0_stride,
-                                        int32_t* flt1,
-                                        int flt1_stride,
-                                        int xq[2],
-                                        const sgr_params_type* params);
-RTCD_EXTERN int64_t (*av1_lowbd_pixel_proj_error)(
-    const uint8_t* src8,
-    int width,
-    int height,
-    int src_stride,
-    const uint8_t* dat8,
-    int dat_stride,
-    int32_t* flt0,
-    int flt0_stride,
-    int32_t* flt1,
-    int flt1_stride,
-    int xq[2],
-    const sgr_params_type* params);
-
 void av1_nn_predict_c(const float* input_nodes,
                       const NN_CONFIG* const nn_config,
                       int reduce_prec,
@@ -3014,47 +1847,6 @@
 void av1_round_shift_array_sse4_1(int32_t* arr, int size, int bit);
 RTCD_EXTERN void (*av1_round_shift_array)(int32_t* arr, int size, int bit);
 
-int av1_selfguided_restoration_c(const uint8_t* dgd8,
-                                 int width,
-                                 int height,
-                                 int dgd_stride,
-                                 int32_t* flt0,
-                                 int32_t* flt1,
-                                 int flt_stride,
-                                 int sgr_params_idx,
-                                 int bit_depth,
-                                 int highbd);
-int av1_selfguided_restoration_sse4_1(const uint8_t* dgd8,
-                                      int width,
-                                      int height,
-                                      int dgd_stride,
-                                      int32_t* flt0,
-                                      int32_t* flt1,
-                                      int flt_stride,
-                                      int sgr_params_idx,
-                                      int bit_depth,
-                                      int highbd);
-int av1_selfguided_restoration_avx2(const uint8_t* dgd8,
-                                    int width,
-                                    int height,
-                                    int dgd_stride,
-                                    int32_t* flt0,
-                                    int32_t* flt1,
-                                    int flt_stride,
-                                    int sgr_params_idx,
-                                    int bit_depth,
-                                    int highbd);
-RTCD_EXTERN int (*av1_selfguided_restoration)(const uint8_t* dgd8,
-                                              int width,
-                                              int height,
-                                              int dgd_stride,
-                                              int32_t* flt0,
-                                              int32_t* flt1,
-                                              int flt_stride,
-                                              int sgr_params_idx,
-                                              int bit_depth,
-                                              int highbd);
-
 void av1_txb_init_levels_c(const tran_low_t* const coeff,
                            const int width,
                            const int height,
@@ -3080,79 +1872,6 @@
 void av1_upsample_intra_edge_high_sse4_1(uint16_t* p, int sz, int bd);
 RTCD_EXTERN void (*av1_upsample_intra_edge_high)(uint16_t* p, int sz, int bd);
 
-void av1_warp_affine_c(const int32_t* mat,
-                       const uint8_t* ref,
-                       int width,
-                       int height,
-                       int stride,
-                       uint8_t* pred,
-                       int p_col,
-                       int p_row,
-                       int p_width,
-                       int p_height,
-                       int p_stride,
-                       int subsampling_x,
-                       int subsampling_y,
-                       ConvolveParams* conv_params,
-                       int16_t alpha,
-                       int16_t beta,
-                       int16_t gamma,
-                       int16_t delta);
-void av1_warp_affine_sse4_1(const int32_t* mat,
-                            const uint8_t* ref,
-                            int width,
-                            int height,
-                            int stride,
-                            uint8_t* pred,
-                            int p_col,
-                            int p_row,
-                            int p_width,
-                            int p_height,
-                            int p_stride,
-                            int subsampling_x,
-                            int subsampling_y,
-                            ConvolveParams* conv_params,
-                            int16_t alpha,
-                            int16_t beta,
-                            int16_t gamma,
-                            int16_t delta);
-void av1_warp_affine_avx2(const int32_t* mat,
-                          const uint8_t* ref,
-                          int width,
-                          int height,
-                          int stride,
-                          uint8_t* pred,
-                          int p_col,
-                          int p_row,
-                          int p_width,
-                          int p_height,
-                          int p_stride,
-                          int subsampling_x,
-                          int subsampling_y,
-                          ConvolveParams* conv_params,
-                          int16_t alpha,
-                          int16_t beta,
-                          int16_t gamma,
-                          int16_t delta);
-RTCD_EXTERN void (*av1_warp_affine)(const int32_t* mat,
-                                    const uint8_t* ref,
-                                    int width,
-                                    int height,
-                                    int stride,
-                                    uint8_t* pred,
-                                    int p_col,
-                                    int p_row,
-                                    int p_width,
-                                    int p_height,
-                                    int p_stride,
-                                    int subsampling_x,
-                                    int subsampling_y,
-                                    ConvolveParams* conv_params,
-                                    int16_t alpha,
-                                    int16_t beta,
-                                    int16_t gamma,
-                                    int16_t delta);
-
 void av1_wedge_compute_delta_squares_c(int16_t* d,
                                        const int16_t* a,
                                        const int16_t* b,
@@ -3416,47 +2135,24 @@
                                  int32_t* var,
                                  int coeff_shift);
 
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_420_hbd_c(TX_SIZE tx_size);
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_420_hbd_ssse3(TX_SIZE tx_size);
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_420_hbd_avx2(TX_SIZE tx_size);
-RTCD_EXTERN cfl_subsample_hbd_fn (*cfl_get_luma_subsampling_420_hbd)(
-    TX_SIZE tx_size);
-
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_420_lbd_c(TX_SIZE tx_size);
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_420_lbd_ssse3(TX_SIZE tx_size);
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_420_lbd_avx2(TX_SIZE tx_size);
 RTCD_EXTERN cfl_subsample_lbd_fn (*cfl_get_luma_subsampling_420_lbd)(
     TX_SIZE tx_size);
 
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_422_hbd_c(TX_SIZE tx_size);
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_422_hbd_ssse3(TX_SIZE tx_size);
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_422_hbd_avx2(TX_SIZE tx_size);
-RTCD_EXTERN cfl_subsample_hbd_fn (*cfl_get_luma_subsampling_422_hbd)(
-    TX_SIZE tx_size);
-
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_422_lbd_c(TX_SIZE tx_size);
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_422_lbd_ssse3(TX_SIZE tx_size);
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_422_lbd_avx2(TX_SIZE tx_size);
 RTCD_EXTERN cfl_subsample_lbd_fn (*cfl_get_luma_subsampling_422_lbd)(
     TX_SIZE tx_size);
 
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_444_hbd_c(TX_SIZE tx_size);
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_444_hbd_ssse3(TX_SIZE tx_size);
-cfl_subsample_hbd_fn cfl_get_luma_subsampling_444_hbd_avx2(TX_SIZE tx_size);
-RTCD_EXTERN cfl_subsample_hbd_fn (*cfl_get_luma_subsampling_444_hbd)(
-    TX_SIZE tx_size);
-
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_444_lbd_c(TX_SIZE tx_size);
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_444_lbd_ssse3(TX_SIZE tx_size);
 cfl_subsample_lbd_fn cfl_get_luma_subsampling_444_lbd_avx2(TX_SIZE tx_size);
 RTCD_EXTERN cfl_subsample_lbd_fn (*cfl_get_luma_subsampling_444_lbd)(
     TX_SIZE tx_size);
 
-cfl_predict_hbd_fn cfl_get_predict_hbd_fn_c(TX_SIZE tx_size);
-cfl_predict_hbd_fn cfl_get_predict_hbd_fn_ssse3(TX_SIZE tx_size);
-cfl_predict_hbd_fn cfl_get_predict_hbd_fn_avx2(TX_SIZE tx_size);
-RTCD_EXTERN cfl_predict_hbd_fn (*cfl_get_predict_hbd_fn)(TX_SIZE tx_size);
-
 cfl_predict_lbd_fn cfl_get_predict_lbd_fn_c(TX_SIZE tx_size);
 cfl_predict_lbd_fn cfl_get_predict_lbd_fn_ssse3(TX_SIZE tx_size);
 cfl_predict_lbd_fn cfl_get_predict_lbd_fn_avx2(TX_SIZE tx_size);
@@ -3477,14 +2173,6 @@
 
   (void)flags;
 
-  av1_apply_selfguided_restoration = av1_apply_selfguided_restoration_c;
-  if (flags & HAS_SSE4_1)
-    av1_apply_selfguided_restoration = av1_apply_selfguided_restoration_sse4_1;
-  if (flags & HAS_AVX2)
-    av1_apply_selfguided_restoration = av1_apply_selfguided_restoration_avx2;
-  av1_apply_temporal_filter = av1_apply_temporal_filter_sse2;
-  if (flags & HAS_AVX2)
-    av1_apply_temporal_filter = av1_apply_temporal_filter_avx2;
   av1_block_error = av1_block_error_sse2;
   if (flags & HAS_AVX2)
     av1_block_error = av1_block_error_avx2;
@@ -3511,34 +2199,11 @@
   if (flags & HAS_AVX2)
     av1_build_compound_diffwtd_mask_highbd =
         av1_build_compound_diffwtd_mask_highbd_avx2;
-  av1_calc_frame_error = av1_calc_frame_error_sse2;
-  if (flags & HAS_AVX2)
-    av1_calc_frame_error = av1_calc_frame_error_avx2;
-  av1_calc_proj_params = av1_calc_proj_params_c;
-  if (flags & HAS_SSE4_1)
-    av1_calc_proj_params = av1_calc_proj_params_sse4_1;
-  if (flags & HAS_AVX2)
-    av1_calc_proj_params = av1_calc_proj_params_avx2;
-  av1_calc_proj_params_high_bd = av1_calc_proj_params_high_bd_c;
-  if (flags & HAS_SSE4_1)
-    av1_calc_proj_params_high_bd = av1_calc_proj_params_high_bd_sse4_1;
-  if (flags & HAS_AVX2)
-    av1_calc_proj_params_high_bd = av1_calc_proj_params_high_bd_avx2;
   av1_compute_cross_correlation = av1_compute_cross_correlation_c;
   if (flags & HAS_SSE4_1)
     av1_compute_cross_correlation = av1_compute_cross_correlation_sse4_1;
   if (flags & HAS_AVX2)
     av1_compute_cross_correlation = av1_compute_cross_correlation_avx2;
-  av1_compute_stats = av1_compute_stats_c;
-  if (flags & HAS_SSE4_1)
-    av1_compute_stats = av1_compute_stats_sse4_1;
-  if (flags & HAS_AVX2)
-    av1_compute_stats = av1_compute_stats_avx2;
-  av1_compute_stats_highbd = av1_compute_stats_highbd_c;
-  if (flags & HAS_SSE4_1)
-    av1_compute_stats_highbd = av1_compute_stats_highbd_sse4_1;
-  if (flags & HAS_AVX2)
-    av1_compute_stats_highbd = av1_compute_stats_highbd_avx2;
   av1_convolve_2d_scale = av1_convolve_2d_scale_c;
   if (flags & HAS_SSE4_1)
     av1_convolve_2d_scale = av1_convolve_2d_scale_sse4_1;
@@ -3663,64 +2328,6 @@
     av1_get_horver_correlation_full = av1_get_horver_correlation_full_sse4_1;
   if (flags & HAS_AVX2)
     av1_get_horver_correlation_full = av1_get_horver_correlation_full_avx2;
-  av1_highbd_apply_temporal_filter = av1_highbd_apply_temporal_filter_sse2;
-  if (flags & HAS_AVX2)
-    av1_highbd_apply_temporal_filter = av1_highbd_apply_temporal_filter_avx2;
-  av1_highbd_block_error = av1_highbd_block_error_sse2;
-  if (flags & HAS_AVX2)
-    av1_highbd_block_error = av1_highbd_block_error_avx2;
-  av1_highbd_convolve_2d_scale = av1_highbd_convolve_2d_scale_c;
-  if (flags & HAS_SSE4_1)
-    av1_highbd_convolve_2d_scale = av1_highbd_convolve_2d_scale_sse4_1;
-  av1_highbd_convolve_2d_sr = av1_highbd_convolve_2d_sr_c;
-  if (flags & HAS_SSSE3)
-    av1_highbd_convolve_2d_sr = av1_highbd_convolve_2d_sr_ssse3;
-  if (flags & HAS_AVX2)
-    av1_highbd_convolve_2d_sr = av1_highbd_convolve_2d_sr_avx2;
-  av1_highbd_convolve_horiz_rs = av1_highbd_convolve_horiz_rs_c;
-  if (flags & HAS_SSE4_1)
-    av1_highbd_convolve_horiz_rs = av1_highbd_convolve_horiz_rs_sse4_1;
-  av1_highbd_convolve_x_sr = av1_highbd_convolve_x_sr_c;
-  if (flags & HAS_SSSE3)
-    av1_highbd_convolve_x_sr = av1_highbd_convolve_x_sr_ssse3;
-  if (flags & HAS_AVX2)
-    av1_highbd_convolve_x_sr = av1_highbd_convolve_x_sr_avx2;
-  av1_highbd_convolve_y_sr = av1_highbd_convolve_y_sr_c;
-  if (flags & HAS_SSSE3)
-    av1_highbd_convolve_y_sr = av1_highbd_convolve_y_sr_ssse3;
-  if (flags & HAS_AVX2)
-    av1_highbd_convolve_y_sr = av1_highbd_convolve_y_sr_avx2;
-  av1_highbd_dist_wtd_convolve_2d = av1_highbd_dist_wtd_convolve_2d_c;
-  if (flags & HAS_SSE4_1)
-    av1_highbd_dist_wtd_convolve_2d = av1_highbd_dist_wtd_convolve_2d_sse4_1;
-  if (flags & HAS_AVX2)
-    av1_highbd_dist_wtd_convolve_2d = av1_highbd_dist_wtd_convolve_2d_avx2;
-  av1_highbd_dist_wtd_convolve_2d_copy = av1_highbd_dist_wtd_convolve_2d_copy_c;
-  if (flags & HAS_SSE4_1)
-    av1_highbd_dist_wtd_convolve_2d_copy =
-        av1_highbd_dist_wtd_convolve_2d_copy_sse4_1;
-  if (flags & HAS_AVX2)
-    av1_highbd_dist_wtd_convolve_2d_copy =
-        av1_highbd_dist_wtd_convolve_2d_copy_avx2;
-  av1_highbd_dist_wtd_convolve_x = av1_highbd_dist_wtd_convolve_x_c;
-  if (flags & HAS_SSE4_1)
-    av1_highbd_dist_wtd_convolve_x = av1_highbd_dist_wtd_convolve_x_sse4_1;
-  if (flags & HAS_AVX2)
-    av1_highbd_dist_wtd_convolve_x = av1_highbd_dist_wtd_convolve_x_avx2;
-  av1_highbd_dist_wtd_convolve_y = av1_highbd_dist_wtd_convolve_y_c;
-  if (flags & HAS_SSE4_1)
-    av1_highbd_dist_wtd_convolve_y = av1_highbd_dist_wtd_convolve_y_sse4_1;
-  if (flags & HAS_AVX2)
-    av1_highbd_dist_wtd_convolve_y = av1_highbd_dist_wtd_convolve_y_avx2;
-  av1_highbd_dr_prediction_z1 = av1_highbd_dr_prediction_z1_c;
-  if (flags & HAS_AVX2)
-    av1_highbd_dr_prediction_z1 = av1_highbd_dr_prediction_z1_avx2;
-  av1_highbd_dr_prediction_z2 = av1_highbd_dr_prediction_z2_c;
-  if (flags & HAS_AVX2)
-    av1_highbd_dr_prediction_z2 = av1_highbd_dr_prediction_z2_avx2;
-  av1_highbd_dr_prediction_z3 = av1_highbd_dr_prediction_z3_c;
-  if (flags & HAS_AVX2)
-    av1_highbd_dr_prediction_z3 = av1_highbd_dr_prediction_z3_avx2;
   av1_highbd_inv_txfm_add = av1_highbd_inv_txfm_add_c;
   if (flags & HAS_SSE4_1)
     av1_highbd_inv_txfm_add = av1_highbd_inv_txfm_add_sse4_1;
@@ -3744,28 +2351,6 @@
   av1_highbd_inv_txfm_add_8x8 = av1_highbd_inv_txfm_add_8x8_c;
   if (flags & HAS_SSE4_1)
     av1_highbd_inv_txfm_add_8x8 = av1_highbd_inv_txfm_add_8x8_sse4_1;
-  av1_highbd_pixel_proj_error = av1_highbd_pixel_proj_error_c;
-  if (flags & HAS_SSE4_1)
-    av1_highbd_pixel_proj_error = av1_highbd_pixel_proj_error_sse4_1;
-  if (flags & HAS_AVX2)
-    av1_highbd_pixel_proj_error = av1_highbd_pixel_proj_error_avx2;
-  av1_highbd_quantize_fp = av1_highbd_quantize_fp_c;
-  if (flags & HAS_SSE4_1)
-    av1_highbd_quantize_fp = av1_highbd_quantize_fp_sse4_1;
-  if (flags & HAS_AVX2)
-    av1_highbd_quantize_fp = av1_highbd_quantize_fp_avx2;
-  av1_highbd_warp_affine = av1_highbd_warp_affine_c;
-  if (flags & HAS_SSE4_1)
-    av1_highbd_warp_affine = av1_highbd_warp_affine_sse4_1;
-  if (flags & HAS_AVX2)
-    av1_highbd_warp_affine = av1_highbd_warp_affine_avx2;
-  av1_highbd_wiener_convolve_add_src = av1_highbd_wiener_convolve_add_src_c;
-  if (flags & HAS_SSSE3)
-    av1_highbd_wiener_convolve_add_src =
-        av1_highbd_wiener_convolve_add_src_ssse3;
-  if (flags & HAS_AVX2)
-    av1_highbd_wiener_convolve_add_src =
-        av1_highbd_wiener_convolve_add_src_avx2;
   av1_inv_txfm2d_add_4x4 = av1_inv_txfm2d_add_4x4_c;
   if (flags & HAS_SSE4_1)
     av1_inv_txfm2d_add_4x4 = av1_inv_txfm2d_add_4x4_sse4_1;
@@ -3782,11 +2367,6 @@
     av1_lowbd_fwd_txfm = av1_lowbd_fwd_txfm_sse4_1;
   if (flags & HAS_AVX2)
     av1_lowbd_fwd_txfm = av1_lowbd_fwd_txfm_avx2;
-  av1_lowbd_pixel_proj_error = av1_lowbd_pixel_proj_error_c;
-  if (flags & HAS_SSE4_1)
-    av1_lowbd_pixel_proj_error = av1_lowbd_pixel_proj_error_sse4_1;
-  if (flags & HAS_AVX2)
-    av1_lowbd_pixel_proj_error = av1_lowbd_pixel_proj_error_avx2;
   av1_nn_predict = av1_nn_predict_c;
   if (flags & HAS_SSE3)
     av1_nn_predict = av1_nn_predict_sse3;
@@ -3808,11 +2388,6 @@
   av1_round_shift_array = av1_round_shift_array_c;
   if (flags & HAS_SSE4_1)
     av1_round_shift_array = av1_round_shift_array_sse4_1;
-  av1_selfguided_restoration = av1_selfguided_restoration_c;
-  if (flags & HAS_SSE4_1)
-    av1_selfguided_restoration = av1_selfguided_restoration_sse4_1;
-  if (flags & HAS_AVX2)
-    av1_selfguided_restoration = av1_selfguided_restoration_avx2;
   av1_txb_init_levels = av1_txb_init_levels_c;
   if (flags & HAS_SSE4_1)
     av1_txb_init_levels = av1_txb_init_levels_sse4_1;
@@ -3824,11 +2399,6 @@
   av1_upsample_intra_edge_high = av1_upsample_intra_edge_high_c;
   if (flags & HAS_SSE4_1)
     av1_upsample_intra_edge_high = av1_upsample_intra_edge_high_sse4_1;
-  av1_warp_affine = av1_warp_affine_c;
-  if (flags & HAS_SSE4_1)
-    av1_warp_affine = av1_warp_affine_sse4_1;
-  if (flags & HAS_AVX2)
-    av1_warp_affine = av1_warp_affine_avx2;
   av1_wedge_compute_delta_squares = av1_wedge_compute_delta_squares_sse2;
   if (flags & HAS_AVX2)
     av1_wedge_compute_delta_squares = av1_wedge_compute_delta_squares_avx2;
@@ -3869,41 +2439,21 @@
     cdef_find_dir = cdef_find_dir_sse4_1;
   if (flags & HAS_AVX2)
     cdef_find_dir = cdef_find_dir_avx2;
-  cfl_get_luma_subsampling_420_hbd = cfl_get_luma_subsampling_420_hbd_c;
-  if (flags & HAS_SSSE3)
-    cfl_get_luma_subsampling_420_hbd = cfl_get_luma_subsampling_420_hbd_ssse3;
-  if (flags & HAS_AVX2)
-    cfl_get_luma_subsampling_420_hbd = cfl_get_luma_subsampling_420_hbd_avx2;
   cfl_get_luma_subsampling_420_lbd = cfl_get_luma_subsampling_420_lbd_c;
   if (flags & HAS_SSSE3)
     cfl_get_luma_subsampling_420_lbd = cfl_get_luma_subsampling_420_lbd_ssse3;
   if (flags & HAS_AVX2)
     cfl_get_luma_subsampling_420_lbd = cfl_get_luma_subsampling_420_lbd_avx2;
-  cfl_get_luma_subsampling_422_hbd = cfl_get_luma_subsampling_422_hbd_c;
-  if (flags & HAS_SSSE3)
-    cfl_get_luma_subsampling_422_hbd = cfl_get_luma_subsampling_422_hbd_ssse3;
-  if (flags & HAS_AVX2)
-    cfl_get_luma_subsampling_422_hbd = cfl_get_luma_subsampling_422_hbd_avx2;
   cfl_get_luma_subsampling_422_lbd = cfl_get_luma_subsampling_422_lbd_c;
   if (flags & HAS_SSSE3)
     cfl_get_luma_subsampling_422_lbd = cfl_get_luma_subsampling_422_lbd_ssse3;
   if (flags & HAS_AVX2)
     cfl_get_luma_subsampling_422_lbd = cfl_get_luma_subsampling_422_lbd_avx2;
-  cfl_get_luma_subsampling_444_hbd = cfl_get_luma_subsampling_444_hbd_c;
-  if (flags & HAS_SSSE3)
-    cfl_get_luma_subsampling_444_hbd = cfl_get_luma_subsampling_444_hbd_ssse3;
-  if (flags & HAS_AVX2)
-    cfl_get_luma_subsampling_444_hbd = cfl_get_luma_subsampling_444_hbd_avx2;
   cfl_get_luma_subsampling_444_lbd = cfl_get_luma_subsampling_444_lbd_c;
   if (flags & HAS_SSSE3)
     cfl_get_luma_subsampling_444_lbd = cfl_get_luma_subsampling_444_lbd_ssse3;
   if (flags & HAS_AVX2)
     cfl_get_luma_subsampling_444_lbd = cfl_get_luma_subsampling_444_lbd_avx2;
-  cfl_get_predict_hbd_fn = cfl_get_predict_hbd_fn_c;
-  if (flags & HAS_SSSE3)
-    cfl_get_predict_hbd_fn = cfl_get_predict_hbd_fn_ssse3;
-  if (flags & HAS_AVX2)
-    cfl_get_predict_hbd_fn = cfl_get_predict_hbd_fn_avx2;
   cfl_get_predict_lbd_fn = cfl_get_predict_lbd_fn_c;
   if (flags & HAS_SSSE3)
     cfl_get_predict_lbd_fn = cfl_get_predict_lbd_fn_ssse3;
diff --git a/third_party/libva_protected_content/va_protected_content.h b/third_party/libva_protected_content/va_protected_content.h
index 42b6ddfc..dfea3ce 100644
--- a/third_party/libva_protected_content/va_protected_content.h
+++ b/third_party/libva_protected_content/va_protected_content.h
@@ -178,7 +178,7 @@
   uint32_t va_reserved[VA_PADDING_MEDIUM];
 } VAEncryptionSegmentInfo;
 
-/** \brief encrytpion parameters, corresonding to
+/** \brief encryption parameters, corresponding to
  * #VAEncryptionParameterBufferType*/
 typedef struct _VAEncryptionParameters {
   /** \brief Encryption type, attribute values. */
@@ -197,6 +197,21 @@
   uint8_t wrapped_decrypt_blob[16];
   /** \brief Wrapped Key blob info (Sne)kb */
   uint8_t wrapped_encrypt_blob[16];
+  /** \brief Indicates the number of 16-byte BLOCKS that are encrypted in any
+   *  given encrypted region of segments.
+   *  If this value is zero:
+   *    1. All bytes in encrypted region of segments are encrypted, i.e. the
+   *       CENC or CBC1 scheme is being used
+   *    2. blocks_stripe_clear must also be zero.
+   *  If this value is non-zero, blocks_stripe_clear must also be non-zero. */
+  uint32_t blocks_stripe_encrypted;
+  /** \brief Indicates the number of 16-byte BLOCKS that are clear in any given
+   *  encrypted region of segments, as defined by the CENS and CBCS schemes in
+   *  the common encryption spec.
+   *  If this value is zero, all bytes in encrypted region of segments are
+   *  encrypted, i.e. the CENC or CBC1 scheme is being used.
+   */
+  uint32_t blocks_stripe_clear;
   /** \brief Reserved bytes for future use, must be zero */
   uint32_t va_reserved[VA_PADDING_MEDIUM];
 } VAEncryptionParameters;
@@ -215,7 +230,7 @@
   void* reserved_extension;  // The reserved extension for future BLT operations
 } VA_PROTECTED_BLT_PARAMS;
 
-/** \brief cenc status parameters, corresonding to
+/** \brief cenc status parameters, corresponding to
  * #VACencStatusParameterBufferType*/
 typedef struct _VACencStatusParameters {
   /** \brief The status report index feedback. */
@@ -485,7 +500,7 @@
 /** \brief Buffer for CENC status reporting*/
 typedef struct _VACencStatusBuf {
   /** \brief Encryption status. VA_ENCRYPTION_STATUS_SUCCESSFUL if
-   *  hardware has returned detailed inforamtion, others mean the
+   *  hardware has returned detailed information, others mean the
    *  CENC result is invalid  */
   VAEncryptionStatus status;
   /* \brief feedback of status report index
diff --git a/tools/mb/mb.py b/tools/mb/mb.py
index f9db99a..9ab2b2b 100755
--- a/tools/mb/mb.py
+++ b/tools/mb/mb.py
@@ -618,7 +618,7 @@
     # TODO(dpranke): Also, add support for sharding and merging results.
     dimensions = []
     for k, v in self._DefaultDimensions() + self.args.dimensions:
-      dimensions += ['-d', k, v]
+      dimensions += ['-d', '%s=%s' % (k, v)]
 
     archive_json_path = self.ToSrcRelPath(
         '%s/%s.archive.json' % (build_dir, target))
@@ -672,27 +672,47 @@
           file=sys.stderr)
       return 1
 
-    tags = ['--tags=%s' % tag for tag in self.args.tags]
+    tags = ['-tag=%s' % tag for tag in self.args.tags]
 
+    try:
+      json_dir = self.TempDir()
+      json_file = self.PathJoin(json_dir, 'task.json')
+      cmd = [
+          self.PathJoin('tools', 'luci-go', 'swarming'),
+          'trigger',
+          '-isolated',
+          isolated_hash,
+          '-I',
+          'https://' + isolate_server,
+          '-namespace',
+          namespace,
+          '-server',
+          swarming_server,
+          '-tag=purpose:user-debug-mb',
+          '-relative-cwd',
+          self.ToSrcRelPath(build_dir),
+          '-dump-json',
+          json_file,
+      ] + tags + dimensions + ['--'] + list(isolate_cmd)
+      if self.args.extra_args:
+        cmd += self.args.extra_args
+      self.Print('')
+      ret, _, _ = self.Run(cmd, force_verbose=True, buffer_output=False)
+      if ret:
+        return ret
+      task_json = self.ReadFile(json_file)
+      task_id = json.loads(task_json)["tasks"][0]['task_id']
+    finally:
+      if json_dir:
+        self.RemoveDirectory(json_dir)
     cmd = [
-        self.executable,
-        self.PathJoin('tools', 'swarming_client', 'swarming.py'),
-        'run',
-        '-s',
-        isolated_hash,
-        '-I',
-        isolate_server,
-        '--namespace',
-        namespace,
-        '-S',
+        self.PathJoin('tools', 'luci-go', 'swarming'),
+        'collect',
+        '-server',
         swarming_server,
-        '--tags=purpose:user-debug-mb',
-        '--relative-cwd',
-        self.ToSrcRelPath(build_dir),
-    ] + tags + dimensions + ['--raw-cmd', '--'] + list(isolate_cmd)
-    if self.args.extra_args:
-      cmd += self.args.extra_args
-    self.Print('')
+        '-task-output-stdout=console',
+        task_id,
+    ]
     ret, _, _ = self.Run(cmd, force_verbose=True, buffer_output=False)
     return ret
 
diff --git a/tools/mb/mb_unittest.py b/tools/mb/mb_unittest.py
index a868c0e..5779807 100755
--- a/tools/mb/mb_unittest.py
+++ b/tools/mb/mb_unittest.py
@@ -319,7 +319,9 @@
       actual_ret = mbw.Main(args)
     finally:
       os.environ = prev_env
-    self.assertEqual(actual_ret, ret)
+    self.assertEqual(
+        actual_ret, ret,
+        "ret: %s, out: %s, err: %s" % (actual_ret, mbw.out, mbw.err))
     if out is not None:
       self.assertEqual(mbw.out, out)
     if err is not None:
@@ -714,7 +716,10 @@
          "/some/vpython/pkg  git_revision:deadbeef\n"),
     }
 
+    task_json = json.dumps({'tasks': [{'task_id': '00000'}]})
+
     mbw = self.fake_mbw(files=files)
+    mbw.files[mbw.PathJoin(mbw.TempDir(), 'task.json')] = task_json
     original_impl = mbw.ToSrcRelPath
 
     def to_src_rel_path_stub(path):
@@ -726,6 +731,9 @@
 
     self.check(['run', '-s', '-c', 'debug_goma', '//out/Default',
                 'base_unittests'], mbw=mbw, ret=0)
+    mbw = self.fake_mbw(files=files)
+    mbw.files[mbw.PathJoin(mbw.TempDir(), 'task.json')] = task_json
+    mbw.ToSrcRelPath = to_src_rel_path_stub
     self.check(['run', '-s', '-c', 'debug_goma', '-d', 'os', 'Win7',
                 '//out/Default', 'base_unittests'], mbw=mbw, ret=0)
 
diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml
index b170d495..d4b77e3 100644
--- a/tools/metrics/histograms/enums.xml
+++ b/tools/metrics/histograms/enums.xml
@@ -8933,9 +8933,10 @@
 <enum name="BrowserProfileType">
   <int value="0" label="Regular"/>
   <int value="1" label="Incognito"/>
-  <int value="2" label="Guest"/>
+  <int value="2" label="Guest (OTR)"/>
   <int value="3" label="System"/>
   <int value="4" label="Other Off The Record"/>
+  <int value="5" label="Guest (Ephemeral)"/>
 </enum>
 
 <enum name="BrowserServicesVerificationResult">
@@ -11831,13 +11832,6 @@
   <int value="1" label="deflate"/>
 </enum>
 
-<enum name="CompromiseType">
-  <int value="0"
-      label="Leaked - If the credentials was leaked by a data breach."/>
-  <int value="1"
-      label="Phished - If the credentials was reused on a phishing site."/>
-</enum>
-
 <enum name="ComputeCurrentSigninStatus">
   <obsolete>
     Deprecated as of Jun 2016. The enum was added for debugging purpose and is
@@ -16424,6 +16418,7 @@
   <int value="37" label="YouTube"/>
   <int value="38" label="YouTube Music"/>
   <int value="40" label="Stadia"/>
+  <int value="41" label="ScanningApp"/>
 </enum>
 
 <enum name="DefaultBrowserAsyncAttemptResult">
@@ -17845,6 +17840,7 @@
   <int value="8" label="LayoutAnimations"/>
   <int value="9" label="DocumentWrite"/>
   <int value="10" label="SyncScript"/>
+  <int value="11" label="JSProfiling"/>
 </enum>
 
 <enum name="DocumentScanSaneBackend">
@@ -38282,6 +38278,13 @@
   <int value="35" label="Ran by google.com/intl/ (deprecated)"/>
 </enum>
 
+<enum name="InsecureCredentialsType">
+  <int value="0" label="Leaked"/>
+  <int value="1" label="Phished"/>
+  <int value="2" label="Weak"/>
+  <int value="3" label="Reused"/>
+</enum>
+
 <enum name="InsecureDownloadExtensions">
   <int value="0" label="kUnknown"/>
   <int value="1" label="kNone"/>
@@ -42051,6 +42054,7 @@
   <int value="-1919683750" label="EnableOopPrintDrivers:disabled"/>
   <int value="-1919199528"
       label="AlwaysShowServerCardsInSyncTransport:disabled"/>
+  <int value="-1917031398" label="OmniboxNativeVoiceSuggestProvider:disabled"/>
   <int value="-1916060206" label="enable-display-zoom-setting"/>
   <int value="-1915854488" label="enable-offline-pages"/>
   <int value="-1913801713"
@@ -45609,6 +45613,7 @@
   <int value="1479248574" label="disable-voice-input"/>
   <int value="1481562816" label="disable-password-link"/>
   <int value="1482039233" label="SearchSuggestionsOnLocalNtp:disabled"/>
+  <int value="1482245628" label="OmniboxNativeVoiceSuggestProvider:enabled"/>
   <int value="1482839038" label="AutofillCreditCardAuthentication:enabled"/>
   <int value="1483980996" label="MacSyscallSandbox:enabled"/>
   <int value="1486171015" label="disable-fill-on-account-select"/>
@@ -55151,6 +55156,11 @@
   <int value="1101" label="Verified Access"/>
   <int value="1102" label="Keep Wi-Fi On During Sleep (Deprecated)"/>
   <int value="1103" label="Usage Stats And Crash Reports"/>
+  <int value="1104" label="Privacy: Guest Browsing V2"/>
+  <int value="1105" label="Privacy: Show Usernames And Photos At Sign In V2"/>
+  <int value="1106" label="Privacy: Restrict Sign In V2"/>
+  <int value="1107" label="Privacy: Add To User Allowlist V2"/>
+  <int value="1108" label="Privacy: Remove From User Allowlist V2"/>
   <int value="1200" label="Add Language"/>
   <int value="1201" label="Show Input Options In Shelf"/>
   <int value="1202" label="Show Personal Information Suggestions"/>
@@ -55314,6 +55324,7 @@
   <int value="804" label="Crostini Develop Android Apps"/>
   <int value="805" label="Crostini Port Forwarding"/>
   <int value="1000" label="Time Zone"/>
+  <int value="1100" label="Manage Other People V2"/>
   <int value="1200" label="Languages And Input Details"/>
   <int value="1201" label="Manage Input Methods"/>
   <int value="1202" label="Smart Inputs"/>
diff --git a/tools/metrics/histograms/histograms_xml/accessibility/histograms.xml b/tools/metrics/histograms/histograms_xml/accessibility/histograms.xml
index aa90d0d9..98bd34c 100644
--- a/tools/metrics/histograms/histograms_xml/accessibility/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/accessibility/histograms.xml
@@ -265,7 +265,7 @@
 </histogram>
 
 <histogram name="Accessibility.CrosHighContrast" enum="BooleanEnabled"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>dmazzoni@chromium.org</owner>
   <owner>kenjibaheux@google.com</owner>
   <owner>chrome-a11y-core@google.com</owner>
@@ -459,7 +459,7 @@
 </histogram>
 
 <histogram name="Accessibility.ImageLabels.ModalDialogAccepted"
-    enum="BooleanAccepted" expires_after="2021-03-28">
+    enum="BooleanAccepted" expires_after="2021-06-06">
   <owner>katie@chromium.org</owner>
   <owner>dmazzoni@chromium.org</owner>
   <summary>
@@ -530,7 +530,7 @@
 </histogram>
 
 <histogram name="Accessibility.LanguageDetection.LangsPerPage" units="count"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>chrishall@chromium.org</owner>
   <owner>aboxhall@chromium.org</owner>
   <owner>dmazzoni@chromium.org</owner>
diff --git a/tools/metrics/histograms/histograms_xml/android/histograms.xml b/tools/metrics/histograms/histograms_xml/android/histograms.xml
index 6e407c0..4eccbcb 100644
--- a/tools/metrics/histograms/histograms_xml/android/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/android/histograms.xml
@@ -161,7 +161,7 @@
 </histogram>
 
 <histogram name="Android.BackgroundTaskScheduler.TaskCreated.WithExpiration"
-    enum="BackgroundTaskId" expires_after="2021-04-04">
+    enum="BackgroundTaskId" expires_after="2021-06-06">
   <owner>ioanastefan@chromium.org</owner>
   <owner>nator@chromium.org</owner>
   <owner>knollr@chromium.org</owner>
@@ -172,7 +172,7 @@
 </histogram>
 
 <histogram name="Android.BackgroundTaskScheduler.TaskCreated.WithoutExpiration"
-    enum="BackgroundTaskId" expires_after="2021-04-04">
+    enum="BackgroundTaskId" expires_after="2021-06-06">
   <owner>ioanastefan@chromium.org</owner>
   <owner>nator@chromium.org</owner>
   <owner>knollr@chromium.org</owner>
@@ -201,7 +201,7 @@
 </histogram>
 
 <histogram name="Android.BackgroundTaskScheduler.TaskLoadedNative.FullBrowser"
-    enum="BackgroundTaskId" expires_after="2021-04-04">
+    enum="BackgroundTaskId" expires_after="2021-06-06">
   <owner>mheikal@chromium.org</owner>
   <owner>hanxi@chromium.org</owner>
   <owner>hnakashima@chromium.org</owner>
@@ -212,7 +212,7 @@
 </histogram>
 
 <histogram name="Android.BackgroundTaskScheduler.TaskLoadedNative.ReducedMode"
-    enum="BackgroundTaskId" expires_after="2021-04-04">
+    enum="BackgroundTaskId" expires_after="2021-06-06">
   <owner>mheikal@chromium.org</owner>
   <owner>hanxi@chromium.org</owner>
   <owner>hnakashima@chromium.org</owner>
@@ -222,7 +222,7 @@
 </histogram>
 
 <histogram name="Android.BackgroundTaskScheduler.TaskScheduled.Failure"
-    enum="BackgroundTaskId" expires_after="2021-04-04">
+    enum="BackgroundTaskId" expires_after="2021-06-06">
   <owner>fgorski@chromium.org</owner>
   <owner>nyquist@chromium.org</owner>
   <summary>
@@ -231,7 +231,7 @@
 </histogram>
 
 <histogram name="Android.BackgroundTaskScheduler.TaskScheduled.Success"
-    enum="BackgroundTaskId" expires_after="2021-04-04">
+    enum="BackgroundTaskId" expires_after="2021-06-06">
   <owner>fgorski@chromium.org</owner>
   <owner>nyquist@chromium.org</owner>
   <summary>
@@ -538,7 +538,7 @@
 </histogram>
 
 <histogram name="Android.DefaultBrowserPromo.UIDismissalReason.NoDefault"
-    enum="AndroidDefaultBrowserPromoUserActionType" expires_after="2021-03-26">
+    enum="AndroidDefaultBrowserPromoUserActionType" expires_after="2021-06-06">
   <owner>lazzzis@google.com</owner>
   <owner>twellington@chromium.org</owner>
   <owner>pavely@chromium.org</owner>
@@ -560,7 +560,7 @@
 </histogram>
 
 <histogram name="Android.DeviceSize.LargestDisplaySize" units="dp"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>twellington@chromium.org</owner>
   <owner>tedchoc@chromium.org</owner>
   <owner>clank-app-team@google.com</owner>
@@ -572,7 +572,7 @@
 </histogram>
 
 <histogram name="Android.DeviceSize.SmallestDisplaySize" units="dp"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>twellington@chromium.org</owner>
   <owner>tedchoc@chromium.org</owner>
   <owner>clank-app-team@google.com</owner>
@@ -738,7 +738,7 @@
 </histogram>
 
 <histogram name="Android.DownloadManager.OpenSource.Audio"
-    enum="AndroidDownloadOpenSource" expires_after="2021-04-04">
+    enum="AndroidDownloadOpenSource" expires_after="2021-06-06">
   <owner>xingliu@chromium.org</owner>
   <owner>clank-downloads@google.com</owner>
   <summary>Records how users open audio download files on Android.</summary>
@@ -913,7 +913,7 @@
 </histogram>
 
 <histogram name="Android.FeatureModules.StartupTime" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>agrieve@chromium.org</owner>
   <owner>fredmello@chromium.org</owner>
   <owner>tiborg@chromium.org</owner>
@@ -1395,7 +1395,7 @@
 </histogram>
 
 <histogram name="Android.NTP.Impression" enum="NTPImpressionType"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>finkm@chromium.org</owner>
   <summary>
     Counts impressions of the NTP on Android. It also counts potential
@@ -2850,7 +2850,7 @@
 </histogram>
 
 <histogram name="AndroidSms.FcmMessageDispatchFailure"
-    enum="AndroidSmsFcmMessageType" expires_after="2021-04-04">
+    enum="AndroidSmsFcmMessageType" expires_after="2021-06-06">
   <owner>azeemarshad@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -2872,7 +2872,7 @@
 </histogram>
 
 <histogram name="AndroidSms.FcmMessageDispatchSuccess"
-    enum="AndroidSmsFcmMessageType" expires_after="2021-04-04">
+    enum="AndroidSmsFcmMessageType" expires_after="2021-06-06">
   <owner>azeemarshad@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -2883,7 +2883,7 @@
 </histogram>
 
 <histogram name="AndroidSms.MultiDeviceFeatureState"
-    enum="MultiDevice_FeatureState" expires_after="2021-04-04">
+    enum="MultiDevice_FeatureState" expires_after="2021-06-06">
   <owner>azeemarshad@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
diff --git a/tools/metrics/histograms/histograms_xml/apps/histograms.xml b/tools/metrics/histograms/histograms_xml/apps/histograms.xml
index 1af775b..4fe7215 100644
--- a/tools/metrics/histograms/histograms_xml/apps/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/apps/histograms.xml
@@ -845,7 +845,7 @@
 </histogram>
 
 <histogram name="Apps.AppListPageOpened" enum="AppListPage"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>calamity@chromium.org</owner>
   <owner>src/ash/app_list/OWNERS</owner>
   <summary>
@@ -1027,7 +1027,7 @@
 </histogram>
 
 <histogram name="Apps.AppListSearchQueryLength" units="characters"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
 <!-- Name completed by histogram_suffixes name="TabletOrClamshellMode" -->
 
   <owner>calamity@chromium.org</owner>
@@ -1194,7 +1194,7 @@
 </histogram>
 
 <histogram base="true" name="Apps.ContextMenuShowSource" enum="MenuSourceType"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
 <!-- Name completed by histogram_suffixes
      name="AppUIComponent" -->
 
@@ -1249,7 +1249,7 @@
 </histogram>
 
 <histogram base="true" name="Apps.DefaultAppLaunch" enum="DefaultAppName"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
 <!-- Name completed by histogram_suffixes name="DefaultAppLaunchSource" -->
 
   <owner>dominickn@chromium.org</owner>
diff --git a/tools/metrics/histograms/histograms_xml/arc/histograms.xml b/tools/metrics/histograms/histograms_xml/arc/histograms.xml
index d3a32b4..eac28b0 100644
--- a/tools/metrics/histograms/histograms_xml/arc/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/arc/histograms.xml
@@ -445,7 +445,7 @@
 </histogram>
 
 <histogram name="Arc.EngagementTime.Background" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>maajid@google.com</owner>
   <owner>shaochuan@google.com</owner>
   <owner>shihuis@google.com</owner>
@@ -780,7 +780,7 @@
 </histogram>
 
 <histogram name="Arc.PlayStoreSearch.ReturnedAppsTotal" units="apps"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>hejq@chromium.org</owner>
   <summary>
     The total number of returned apps of a Play Store app discovery query.
@@ -1006,7 +1006,7 @@
 </histogram>
 
 <histogram name="Arc.SdkVersionUpgradeType" enum="ArcSdkVersionUpgradeType"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>niwa@google.com</owner>
   <owner>yusukes@google.com</owner>
   <summary>
diff --git a/tools/metrics/histograms/histograms_xml/ash/histograms.xml b/tools/metrics/histograms/histograms_xml/ash/histograms.xml
index 8c8b22e..41a7c8ef 100644
--- a/tools/metrics/histograms/histograms_xml/ash/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/ash/histograms.xml
@@ -861,7 +861,7 @@
 </histogram>
 
 <histogram name="Ash.HotseatGesture" enum="HotseatInAppGesture"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>andrewxu@chromium.org</owner>
   <owner>tbarzic@chromium.org</owner>
   <summary>Gestures supported by the in-app hotseat.</summary>
@@ -1124,7 +1124,7 @@
 </histogram>
 
 <histogram name="Ash.NumberOfVisibleWindowsInPrimaryDisplay" units="Windows"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>jamescook@chromium.org</owner>
   <summary>
     An upper bound on the number of windows visible to the user on the primary
@@ -1952,13 +1952,13 @@
 </histogram>
 
 <histogram name="Ash.TouchView.TouchViewActivePercentage" units="%"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>girard@chromium.org</owner>
   <summary>The proportion of time spent in TouchView during a session.</summary>
 </histogram>
 
 <histogram name="Ash.TouchView.TouchViewActiveTotal" units="minutes"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>girard@chromium.org</owner>
   <summary>The total time that TouchView is active during a session.</summary>
 </histogram>
@@ -2296,7 +2296,7 @@
 
 <histogram
     name="Ash.WorkspaceWindowResizer.TabDragging.PresentationTime.MaxLatency.ClamshellMode"
-    units="ms" expires_after="2021-02-03">
+    units="ms" expires_after="2021-06-06">
   <owner>yichenz@chromium.org</owner>
   <owner>chromeos-wmp@google.com</owner>
   <summary>
diff --git a/tools/metrics/histograms/histograms_xml/assistant/histograms.xml b/tools/metrics/histograms/histograms_xml/assistant/histograms.xml
index 879ca45..4e6def1 100644
--- a/tools/metrics/histograms/histograms_xml/assistant/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/assistant/histograms.xml
@@ -154,7 +154,7 @@
 </histogram>
 
 <histogram name="Assistant.QuerySource" enum="AssistantQuerySource"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>xiaohuic@chromium.org</owner>
   <owner>meilinw@chromium.org</owner>
   <summary>
diff --git a/tools/metrics/histograms/histograms_xml/autofill/histograms.xml b/tools/metrics/histograms/histograms_xml/autofill/histograms.xml
index c0cc8d56..50001ee 100644
--- a/tools/metrics/histograms/histograms_xml/autofill/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/autofill/histograms.xml
@@ -32,7 +32,7 @@
 </histogram>
 
 <histogram name="Autofill.Address.IsEnabled.Startup" enum="BooleanEnabled"
-    expires_after="2021-04-01">
+    expires_after="2021-06-06">
   <owner>jsaul@google.com</owner>
   <owner>chrome-autofill@google.com</owner>
   <summary>
@@ -417,7 +417,7 @@
 </histogram>
 
 <histogram name="Autofill.CardUploadEnabled" enum="AutofillCardUploadEnabled"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>aneeshali@google.com</owner>
   <owner>jsaul@google.com</owner>
   <summary>
@@ -428,7 +428,7 @@
 </histogram>
 
 <histogram name="Autofill.CreditCard.IsEnabled.PageLoad" enum="BooleanEnabled"
-    expires_after="2021-04-01">
+    expires_after="2021-06-06">
   <owner>jsaul@google.com</owner>
   <owner>chrome-autofill@google.com</owner>
   <summary>
@@ -438,7 +438,7 @@
 </histogram>
 
 <histogram name="Autofill.CreditCard.IsEnabled.Startup" enum="BooleanEnabled"
-    expires_after="2021-04-01">
+    expires_after="2021-06-06">
   <owner>jsaul@google.com</owner>
   <owner>chrome-autofill@google.com</owner>
   <summary>
@@ -592,7 +592,7 @@
 </histogram>
 
 <histogram name="Autofill.ExpirationDateFixFlowPromptShown" enum="Boolean"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>siashah@google.com</owner>
   <owner>jsaul@google.com</owner>
   <owner>payments-autofill-team@google.com</owner>
@@ -962,7 +962,7 @@
 </histogram>
 
 <histogram name="Autofill.IsEnabled.Startup" enum="BooleanEnabled"
-    expires_after="2021-04-01">
+    expires_after="2021-06-06">
   <owner>jsaul@google.com</owner>
   <owner>battre@chromium.org</owner>
   <owner>chrome-autofill@google.com</owner>
@@ -1487,7 +1487,7 @@
 </histogram>
 
 <histogram name="Autofill.ServerCardLinkClicked" enum="AutofillSyncState"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>jsaul@google.com</owner>
   <owner>battre@chromium.org</owner>
   <owner>chrome-autofill@google.com</owner>
@@ -1592,7 +1592,7 @@
 </histogram>
 
 <histogram name="Autofill.StrikeDatabase.NthStrikeAdded" units="strikes"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
 <!-- Name completed by histogram_suffixes name="AutofillStrikeDatabaseProjectType" -->
 
   <owner>jsaul@google.com</owner>
@@ -1604,7 +1604,7 @@
 </histogram>
 
 <histogram name="Autofill.StrikeDatabase.StrikeDatabaseInitFailed"
-    units="attempts" expires_after="2021-04-04">
+    units="attempts" expires_after="2021-06-06">
   <owner>jsaul@google.com</owner>
   <owner>annelim@google.com</owner>
   <summary>
@@ -1764,7 +1764,7 @@
 </histogram>
 
 <histogram name="Autofill.UnmaskPrompt.Duration" units="ms"
-    expires_after="2021-04-01">
+    expires_after="2021-06-06">
   <owner>jsaul@google.com</owner>
   <owner>siyua@chromium.org</owner>
   <summary>
@@ -1775,7 +1775,7 @@
 </histogram>
 
 <histogram name="Autofill.UnmaskPrompt.Events" enum="AutofillUnmaskPromptEvent"
-    expires_after="2021-04-01">
+    expires_after="2021-06-06">
   <owner>jsaul@google.com</owner>
   <owner>siyua@chromium.org</owner>
   <summary>
@@ -1785,7 +1785,7 @@
 </histogram>
 
 <histogram name="Autofill.UnmaskPrompt.GetRealPanDuration" units="ms"
-    expires_after="2021-04-01">
+    expires_after="2021-06-06">
   <owner>jsaul@google.com</owner>
   <owner>siyua@chromium.org</owner>
   <summary>
@@ -1796,7 +1796,7 @@
 </histogram>
 
 <histogram name="Autofill.UnmaskPrompt.GetRealPanResult"
-    enum="AutofillGetRealPanResult" expires_after="2021-04-01">
+    enum="AutofillGetRealPanResult" expires_after="2021-06-06">
   <owner>jsaul@google.com</owner>
   <owner>siyua@chromium.org</owner>
   <summary>
diff --git a/tools/metrics/histograms/histograms_xml/background/histograms.xml b/tools/metrics/histograms/histograms_xml/background/histograms.xml
index ddf81fb..83c2f67d 100644
--- a/tools/metrics/histograms/histograms_xml/background/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/background/histograms.xml
@@ -340,7 +340,7 @@
 </histogram>
 
 <histogram name="BackgroundSync.Registration.OneShot"
-    enum="BackgroundSyncStatus" expires_after="2021-04-04">
+    enum="BackgroundSyncStatus" expires_after="2021-06-06">
   <owner>nator@chromium.org</owner>
   <owner>rayankans@chromium.org</owner>
   <summary>
diff --git a/tools/metrics/histograms/histograms_xml/blink/histograms.xml b/tools/metrics/histograms/histograms_xml/blink/histograms.xml
index 8b10863..463efda 100644
--- a/tools/metrics/histograms/histograms_xml/blink/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/blink/histograms.xml
@@ -86,7 +86,7 @@
 </histogram>
 
 <histogram name="Blink.Canvas.ContextType" enum="CanvasContextType"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>fserb@chromium.org</owner>
   <owner>aaronhk@chromium.org</owner>
   <summary>
@@ -104,7 +104,7 @@
 </histogram>
 
 <histogram base="true" name="Blink.Canvas.DrawImage.Duration"
-    units="microseconds" expires_after="2021-04-04">
+    units="microseconds" expires_after="2021-06-06">
   <owner>fserb@chromium.org</owner>
   <owner>aaronhk@chromium.org</owner>
   <summary>
@@ -117,7 +117,7 @@
 </histogram>
 
 <histogram base="true" name="Blink.Canvas.DrawImage.SqrtNumberOfPixels"
-    units="sqrt(pixels)" expires_after="2021-04-04">
+    units="sqrt(pixels)" expires_after="2021-06-06">
   <owner>fserb@chromium.org</owner>
   <owner>aaronhk@chromium.org</owner>
   <summary>
@@ -193,7 +193,7 @@
 </histogram>
 
 <histogram name="Blink.Canvas.NumCanvasesPerPage" units="canvases"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>aaronhk@chromium.org</owner>
   <owner>fserb@chromium.org</owner>
   <summary>
@@ -223,7 +223,7 @@
 </histogram>
 
 <histogram name="Blink.Canvas.RasterDuration" units="microseconds"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>aaronhk@chromium.org</owner>
   <owner>fserb@chromium.org</owner>
   <summary>
@@ -592,7 +592,7 @@
 </histogram>
 
 <histogram name="Blink.DisplayLockIntersectionObserver.UpdateTime"
-    units="microseconds" expires_after="2021-03-21">
+    units="microseconds" expires_after="2021-06-06">
 <!-- Name completed by histogram_suffixes name="BlinkUpdateTimePreFCPSuffixes" -->
 
 <!-- Name completed by histogram_suffixes name="BlinkUpdateTimePostFCPSuffixes" -->
@@ -1127,7 +1127,7 @@
 </histogram>
 
 <histogram name="Blink.JavascriptIntersectionObserver.UpdateTime"
-    units="microseconds" expires_after="2021-03-21">
+    units="microseconds" expires_after="2021-06-06">
 <!-- Name completed by histogram_suffixes name="BlinkUpdateTimePreFCPSuffixes" -->
 
 <!-- Name completed by histogram_suffixes name="BlinkUpdateTimePostFCPSuffixes" -->
@@ -1240,7 +1240,7 @@
 </histogram>
 
 <histogram name="Blink.LazyLoadIntersectionObserver.UpdateTime"
-    units="microseconds" expires_after="2021-03-21">
+    units="microseconds" expires_after="2021-06-06">
 <!-- Name completed by histogram_suffixes name="BlinkUpdateTimePreFCPSuffixes" -->
 
 <!-- Name completed by histogram_suffixes name="BlinkUpdateTimePostFCPSuffixes" -->
@@ -1537,7 +1537,7 @@
 </histogram>
 
 <histogram name="Blink.MediaIntersectionObserver.UpdateTime"
-    units="microseconds" expires_after="2021-03-21">
+    units="microseconds" expires_after="2021-06-06">
 <!-- Name completed by histogram_suffixes name="BlinkUpdateTimePreFCPSuffixes" -->
 
 <!-- Name completed by histogram_suffixes name="BlinkUpdateTimePostFCPSuffixes" -->
@@ -2140,7 +2140,7 @@
 </histogram>
 
 <histogram name="Blink.UseCounter.Extensions.Features" enum="FeatureObserver"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>chasej@chromium.org</owner>
   <owner>feature-control@chromium.org</owner>
   <summary>
diff --git a/tools/metrics/histograms/histograms_xml/browser/histograms.xml b/tools/metrics/histograms/histograms_xml/browser/histograms.xml
index 9216524..1a16d1a 100644
--- a/tools/metrics/histograms/histograms_xml/browser/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/browser/histograms.xml
@@ -275,7 +275,7 @@
 </histogram>
 
 <histogram name="Browser.Responsiveness.IOJanksTotalPerMinute" units="janks"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>gab@chromium.org</owner>
   <owner>olivierli@chromium.org</owner>
   <summary>
@@ -289,7 +289,7 @@
 </histogram>
 
 <histogram name="Browser.Responsiveness.IOJankyIntervalsPerMinute"
-    units="janks" expires_after="2021-04-04">
+    units="janks" expires_after="2021-06-06">
   <owner>gab@chromium.org</owner>
   <owner>olivierli@chromium.org</owner>
   <summary>
@@ -572,7 +572,7 @@
 </histogram>
 
 <histogram name="BrowserRenderProcessHost.TotalTime" units="ms"
-    expires_after="2021-02-21">
+    expires_after="2021-06-06">
   <owner>johnidel@chromium.org</owner>
   <owner>chrome-ads-histograms@google.com</owner>
   <summary>
@@ -732,7 +732,7 @@
 </histogram>
 
 <histogram name="BrowserSwitcher.ExternalSitelistSize" units="rules"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>nicolaso@chromium.org</owner>
   <owner>pastarmovj@chromium.org</owner>
   <summary>
@@ -783,7 +783,7 @@
 </histogram>
 
 <histogram name="BrowserSwitcher.LaunchTime" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>nicolaso@chromium.org</owner>
   <owner>pastarmovj@chromium.org</owner>
   <summary>
@@ -803,7 +803,7 @@
 </histogram>
 
 <histogram name="BrowserSwitcher.UrlListWildcard" enum="BooleanPresent"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>nicolaso@chromium.org</owner>
   <owner>pastarmovj@chromium.org</owner>
   <summary>
diff --git a/tools/metrics/histograms/histograms_xml/chromeos/histograms.xml b/tools/metrics/histograms/histograms_xml/chromeos/histograms.xml
index 9261eae..bec88ae 100644
--- a/tools/metrics/histograms/histograms_xml/chromeos/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/chromeos/histograms.xml
@@ -81,7 +81,7 @@
 </histogram>
 
 <histogram name="ChromeOS.Apps.NumberOfAppsForNotification"
-    enum="BooleanMultipleApps" expires_after="2021-01-31">
+    enum="BooleanMultipleApps" expires_after="2021-06-06">
   <owner>dominickn@chromium.org</owner>
   <owner>nancylingwang@chromium.org</owner>
   <summary>
@@ -430,7 +430,7 @@
 </histogram>
 
 <histogram name="ChromeOS.KeyPermissionsManager.Migration"
-    enum="KeyPermissionsManagerMigrationStatus" expires_after="2021-04-01">
+    enum="KeyPermissionsManagerMigrationStatus" expires_after="2021-06-06">
   <owner>omorsi@google.com</owner>
   <owner>pmarko@google.com</owner>
   <summary>
@@ -838,7 +838,7 @@
 </histogram>
 
 <histogram name="ChromeOS.Settings.PathVisited" enum="WebUISettingsPathHashes"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>khorimoto@chromium.org</owner>
   <owner>cros-customization@google.com</owner>
   <summary>
diff --git a/tools/metrics/histograms/histograms_xml/compositing/histograms.xml b/tools/metrics/histograms/histograms_xml/compositing/histograms.xml
index b6c85a7..826c681 100644
--- a/tools/metrics/histograms/histograms_xml/compositing/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/compositing/histograms.xml
@@ -450,7 +450,7 @@
 </histogram>
 
 <histogram name="Compositing.Renderer.LCDTextDisallowedReasonKPixels"
-    enum="LCDTextDisallowedReason" expires_after="2021-04-01">
+    enum="LCDTextDisallowedReason" expires_after="2021-06-06">
   <owner>wangxianzhu@chromium.org</owner>
   <owner>paint-dev@chromium.org</owner>
   <summary>
diff --git a/tools/metrics/histograms/histograms_xml/content/histograms.xml b/tools/metrics/histograms/histograms_xml/content/histograms.xml
index 9372fe75..75cd35c 100644
--- a/tools/metrics/histograms/histograms_xml/content/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/content/histograms.xml
@@ -77,7 +77,7 @@
 </histogram>
 
 <histogram name="ContentCapture.SendContentTime" units="microseconds"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>michaelbai@chromium.org</owner>
   <owner>src/third_party/blink/renderer/core/content_capture/OWNERS</owner>
   <summary>
@@ -107,7 +107,7 @@
 </histogram>
 
 <histogram name="ContentCapture.TaskDelayTimeInMs" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>michaelbai@chromium.org</owner>
   <owner>src/third_party/blink/renderer/core/content_capture/OWNERS</owner>
   <summary>
@@ -615,7 +615,7 @@
 </histogram>
 
 <histogram name="ContentSuggestions.Feed.AvailableOffline.Opened"
-    enum="Boolean" expires_after="2021-04-04">
+    enum="Boolean" expires_after="2021-06-06">
   <owner>carlosk@chromium.org</owner>
   <owner>harringtond@chromium.org</owner>
   <owner>feed@chromium.org</owner>
diff --git a/tools/metrics/histograms/histograms_xml/cros/histograms.xml b/tools/metrics/histograms/histograms_xml/cros/histograms.xml
index 62abc62..cf364515 100644
--- a/tools/metrics/histograms/histograms_xml/cros/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/cros/histograms.xml
@@ -34,7 +34,7 @@
 </histogram>
 
 <histogram name="CrosDisks.ArchiveType" enum="CrosDisksArchiveType"
-    expires_after="2021-04-01">
+    expires_after="2021-06-06">
   <owner>fdegros@chromium.org</owner>
   <owner>chromeos-files-app@google.com</owner>
   <summary>
@@ -44,7 +44,7 @@
 </histogram>
 
 <histogram name="CrosDisks.DeviceMediaType" enum="CrosDisksDeviceMediaType"
-    expires_after="2021-04-01">
+    expires_after="2021-06-06">
   <owner>fdegros@chromium.org</owner>
   <owner>chromeos-files-app@google.com</owner>
   <summary>
@@ -54,7 +54,7 @@
 </histogram>
 
 <histogram name="CrosDisks.FilesystemType" enum="CrosDisksFilesystemType"
-    expires_after="2021-04-01">
+    expires_after="2021-06-06">
   <owner>fdegros@chromium.org</owner>
   <owner>chromeos-files-app@google.com</owner>
   <summary>
@@ -74,7 +74,7 @@
 </histogram>
 
 <histogram name="CrosDisks.Fuse.Rar2fs" enum="Rar2fsError"
-    expires_after="2021-04-01">
+    expires_after="2021-06-06">
   <owner>fdegros@chromium.org</owner>
   <owner>chromeos-files-app@google.com</owner>
   <summary>
diff --git a/tools/metrics/histograms/histograms_xml/crostini/histograms.xml b/tools/metrics/histograms/histograms_xml/crostini/histograms.xml
index 51add91..95987116 100644
--- a/tools/metrics/histograms/histograms_xml/crostini/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/crostini/histograms.xml
@@ -41,7 +41,7 @@
 </histogram>
 
 <histogram name="Crostini.AppsInstalledAtLogin" units="apps"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>clumptini@google.com</owner>
   <owner>tbuckley@chromium.org</owner>
   <summary>
@@ -88,7 +88,7 @@
 </histogram>
 
 <histogram name="Crostini.Backup" enum="CrostiniExportContainerResult"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>clumptini@google.com</owner>
   <owner>tbuckley@chromium.org</owner>
   <summary>Result of crostini backup.</summary>
@@ -127,14 +127,14 @@
 </histogram>
 
 <histogram name="Crostini.BackupTimeFailed" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>clumptini@google.com</owner>
   <owner>tbuckley@chromium.org</owner>
   <summary>Time taken for failed backup.</summary>
 </histogram>
 
 <histogram name="Crostini.BackupTimeSuccess" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>clumptini@google.com</owner>
   <owner>tbuckley@chromium.org</owner>
   <summary>Time taken for successful backup.</summary>
@@ -152,7 +152,7 @@
 </histogram>
 
 <histogram name="Crostini.ContainerOsVersion" enum="CrostiniContainerOsVersion"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>clumptini@google.com</owner>
   <owner>tbuckley@chromium.org</owner>
   <summary>
@@ -173,7 +173,7 @@
 </histogram>
 
 <histogram name="Crostini.Crosvm.Processes.Count" units="processes"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>clumptini@google.com</owner>
   <owner>tbuckley@chromium.org</owner>
   <summary>
@@ -249,7 +249,7 @@
 </histogram>
 
 <histogram name="Crostini.Restarter.Started" enum="BooleanAttempted"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>clumptini@google.com</owner>
   <owner>tbuckley@chromium.org</owner>
   <summary>
@@ -259,7 +259,7 @@
 </histogram>
 
 <histogram name="Crostini.RestarterResult" enum="CrostiniResult"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>clumptini@google.com</owner>
   <owner>tbuckley@chromium.org</owner>
   <summary>
@@ -269,7 +269,7 @@
 </histogram>
 
 <histogram name="Crostini.Restore" enum="CrostiniImportContainerResult"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>clumptini@google.com</owner>
   <owner>tbuckley@chromium.org</owner>
   <summary>Result of crostini restore.</summary>
@@ -308,7 +308,7 @@
 </histogram>
 
 <histogram name="Crostini.SetupResult" enum="CrostiniSetupResult"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>clumptini@google.com</owner>
   <owner>tbuckley@chromium.org</owner>
   <summary>
@@ -405,7 +405,7 @@
 </histogram>
 
 <histogram name="Crostini.UninstallResult" enum="CrostiniUninstallResult"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>clumptini@google.com</owner>
   <owner>tbuckley@chromium.org</owner>
   <summary>
diff --git a/tools/metrics/histograms/histograms_xml/crypt/histograms.xml b/tools/metrics/histograms/histograms_xml/crypt/histograms.xml
index adf3ae3..208c9a2 100644
--- a/tools/metrics/histograms/histograms_xml/crypt/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/crypt/histograms.xml
@@ -43,7 +43,7 @@
 </histogram>
 
 <histogram name="CryptAuth.ClientAppMetadataInstanceIdTokenFetch.Result"
-    enum="InstanceIDResult" expires_after="2021-04-04">
+    enum="InstanceIDResult" expires_after="2021-06-06">
   <owner>khorimoto@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -53,7 +53,7 @@
 </histogram>
 
 <histogram name="CryptAuth.ClientAppMetadataInstanceIdTokenFetch.Retries"
-    units="retries" expires_after="2021-04-04">
+    units="retries" expires_after="2021-06-06">
   <owner>khorimoto@chromium.org</owner>
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
@@ -65,7 +65,7 @@
 </histogram>
 
 <histogram name="CryptAuth.DeviceSync.Result" enum="BooleanSuccess"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>Indicates success of performing a DeviceSync.</summary>
@@ -128,7 +128,7 @@
 </histogram>
 
 <histogram name="CryptAuth.DeviceSyncSoftwareFeaturesResult"
-    enum="BooleanSuccess" expires_after="2021-04-04">
+    enum="BooleanSuccess" expires_after="2021-06-06">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -264,7 +264,7 @@
 
 <histogram
     name="CryptAuth.DeviceSyncV2.DeviceSyncer.IsLocalDeviceMetadataConsistent"
-    enum="BooleanConsistent" expires_after="2021-04-04">
+    enum="BooleanConsistent" expires_after="2021-06-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -275,7 +275,7 @@
 </histogram>
 
 <histogram name="CryptAuth.DeviceSyncV2.DeviceSyncer.MetadataDecryptionSuccess"
-    enum="BooleanSuccess" expires_after="2021-04-04">
+    enum="BooleanSuccess" expires_after="2021-06-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -286,7 +286,7 @@
 </histogram>
 
 <histogram name="CryptAuth.DeviceSyncV2.DeviceSyncer.MetadataParsingSuccess"
-    enum="BooleanSuccess" expires_after="2021-04-04">
+    enum="BooleanSuccess" expires_after="2021-06-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -299,7 +299,7 @@
 
 <histogram
     name="CryptAuth.DeviceSyncV2.FeatureStatusGetter.ApiCallResult.GetFeatureStatuses"
-    enum="CryptAuthApiCallResult" expires_after="2021-04-04">
+    enum="CryptAuthApiCallResult" expires_after="2021-06-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -311,7 +311,7 @@
 
 <histogram
     name="CryptAuth.DeviceSyncV2.FeatureStatusGetter.CorrectNumberOfDevicesInResponse"
-    enum="BooleanExpected" expires_after="2021-04-04">
+    enum="BooleanExpected" expires_after="2021-06-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -335,7 +335,7 @@
 
 <histogram
     name="CryptAuth.DeviceSyncV2.FeatureStatusGetter.IsDuplicateDeviceId"
-    enum="BooleanDuplicate" expires_after="2021-04-04">
+    enum="BooleanDuplicate" expires_after="2021-06-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -347,7 +347,7 @@
 </histogram>
 
 <histogram name="CryptAuth.DeviceSyncV2.FeatureStatusGetter.IsKnownFeatureType"
-    enum="BooleanKnown" expires_after="2021-04-04">
+    enum="BooleanKnown" expires_after="2021-06-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -361,7 +361,7 @@
 
 <histogram
     name="CryptAuth.DeviceSyncV2.FeatureStatusGetter.IsUnsupportedFeatureMarkedEnabled"
-    enum="Boolean" expires_after="2021-04-04">
+    enum="Boolean" expires_after="2021-06-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -374,7 +374,7 @@
 
 <histogram
     name="CryptAuth.DeviceSyncV2.FeatureStatusGetter.WasDeviceInResponseRequested"
-    enum="BooleanRequested" expires_after="2021-04-04">
+    enum="BooleanRequested" expires_after="2021-06-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -437,7 +437,7 @@
 
 <histogram
     name="CryptAuth.DeviceSyncV2.GroupPrivateKeySharer.EncryptionSuccess"
-    enum="BooleanSuccess" expires_after="2021-04-04">
+    enum="BooleanSuccess" expires_after="2021-06-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -474,7 +474,7 @@
 
 <histogram
     name="CryptAuth.DeviceSyncV2.GroupPrivateKeySharer.IsEncryptingKeyEmpty"
-    enum="Boolean" expires_after="2021-04-04">
+    enum="Boolean" expires_after="2021-06-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -487,7 +487,7 @@
 </histogram>
 
 <histogram name="CryptAuth.DeviceSyncV2.InvocationReason"
-    enum="CryptAuthV2InvocationReason" expires_after="2021-04-04">
+    enum="CryptAuthV2InvocationReason" expires_after="2021-06-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -594,7 +594,7 @@
 
 <histogram
     name="CryptAuth.DeviceSyncV2.MetadataSyncer.IsDeviceMetadataPacketValid"
-    enum="Boolean" expires_after="2021-04-04">
+    enum="Boolean" expires_after="2021-06-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -605,7 +605,7 @@
 </histogram>
 
 <histogram name="CryptAuth.DeviceSyncV2.MetadataSyncer.IsDuplicateDeviceId"
-    enum="Boolean" expires_after="2021-04-04">
+    enum="Boolean" expires_after="2021-06-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -617,7 +617,7 @@
 </histogram>
 
 <histogram name="CryptAuth.DeviceSyncV2.RemoteDeviceProvider.NumV1Devices"
-    units="count" expires_after="2021-04-04">
+    units="count" expires_after="2021-06-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -629,7 +629,7 @@
 </histogram>
 
 <histogram name="CryptAuth.DeviceSyncV2.RemoteDeviceProvider.NumV2Devices"
-    units="count" expires_after="2021-04-04">
+    units="count" expires_after="2021-06-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -642,7 +642,7 @@
 
 <histogram
     name="CryptAuth.DeviceSyncV2.RemoteDeviceProvider.PercentageOfV1DevicesReplacedByV2Devices"
-    units="%" expires_after="2021-04-04">
+    units="%" expires_after="2021-06-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -671,7 +671,7 @@
 
 <histogram
     name="CryptAuth.DeviceSyncV2.RemoteDeviceProvider.RatioOfV2ToV1Devices"
-    units="%" expires_after="2021-04-04">
+    units="%" expires_after="2021-06-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -699,7 +699,7 @@
 </histogram>
 
 <histogram name="CryptAuth.DeviceSyncV2.Result.ResultCode"
-    enum="CryptAuthV2DeviceSyncResultCode" expires_after="2021-04-04">
+    enum="CryptAuthV2DeviceSyncResultCode" expires_after="2021-06-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -709,7 +709,7 @@
 </histogram>
 
 <histogram name="CryptAuth.DeviceSyncV2.Result.ResultType"
-    enum="CryptAuthV2DeviceSyncResultType" expires_after="2021-04-04">
+    enum="CryptAuthV2DeviceSyncResultType" expires_after="2021-06-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -719,7 +719,7 @@
 </histogram>
 
 <histogram name="CryptAuth.Enrollment.Result" enum="BooleanSuccess"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -794,7 +794,7 @@
 </histogram>
 
 <histogram name="CryptAuth.EnrollmentV2.InvocationReason"
-    enum="CryptAuthV2InvocationReason" expires_after="2021-04-04">
+    enum="CryptAuthV2InvocationReason" expires_after="2021-06-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -804,7 +804,7 @@
 </histogram>
 
 <histogram name="CryptAuth.EnrollmentV2.Result.ResultCode"
-    enum="CryptAuthV2EnrollmentResult" expires_after="2021-04-04">
+    enum="CryptAuthV2EnrollmentResult" expires_after="2021-06-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -824,7 +824,7 @@
 </histogram>
 
 <histogram name="CryptAuth.EnrollmentV2.UserKeyPairState"
-    enum="CryptAuthV2EnrollmentUserKeyPairState" expires_after="2021-04-04">
+    enum="CryptAuthV2EnrollmentUserKeyPairState" expires_after="2021-06-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -908,7 +908,7 @@
 </histogram>
 
 <histogram name="CryptAuth.Gcm.Registration.AttemptTimeWithRetries" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -940,7 +940,7 @@
 </histogram>
 
 <histogram name="CryptAuth.InstanceId.DidInstanceIdChange"
-    enum="BooleanChanged" expires_after="2021-04-04">
+    enum="BooleanChanged" expires_after="2021-06-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -951,7 +951,7 @@
 </histogram>
 
 <histogram name="CryptAuth.InstanceId.DidInstanceIdTokenChange"
-    enum="BooleanChanged" expires_after="2021-04-04">
+    enum="BooleanChanged" expires_after="2021-06-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
diff --git a/tools/metrics/histograms/histograms_xml/cryptohome/histograms.xml b/tools/metrics/histograms/histograms_xml/cryptohome/histograms.xml
index fa1132f3..17a645a 100644
--- a/tools/metrics/histograms/histograms_xml/cryptohome/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/cryptohome/histograms.xml
@@ -63,7 +63,7 @@
 </histogram>
 
 <histogram name="Cryptohome.DeprecatedApiCalled"
-    enum="CryptohomeDeprecatedApiCalled" expires_after="2021-04-04">
+    enum="CryptohomeDeprecatedApiCalled" expires_after="2021-06-06">
   <owner>apronin@chromium.org</owner>
   <owner>louiscollard@chromium.org</owner>
   <owner>zuan@chromium.org</owner>
@@ -364,7 +364,7 @@
 </histogram>
 
 <histogram name="Cryptohome.OOPMountCleanupResult"
-    enum="CryptohomeOOPMountCleanupResult" expires_after="2021-04-04">
+    enum="CryptohomeOOPMountCleanupResult" expires_after="2021-06-06">
   <owner>betuls@chromium.org</owner>
   <owner>jorgelo@chromium.org</owner>
   <summary>
@@ -374,7 +374,7 @@
 </histogram>
 
 <histogram name="Cryptohome.OOPMountOperationResult"
-    enum="CryptohomeOOPMountOperationResult" expires_after="2021-04-04">
+    enum="CryptohomeOOPMountOperationResult" expires_after="2021-06-06">
   <owner>betuls@chromium.org</owner>
   <owner>jorgelo@chromium.org</owner>
   <summary>
@@ -449,7 +449,7 @@
 </histogram>
 
 <histogram name="Cryptohome.TimeToMountEx" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>jorgelo@chromium.org</owner>
   <owner>cros-hwsec+uma@chromium.org</owner>
   <summary>
@@ -469,7 +469,7 @@
 </histogram>
 
 <histogram name="Cryptohome.TimeToMountGuestEx" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>jorgelo@chromium.org</owner>
   <owner>cros-hwsec+uma@chromium.org</owner>
   <summary>
@@ -479,7 +479,7 @@
 </histogram>
 
 <histogram name="Cryptohome.TimeToPerformEphemeralMount" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>jorgelo@chromium.org</owner>
   <owner>cros-hwsec+uma@chromium.org</owner>
   <summary>
@@ -513,7 +513,7 @@
 </histogram>
 
 <histogram name="Cryptohome.TimeToPerformOOPMountOperation" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>jorgelo@chromium.org</owner>
   <owner>betuls@chromium.org</owner>
   <summary>
diff --git a/tools/metrics/histograms/histograms_xml/data_reduction_proxy/histograms.xml b/tools/metrics/histograms/histograms_xml/data_reduction_proxy/histograms.xml
index 8990b6c..2d2748a 100644
--- a/tools/metrics/histograms/histograms_xml/data_reduction_proxy/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/data_reduction_proxy/histograms.xml
@@ -232,7 +232,7 @@
 </histogram>
 
 <histogram name="DataReductionProxy.EnabledState"
-    enum="DataReductionProxyEnabledState" expires_after="2021-03-10">
+    enum="DataReductionProxyEnabledState" expires_after="2021-06-06">
   <owner>rajendrant@chromium.org</owner>
   <owner>tbansal@chromium.org</owner>
   <summary>
diff --git a/tools/metrics/histograms/histograms_xml/dom/histograms.xml b/tools/metrics/histograms/histograms_xml/dom/histograms.xml
index e3f3590..299563c 100644
--- a/tools/metrics/histograms/histograms_xml/dom/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/dom/histograms.xml
@@ -102,7 +102,7 @@
 </histogram>
 
 <histogram name="DomDistiller.ReaderMode.EntryPoint"
-    enum="ReaderModeEntryPoint" expires_after="2021-04-04">
+    enum="ReaderModeEntryPoint" expires_after="2021-06-06">
   <owner>katie@chromium.org</owner>
   <owner>gilmanmh@google.com</owner>
   <owner>chrome-a11y-core@google.com</owner>
@@ -110,7 +110,7 @@
 </histogram>
 
 <histogram name="DomDistiller.ReaderMode.ExitPoint" enum="ReaderModeEntryPoint"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>katie@chromium.org</owner>
   <owner>gilmanmh@google.com</owner>
   <owner>chrome-a11y-core@google.com</owner>
@@ -161,7 +161,7 @@
 </histogram>
 
 <histogram name="DomDistiller.Time.ActivelyViewingReaderModePage" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>katie@chromium.org</owner>
   <owner>chrome-a11y-core@chromium.org</owner>
   <summary>
diff --git a/tools/metrics/histograms/histograms_xml/enterprise/histograms.xml b/tools/metrics/histograms/histograms_xml/enterprise/histograms.xml
index a861812..b08af321 100644
--- a/tools/metrics/histograms/histograms_xml/enterprise/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/enterprise/histograms.xml
@@ -310,7 +310,7 @@
 </histogram>
 
 <histogram name="Enterprise.CloudReportingResponse"
-    enum="EnterpriseCloudReportingResponse" expires_after="2021-04-04">
+    enum="EnterpriseCloudReportingResponse" expires_after="2021-06-06">
   <owner>zmin@chromium.org</owner>
   <owner>pastarmovj@chromium.org</owner>
   <summary>
@@ -494,7 +494,7 @@
 </histogram>
 
 <histogram name="Enterprise.DMServerRequestSuccess"
-    enum="EnterpriseDMServerRequestSuccess" expires_after="2021-04-04">
+    enum="EnterpriseDMServerRequestSuccess" expires_after="2021-06-06">
   <owner>poromov@chromium.org</owner>
   <owner>managed-devices@google.com</owner>
   <summary>
@@ -907,7 +907,7 @@
 
 <histogram name="Enterprise.MachineLevelUserCloudPolicyEnrollment.Result"
     enum="MachineLevelUserCloudPolicyEnrollmentResult"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>rogerta@chromium.org</owner>
   <owner>zmin@chromium.org</owner>
   <summary>The result of machine level user cloud policy enrollment.</summary>
@@ -965,7 +965,7 @@
 </histogram>
 
 <histogram name="Enterprise.Policies" enum="EnterprisePolicies"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>mnissler@chromium.org</owner>
   <summary>
     A set of enterprise policy rules that are in use. This is recorded every 24
@@ -1592,7 +1592,7 @@
 </histogram>
 
 <histogram name="EnterpriseCheck.IsFullyManaged2" enum="IsFullyManagedBoolean"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>twellington@google.com</owner>
   <owner>tedchcoc@chromium.org</owner>
   <summary>
diff --git a/tools/metrics/histograms/histograms_xml/event/histograms.xml b/tools/metrics/histograms/histograms_xml/event/histograms.xml
index 2cd518b..962548d 100644
--- a/tools/metrics/histograms/histograms_xml/event/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/event/histograms.xml
@@ -22,7 +22,7 @@
 <histograms>
 
 <histogram name="Event.AggregatedLatency.Renderer2" units="microseconds"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>flackr@chromium.org</owner>
   <summary>
     Time between initiation of any input event and the renderer receiving and
@@ -65,7 +65,7 @@
 </histogram>
 
 <histogram name="Event.AsyncTargeting.ResponseTime" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>yigu@chromium.org</owner>
   <summary>
     Tracks how long it takes for a client to respond to an asynchronous request
@@ -550,7 +550,7 @@
 
 <histogram
     name="Event.Latency.ScrollBegin.Scrollbar.TimeToScrollUpdateSwapBegin4"
-    units="microseconds" expires_after="2021-04-04">
+    units="microseconds" expires_after="2021-06-06">
   <owner>nzolghadr@chromium.org</owner>
   <owner>dlibby@microsoft.com</owner>
   <owner>input-dev@chromium.org</owner>
@@ -653,7 +653,7 @@
 </histogram>
 
 <histogram name="Event.Latency.ScrollBegin.Touch.GpuSwap2" units="microseconds"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>flackr@chromium.org</owner>
   <summary>
     Time between gpu starts to swap the first ScrollUpdate gesture event in a
@@ -1047,7 +1047,7 @@
 </histogram>
 
 <histogram name="Event.Latency.ScrollUpdate.TimeToScrollUpdateSwapBegin2"
-    units="microseconds" expires_after="2021-04-04">
+    units="microseconds" expires_after="2021-06-06">
   <owner>nzolghadr@chromium.org</owner>
   <summary>
     Time between initial creation of a wheel/touch event and start of the frame
@@ -1217,7 +1217,7 @@
 </histogram>
 
 <histogram name="Event.Latency.ScrollUpdate.Touch.GpuSwap2"
-    units="microseconds" expires_after="2021-04-05">
+    units="microseconds" expires_after="2021-06-06">
   <owner>flackr@chromium.org</owner>
   <owner>input-dev@chromium.org</owner>
   <summary>
@@ -1422,7 +1422,7 @@
 </histogram>
 
 <histogram name="Event.PassiveListeners" enum="EventResultType"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>dtapuska@chromium.org</owner>
   <summary>
     The result of handling of MouseWheel, TouchStart, TouchMove, TouchEnd events
diff --git a/tools/metrics/histograms/histograms_xml/extensions/histograms.xml b/tools/metrics/histograms/histograms_xml/extensions/histograms.xml
index e306334..f4598de 100644
--- a/tools/metrics/histograms/histograms_xml/extensions/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/extensions/histograms.xml
@@ -259,7 +259,7 @@
 </histogram>
 
 <histogram name="Extensions.BookmarkAppLaunchSource" enum="AppLaunchSource"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>benwells@chromium.org</owner>
   <owner>dominickn@chromium.org</owner>
   <owner>mgiuca@chromium.org</owner>
@@ -590,7 +590,7 @@
 
 <histogram
     name="Extensions.DeclarativeNetRequest.EvaluateBeforeRequestTime.SingleExtension2"
-    units="microseconds" expires_after="2021-04-04">
+    units="microseconds" expires_after="2021-06-06">
   <owner>karandeepb@chromium.org</owner>
   <owner>extensions-core@chromium.org</owner>
   <summary>
@@ -603,7 +603,7 @@
 
 <histogram
     name="Extensions.DeclarativeNetRequest.EvaluateRequestTime.AllExtensions3"
-    units="microseconds" expires_after="2021-04-04">
+    units="microseconds" expires_after="2021-06-06">
   <owner>karandeepb@chromium.org</owner>
   <owner>extensions-core@chromium.org</owner>
   <summary>
@@ -956,7 +956,7 @@
 </histogram>
 
 <histogram name="Extensions.DisableReason" enum="ExtensionDisableReason"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>rdevlin.cronin@chromium.org</owner>
   <owner>extensions-core@chromium.org</owner>
   <summary>
@@ -1122,7 +1122,7 @@
 </histogram>
 
 <histogram name="Extensions.ExtensionAddDisabledRemotelyReason"
-    enum="ExtensionUpdateCheckDataKey" expires_after="2021-04-04">
+    enum="ExtensionUpdateCheckDataKey" expires_after="2021-06-06">
   <owner>bdea@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -1155,7 +1155,7 @@
 </histogram>
 
 <histogram name="Extensions.ExtensionDisabledRemotely"
-    enum="ExtensionUpdateCheckDataKey" expires_after="2021-04-04">
+    enum="ExtensionUpdateCheckDataKey" expires_after="2021-06-06">
   <owner>bdea@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -1424,7 +1424,7 @@
 </histogram>
 
 <histogram name="Extensions.ForceInstalledFailureNoUpdatesInfo"
-    enum="ExtensionNoUpdatesInfo" expires_after="2021-04-04">
+    enum="ExtensionNoUpdatesInfo" expires_after="2021-06-06">
   <owner>snijhara@google.com</owner>
   <owner>swapnilgupta@google.com</owner>
   <owner>burunduk@chromium.org</owner>
@@ -1784,7 +1784,7 @@
 </histogram>
 
 <histogram name="Extensions.Functions.FailedTime" enum="ExtensionFunctions"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>rdevlin.cronin@chromium.org</owner>
   <owner>extensions-core@chromium.org</owner>
   <summary>
@@ -1795,7 +1795,7 @@
 </histogram>
 
 <histogram name="Extensions.Functions.FailedTotalExecutionTime" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>rdevlin.cronin@chromium.org</owner>
   <owner>extensions-core@chromium.org</owner>
   <summary>
@@ -1836,7 +1836,7 @@
 </histogram>
 
 <histogram name="Extensions.Functions.SucceededTime" enum="ExtensionFunctions"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>rdevlin.cronin@chromium.org</owner>
   <owner>extensions-core@chromium.org</owner>
   <summary>
@@ -1847,7 +1847,7 @@
 </histogram>
 
 <histogram name="Extensions.Functions.SucceededTotalExecutionTime" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>rdevlin.cronin@chromium.org</owner>
   <owner>extensions-core@chromium.org</owner>
   <summary>
@@ -1860,7 +1860,7 @@
 </histogram>
 
 <histogram name="Extensions.Functions.SynchronousExecutionTime" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>rdevlin.cronin@chromium.org</owner>
   <owner>extensions-core@chromium.org</owner>
   <summary>
diff --git a/tools/metrics/histograms/histograms_xml/fingerprint/histograms.xml b/tools/metrics/histograms/histograms_xml/fingerprint/histograms.xml
index b80f56e2..250e0386 100644
--- a/tools/metrics/histograms/histograms_xml/fingerprint/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/fingerprint/histograms.xml
@@ -48,7 +48,7 @@
 </histogram>
 
 <histogram name="Fingerprint.Reset.ResetContextMode"
-    enum="FingerprintSensorMode" expires_after="2021-03-15">
+    enum="FingerprintSensorMode" expires_after="2021-06-06">
   <owner>tomhughes@chromium.org</owner>
   <owner>chromeos-fingerprint@google.com</owner>
   <summary>The mode FPMCU was in when we reset context.</summary>
diff --git a/tools/metrics/histograms/histograms_xml/geolocation/histograms.xml b/tools/metrics/histograms/histograms_xml/geolocation/histograms.xml
index 6e696c1..ca499265 100644
--- a/tools/metrics/histograms/histograms_xml/geolocation/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/geolocation/histograms.xml
@@ -22,7 +22,7 @@
 <histograms>
 
 <histogram name="Geolocation.AuthorizationActionExistingUser"
-    enum="GeolocationAuthorizationAction" expires_after="2021-04-04">
+    enum="GeolocationAuthorizationAction" expires_after="2021-06-06">
   <owner>mattreynolds@chromium.org</owner>
   <owner>device-dev@chromium.org</owner>
   <summary>
@@ -32,7 +32,7 @@
 </histogram>
 
 <histogram name="Geolocation.AuthorizationActionNewUser"
-    enum="GeolocationAuthorizationAction" expires_after="2021-04-04">
+    enum="GeolocationAuthorizationAction" expires_after="2021-06-06">
   <owner>mattreynolds@chromium.org</owner>
   <owner>device-dev@chromium.org</owner>
   <summary>
diff --git a/tools/metrics/histograms/histograms_xml/gpu/histograms.xml b/tools/metrics/histograms/histograms_xml/gpu/histograms.xml
index 9ae643d..c5ba6ac7 100644
--- a/tools/metrics/histograms/histograms_xml/gpu/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/gpu/histograms.xml
@@ -137,7 +137,7 @@
 </histogram>
 
 <histogram name="GPU.ANGLE.ProgramCache.LoadBinarySuccess"
-    enum="BooleanSuccess" expires_after="2021-04-04">
+    enum="BooleanSuccess" expires_after="2021-06-06">
   <owner>jonahr@google.com</owner>
   <owner>angle-team@google.com</owner>
   <summary>
@@ -754,7 +754,7 @@
 </histogram>
 
 <histogram name="GPU.GPUProcessTerminationStatus2" enum="GpuTerminationStatus"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>vmiura@chromium.org</owner>
   <summary>
     Counts for each time the GPU Process Host detects the process dies.
@@ -1131,7 +1131,7 @@
 </histogram>
 
 <histogram name="GPU.Vulkan.CreateExternalVkSemaphore" units="microseconds"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>backer@chromium.org</owner>
   <owner>penghuang@chromium.org</owner>
   <owner>vasilyt@chromium.org</owner>
@@ -1153,7 +1153,7 @@
 </histogram>
 
 <histogram name="GPU.Vulkan.ImportSemaphoreGLPerSwapBuffers" units="units"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>backer@chromium.org</owner>
   <owner>penghuang@chromium.org</owner>
   <owner>vasilyt@chromium.org</owner>
@@ -1161,7 +1161,7 @@
 </histogram>
 
 <histogram name="GPU.Vulkan.ImportVkSemaphoreHandle" units="microseconds"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>backer@chromium.org</owner>
   <owner>penghuang@chromium.org</owner>
   <owner>vasilyt@chromium.org</owner>
@@ -1172,7 +1172,7 @@
 </histogram>
 
 <histogram name="GPU.Vulkan.ImportVkSemaphoreIntoGL" units="microseconds"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>backer@chromium.org</owner>
   <owner>penghuang@chromium.org</owner>
   <owner>vasilyt@chromium.org</owner>
diff --git a/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml b/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml
index 0b8f5581..c369883 100644
--- a/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml
+++ b/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml
@@ -3308,8 +3308,13 @@
 </histogram_suffixes>
 
 <histogram_suffixes name="CompromisedCredentialsAction" separator=".">
-  <suffix name="Remove" label="Saved password is removed from the database"/>
-  <suffix name="Update" label="Saved password is updated in the database"/>
+  <suffix name="Add" label="Insecure password is added to the database"/>
+  <suffix name="Remove" label="Insecure password is removed from the database"/>
+  <suffix name="Update" label="Insecure password is updated in the database">
+    <obsolete>
+      Deprecated December 2020 because it isn't recorded.
+    </obsolete>
+  </suffix>
   <affected-histogram name="PasswordManager.CompromisedCredentials"/>
 </histogram_suffixes>
 
diff --git a/tools/metrics/histograms/histograms_xml/history/histograms.xml b/tools/metrics/histograms/histograms_xml/history/histograms.xml
index b27b2b1..c2926ce 100644
--- a/tools/metrics/histograms/histograms_xml/history/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/history/histograms.xml
@@ -407,7 +407,7 @@
 </histogram>
 
 <histogram name="History.DomainCount1Day" units="domains"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>mpearson@chromium.org</owner>
   <owner>mjzhang@chromium.org</owner>
   <owner>chrome-analysis-team@google.com</owner>
@@ -432,7 +432,7 @@
 </histogram>
 
 <histogram name="History.DomainCount28Day" units="domains"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>mpearson@chromium.org</owner>
   <owner>mjzhang@chromium.org</owner>
   <owner>chrome-analysis-team@google.com</owner>
@@ -458,7 +458,7 @@
 </histogram>
 
 <histogram name="History.DomainCount7Day" units="domains"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>mpearson@chromium.org</owner>
   <owner>mjzhang@chromium.org</owner>
   <owner>chrome-analysis-team@google.com</owner>
@@ -484,7 +484,7 @@
 </histogram>
 
 <histogram name="History.DomainCountQueryTime" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>mpearson@chromium.org</owner>
   <owner>mjzhang@chromium.org</owner>
   <owner>chrome-analysis-team@google.com</owner>
@@ -687,7 +687,7 @@
 </histogram>
 
 <histogram name="History.MonthlyHostCount" units="hosts"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>mpearson@chromium.org</owner>
   <owner>sky@chromium.org</owner>
   <summary>
@@ -854,7 +854,7 @@
 </histogram>
 
 <histogram name="History.WeeklyHostCount" units="units"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>mpearson@chromium.org</owner>
   <owner>sky@chromium.org</owner>
   <summary>
diff --git a/tools/metrics/histograms/histograms_xml/input/histograms.xml b/tools/metrics/histograms/histograms_xml/input/histograms.xml
index eac03cc..3010a49 100644
--- a/tools/metrics/histograms/histograms_xml/input/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/input/histograms.xml
@@ -207,14 +207,14 @@
 </histogram>
 
 <histogram name="InputMethod.AutoCorrectLevel" enum="IMECorrectionLevel"
-    expires_after="2021-04-01">
+    expires_after="2021-06-06">
   <owner>shend@chromium.org</owner>
   <owner>essential-inputs-team@google.com</owner>
   <summary>The auto-correction level for suggestion engine.</summary>
 </histogram>
 
 <histogram name="InputMethod.Category" enum="InputMethodCategory"
-    expires_after="2021-04-01">
+    expires_after="2021-06-06">
   <owner>shend@chromium.org</owner>
   <owner>essential-inputs-team@google.com</owner>
   <summary>
@@ -224,7 +224,7 @@
 </histogram>
 
 <histogram name="InputMethod.Commit.Index" units="units"
-    expires_after="2021-04-01">
+    expires_after="2021-06-06">
   <owner>shend@chromium.org</owner>
   <owner>essential-inputs-team@google.com</owner>
   <summary>
@@ -378,7 +378,7 @@
 </histogram>
 
 <histogram name="InputMethod.KeyEventLatency" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>shend@chromium.org</owner>
   <owner>essential-inputs-team@google.com</owner>
   <summary>Time taken by the engine to handle a key event.</summary>
@@ -468,7 +468,7 @@
 </histogram>
 
 <histogram name="InputMethod.PkCommit.Index" units="units"
-    expires_after="2021-04-01">
+    expires_after="2021-06-06">
   <owner>shend@chromium.org</owner>
   <owner>essential-inputs-team@google.com</owner>
   <summary>
@@ -596,7 +596,7 @@
 </histogram>
 
 <histogram name="InputMethod.VirtualKeyboard.ErrorType"
-    enum="VirtualKeyboardErrorTypeHashes" expires_after="2021-04-04">
+    enum="VirtualKeyboardErrorTypeHashes" expires_after="2021-06-06">
   <owner>shend@chromium.org</owner>
   <owner>essential-inputs-team@google.com</owner>
   <summary>Errors from the virtual keyboard extension</summary>
diff --git a/tools/metrics/histograms/histograms_xml/instant/histograms.xml b/tools/metrics/histograms/histograms_xml/instant/histograms.xml
index d535597..7a79f060 100644
--- a/tools/metrics/histograms/histograms_xml/instant/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/instant/histograms.xml
@@ -162,7 +162,7 @@
 <histogram
     name="InstantTethering.ConnectionToHostResult.SuccessRate.Background"
     enum="InstantTethering_ConnectionToHostResult_SuccessRate"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -179,7 +179,7 @@
 </histogram>
 
 <histogram name="InstantTethering.FeatureState"
-    enum="InstantTethering_FeatureState" expires_after="2021-04-04">
+    enum="InstantTethering_FeatureState" expires_after="2021-06-06">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -229,7 +229,7 @@
 </histogram>
 
 <histogram name="InstantTethering.HotspotUsageDuration" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -250,7 +250,7 @@
 </histogram>
 
 <histogram name="InstantTethering.MultiDeviceFeatureState"
-    enum="MultiDevice_FeatureState" expires_after="2021-04-04">
+    enum="MultiDevice_FeatureState" expires_after="2021-06-06">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -262,7 +262,7 @@
 
 <histogram name="InstantTethering.NotificationInteractionType"
     enum="InstantTethering_NotificationInteractionType"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -282,7 +282,7 @@
 </histogram>
 
 <histogram name="InstantTethering.Performance.ConnectToHostDuration.Background"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2021-06-06">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -293,7 +293,7 @@
 </histogram>
 
 <histogram name="InstantTethering.Performance.ConnectToHotspotDuration"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2021-06-06">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
diff --git a/tools/metrics/histograms/histograms_xml/ios/histograms.xml b/tools/metrics/histograms/histograms_xml/ios/histograms.xml
index 279995f8..6c6d899 100644
--- a/tools/metrics/histograms/histograms_xml/ios/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/ios/histograms.xml
@@ -108,7 +108,7 @@
 </histogram>
 
 <histogram name="IOS.CredentialExtension.CopyPasswordCount" units="count"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>javierrobles@chromium.org</owner>
   <owner>djean@chromium.org</owner>
   <summary>
@@ -138,7 +138,7 @@
 </histogram>
 
 <histogram name="IOS.CredentialExtension.DisplayCount" units="count"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>javierrobles@chromium.org</owner>
   <owner>djean@chromium.org</owner>
   <summary>
@@ -159,7 +159,7 @@
 </histogram>
 
 <histogram name="IOS.CredentialExtension.FetchPasswordNilArgument"
-    units="count" expires_after="2021-04-04">
+    units="count" expires_after="2021-06-06">
   <owner>javierrobles@chromium.org</owner>
   <owner>djean@chromium.org</owner>
   <summary>
@@ -170,7 +170,7 @@
 </histogram>
 
 <histogram name="IOS.CredentialExtension.PasswordUseCount" units="count"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>javierrobles@chromium.org</owner>
   <owner>djean@chromium.org</owner>
   <summary>
@@ -180,7 +180,7 @@
 </histogram>
 
 <histogram name="IOS.CredentialExtension.QuickPasswordUseCount" units="count"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>javierrobles@chromium.org</owner>
   <owner>djean@chromium.org</owner>
   <summary>
@@ -191,7 +191,7 @@
 </histogram>
 
 <histogram name="IOS.CredentialExtension.ReauthCount" units="count"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>javierrobles@chromium.org</owner>
   <owner>djean@chromium.org</owner>
   <summary>
diff --git a/tools/metrics/histograms/histograms_xml/login/histograms.xml b/tools/metrics/histograms/histograms_xml/login/histograms.xml
index 88693ed..6a78789 100644
--- a/tools/metrics/histograms/histograms_xml/login/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/login/histograms.xml
@@ -92,7 +92,7 @@
 </histogram>
 
 <histogram name="Login.MountNamespaceCreationSuccess" enum="Boolean"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>betuls@chromium.org</owner>
   <owner>jorgelo@chromium.org</owner>
   <owner>chromeos-security-core@google.com</owner>
@@ -148,7 +148,7 @@
 </histogram>
 
 <histogram name="Login.PasswordChangeFlow" enum="LoginPasswordChangeFlow"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>xiyuan@chromium.org</owner>
   <owner>omrilio@chromium.org</owner>
   <summary>
@@ -216,7 +216,7 @@
 </histogram>
 
 <histogram name="Login.TokenCheckResponseTime" units="ms"
-    expires_after="2021-04-01">
+    expires_after="2021-06-06">
   <owner>rsorokin@chromium.org</owner>
   <owner>cros-oac@google.com</owner>
   <summary>
diff --git a/tools/metrics/histograms/histograms_xml/media/histograms.xml b/tools/metrics/histograms/histograms_xml/media/histograms.xml
index 6501d63..5096767 100644
--- a/tools/metrics/histograms/histograms_xml/media/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/media/histograms.xml
@@ -41,7 +41,7 @@
 </histogram>
 
 <histogram name="Media.Android.MediaPlayerSuccess" enum="MediaPlayerExitStatus"
-    expires_after="2021-04-05">
+    expires_after="2021-06-06">
   <owner>tguilbert@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>Android: Whether MediaPlayer exited without errors.</summary>
@@ -218,7 +218,7 @@
 </histogram>
 
 <histogram name="Media.Audio.Capture.LowLatencyCallbackError"
-    enum="BooleanError" expires_after="2021-04-05">
+    enum="BooleanError" expires_after="2021-06-06">
   <owner>guidou@chromium.org</owner>
   <owner>olka@chromium.org</owner>
   <summary>
@@ -427,7 +427,7 @@
 </histogram>
 
 <histogram name="Media.Audio.OutputDeviceAuthorizationTime" units="ms"
-    expires_after="2021-04-05">
+    expires_after="2021-06-06">
   <owner>armax@chromium.org</owner>
   <owner>guidou@chromium.org</owner>
   <owner>olka@chromium.org</owner>
@@ -493,7 +493,7 @@
 </histogram>
 
 <histogram name="Media.Audio.Processing.TotalDelayMs" units="ms"
-    expires_after="2021-04-01">
+    expires_after="2021-06-06">
   <owner>armax@chromium.org</owner>
   <owner>guidou@chromium.org</owner>
   <summary>
@@ -541,7 +541,7 @@
 </histogram>
 
 <histogram name="Media.Audio.Render.GetSourceDataTime.WebRTC"
-    units="microseconds" expires_after="2021-04-04">
+    units="microseconds" expires_after="2021-06-06">
   <owner>guidou@chromium.org</owner>
   <owner>armax@chromium.org</owner>
   <summary>
@@ -558,7 +558,7 @@
 </histogram>
 
 <histogram name="Media.Audio.Render.GetSourceDataTimeMax.WebRTC"
-    units="microseconds" expires_after="2021-04-04">
+    units="microseconds" expires_after="2021-06-06">
   <owner>guidou@chromium.org</owner>
   <owner>armax@chromium.org</owner>
   <summary>
@@ -623,7 +623,7 @@
 </histogram>
 
 <histogram name="Media.Audio.Render.OutputDeviceAuthorizationTimedOut"
-    enum="BooleanTimedOut" expires_after="2021-04-05">
+    enum="BooleanTimedOut" expires_after="2021-06-06">
   <owner>guidou@chromium.org</owner>
   <owner>olka@chromium.org</owner>
   <summary>
@@ -633,7 +633,7 @@
 </histogram>
 
 <histogram name="Media.Audio.Render.OutputDeviceStatus"
-    enum="OutputDeviceStatus" expires_after="2021-04-05">
+    enum="OutputDeviceStatus" expires_after="2021-06-06">
   <owner>armax@chromium.org</owner>
   <owner>dalecurtis@chromium.org</owner>
   <owner>guidou@chromium.org</owner>
@@ -655,7 +655,7 @@
 
 <histogram
     name="Media.Audio.Render.SinkCache.GetOutputDeviceInfoCacheUtilization"
-    enum="GetOutputDeviceInfoCacheHit" expires_after="2021-04-05">
+    enum="GetOutputDeviceInfoCacheHit" expires_after="2021-06-06">
   <owner>guidou@chromium.org</owner>
   <owner>olka@chromium.org</owner>
   <summary>
@@ -938,7 +938,7 @@
 
 <histogram name="Media.AudioOutputResampler.OpenLowLatencyStream"
     enum="AudioOutputResamplerLowLatencyOpenStreamResult"
-    expires_after="2021-04-05">
+    expires_after="2021-06-06">
   <owner>armax@chromium.org</owner>
   <owner>guidou@chromium.org</owner>
   <owner>olka@chromium.org</owner>
@@ -1041,7 +1041,7 @@
 </histogram>
 
 <histogram name="Media.AudioRendererImpl.SinkStatus" enum="OutputDeviceStatus"
-    expires_after="2021-04-05">
+    expires_after="2021-06-06">
   <owner>armax@chromium.org</owner>
   <owner>dalecurtis@chromium.org</owner>
   <owner>guidou@chromium.org</owner>
@@ -1148,7 +1148,7 @@
 </histogram>
 
 <histogram name="Media.Capabilities.DecodingInfo.Time.Video.Clear" units="ms"
-    expires_after="2021-03-21">
+    expires_after="2021-06-06">
   <owner>chcunningham@chromium.org</owner>
   <owner>mlamouri@google.com</owner>
   <owner>media-dev@chromium.org</owner>
@@ -2683,7 +2683,7 @@
 </histogram>
 
 <histogram name="Media.Notification.Cast.Count" units="count"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>takumif@chromium.org</owner>
   <owner>openscreen-eng@google.com</owner>
   <owner>media-dev@chromium.org</owner>
@@ -3707,7 +3707,7 @@
 </histogram>
 
 <histogram name="Media.VideoCapture.DelayUntilFirstFrame" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>guidou@chromium.org</owner>
   <owner>armax@chromium.org</owner>
   <summary>
@@ -4473,7 +4473,7 @@
 </histogram>
 
 <histogram name="MediaRouter.CastStreaming.Session.Launch" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>takumif@chromium.org</owner>
   <owner>openscreen-eng@google.com</owner>
   <summary>Total time to launch a Cast Streaming mirror session.</summary>
@@ -4523,7 +4523,7 @@
 </histogram>
 
 <histogram name="MediaRouter.CastStreaming.Start.Failure"
-    enum="MirrorFailureType" expires_after="2021-04-04">
+    enum="MirrorFailureType" expires_after="2021-06-06">
   <owner>takumif@chromium.org</owner>
   <owner>openscreen-eng@google.com</owner>
   <summary>
@@ -4545,7 +4545,7 @@
 </histogram>
 
 <histogram name="MediaRouter.CastStreaming.Start.Success" enum="MirrorType"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>takumif@chromium.org</owner>
   <owner>openscreen-eng@google.com</owner>
   <summary>
@@ -4641,7 +4641,7 @@
 </histogram>
 
 <histogram name="MediaRouter.Dial.ParsingError"
-    enum="MediaRouterDialParsingError" expires_after="2021-02-01">
+    enum="MediaRouterDialParsingError" expires_after="2021-06-06">
   <owner>takumif@chromium.org</owner>
   <owner>mfoltz@chromium.org</owner>
   <owner>openscreen-eng@google.com</owner>
@@ -4671,7 +4671,7 @@
 </histogram>
 
 <histogram name="MediaRouter.MirroringService.SessionError"
-    enum="MirroringServiceErrorType" expires_after="2021-04-04">
+    enum="MirroringServiceErrorType" expires_after="2021-06-06">
   <owner>takumif@chromium.org</owner>
   <owner>openscreen-eng@google.com</owner>
   <summary>
@@ -4682,7 +4682,7 @@
 </histogram>
 
 <histogram name="MediaRouter.NetworkMonitor.ConnectionType"
-    enum="DiscoveryNetworkMonitorConnectionType" expires_after="2021-04-04">
+    enum="DiscoveryNetworkMonitorConnectionType" expires_after="2021-06-06">
   <owner>btolsch@chromium.org</owner>
   <owner>openscreen-eng@google.com</owner>
   <summary>
@@ -4722,7 +4722,7 @@
 </histogram>
 
 <histogram name="MediaRouter.Provider.CreateRoute.Result"
-    enum="MediaRouteProviderResult" expires_after="2021-04-04">
+    enum="MediaRouteProviderResult" expires_after="2021-06-06">
 <!-- Name completed by histogram_suffixes name="MediaRouteProvider" -->
 
   <owner>takumif@chromium.org</owner>
@@ -4736,7 +4736,7 @@
 </histogram>
 
 <histogram name="MediaRouter.Provider.JoinRoute.Result"
-    enum="MediaRouteProviderResult" expires_after="2021-04-04">
+    enum="MediaRouteProviderResult" expires_after="2021-06-06">
 <!-- Name completed by histogram_suffixes name="MediaRouteProvider" -->
 
   <owner>takumif@chromium.org</owner>
@@ -4750,7 +4750,7 @@
 </histogram>
 
 <histogram name="MediaRouter.Provider.TerminateRoute.Result"
-    enum="MediaRouteProviderResult" expires_after="2021-04-04">
+    enum="MediaRouteProviderResult" expires_after="2021-06-06">
 <!-- Name completed by histogram_suffixes name="MediaRouteProvider" -->
 
   <owner>takumif@chromium.org</owner>
@@ -4802,7 +4802,7 @@
 </histogram>
 
 <histogram name="MediaRouter.Sink.SelectedType" enum="MediaSinkType"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>takumif@chromium.org</owner>
   <owner>openscreen-eng@google.com</owner>
   <summary>
@@ -4812,7 +4812,7 @@
 </histogram>
 
 <histogram name="MediaRouter.Source.CastingSource"
-    enum="MediaRouterSourceTypes" expires_after="2021-04-04">
+    enum="MediaRouterSourceTypes" expires_after="2021-06-06">
   <owner>takumif@chromium.org</owner>
   <owner>openscreen-eng@google.com</owner>
   <summary>
@@ -4890,7 +4890,7 @@
 </histogram>
 
 <histogram name="MediaRouter.Ui.Device.Count" units="units"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>takumif@chromium.org</owner>
   <owner>openscreen-eng@google.com</owner>
   <summary>
diff --git a/tools/metrics/histograms/histograms_xml/memory/histograms.xml b/tools/metrics/histograms/histograms_xml/memory/histograms.xml
index e0024a5..25c4cbc 100644
--- a/tools/metrics/histograms/histograms_xml/memory/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/memory/histograms.xml
@@ -1028,7 +1028,7 @@
 
 <histogram
     name="Memory.Experimental.Renderer.PeakResidentSet.AtHighestPrivateMemoryFootprint"
-    units="MB" expires_after="2021-04-04">
+    units="MB" expires_after="2021-06-06">
   <owner>tasak@google.com</owner>
   <owner>bartekn@google.com</owner>
   <summary>
diff --git a/tools/metrics/histograms/histograms_xml/mobile/histograms.xml b/tools/metrics/histograms/histograms_xml/mobile/histograms.xml
index 3bae52e..33244cf 100644
--- a/tools/metrics/histograms/histograms_xml/mobile/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/mobile/histograms.xml
@@ -587,7 +587,7 @@
 </histogram>
 
 <histogram name="MobileDownload.Location.Dialog.Result"
-    enum="DownloadLocationDialogResult" expires_after="2021-03-01">
+    enum="DownloadLocationDialogResult" expires_after="2021-06-06">
   <owner>xingliu@chromium.org</owner>
   <owner>clank-downloads@google.com</owner>
   <summary>
diff --git a/tools/metrics/histograms/histograms_xml/multi_device/histograms.xml b/tools/metrics/histograms/histograms_xml/multi_device/histograms.xml
index 49289f16..e0a6cd6 100644
--- a/tools/metrics/histograms/histograms_xml/multi_device/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/multi_device/histograms.xml
@@ -22,7 +22,7 @@
 <histograms>
 
 <histogram name="MultiDevice.BetterTogetherSuite.MultiDeviceFeatureState"
-    enum="MultiDevice_FeatureState" expires_after="2021-04-04">
+    enum="MultiDevice_FeatureState" expires_after="2021-06-06">
   <owner>vecore@google.com</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -33,7 +33,7 @@
 </histogram>
 
 <histogram name="MultiDevice.DeviceSyncService.FindEligibleDevices.Result"
-    enum="BooleanSuccess" expires_after="2021-04-04">
+    enum="BooleanSuccess" expires_after="2021-06-06">
   <owner>vecore@google.com</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>Result of trying to find eligible devices.</summary>
@@ -42,7 +42,7 @@
 <histogram
     name="MultiDevice.DeviceSyncService.FindEligibleDevices.Result.FailureReason"
     enum="MultiDevice_DeviceSyncService_DeviceSyncRequestFailureReason"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>vecore@google.com</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -115,7 +115,7 @@
 </histogram>
 
 <histogram name="MultiDevice.PostOOBESetupFlow.PageShown"
-    enum="MultiDevice_PostOOBESetupFlow_Page" expires_after="2021-04-04">
+    enum="MultiDevice_PostOOBESetupFlow_Page" expires_after="2021-06-06">
   <owner>vecore@google.com</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -161,7 +161,7 @@
 
 <histogram
     name="MultiDevice.SecureChannel.BLE.Performance.ReceiveAdvertisementToConnectionDuration.Background"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2021-06-06">
   <owner>vecore@google.com</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -177,7 +177,7 @@
 
 <histogram
     name="MultiDevice.SecureChannel.BLE.Performance.StartScanToAuthenticationDuration.Background"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2021-06-06">
   <owner>vecore@google.com</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -210,7 +210,7 @@
 
 <histogram
     name="MultiDevice.SecureChannel.BLE.Performance.StartScanToReceiveAdvertisementDuration.Background"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2021-06-06">
   <owner>vecore@google.com</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -271,7 +271,7 @@
 </histogram>
 
 <histogram name="MultiDevice.Setup.HostStatus"
-    enum="MultiDevice_Setup_HostStatus" expires_after="2021-04-04">
+    enum="MultiDevice_Setup_HostStatus" expires_after="2021-06-06">
   <owner>vecore@google.com</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -282,7 +282,7 @@
 </histogram>
 
 <histogram name="MultiDevice.Setup.HostVerifier.DoesHostHaveCryptoData"
-    enum="Boolean" expires_after="2021-04-04">
+    enum="Boolean" expires_after="2021-06-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
diff --git a/tools/metrics/histograms/histograms_xml/navigation/histograms.xml b/tools/metrics/histograms/histograms_xml/navigation/histograms.xml
index 450278d..5516c3e 100644
--- a/tools/metrics/histograms/histograms_xml/navigation/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/navigation/histograms.xml
@@ -767,7 +767,7 @@
 </histogram>
 
 <histogram name="Navigation.MainFrame.SiteEngagementLevel"
-    enum="SiteEngagementLevel" expires_after="2021-04-04">
+    enum="SiteEngagementLevel" expires_after="2021-06-06">
   <owner>meacer@chromium.org</owner>
   <owner>security-enamel@chromium.org</owner>
   <summary>
diff --git a/tools/metrics/histograms/histograms_xml/net/histograms.xml b/tools/metrics/histograms/histograms_xml/net/histograms.xml
index 3a1beef4..0018db6f 100644
--- a/tools/metrics/histograms/histograms_xml/net/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/net/histograms.xml
@@ -740,7 +740,7 @@
 </histogram>
 
 <histogram name="Net.DNS.DnsTransaction.UDP.IdMismatch"
-    enum="DNS.UdpIdMismatchStatus" expires_after="2021-04-04">
+    enum="DNS.UdpIdMismatchStatus" expires_after="2021-06-06">
   <owner>ericorth@chromium.org</owner>
   <owner>src/net/OWNERS</owner>
   <summary>
@@ -1555,7 +1555,7 @@
 </histogram>
 
 <histogram name="Net.HttpAuthCount" enum="HttpAuthCount"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>asanka@chromium.org</owner>
   <owner>mmenke@chromium.org</owner>
   <summary>
@@ -1584,7 +1584,7 @@
 </histogram>
 
 <histogram name="Net.HttpAuthTarget" enum="HttpAuthTarget"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>asanka@chromium.org</owner>
   <owner>mmenke@chromium.org</owner>
   <summary>
@@ -4911,7 +4911,7 @@
 </histogram>
 
 <histogram base="true" name="Net.TrustTokens.OperationTotalTime" units="ms"
-    expires_after="2021-03-30">
+    expires_after="2021-06-06">
 <!-- Name completed by histogram_suffixes name="TrustTokenOperationType" -->
 
   <owner>davidvc@chromium.org</owner>
diff --git a/tools/metrics/histograms/histograms_xml/new_tab_page/histograms.xml b/tools/metrics/histograms/histograms_xml/new_tab_page/histograms.xml
index 871b5da3..a9afc9f 100644
--- a/tools/metrics/histograms/histograms_xml/new_tab_page/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/new_tab_page/histograms.xml
@@ -863,7 +863,7 @@
 </histogram>
 
 <histogram name="NewTabPage.MostVisitedAge" units="seconds"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>tiborg@chromium.org</owner>
   <owner>yyushkina@chromium.org</owner>
   <owner>chrome-desktop-ntp@google.com</owner>
@@ -1443,7 +1443,7 @@
 </histogram>
 
 <histogram name="NewTabPage.SuggestionsImpressionAge" units="seconds"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>tiborg@chromium.org</owner>
   <owner>yyushkina@chromium.org</owner>
   <owner>chrome-desktop-ntp@google.com</owner>
diff --git a/tools/metrics/histograms/histograms_xml/omnibox/histograms.xml b/tools/metrics/histograms/histograms_xml/omnibox/histograms.xml
index f29e9c7..fd1a438 100644
--- a/tools/metrics/histograms/histograms_xml/omnibox/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/omnibox/histograms.xml
@@ -221,7 +221,7 @@
 </histogram>
 
 <histogram name="Omnibox.CutOrCopyAllText" units="count"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>jdonnelly@chromium.org</owner>
   <owner>mpearson@chromium.org</owner>
   <owner>chrome-omnibox-team@google.com</owner>
@@ -274,7 +274,7 @@
 </histogram>
 
 <histogram name="Omnibox.EnteredKeywordMode2" enum="OmniboxEnteredKeywordMode2"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>jdonnelly@chromium.org</owner>
   <owner>mpearson@chromium.org</owner>
   <owner>chrome-omnibox-team@google.com</owner>
@@ -682,7 +682,7 @@
 </histogram>
 
 <histogram name="Omnibox.SearchProviderMatches" units="units"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>jdonnelly@chromium.org</owner>
   <owner>mpearson@chromium.org</owner>
   <owner>chrome-omnibox-team@google.com</owner>
@@ -1056,7 +1056,7 @@
 </histogram>
 
 <histogram name="Omnibox.ZeroSuggestRequests" enum="OmniboxZeroSuggestRequests"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>ender@chromium.org</owner>
   <owner>tommycli@chromium.org</owner>
   <owner>chrome-omnibox-team@google.com</owner>
diff --git a/tools/metrics/histograms/histograms_xml/oobe/histograms.xml b/tools/metrics/histograms/histograms_xml/oobe/histograms.xml
index b10cd8d..a19b95f 100644
--- a/tools/metrics/histograms/histograms_xml/oobe/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/oobe/histograms.xml
@@ -32,7 +32,7 @@
 </histogram>
 
 <histogram name="OOBE.BootToSignInCompleted" units="ms"
-    expires_after="2021-04-01">
+    expires_after="2021-06-06">
   <owner>alemate@chromium.org</owner>
   <owner>rsorokin@chromium.org</owner>
   <owner>cros-oac@google.com</owner>
@@ -94,7 +94,7 @@
 </histogram>
 
 <histogram name="OOBE.FingerprintSetupScreen.UserActions"
-    enum="FingerprintSetupScreenUserAction" expires_after="2021-04-04">
+    enum="FingerprintSetupScreenUserAction" expires_after="2021-06-06">
   <owner>raleksandrov@google.com</owner>
   <owner>cros-oac@google.com</owner>
   <summary>
@@ -281,7 +281,7 @@
 </histogram>
 
 <histogram name="OOBE.SyncConsentScreen.Behavior" enum="SyncConsentBehavior"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>jamescook@chromium.org</owner>
   <owner>cros-oac@google.com</owner>
   <summary>
@@ -303,7 +303,7 @@
 </histogram>
 
 <histogram name="OOBE.SyncConsentScreen.SyncEnabled" enum="BooleanEnabled"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>jamescook@chromium.org</owner>
   <owner>cros-oac@google.com</owner>
   <summary>
@@ -314,7 +314,7 @@
 </histogram>
 
 <histogram name="OOBE.SyncConsentScreen.UserChoice"
-    enum="SyncConsentUserChoice" expires_after="2021-04-04">
+    enum="SyncConsentUserChoice" expires_after="2021-06-06">
   <owner>jamescook@chromium.org</owner>
   <owner>cros-oac@google.com</owner>
   <summary>
diff --git a/tools/metrics/histograms/histograms_xml/optimization/histograms.xml b/tools/metrics/histograms/histograms_xml/optimization/histograms.xml
index a5c5cd6a..7e40905 100644
--- a/tools/metrics/histograms/histograms_xml/optimization/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/optimization/histograms.xml
@@ -22,7 +22,7 @@
 <histograms>
 
 <histogram base="true" name="OptimizationGuide.ApplyDecision"
-    enum="OptimizationGuideOptimizationTypeDecision" expires_after="2021-04-04">
+    enum="OptimizationGuideOptimizationTypeDecision" expires_after="2021-06-06">
   <owner>sophiechang@chromium.org</owner>
   <owner>mcrouse@chromium.org</owner>
   <summary>
@@ -32,7 +32,7 @@
 </histogram>
 
 <histogram base="true" name="OptimizationGuide.ApplyDecisionAsync"
-    enum="OptimizationGuideOptimizationTypeDecision" expires_after="2021-04-04">
+    enum="OptimizationGuideOptimizationTypeDecision" expires_after="2021-06-06">
   <owner>sophiechang@chromium.org</owner>
   <owner>mcrouse@chromium.org</owner>
   <summary>
@@ -106,7 +106,7 @@
 </histogram>
 
 <histogram name="OptimizationGuide.HintsFetcher.GetHintsRequest.FetchLatency"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2021-06-06">
   <owner>sophiechang@chromium.org</owner>
   <owner>mcrouse@chromium.org</owner>
   <summary>
@@ -137,7 +137,7 @@
 </histogram>
 
 <histogram name="OptimizationGuide.HintsFetcher.GetHintsRequest.NetErrorCode"
-    enum="NetErrorCodes" expires_after="2021-04-04">
+    enum="NetErrorCodes" expires_after="2021-06-06">
   <owner>mcrouse@chromium.org</owner>
   <owner>sophiechang@chromium.org</owner>
   <summary>
@@ -147,7 +147,7 @@
 </histogram>
 
 <histogram name="OptimizationGuide.HintsFetcher.GetHintsRequest.Status"
-    enum="HttpResponseCode" expires_after="2021-04-04">
+    enum="HttpResponseCode" expires_after="2021-06-06">
   <owner>mcrouse@chromium.org</owner>
   <owner>sophiechang@chromium.org</owner>
   <summary>
@@ -227,7 +227,7 @@
 <histogram
     name="OptimizationGuide.HintsManager.RaceNavigationFetchAttemptStatus"
     enum="OptimizationGuideRaceNavigationFetchAttemptStatus"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>mcrouse@chromium.org</owner>
   <owner>sophiechang@chromium.org</owner>
   <summary>
@@ -452,7 +452,7 @@
 </histogram>
 
 <histogram name="OptimizationGuide.ProcessHintsResult"
-    enum="OptimizationGuideProcessHintsResult" expires_after="2021-04-04">
+    enum="OptimizationGuideProcessHintsResult" expires_after="2021-06-06">
   <owner>mcrouse@chromium.org</owner>
   <owner>sophiechang@chromium.org</owner>
   <summary>
@@ -463,7 +463,7 @@
 </histogram>
 
 <histogram name="OptimizationGuide.RemoteFetchingEnabled"
-    units="BooleanEnabled" expires_after="2021-04-04">
+    units="BooleanEnabled" expires_after="2021-06-06">
   <owner>sophiechang@chromium.org</owner>
   <owner>mcrouse@chromium.org</owner>
   <summary>
diff --git a/tools/metrics/histograms/histograms_xml/others/histograms.xml b/tools/metrics/histograms/histograms_xml/others/histograms.xml
index 50dc7a9..2f6b8a1d 100644
--- a/tools/metrics/histograms/histograms_xml/others/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/others/histograms.xml
@@ -569,7 +569,7 @@
 </histogram>
 
 <histogram name="AppBanners.InstallableStatusCode"
-    enum="AppBannersInstallableStatusCode" expires_after="2021-04-04">
+    enum="AppBannersInstallableStatusCode" expires_after="2021-06-06">
   <owner>dominickn@chromium.org</owner>
   <owner>pjmclachlan@google.com</owner>
   <summary>
@@ -1497,7 +1497,7 @@
 </histogram>
 
 <histogram name="Bookmarks.Count.OnProfileLoad" units="bookmarks"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>supertri@chromium.org</owner>
   <owner>isherman@chromium.org</owner>
   <owner>aidanday@google.com</owner>
@@ -1527,7 +1527,7 @@
 </histogram>
 
 <histogram name="Bookmarks.Count.OnProfileLoad.DuplicateUrl2" units="bookmarks"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>mastiz@chromium.org</owner>
   <owner>sky@chromium.org</owner>
   <summary>
@@ -1540,7 +1540,7 @@
 </histogram>
 
 <histogram name="Bookmarks.Count.OnProfileLoad.DuplicateUrlAndTitle"
-    units="bookmarks" expires_after="2021-04-04">
+    units="bookmarks" expires_after="2021-06-06">
   <owner>mastiz@chromium.org</owner>
   <owner>sky@chromium.org</owner>
   <summary>
@@ -1568,7 +1568,7 @@
 </histogram>
 
 <histogram name="Bookmarks.Count.OnProfileLoad.UniqueUrl" units="bookmarks"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>mastiz@chromium.org</owner>
   <owner>sky@chromium.org</owner>
   <summary>
@@ -1578,7 +1578,7 @@
 </histogram>
 
 <histogram name="Bookmarks.Count.OnProfileLoad.UniqueUrlAndTitle"
-    units="bookmarks" expires_after="2021-04-04">
+    units="bookmarks" expires_after="2021-06-06">
   <owner>mastiz@chromium.org</owner>
   <owner>sky@chromium.org</owner>
   <summary>
@@ -1588,7 +1588,7 @@
 </histogram>
 
 <histogram name="Bookmarks.Count.OnProfileLoad.UniqueUrlAndTitleAndParent"
-    units="bookmarks" expires_after="2021-04-04">
+    units="bookmarks" expires_after="2021-06-06">
   <owner>mastiz@chromium.org</owner>
   <owner>sky@chromium.org</owner>
   <summary>
@@ -1802,7 +1802,7 @@
 </histogram>
 
 <histogram name="CaptivePortal.ProbeReason" enum="CaptivePortalProbeReason"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>ericorth@chromium.org</owner>
   <owner>doh-core@google.com</owner>
   <owner>cros-networking@google.com</owner>
@@ -2159,7 +2159,7 @@
 </histogram>
 
 <histogram name="ChildProcess.Launched.UtilityProcessHash"
-    enum="UtilityProcessNameHash" expires_after="2021-04-04">
+    enum="UtilityProcessNameHash" expires_after="2021-06-06">
   <owner>wfh@chromium.org</owner>
   <summary>
     Count of child utility process launches, bucketed by the hash of their
@@ -2414,7 +2414,7 @@
 </histogram>
 
 <histogram name="Clipboard.ExtensionContentScriptReadHasUserActivation"
-    units="proportion" expires_after="2021-04-01">
+    units="proportion" expires_after="2021-06-06">
   <owner>huangdarwin@chromium.org</owner>
   <owner>src/third_party/blink/renderer/modules/clipboard/OWNERS</owner>
   <summary>
@@ -2533,7 +2533,7 @@
 </histogram>
 
 <histogram base="true" name="CompositorLatency.CompositorOnlyFrame"
-    units="microseconds" expires_after="2021-04-04">
+    units="microseconds" expires_after="2021-06-06">
   <owner>sadrul@chromium.org</owner>
   <owner>graphics-dev@chromium.org</owner>
   <summary>
@@ -2564,7 +2564,7 @@
 </histogram>
 
 <histogram base="true" name="CompositorLatency.DroppedFrame"
-    units="microseconds" expires_after="2021-04-04">
+    units="microseconds" expires_after="2021-06-06">
   <owner>sadrul@chromium.org</owner>
   <owner>graphics-dev@chromium.org</owner>
   <summary>
@@ -3068,7 +3068,7 @@
 </histogram>
 
 <histogram name="Conversions.ExtraReportDelay" units="ms"
-    expires_after="2021-01-30">
+    expires_after="2021-06-06">
   <owner>johnidel@chromium.org</owner>
   <owner>csharrison@chromium.org</owner>
   <summary>
@@ -3093,7 +3093,7 @@
 </histogram>
 
 <histogram name="Conversions.ReportStatus" enum="ConversionReportStatus"
-    expires_after="2021-01-30">
+    expires_after="2021-06-06">
   <owner>johnidel@chromium.org</owner>
   <owner>csharrison@chromium.org</owner>
   <summary>
@@ -3794,7 +3794,7 @@
 </histogram>
 
 <histogram name="Discarding.HighPMFPolicy.DiscardAttemptsCount" units="tabs"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>sebmarchand@chromium.org</owner>
   <owner>catan-team@chromium.org</owner>
   <summary>
@@ -3807,7 +3807,7 @@
 </histogram>
 
 <histogram name="Discarding.HighPMFPolicy.DiscardSuccess"
-    units="BooleanSuccess" expires_after="2021-04-04">
+    units="BooleanSuccess" expires_after="2021-06-06">
   <owner>sebmarchand@chromium.org</owner>
   <owner>catan-team@chromium.org</owner>
   <summary>
@@ -3817,7 +3817,7 @@
 </histogram>
 
 <histogram name="Discarding.HighPMFPolicy.MemoryPressureLevel"
-    enum="MemoryPressureLevel" expires_after="2021-04-04">
+    enum="MemoryPressureLevel" expires_after="2021-06-06">
   <owner>sebmarchand@chromium.org</owner>
   <owner>catan-team@chromium.org</owner>
   <summary>
@@ -3837,7 +3837,7 @@
 </histogram>
 
 <histogram name="Discarding.HighPMFPolicy.SuccessfulDiscardsCount" units="tabs"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>sebmarchand@chromium.org</owner>
   <owner>catan-team@chromium.org</owner>
   <summary>
@@ -4356,7 +4356,7 @@
 </histogram>
 
 <histogram name="Downgrade.TakeSnapshot.FailureCount" units="count"
-    expires_after="2021-03-21">
+    expires_after="2021-06-06">
   <owner>grt@chromium.org</owner>
   <owner>ydago@chromium.org</owner>
   <summary>
@@ -4366,7 +4366,7 @@
 </histogram>
 
 <histogram name="Downgrade.TakeSnapshot.ItemFailure" enum="SnapshotItemId"
-    expires_after="2021-03-21">
+    expires_after="2021-06-06">
   <owner>grt@chromium.org</owner>
   <owner>ydago@chromium.org</owner>
   <summary>
@@ -4619,7 +4619,7 @@
 </histogram>
 
 <histogram name="EasyUnlock.AuthEvent.SignIn" enum="EasyUnlockAuthEvent"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -4641,7 +4641,7 @@
 </histogram>
 
 <histogram name="EasyUnlock.AuthEvent.Unlock" enum="EasyUnlockAuthEvent"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -4952,7 +4952,7 @@
 </histogram>
 
 <histogram name="ExploreSites.RequestStatus" enum="ExploreSitesRequestStatus"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>dimich@chromium.org</owner>
   <owner>freedjm@chromium.org</owner>
   <summary>
@@ -5678,7 +5678,7 @@
 </histogram>
 
 <histogram name="Gamepad.KnownGamepadConnectedWithId"
-    enum="GamepadVendorProduct" expires_after="2021-04-04">
+    enum="GamepadVendorProduct" expires_after="2021-06-06">
   <owner>mattreynolds@chromium.org</owner>
   <owner>deviceapi-team@google.com</owner>
   <summary>
@@ -6317,7 +6317,7 @@
 </histogram>
 
 <histogram base="true" name="GridTabSwitcher.FramePerSecond" units="frame/sec"
-    expires_after="2021-02-14">
+    expires_after="2021-06-06">
   <owner>yusufo@chromium.org</owner>
   <owner>wychen@chromium.org</owner>
   <summary>
@@ -7824,7 +7824,7 @@
 </histogram>
 
 <histogram name="LanguageUsage.AcceptLanguage" enum="LanguageCode"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>perrier@chromium.org</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -7844,7 +7844,7 @@
 </histogram>
 
 <histogram name="LanguageUsage.ApplicationLanguage" enum="LanguageCode"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>perrier@chromium.org</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -7889,7 +7889,7 @@
 </histogram>
 
 <histogram name="Launch.HomeScreenSource" enum="LaunchFromHomeScreenSource"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>dominickn@chromium.org</owner>
   <owner>hartmanng@chromium.org</owner>
   <owner>peconn@chromium.org</owner>
@@ -8764,7 +8764,7 @@
 </histogram>
 
 <histogram name="Manifest.HasProperty" enum="Boolean"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>mgiuca@chromium.org</owner>
   <owner>mlamouri@chromium.org</owner>
   <summary>
@@ -9293,7 +9293,7 @@
 </histogram>
 
 <histogram name="MultiDeviceSetup.OOBE.UserChoice"
-    enum="MultiDeviceSetupOOBEUserChoice" expires_after="2021-04-04">
+    enum="MultiDeviceSetupOOBEUserChoice" expires_after="2021-06-06">
   <owner>vecore@google.com</owner>
   <owner>better-together-dev@google.com</owner>
   <owner>hsuregan@chromium.org</owner>
@@ -9304,7 +9304,7 @@
 </histogram>
 
 <histogram name="MultiDeviceSetup_NotificationClicked"
-    enum="MultiDeviceSetupNotification" expires_after="2021-04-04">
+    enum="MultiDeviceSetupNotification" expires_after="2021-06-06">
   <owner>vecore@google.com</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -10044,7 +10044,7 @@
 </histogram>
 
 <histogram name="NQE.CachedNetworkQualityAvailable" enum="BooleanAvailable"
-    expires_after="2021-04-05">
+    expires_after="2021-06-06">
   <owner>tbansal@chromium.org</owner>
   <owner>bengr@chromium.org</owner>
   <summary>
@@ -10054,7 +10054,7 @@
 </histogram>
 
 <histogram name="NQE.CellularSignalStrength.ECTReduction"
-    units="ECT level reduction" expires_after="2021-04-04">
+    units="ECT level reduction" expires_after="2021-06-06">
   <owner>tbansal@chromium.org</owner>
   <summary>
     Number of buckets by which effective connection type was reduced or capped
@@ -10064,7 +10064,7 @@
 </histogram>
 
 <histogram name="NQE.CellularSignalStrength.LevelAvailable"
-    enum="BooleanAvailable" expires_after="2021-04-04">
+    enum="BooleanAvailable" expires_after="2021-06-06">
   <owner>tbansal@chromium.org</owner>
   <owner>bengr@chromium.org</owner>
   <summary>
@@ -10112,7 +10112,7 @@
 </histogram>
 
 <histogram name="NQE.EndToEndRTT.OnECTComputation" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>tbansal@chromium.org</owner>
   <owner>src/net/nqe/OWNERS</owner>
   <summary>
@@ -10153,7 +10153,7 @@
   </summary>
 </histogram>
 
-<histogram name="NQE.Prefs.ReadCount" units="count" expires_after="2021-04-05">
+<histogram name="NQE.Prefs.ReadCount" units="count" expires_after="2021-06-06">
   <owner>tbansal@chromium.org</owner>
   <owner>bengr@chromium.org</owner>
   <summary>
@@ -10162,7 +10162,7 @@
   </summary>
 </histogram>
 
-<histogram name="NQE.Prefs.ReadSize" units="count" expires_after="2021-04-05">
+<histogram name="NQE.Prefs.ReadSize" units="count" expires_after="2021-06-06">
   <owner>tbansal@chromium.org</owner>
   <owner>bengr@chromium.org</owner>
   <summary>
@@ -10171,7 +10171,7 @@
   </summary>
 </histogram>
 
-<histogram name="NQE.Prefs.WriteCount" units="count" expires_after="2021-04-05">
+<histogram name="NQE.Prefs.WriteCount" units="count" expires_after="2021-06-06">
   <owner>tbansal@chromium.org</owner>
   <owner>bengr@chromium.org</owner>
   <summary>
@@ -10334,7 +10334,7 @@
 </histogram>
 
 <histogram name="OriginTrials.ValidationResult" enum="OriginTrialTokenStatus"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>chasej@chromium.org</owner>
   <owner>iclelland@chromium.org</owner>
   <owner>feature-control@chromium.org</owner>
@@ -10728,7 +10728,7 @@
 </histogram>
 
 <histogram name="PartnerBookmark.Count2" units="bookmarks"
-    expires_after="2021-04-03">
+    expires_after="2021-06-06">
   <owner>bttk@chromium.org</owner>
   <owner>wychen@chromium.org</owner>
   <summary>
@@ -10759,7 +10759,7 @@
 </histogram>
 
 <histogram name="PDF.Actions" enum="ChromePDFViewerActions"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>hnakashima@chromium.org</owner>
   <summary>
     Tracks user actions in the PDF viewer. Logged when the document is opened
@@ -10831,7 +10831,7 @@
   </summary>
 </histogram>
 
-<histogram name="PDF.Version" enum="PDFVersion" expires_after="2021-04-01">
+<histogram name="PDF.Version" enum="PDFVersion" expires_after="2021-06-06">
   <owner>dhoss@chromium.org</owner>
   <owner>thestig@chromium.org</owner>
   <summary>Tracks versions of documents opened in the PDF viewer.</summary>
@@ -11466,7 +11466,7 @@
 </histogram>
 
 <histogram name="Previews.CacheControlNoTransform.BlockedPreview"
-    enum="PreviewsType" expires_after="2021-03-31">
+    enum="PreviewsType" expires_after="2021-06-06">
   <owner>sophiechang@chromium.org</owner>
   <owner>mcrouse@chromium.org</owner>
   <owner>src/components/previews/OWNERS</owner>
@@ -11569,7 +11569,7 @@
 </histogram>
 
 <histogram name="Previews.LitePageNotificationInfoBar"
-    enum="PreviewsLitePageInfoBarAction" expires_after="2021-03-28">
+    enum="PreviewsLitePageInfoBarAction" expires_after="2021-06-06">
   <owner>robertogden@chromium.org</owner>
   <owner>src/components/data_reduction_proxy/OWNERS</owner>
   <summary>
@@ -11578,7 +11578,7 @@
 </histogram>
 
 <histogram name="Previews.OmniboxAction" enum="PreviewsUserOmniboxAction"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>robertogden@chromium.org</owner>
   <summary>User interactions with the Previews Android Omnibox UI.</summary>
 </histogram>
@@ -11603,7 +11603,7 @@
 </histogram>
 
 <histogram name="Previews.PageEndReason" enum="PageEndReason"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>robertogden@chromium.org</owner>
   <summary>Records why the page load ended on a given preview type.</summary>
 </histogram>
@@ -13644,7 +13644,7 @@
 </histogram>
 
 <histogram name="SignedExchange.CertVerificationResult" enum="NetErrorCodes"
-    expires_after="2021-04-01">
+    expires_after="2021-06-06">
   <owner>ksakamoto@chromium.org</owner>
   <owner>kinuko@chromium.org</owner>
   <owner>horo@chromium.org</owner>
@@ -13678,7 +13678,7 @@
 </histogram>
 
 <histogram name="SignedExchange.LoadResult2" enum="SignedExchangeLoadResult"
-    expires_after="2021-04-01">
+    expires_after="2021-06-06">
   <owner>ksakamoto@chromium.org</owner>
   <owner>kinuko@chromium.org</owner>
   <owner>horo@chromium.org</owner>
@@ -13712,7 +13712,7 @@
 </histogram>
 
 <histogram name="SignedExchange.Prefetch.LoadResult2"
-    enum="SignedExchangeLoadResult" expires_after="2021-04-01">
+    enum="SignedExchangeLoadResult" expires_after="2021-06-06">
   <owner>kinuko@chromium.org</owner>
   <owner>ksakamoto@chromium.org</owner>
   <owner>horo@chromium.org</owner>
@@ -14345,7 +14345,7 @@
 </histogram>
 
 <histogram name="SpellCheck.SpellingService.Enabled" enum="BooleanEnabled"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>groby@chromium.org</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -14669,8 +14669,9 @@
 </histogram>
 
 <histogram name="SSORecallPromo.AccountsAvailable" units="units"
-    expires_after="2020-11-30">
+    expires_after="2021-04-20">
   <owner>msarda@chromium.org</owner>
+  <owner>chrome-signin-team@google.com</owner>
   <summary>
     Number of accounts available for Single Sign On with the current device,
     recorded at the time the SSO Promo is shown.
@@ -14678,16 +14679,18 @@
 </histogram>
 
 <histogram name="SSORecallPromo.PromoAction" enum="SSOPromoUserAction"
-    expires_after="2020-11-30">
+    expires_after="2021-04-20">
   <owner>msarda@chromium.org</owner>
+  <owner>chrome-signin-team@google.com</owner>
   <summary>
     Action the user takes when the Single Sign On promotion is shown.
   </summary>
 </histogram>
 
 <histogram name="SSORecallPromo.PromoSeenCount" units="units"
-    expires_after="2020-11-30">
+    expires_after="2021-04-20">
   <owner>msarda@chromium.org</owner>
+  <owner>chrome-signin-team@google.com</owner>
   <summary>
     Number of times the promotion has been seen on the current device.
   </summary>
@@ -14704,7 +14707,7 @@
 </histogram>
 
 <histogram name="Style.InvalidationTime" units="microseconds"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>futhark@chromium.org</owner>
   <summary>
     Microseconds spent in StyleEngine::InvalidateStyle. Only samples from high
@@ -14713,7 +14716,7 @@
 </histogram>
 
 <histogram name="Style.RebuildLayoutTreeTime" units="microseconds"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>futhark@chromium.org</owner>
   <summary>
     Microseconds spent in RebuildLayoutTree called from Document::UpdateStyle.
@@ -14721,7 +14724,7 @@
 </histogram>
 
 <histogram name="Style.RecalcTime" units="microseconds"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>futhark@chromium.org</owner>
   <summary>
     Microseconds spent in RecalcStyle called from Document::UpdateStyle.
@@ -16020,7 +16023,7 @@
 </histogram>
 
 <histogram name="Tracing.Background.FinalizationDisallowedReason"
-    enum="TracingFinalizationDisallowedReason" expires_after="2021-04-04">
+    enum="TracingFinalizationDisallowedReason" expires_after="2021-06-06">
   <owner>ssid@chromium.org</owner>
   <summary>
     Reason why background tracing finalization was not allowed. Also see
@@ -16424,7 +16427,7 @@
 </histogram>
 
 <histogram name="UserManager.LoginUserType" enum="UserType"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>achuith@chromium.org</owner>
   <summary>
     The number of users of different types that log in to the system (Chrome
@@ -17167,7 +17170,7 @@
 </histogram>
 
 <histogram name="WebApp.Preinstalled.DisabledCount" units="apps"
-    expires_after="2021-04-01">
+    expires_after="2021-06-06">
   <owner>alancutter@chromium.org</owner>
   <owner>desktop-pwas-team@google.com</owner>
   <summary>
@@ -17305,7 +17308,7 @@
 </histogram>
 
 <histogram name="WebAuthentication.CableV1DiscoveryEvent"
-    enum="WebAuthenticationCableV1DiscoveryEvent" expires_after="2021-04-04">
+    enum="WebAuthenticationCableV1DiscoveryEvent" expires_after="2021-06-06">
   <owner>agl@chromium.org</owner>
   <owner>martinkr@google.com</owner>
   <summary>
@@ -17432,7 +17435,7 @@
 
 <histogram name="WebAuthentication.U2FAttestationPromptResult"
     enum="WebAuthenticationU2FAttestationPromptResult"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>agl@chromium.org</owner>
   <summary>
     Tracks events related to prompting users for permission to pass U2F
@@ -17713,7 +17716,7 @@
 </histogram>
 
 <histogram name="WebShare.ApiCount" enum="WebShareMethod"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>mgiuca@chromium.org</owner>
   <summary>
     Counts the number of calls to navigator.share. Includes both successful and
@@ -17907,7 +17910,7 @@
 </histogram>
 
 <histogram name="WebUI.Settings.PathVisited" enum="WebUISettingsPathHashes"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>dschuyler@chromium.org</owner>
   <owner>tbuckley@chromium.org</owner>
   <owner>bettes@chromium.org</owner>
@@ -17931,7 +17934,7 @@
 </histogram>
 
 <histogram name="WebUITabStrip.CloseTabAction"
-    enum="WebUITabStripCloseTabActions" expires_after="2021-03-21">
+    enum="WebUITabStripCloseTabActions" expires_after="2021-06-06">
   <owner>johntlee@chromium.org</owner>
   <owner>dpapad@chromium.org</owner>
   <summary>
@@ -17953,7 +17956,7 @@
 </histogram>
 
 <histogram name="WebUITabStrip.OpenDuration" units="ms"
-    expires_after="2021-03-21">
+    expires_after="2021-06-06">
   <owner>collinbaker@chromium.org</owner>
   <owner>dfried@chromium.org</owner>
   <summary>
diff --git a/tools/metrics/histograms/histograms_xml/page/histograms.xml b/tools/metrics/histograms/histograms_xml/page/histograms.xml
index 413c7413..af83c835 100644
--- a/tools/metrics/histograms/histograms_xml/page/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/page/histograms.xml
@@ -718,7 +718,7 @@
 
 <histogram
     name="PageLoad.DocumentTiming.NavigationToDOMContentLoadedEventFired"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2021-06-06">
   <owner>bmcquade@chromium.org</owner>
   <owner>csharrison@chromium.org</owner>
   <summary>
@@ -728,7 +728,7 @@
 </histogram>
 
 <histogram name="PageLoad.DocumentTiming.NavigationToLoadEventFired" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>bmcquade@chromium.org</owner>
   <owner>csharrison@chromium.org</owner>
   <summary>
@@ -738,7 +738,7 @@
 </histogram>
 
 <histogram base="true" name="PageLoad.Experimental.AbortTiming.Background"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2021-06-06">
   <owner>bmcquade@chromium.org</owner>
   <owner>csharrison@chromium.org</owner>
   <summary>
@@ -749,7 +749,7 @@
 </histogram>
 
 <histogram base="true" name="PageLoad.Experimental.AbortTiming.Close"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2021-06-06">
   <owner>csharrison@chromium.org</owner>
   <summary>
     This metric is still experimental and not yet ready to be relied upon.
@@ -770,7 +770,7 @@
 </histogram>
 
 <histogram base="true" name="PageLoad.Experimental.AbortTiming.NewNavigation"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2021-06-06">
   <owner>csharrison@chromium.org</owner>
   <summary>
     This metric is still experimental and not yet ready to be relied upon.
@@ -790,7 +790,7 @@
 </histogram>
 
 <histogram base="true" name="PageLoad.Experimental.AbortTiming.Reload"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2021-06-06">
   <owner>csharrison@chromium.org</owner>
   <summary>
     This metric is still experimental and not yet ready to be relied upon.
@@ -800,7 +800,7 @@
 </histogram>
 
 <histogram base="true" name="PageLoad.Experimental.AbortTiming.Stop" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>csharrison@chromium.org</owner>
   <summary>
     This metric is still experimental and not yet ready to be relied upon.
@@ -822,7 +822,7 @@
 </histogram>
 
 <histogram name="PageLoad.Experimental.Bytes.Network" units="KB"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>jkarlin@chromium.org</owner>
   <summary>
     The number of prefiltered (e.g., compressed) response body KiloBytes loaded
@@ -833,7 +833,7 @@
 </histogram>
 
 <histogram name="PageLoad.Experimental.Bytes.NetworkIncludingHeaders"
-    units="KB" expires_after="2021-04-04">
+    units="KB" expires_after="2021-06-06">
   <owner>jkarlin@chromium.org</owner>
   <summary>
     The number of prefiltered (e.g., compressed) KiloBytes loaded over the
@@ -1125,7 +1125,7 @@
 </histogram>
 
 <histogram name="PageLoad.Experimental.PageLoadType" enum="PageLoadType"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>npm@chromium.org</owner>
   <owner>speed-metrics-dev@chromium.org</owner>
   <summary>
@@ -1150,7 +1150,7 @@
 </histogram>
 
 <histogram name="PageLoad.Experimental.PaintTiming.InputToFirstContentfulPaint"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2021-06-06">
   <owner>sullivan@chromium.org</owner>
   <summary>
     The time between the OS-level input event that initiated a navigation, and
@@ -1191,7 +1191,7 @@
 
 <histogram
     name="PageLoad.Experimental.PaintTiming.NavigationToFirstMeaningfulPaint"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2021-06-06">
   <owner>ksakamoto@chromium.org</owner>
   <owner>speed-metrics-dev@chromium.org</owner>
   <summary>
@@ -1215,7 +1215,7 @@
 </histogram>
 
 <histogram name="PageLoad.Experimental.TotalForegroundDuration" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>npm@chromium.org</owner>
   <owner>speed-metrics-dev@chromium.org</owner>
   <summary>
@@ -1508,7 +1508,7 @@
 </histogram>
 
 <histogram name="PageLoad.Internal.ErrorCode" enum="InternalErrorLoadEvent"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>csharrison@chromium.org</owner>
   <owner>bmcquade@chromium.org</owner>
   <summary>
@@ -1517,7 +1517,7 @@
 </histogram>
 
 <histogram name="PageLoad.Internal.NavigationStartedInForeground"
-    enum="BooleanForeground" expires_after="2021-04-04">
+    enum="BooleanForeground" expires_after="2021-06-06">
   <owner>bmcquade@chromium.org</owner>
   <summary>Whether a navigation started in the foreground.</summary>
 </histogram>
@@ -1589,7 +1589,7 @@
 
 <histogram
     name="PageLoad.Internal.PaintTiming.LargestContentfulPaint.ContentType"
-    enum="LargestContentType" expires_after="2021-04-04">
+    enum="LargestContentType" expires_after="2021-06-06">
   <owner>maxlg@chromium.org</owner>
   <owner>npm@chromium.org</owner>
   <owner>speed-metrics-dev@chromium.org</owner>
@@ -1727,7 +1727,7 @@
 </histogram>
 
 <histogram name="PageLoad.LayoutInstability.CumulativeShiftScore"
-    units="scorex10" expires_after="2021-04-04">
+    units="scorex10" expires_after="2021-06-06">
   <owner>bmcquade@chromium.org</owner>
   <owner>skobes@chromium.org</owner>
   <summary>
@@ -1756,7 +1756,7 @@
 </histogram>
 
 <histogram name="PageLoad.LayoutInstability.CumulativeShiftScore.MainFrame"
-    units="scorex10" expires_after="2021-04-04">
+    units="scorex10" expires_after="2021-06-06">
   <owner>bmcquade@chromium.org</owner>
   <owner>skobes@chromium.org</owner>
   <summary>
@@ -1824,7 +1824,7 @@
 </histogram>
 
 <histogram name="PageLoad.PageTiming.ForegroundDuration" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>bmcquade@chromium.org</owner>
   <summary>
     For page loads that start in the foreground, measures the duration of time
@@ -1861,7 +1861,7 @@
 </histogram>
 
 <histogram name="PageLoad.PageTiming.NavigationToFirstForeground" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>bmcquade@chromium.org</owner>
   <owner>csharrison@chromium.org</owner>
   <summary>
@@ -1872,7 +1872,7 @@
 </histogram>
 
 <histogram name="PageLoad.PaintTiming.ForegroundToFirstContentfulPaint"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2021-06-06">
   <owner>sullivan@chromium.org</owner>
   <owner>speed-metrics-dev@chromium.org</owner>
   <summary>
@@ -1946,7 +1946,7 @@
 </histogram>
 
 <histogram name="PageLoad.PaintTiming.NavigationToFirstImagePaint" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>sullivan@chromium.org</owner>
   <owner>speed-metrics-dev@chromium.org</owner>
   <summary>
@@ -1957,7 +1957,7 @@
 </histogram>
 
 <histogram name="PageLoad.PaintTiming.NavigationToFirstPaint" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>ksakamoto@chromium.org</owner>
   <owner>speed-metrics-dev@chromium.org</owner>
   <summary>
@@ -2004,7 +2004,7 @@
 </histogram>
 
 <histogram name="PageLoad.PaintTiming.NavigationToLargestContentfulPaint"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2021-06-06">
   <owner>maxlg@chromium.org</owner>
   <owner>speed-metrics-dev@chromium.org</owner>
   <summary>
@@ -2024,7 +2024,7 @@
 
 <histogram
     name="PageLoad.PaintTiming.NavigationToLargestContentfulPaint.MainFrame"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2021-06-06">
   <owner>maxlg@chromium.org</owner>
   <owner>speed-metrics-dev@chromium.org</owner>
   <summary>
@@ -2065,7 +2065,7 @@
 </histogram>
 
 <histogram name="PageLoad.PaintTiming.ParseStartToFirstContentfulPaint"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2021-06-06">
   <owner>bmcquade@chromium.org</owner>
   <owner>csharrison@chromium.org</owner>
   <owner>speed-metrics-dev@chromium.org</owner>
@@ -2076,7 +2076,7 @@
 </histogram>
 
 <histogram name="PageLoad.ParseTiming.NavigationToParseStart" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>bmcquade@chromium.org</owner>
   <owner>csharrison@chromium.org</owner>
   <summary>
@@ -2108,7 +2108,7 @@
 </histogram>
 
 <histogram name="PageLoad.ParseTiming.ParseBlockedOnScriptLoad" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>bmcquade@chromium.org</owner>
   <owner>csharrison@chromium.org</owner>
   <summary>
@@ -2191,7 +2191,7 @@
 </histogram>
 
 <histogram name="PageSerialization.MhtmlGeneration.FinalSaveStatus"
-    enum="MhtmlGenerationFinalSaveStatus" expires_after="2021-04-04">
+    enum="MhtmlGenerationFinalSaveStatus" expires_after="2021-06-06">
   <owner>sclittle@chromium.org</owner>
   <owner>offline-dev@chromium.org</owner>
   <summary>Final status of the MHTML save operation for a page.</summary>
diff --git a/tools/metrics/histograms/histograms_xml/password/histograms.xml b/tools/metrics/histograms/histograms_xml/password/histograms.xml
index a67e345a..e043cfb 100644
--- a/tools/metrics/histograms/histograms_xml/password/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/password/histograms.xml
@@ -42,7 +42,7 @@
 </histogram>
 
 <histogram name="PasswordBubble.DisplayDisposition"
-    enum="PasswordBubbleDisplayDisposition" expires_after="2021-04-04">
+    enum="PasswordBubbleDisplayDisposition" expires_after="2021-06-06">
   <owner>vasilii@chromium.org</owner>
   <summary>
     When the password management bubble opened, what state was it in?
@@ -50,7 +50,7 @@
 </histogram>
 
 <histogram name="PasswordGeneration.Event" enum="PasswordGenerationEvent"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>jdoerrie@chromium.org</owner>
   <owner>kolos@chromium.org</owner>
   <owner>vasilii@chromium.org</owner>
@@ -755,7 +755,7 @@
 </histogram>
 
 <histogram name="PasswordManager.BulkCheck.CanceledTime" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>vasilii@chromium.org</owner>
   <owner>jdoerrie@chromium.org</owner>
   <summary>
@@ -764,7 +764,7 @@
 </histogram>
 
 <histogram name="PasswordManager.BulkCheck.CheckedCredentials"
-    units="credentials" expires_after="2021-04-04">
+    units="credentials" expires_after="2021-06-06">
   <owner>vasilii@chromium.org</owner>
   <owner>jdoerrie@chromium.org</owner>
   <summary>
@@ -774,14 +774,14 @@
 </histogram>
 
 <histogram name="PasswordManager.BulkCheck.Error"
-    enum="PasswordLeakDetectionError" expires_after="2021-04-04">
+    enum="PasswordLeakDetectionError" expires_after="2021-06-06">
   <owner>vasilii@chromium.org</owner>
   <owner>jdoerrie@chromium.org</owner>
   <summary>Error encountered during the password bulk check.</summary>
 </histogram>
 
 <histogram name="PasswordManager.BulkCheck.LeaksFound" units="credentials"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>vasilii@chromium.org</owner>
   <owner>jdoerrie@chromium.org</owner>
   <summary>
@@ -810,7 +810,7 @@
 </histogram>
 
 <histogram name="PasswordManager.BulkCheck.Time" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>vasilii@chromium.org</owner>
   <owner>jdoerrie@chromium.org</owner>
   <summary>
@@ -819,7 +819,7 @@
 </histogram>
 
 <histogram name="PasswordManager.BulkCheck.TimePerCredential" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>vasilii@chromium.org</owner>
   <owner>jdoerrie@chromium.org</owner>
   <summary>
@@ -829,14 +829,14 @@
 </histogram>
 
 <histogram name="PasswordManager.BulkCheck.UserAction"
-    enum="PasswordCheckInteraction" expires_after="2021-04-04">
+    enum="PasswordCheckInteraction" expires_after="2021-06-06">
   <owner>jdoerrie@chromium.org</owner>
   <owner>vasilii@chromium.org</owner>
   <summary>User actions performed on the Password Check settings page.</summary>
 </histogram>
 
 <histogram name="PasswordManager.BulkCheck.UserActionAndroid"
-    enum="PasswordCheckUIUserActionAndroid" expires_after="2021-04-04">
+    enum="PasswordCheckUIUserActionAndroid" expires_after="2021-06-06">
   <owner>ioanap@chromium.org</owner>
   <owner>fhorschigg@chromium.org</owner>
   <summary>User actions performed on the Password Check settings view.</summary>
@@ -896,16 +896,16 @@
   </summary>
 </histogram>
 
-<histogram name="PasswordManager.CompromisedCredentials" enum="CompromiseType"
-    expires_after="2021-04-26">
+<histogram name="PasswordManager.CompromisedCredentials"
+    enum="InsecureCredentialsType" expires_after="2021-04-26">
   <owner>bdea@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
-    Collects the type of compromised credential when it is added, updated, or
-    removed from the table. Compromised credentials are saved passwords that are
-    added when they are leaked or phished, updated when signon_realm and/or
-    username is changed, or removed when the password is dropped from the
-    password_manager or the password has changed.
+    Collects the type of insecure credential when it is added to or removed from
+    the table. Insecure credentials are properties of saved passwords that are
+    added when they are identified as leaked, phished, weak, or reused. They are
+    removed when the password is dropped from the password_manager or the
+    password has changed.
   </summary>
 </histogram>
 
@@ -1074,7 +1074,7 @@
 </histogram>
 
 <histogram name="PasswordManager.FillingAssistance"
-    enum="PasswordManagerFillingAssistance" expires_after="2021-04-04">
+    enum="PasswordManagerFillingAssistance" expires_after="2021-06-06">
   <owner>jdoerrie@chromium.org</owner>
   <owner>battre@chromium.org</owner>
   <summary>
@@ -1279,7 +1279,7 @@
 </histogram>
 
 <histogram name="PasswordManager.IsSyncPasswordHashSaved"
-    enum="IsSyncPasswordHashSaved" expires_after="2021-04-04">
+    enum="IsSyncPasswordHashSaved" expires_after="2021-06-06">
   <owner>vakh@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -1600,7 +1600,7 @@
 </histogram>
 
 <histogram name="PasswordManager.NewlySavedPasswordIsGenerated"
-    enum="BooleanNewlySavedPasswordIsGenerated" expires_after="2021-04-04">
+    enum="BooleanNewlySavedPasswordIsGenerated" expires_after="2021-06-06">
   <owner>nepper@chromium.org</owner>
   <owner>battre@chromium.org</owner>
   <owner>kolos@chromium.org</owner>
@@ -1665,7 +1665,7 @@
 </histogram>
 
 <histogram name="PasswordManager.PasswordDropdownItemSelected"
-    enum="PasswordDropdownSelectedOption" expires_after="2021-04-04">
+    enum="PasswordDropdownSelectedOption" expires_after="2021-06-06">
   <owner>jdoerrie@chromium.org</owner>
   <owner>vasilii@chromium.org</owner>
   <summary>
@@ -1674,7 +1674,7 @@
 </histogram>
 
 <histogram name="PasswordManager.PasswordDropdownShown"
-    enum="PasswordDropdownState" expires_after="2021-04-04">
+    enum="PasswordDropdownState" expires_after="2021-06-06">
   <owner>jdoerrie@chromium.org</owner>
   <owner>vasilii@chromium.org</owner>
   <summary>Logs the state of the password dropdown when it's shown.</summary>
@@ -1826,7 +1826,7 @@
 </histogram>
 
 <histogram name="PasswordManager.PasswordSyncState" enum="PasswordSyncState"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>jdoerrie@chromium.org</owner>
   <owner>vasilii@chromium.org</owner>
   <summary>
@@ -1869,7 +1869,7 @@
 </histogram>
 
 <histogram name="PasswordManager.RemoveCompromisedCredentials"
-    enum="PasswordStoreChange" expires_after="2021-04-04">
+    enum="PasswordStoreChange" expires_after="2021-06-06">
   <owner>bdea@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -1879,7 +1879,7 @@
 </histogram>
 
 <histogram name="PasswordManager.RemoveCompromisedCredentials.RemoveReason"
-    enum="RemoveCompromisedCredentialsReason" expires_after="2021-04-04">
+    enum="RemoveCompromisedCredentialsReason" expires_after="2021-06-06">
   <owner>bdea@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -1898,7 +1898,7 @@
 </histogram>
 
 <histogram name="PasswordManager.RequirementsSpecFetcher.NetErrorCode"
-    enum="NetErrorCodes" expires_after="2021-04-04">
+    enum="NetErrorCodes" expires_after="2021-06-06">
   <owner>battre@chromium.org</owner>
   <owner>jdoerrie@chromium.org</owner>
   <summary>
@@ -1959,7 +1959,7 @@
 </histogram>
 
 <histogram name="PasswordManager.SaveUIDismissalReason"
-    enum="PasswordManagerUIDismissalReason" expires_after="2021-04-04">
+    enum="PasswordManagerUIDismissalReason" expires_after="2021-06-06">
 <!-- Name completed by histogram_suffixes name="PasswordAccountStorageUserState" -->
 
   <owner>vasilii@chromium.org</owner>
@@ -2167,7 +2167,7 @@
 </histogram>
 
 <histogram name="PasswordManager.TouchToFill.DismissalReason"
-    enum="BottomSheet.StateChangeReason" expires_after="2021-04-04">
+    enum="BottomSheet.StateChangeReason" expires_after="2021-06-06">
   <owner>jdoerrie@chromium.org</owner>
   <owner>fhorschig@chromium.org</owner>
   <summary>
@@ -2202,7 +2202,7 @@
 </histogram>
 
 <histogram name="PasswordManager.UpdateUIDismissalReason"
-    enum="PasswordManagerUIDismissalReason" expires_after="2021-04-04">
+    enum="PasswordManagerUIDismissalReason" expires_after="2021-06-06">
   <owner>vasilii@chromium.org</owner>
   <summary>Why was the update password UI (bubble or infobar) closed?</summary>
 </histogram>
@@ -2269,7 +2269,7 @@
 
 <histogram
     name="PasswordManager.WellKnownChangePassword.GetChangePasswordUsage"
-    enum="GetChangePasswordUrlMetric" expires_after="2021-04-04">
+    enum="GetChangePasswordUrlMetric" expires_after="2021-06-06">
   <owner>jdoerrie@chromium.org</owner>
   <owner>vasilii@chromium.org</owner>
   <summary>
@@ -2299,7 +2299,7 @@
 </histogram>
 
 <histogram name="PasswordManager.WellKnownChangePassword.GstaticFetchResult"
-    enum="ChangePasswordUrlFetchResult" expires_after="2021-04-04">
+    enum="ChangePasswordUrlFetchResult" expires_after="2021-06-06">
   <owner>jdoerrie@chromium.org</owner>
   <owner>vasilii@chromium.org</owner>
   <summary>
@@ -2309,7 +2309,7 @@
 </histogram>
 
 <histogram name="PasswordManager.WellKnownChangePassword.GstaticFetchTime"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2021-06-06">
   <owner>jdoerrie@chromium.org</owner>
   <owner>vasilii@chromium.org</owner>
   <summary>Logs the loading time for the gstatic file request.</summary>
@@ -2447,7 +2447,7 @@
 </histogram>
 
 <histogram name="PasswordProtection.RequestNetworkDuration" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>vakh@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -2457,7 +2457,7 @@
 </histogram>
 
 <histogram base="true" name="PasswordProtection.RequestOutcome"
-    enum="PasswordProtectionRequestOutcome" expires_after="2021-04-04">
+    enum="PasswordProtectionRequestOutcome" expires_after="2021-06-06">
   <owner>vakh@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -2479,7 +2479,7 @@
 </histogram>
 
 <histogram name="PasswordProtection.Verdict" enum="PasswordProtectionVerdict"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>vakh@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
diff --git a/tools/metrics/histograms/histograms_xml/permissions/histograms.xml b/tools/metrics/histograms/histograms_xml/permissions/histograms.xml
index 78d84ced..ea21c95d 100644
--- a/tools/metrics/histograms/histograms_xml/permissions/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/permissions/histograms.xml
@@ -34,7 +34,7 @@
 </histogram>
 
 <histogram name="Permissions.Action.WithDisposition" enum="PermissionAction"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>andypaicu@chromium.org</owner>
   <owner>engedy@chromium.org</owner>
   <owner>hkamila@chromium.org</owner>
@@ -147,7 +147,7 @@
 </histogram>
 
 <histogram name="Permissions.CrowdDeny.PreloadData.IsLoadedAtAbuseCheckTime"
-    enum="Boolean" expires_after="2021-04-04">
+    enum="Boolean" expires_after="2021-06-06">
   <owner>elklm@chromium.org</owner>
   <owner>src/components/permissions/PERMISSIONS_OWNERS</owner>
   <summary>
@@ -157,7 +157,7 @@
 </histogram>
 
 <histogram name="Permissions.CrowdDeny.PreloadData.NotificationUxQuality"
-    enum="CrowdDenyNotificationUxQuality" expires_after="2021-04-04">
+    enum="CrowdDenyNotificationUxQuality" expires_after="2021-06-06">
   <owner>andypaicu@chromium.org</owner>
   <owner>engedy@chromium.org</owner>
   <owner>hkamila@chromium.org</owner>
@@ -168,7 +168,7 @@
 </histogram>
 
 <histogram name="Permissions.CrowdDeny.PreloadData.VersionAtAbuseCheckTime"
-    units="date" expires_after="2021-04-04">
+    units="date" expires_after="2021-06-06">
   <owner>elklm@chromium.org</owner>
   <owner>src/components/permissions/PERMISSIONS_OWNERS</owner>
   <summary>
@@ -190,7 +190,7 @@
 </histogram>
 
 <histogram name="Permissions.CrowdDeny.SafeBrowsing.RequestDuration" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>andypaicu@chromium.org</owner>
   <owner>engedy@chromium.org</owner>
   <owner>hkamila@chromium.org</owner>
@@ -202,7 +202,7 @@
 </histogram>
 
 <histogram name="Permissions.CrowdDeny.SafeBrowsing.Verdict"
-    enum="CrowdDenySafeBrowsingVerdict" expires_after="2021-04-04">
+    enum="CrowdDenySafeBrowsingVerdict" expires_after="2021-06-06">
   <owner>andypaicu@chromium.org</owner>
   <owner>engedy@chromium.org</owner>
   <owner>hkamila@chromium.org</owner>
@@ -488,7 +488,7 @@
 
 <histogram
     name="Permissions.QuietNotificationPrompts.DidEnableAdapativelyInPrefs"
-    enum="Boolean" expires_after="2021-04-04">
+    enum="Boolean" expires_after="2021-06-06">
   <owner>andypaicu@chromium.org</owner>
   <owner>engedy@chromium.org</owner>
   <owner>hkamila@chromium.org</owner>
@@ -500,7 +500,7 @@
 
 <histogram
     name="Permissions.QuietNotificationPrompts.EnabledStateInPrefsChangedTo"
-    enum="BooleanEnabled" expires_after="2021-04-04">
+    enum="BooleanEnabled" expires_after="2021-06-06">
   <owner>andypaicu@chromium.org</owner>
   <owner>engedy@chromium.org</owner>
   <owner>hkamila@chromium.org</owner>
@@ -511,7 +511,7 @@
 </histogram>
 
 <histogram name="Permissions.QuietNotificationPrompts.IsEnabledInPrefs"
-    enum="BooleanEnabled" expires_after="2021-04-04">
+    enum="BooleanEnabled" expires_after="2021-06-06">
   <owner>andypaicu@chromium.org</owner>
   <owner>engedy@chromium.org</owner>
   <owner>hkamila@chromium.org</owner>
diff --git a/tools/metrics/histograms/histograms_xml/platform/histograms.xml b/tools/metrics/histograms/histograms_xml/platform/histograms.xml
index 1f634d0..8066534 100644
--- a/tools/metrics/histograms/histograms_xml/platform/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/platform/histograms.xml
@@ -226,7 +226,7 @@
 </histogram>
 
 <histogram name="Platform.CrOS.CrashSenderRemoveReason"
-    enum="CrosCrashSenderRemoveReason" expires_after="2021-04-04">
+    enum="CrosCrashSenderRemoveReason" expires_after="2021-06-06">
   <owner>iby@chromium.org</owner>
   <owner>mutexlox@chromium.org</owner>
   <owner>cros-telemetry@google.com</owner>
@@ -626,7 +626,7 @@
   </summary>
 </histogram>
 
-<histogram name="Platform.Memory.Gpu" units="MiB" expires_after="2021-04-04">
+<histogram name="Platform.Memory.Gpu" units="MiB" expires_after="2021-06-06">
 <!-- Name completed by histogram_suffixes name="ProcessMemoryType" -->
 
   <owner>sonnyrao@chromium.org</owner>
diff --git a/tools/metrics/histograms/histograms_xml/plugin/histograms.xml b/tools/metrics/histograms/histograms_xml/plugin/histograms.xml
index 80214e0..a675a224 100644
--- a/tools/metrics/histograms/histograms_xml/plugin/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/plugin/histograms.xml
@@ -28,7 +28,7 @@
 </histogram>
 
 <histogram name="Plugin.FlashUsage" enum="FlashUsage"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>yzshen@chromium.org</owner>
   <owner>thestig@chromium.org</owner>
   <summary>Collects Flash usage data.</summary>
diff --git a/tools/metrics/histograms/histograms_xml/power/histograms.xml b/tools/metrics/histograms/histograms_xml/power/histograms.xml
index 52aa0a67..a6cf0ba 100644
--- a/tools/metrics/histograms/histograms_xml/power/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/power/histograms.xml
@@ -64,7 +64,7 @@
 </histogram>
 
 <histogram name="Power.BatteryChargeHealth" units="%"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>tbroch@chromium.org</owner>
   <summary>
     Chrome OS battery charge health percentage. Sampled once when device starts
@@ -82,7 +82,7 @@
 </histogram>
 
 <histogram name="Power.BatteryDischargeRateWhileSuspended" units="mW"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>tbroch@chromium.org</owner>
   <summary>
     Chrome OS battery discharge rate in mW while the system was suspended,
@@ -102,7 +102,7 @@
   </summary>
 </histogram>
 
-<histogram name="Power.BatteryPercentDrop" units="%" expires_after="2021-04-04">
+<histogram name="Power.BatteryPercentDrop" units="%" expires_after="2021-06-06">
   <owner>ryansturm@chromium.org</owner>
   <owner>tbansal@chromium.org</owner>
   <summary>
@@ -154,7 +154,7 @@
 </histogram>
 
 <histogram name="Power.BatteryRemainingWhenChargeStarts" units="%"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>tbroch@chromium.org</owner>
   <summary>
     Chrome OS remaining battery charge as percent of the maximum battery charge,
@@ -593,7 +593,7 @@
 </histogram>
 
 <histogram name="Power.IdleSuspendCountDaily" units="count"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>tbroch@chromium.org</owner>
   <owner>jiameng@chromium.org</owner>
   <summary>
@@ -720,7 +720,7 @@
 </histogram>
 
 <histogram name="Power.LidClosedSuspendCountDaily" units="count"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>tbroch@chromium.org</owner>
   <summary>
     Number of times that that the system has suspended in response to its lid
@@ -871,7 +871,7 @@
 </histogram>
 
 <histogram name="Power.PowerButtonPressInTabletMode"
-    enum="PowerButtonPressType" expires_after="2021-04-04">
+    enum="PowerButtonPressType" expires_after="2021-06-06">
   <owner>minch@chromium.org</owner>
   <owner>xdai@chromium.org</owner>
   <summary>
@@ -930,7 +930,7 @@
 </histogram>
 
 <histogram name="Power.SuspendAttempt" enum="SuspendAttempt"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>tbroch@chromium.org</owner>
   <summary>
     The number of suspend attempts on Chrome OS. Samples are reported before
@@ -940,7 +940,7 @@
 </histogram>
 
 <histogram name="Power.SuspendAttemptsBeforeCancel" units="units"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>tbroch@chromium.org</owner>
   <summary>
     The number of suspend attempts performed for a single suspend request (e.g.
@@ -951,7 +951,7 @@
 </histogram>
 
 <histogram name="Power.SuspendAttemptsBeforeSuccess" units="units"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>tbroch@chromium.org</owner>
   <summary>
     The number of suspend attempts performed for a single suspend request (e.g.
@@ -961,7 +961,7 @@
 </histogram>
 
 <histogram name="Power.SuspendResult" enum="SuspendResult"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>tbroch@chromium.org</owner>
   <summary>
     The results of suspend attempts on Chrome OS. Samples are reported after
diff --git a/tools/metrics/histograms/histograms_xml/print/histograms.xml b/tools/metrics/histograms/histograms_xml/print/histograms.xml
index f34952a..425995d9 100644
--- a/tools/metrics/histograms/histograms_xml/print/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/print/histograms.xml
@@ -221,7 +221,7 @@
 </histogram>
 
 <histogram name="PrintPreview.UserAction" enum="PrintPreviewUserActionType"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>thestig@chromium.org</owner>
   <summary>
     Action taken by the user in the preview tab such as print, cancel, print to
diff --git a/tools/metrics/histograms/histograms_xml/printing/histograms.xml b/tools/metrics/histograms/histograms_xml/printing/histograms.xml
index 0ebbd9b..afe4050 100644
--- a/tools/metrics/histograms/histograms_xml/printing/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/printing/histograms.xml
@@ -191,7 +191,7 @@
 </histogram>
 
 <histogram name="Printing.CUPS.MigratedMakeAndModel" enum="BooleanMigrated"
-    expires_after="2021-01-24">
+    expires_after="2021-06-06">
   <owner>luum@chromium.org</owner>
   <owner>cros-printing-dev@chromium.org</owner>
   <summary>
diff --git a/tools/metrics/histograms/histograms_xml/profile/histograms.xml b/tools/metrics/histograms/histograms_xml/profile/histograms.xml
index 819e380..5e8d010 100644
--- a/tools/metrics/histograms/histograms_xml/profile/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/profile/histograms.xml
@@ -119,7 +119,7 @@
 </histogram>
 
 <histogram name="Profile.CreateResult" enum="ProfileCreateResult"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>treib@chromium.org</owner>
   <owner>rogerta@chromium.org</owner>
   <owner>msarda@chromium.org</owner>
@@ -207,6 +207,20 @@
   <summary>Size of the favicons database.</summary>
 </histogram>
 
+<histogram name="Profile.Guest.{Type}.Lifetime" units="minutes"
+    expires_after="2021-06-01">
+  <owner>rhalavati@chromium.org</owner>
+  <owner>chrome-privacy-core@google.com</owner>
+  <summary>
+    This histogram records the lifetime duration of {Type} Guest profiles. It is
+    recorded once the profile for an {Type} Guest session is closed.
+  </summary>
+  <token key="Type">
+    <variant name="Ephemeral"/>
+    <variant name="OTR"/>
+  </token>
+</histogram>
+
 <histogram name="Profile.HistorySize" units="MB" expires_after="M82">
   <owner>hajimehoshi@chromium.org</owner>
   <owner>kouhei@chromium.org</owner>
diff --git a/tools/metrics/histograms/histograms_xml/quota/histograms.xml b/tools/metrics/histograms/histograms_xml/quota/histograms.xml
index edd00d9..4ca704b 100644
--- a/tools/metrics/histograms/histograms_xml/quota/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/quota/histograms.xml
@@ -137,7 +137,7 @@
 </histogram>
 
 <histogram name="Quota.GlobalUsageOfTemporaryStorage" units="MB"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>jarrydg@chromium.org</owner>
   <summary>Global usage of temporary storage.</summary>
 </histogram>
@@ -243,7 +243,7 @@
   <summary>Time spent to an eviction round.</summary>
 </histogram>
 
-<histogram name="Quota.TotalDiskSpace" units="MB" expires_after="2021-04-04">
+<histogram name="Quota.TotalDiskSpace" units="MB" expires_after="2021-06-06">
   <owner>jarrydg@chromium.org</owner>
   <summary>
     Total disk space for the storage directory. Logged at irregular intervals.
diff --git a/tools/metrics/histograms/histograms_xml/renderer/histograms.xml b/tools/metrics/histograms/histograms_xml/renderer/histograms.xml
index 18f2838..f6ea747 100644
--- a/tools/metrics/histograms/histograms_xml/renderer/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/renderer/histograms.xml
@@ -197,7 +197,7 @@
 </histogram>
 
 <histogram base="true" name="RendererScheduler.QueueingDurationPerQueueType"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2021-06-06">
 <!-- Name completed by histogram_suffixes name="RendererScheduler.QueueType" -->
 
   <owner>kdillon@chromium.org</owner>
diff --git a/tools/metrics/histograms/histograms_xml/renderer4/histograms.xml b/tools/metrics/histograms/histograms_xml/renderer4/histograms.xml
index 9a29901..d48afc9 100644
--- a/tools/metrics/histograms/histograms_xml/renderer4/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/renderer4/histograms.xml
@@ -75,7 +75,7 @@
 </histogram>
 
 <histogram name="Renderer4.GpuImageDecodeState.CachePeakUsagePercent"
-    units="units" expires_after="2021-04-04">
+    units="units" expires_after="2021-06-06">
   <owner>sashamcintosh@chromium.org</owner>
   <owner>ericrk@chromium.org</owner>
   <summary>
diff --git a/tools/metrics/histograms/histograms_xml/safe_browsing/histograms.xml b/tools/metrics/histograms/histograms_xml/safe_browsing/histograms.xml
index a620323..f1b73dd 100644
--- a/tools/metrics/histograms/histograms_xml/safe_browsing/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/safe_browsing/histograms.xml
@@ -738,7 +738,7 @@
 </histogram>
 
 <histogram name="SafeBrowsing.Pref.Enhanced" enum="BooleanEnabled"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>bdea@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -748,7 +748,7 @@
 </histogram>
 
 <histogram name="SafeBrowsing.Pref.Extended" enum="BooleanEnabled"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>vakh@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -758,7 +758,7 @@
 </histogram>
 
 <histogram name="SafeBrowsing.Pref.General" enum="BooleanEnabled"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>vakh@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -1037,7 +1037,7 @@
 </histogram>
 
 <histogram name="SafeBrowsing.TokenFetcher.ErrorType"
-    enum="GoogleServiceAuthError" expires_after="2021-04-06">
+    enum="GoogleServiceAuthError" expires_after="2021-06-06">
   <owner>xinghuilu@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
diff --git a/tools/metrics/histograms/histograms_xml/sb_client/histograms.xml b/tools/metrics/histograms/histograms_xml/sb_client/histograms.xml
index 4e92b75..6ef31d48 100644
--- a/tools/metrics/histograms/histograms_xml/sb_client/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/sb_client/histograms.xml
@@ -462,7 +462,7 @@
 </histogram>
 
 <histogram name="SBClientPhishing.PhishingDetectorResult"
-    enum="ClientSidePhishingResult" expires_after="2021-04-04">
+    enum="ClientSidePhishingResult" expires_after="2021-06-06">
   <owner>drubery@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>The result enum received from the renderer-side classifier</summary>
@@ -609,7 +609,7 @@
 </histogram>
 
 <histogram name="SBClientPhishing.VisualFeatureTime" units="ms"
-    expires_after="2021-03-28">
+    expires_after="2021-06-06">
   <owner>drubery@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
diff --git a/tools/metrics/histograms/histograms_xml/security/histograms.xml b/tools/metrics/histograms/histograms_xml/security/histograms.xml
index a60d97c..9f590cc 100644
--- a/tools/metrics/histograms/histograms_xml/security/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/security/histograms.xml
@@ -99,7 +99,7 @@
 </histogram>
 
 <histogram base="true" name="Security.PageEndReason" enum="PageEndReason"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>cthomp@chromium.org</owner>
   <owner>security-enamel@chromium.org</owner>
   <summary>
@@ -184,7 +184,7 @@
 </histogram>
 
 <histogram name="Security.PageInfo.TimeOpen.Action" units="units"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>cthomp@chromium.org</owner>
   <owner>security-enamel@chromium.org</owner>
   <summary>
@@ -194,7 +194,7 @@
 </histogram>
 
 <histogram name="Security.PageInfo.TimeOpen.NoAction" units="units"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>cthomp@chromium.org</owner>
   <owner>security-enamel@chromium.org</owner>
   <summary>
@@ -576,7 +576,7 @@
 </histogram>
 
 <histogram name="Security.SecurityLevel.OnCommit" enum="SecurityLevel"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>cthomp@chromium.org</owner>
   <owner>security-enamel@chromium.org</owner>
   <summary>
@@ -588,7 +588,7 @@
 </histogram>
 
 <histogram name="Security.SecurityLevel.OnComplete" enum="SecurityLevel"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>cthomp@chromium.org</owner>
   <owner>security-enamel@chromium.org</owner>
   <summary>
@@ -611,7 +611,7 @@
 </histogram>
 
 <histogram base="true" name="Security.SiteEngagementDelta" units="units"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>cthomp@chromium.org</owner>
   <owner>security-enamel@chromium.org</owner>
   <summary>
@@ -626,7 +626,7 @@
 </histogram>
 
 <histogram base="true" name="Security.TimeOnPage2" units="units"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>cthomp@chromium.org</owner>
   <owner>security-enamel@chromium.org</owner>
   <summary>
diff --git a/tools/metrics/histograms/histograms_xml/service/histograms.xml b/tools/metrics/histograms/histograms_xml/service/histograms.xml
index cc33f269..aa849e07 100644
--- a/tools/metrics/histograms/histograms_xml/service/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/service/histograms.xml
@@ -312,7 +312,7 @@
 </histogram>
 
 <histogram name="ServiceWorker.FetchEvent.HasResponse.Time" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>falken@chromium.org</owner>
   <owner>chrome-worker@google.com</owner>
   <summary>
@@ -1017,7 +1017,7 @@
 </histogram>
 
 <histogram name="ServiceWorker.StartWorker.Status"
-    enum="ServiceWorkerStatusCode" expires_after="2021-04-04">
+    enum="ServiceWorkerStatusCode" expires_after="2021-06-06">
   <owner>falken@chromium.org</owner>
   <owner>chrome-worker@google.com</owner>
   <summary>
@@ -1039,7 +1039,7 @@
 </histogram>
 
 <histogram name="ServiceWorker.StartWorker.Time" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>falken@chromium.org</owner>
   <owner>chrome-worker@google.com</owner>
   <summary>
diff --git a/tools/metrics/histograms/histograms_xml/settings/histograms.xml b/tools/metrics/histograms/histograms_xml/settings/histograms.xml
index ed836c0..b5c6e52 100644
--- a/tools/metrics/histograms/histograms_xml/settings/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/settings/histograms.xml
@@ -60,7 +60,7 @@
 </histogram>
 
 <histogram name="Settings.Homepage.LocationType" enum="HomepageLocationType"
-    expires_after="2021-04-03">
+    expires_after="2021-06-06">
   <owner>bttk@chromium.org</owner>
   <owner>twellington@chromium.org</owner>
   <owner>wenyufu@chromium.org</owner>
diff --git a/tools/metrics/histograms/histograms_xml/signin/histograms.xml b/tools/metrics/histograms/histograms_xml/signin/histograms.xml
index a2d01c2..4439565e 100644
--- a/tools/metrics/histograms/histograms_xml/signin/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/signin/histograms.xml
@@ -853,7 +853,7 @@
 </histogram>
 
 <histogram name="Signin.SecondaryAccountConsentLog"
-    enum="SecondaryAccountConsentLoggerResult" expires_after="2021-04-01">
+    enum="SecondaryAccountConsentLoggerResult" expires_after="2021-06-06">
   <owner>anastasiian@chromium.org</owner>
   <owner>sinhak@chromium.org</owner>
   <summary>
diff --git a/tools/metrics/histograms/histograms_xml/smart/histograms.xml b/tools/metrics/histograms/histograms_xml/smart/histograms.xml
index b7aef20..fcb3b796 100644
--- a/tools/metrics/histograms/histograms_xml/smart/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/smart/histograms.xml
@@ -22,7 +22,7 @@
 <histograms>
 
 <histogram name="SmartLock.AuthMethodChoice.SignIn"
-    enum="SmartLockAuthMethodChoice" expires_after="2021-04-04">
+    enum="SmartLockAuthMethodChoice" expires_after="2021-06-06">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>Records the user's sign in method choice.</summary>
@@ -39,7 +39,7 @@
 </histogram>
 
 <histogram name="SmartLock.AuthMethodChoice.Unlock"
-    enum="SmartLockAuthMethodChoice" expires_after="2021-04-04">
+    enum="SmartLockAuthMethodChoice" expires_after="2021-06-06">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>Records the user's unlock method choice.</summary>
@@ -56,7 +56,7 @@
 </histogram>
 
 <histogram name="SmartLock.AuthResult.SignIn" enum="BooleanSuccess"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -86,7 +86,7 @@
 </histogram>
 
 <histogram name="SmartLock.AuthResult.Unlock" enum="BooleanSuccess"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -129,7 +129,7 @@
 </histogram>
 
 <histogram name="SmartLock.EnabledState" enum="SmartLockEnabledState"
-    expires_after="2021-02-02">
+    expires_after="2021-06-06">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -152,7 +152,7 @@
 </histogram>
 
 <histogram name="SmartLock.FindAndConnectToHostResult.Unlock"
-    enum="SmartLockFindAndConnectToHostResult" expires_after="2021-04-04">
+    enum="SmartLockFindAndConnectToHostResult" expires_after="2021-06-06">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -183,7 +183,7 @@
 </histogram>
 
 <histogram name="SmartLock.GetRemoteStatus.Unlock" enum="BooleanSuccess"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -216,7 +216,7 @@
 
 <histogram
     name="SmartLock.Performance.AuthenticationToReceiveFirstRemoteStatusDuration.Unlock"
-    units="ms" expires_after="2021-02-02">
+    units="ms" expires_after="2021-06-06">
 <!-- Name completed by histogram_suffixes name="SmartLockStatusTypes" -->
 
   <owner>hansberry@chromium.org</owner>
@@ -239,7 +239,7 @@
 
 <histogram
     name="SmartLock.Performance.ShowLockScreenToShowFirstStatusToUserDuration.Unlock"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2021-06-06">
 <!-- Name completed by histogram_suffixes name="SmartLockStatusTypes" -->
 
   <owner>hansberry@chromium.org</owner>
@@ -263,7 +263,7 @@
 
 <histogram
     name="SmartLock.Performance.StartScanToReceiveFirstRemoteStatusDuration.Unlock"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2021-06-06">
 <!-- Name completed by histogram_suffixes name="SmartLockStatusTypes" -->
 
   <owner>hansberry@chromium.org</owner>
diff --git a/tools/metrics/histograms/histograms_xml/stability/histograms.xml b/tools/metrics/histograms/histograms_xml/stability/histograms.xml
index d6f0a6bf..22a4a23 100644
--- a/tools/metrics/histograms/histograms_xml/stability/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/stability/histograms.xml
@@ -86,7 +86,7 @@
 </histogram>
 
 <histogram name="Stability.Android.RendererCrash" enum="Boolean"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>wnwen@chromium.org</owner>
   <summary>
     Counts renderer crashes including OOMs. Android only. Mirrors old stability
@@ -369,7 +369,7 @@
 </histogram>
 
 <histogram name="Stability.iOS.UTE.AvailableStorage" units="KB"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>michaeldo@chromium.org</owner>
   <owner>olivierrobin@chromium.org</owner>
   <summary>
@@ -395,7 +395,7 @@
 </histogram>
 
 <histogram name="Stability.iOS.UTE.DeviceThermalState"
-    enum="IOSDeviceThermalState" expires_after="2021-04-04">
+    enum="IOSDeviceThermalState" expires_after="2021-06-06">
   <owner>michaeldo@chromium.org</owner>
   <owner>olivierrobin@chromium.org</owner>
   <summary>
@@ -405,7 +405,7 @@
 </histogram>
 
 <histogram name="Stability.iOS.UTE.HasPossibleExplanation"
-    enum="BooleanHasPossibleExplanation" expires_after="2021-04-04">
+    enum="BooleanHasPossibleExplanation" expires_after="2021-06-06">
   <owner>michaeldo@chromium.org</owner>
   <owner>olivierrobin@chromium.org</owner>
   <summary>
@@ -463,7 +463,7 @@
 </histogram>
 
 <histogram name="Stability.iOS.UTE.OSRestartedAfterPreviousSession"
-    enum="BooleanRebooted" expires_after="2021-04-04">
+    enum="BooleanRebooted" expires_after="2021-06-06">
   <owner>eugenebut@chromium.org</owner>
   <owner>michaeldo@chromium.org</owner>
   <summary>
diff --git a/tools/metrics/histograms/histograms_xml/startup/histograms.xml b/tools/metrics/histograms/histograms_xml/startup/histograms.xml
index 5fa2e95..94be00e 100644
--- a/tools/metrics/histograms/histograms_xml/startup/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/startup/histograms.xml
@@ -151,7 +151,7 @@
 </histogram>
 
 <histogram name="Startup.Android.GURLEnsureMainDexInitialized" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>mthiesse@chromium.org</owner>
   <owner>yfriedman@chromium.org</owner>
   <summary>
@@ -648,7 +648,7 @@
 </histogram>
 
 <histogram name="Startup.Temperature" enum="StartupTemperature"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
 <!-- expires-after: Diagnosis metric for changes in StartupTemperature suffix.
      Shouldn't truly expire but kColdStartHardFaultCountThreshold should be
      surveyed yearly. -->
diff --git a/tools/metrics/histograms/histograms_xml/subresource/histograms.xml b/tools/metrics/histograms/histograms_xml/subresource/histograms.xml
index 958d987..7619363 100644
--- a/tools/metrics/histograms/histograms_xml/subresource/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/subresource/histograms.xml
@@ -150,7 +150,7 @@
 </histogram>
 
 <histogram name="SubresourceFilter.IndexRuleset.Verify.Status"
-    enum="SubresourceFilterVerifyStatus" expires_after="2021-04-04">
+    enum="SubresourceFilterVerifyStatus" expires_after="2021-06-06">
   <owner>alexmt@chromium.org</owner>
   <owner>chrome-ads-histograms@google.com</owner>
   <summary>
@@ -552,7 +552,7 @@
 </histogram>
 
 <histogram name="SubresourceRedirect.ImageCompressionNotificationInfoBar"
-    enum="HttpsImageCompressionInfoBarAction" expires_after="2021-04-04">
+    enum="HttpsImageCompressionInfoBarAction" expires_after="2021-06-06">
   <owner>rajendrant@chromium.org</owner>
   <owner>src/components/data_reduction_proxy/OWNERS</owner>
   <summary>
diff --git a/tools/metrics/histograms/histograms_xml/sync/histograms.xml b/tools/metrics/histograms/histograms_xml/sync/histograms.xml
index 13588bad..610b0c98 100644
--- a/tools/metrics/histograms/histograms_xml/sync/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/sync/histograms.xml
@@ -152,7 +152,7 @@
 </histogram>
 
 <histogram name="Sync.ConfigureDataTypes" enum="SyncModelTypes"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>mastiz@chromium.org</owner>
   <owner>treib@chromium.org</owner>
   <summary>
@@ -378,7 +378,7 @@
 </histogram>
 
 <histogram name="Sync.InitialState" enum="SyncInitialState"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>treib@chromium.org</owner>
   <owner>mastiz@chromium.org</owner>
   <summary>
@@ -540,7 +540,7 @@
 </histogram>
 
 <histogram base="true" name="Sync.ModelTypeErrorSite"
-    enum="SyncModelTypeErrorSite" expires_after="2021-04-04">
+    enum="SyncModelTypeErrorSite" expires_after="2021-06-06">
 <!-- Name completed by histogram_suffixes name="SyncModelType" -->
 
   <owner>jkrcal@chromium.org</owner>
@@ -574,7 +574,7 @@
 </histogram>
 
 <histogram base="true" name="Sync.ModelTypeStoreCommitWriteBatchOutcome"
-    enum="LevelDBStatus" expires_after="2021-04-04">
+    enum="LevelDBStatus" expires_after="2021-06-06">
 <!-- Name completed by histogram_suffixes name="SyncModelType" -->
 
   <owner>qjw@chromium.org</owner>
@@ -716,7 +716,7 @@
 </histogram>
 
 <histogram name="Sync.PostedClientToServerMessage"
-    enum="SyncClientToServerMessageContents" expires_after="2021-04-04">
+    enum="SyncClientToServerMessageContents" expires_after="2021-06-06">
   <owner>mastiz@chromium.org</owner>
   <summary>
     Number of network requests issued by sync to the sync server, grouped by
@@ -725,7 +725,7 @@
 </histogram>
 
 <histogram name="Sync.PostedClientToServerMessageError" enum="SyncErrorType"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>mastiz@chromium.org</owner>
   <summary>
     A sync error code received from the sync server as a result of a
@@ -829,7 +829,7 @@
 </histogram>
 
 <histogram name="Sync.SharingMessage.CommitResult"
-    enum="SyncSharingMessageCommitErrorCode" expires_after="2021-04-04">
+    enum="SyncSharingMessageCommitErrorCode" expires_after="2021-06-06">
   <owner>rushans@google.com</owner>
   <owner>treib@chromium.org</owner>
   <summary>
@@ -929,7 +929,7 @@
 </histogram>
 
 <histogram name="Sync.SyncEverything2" enum="Boolean"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>treib@chromium.org</owner>
   <owner>mastiz@chromium.org</owner>
   <summary>
@@ -988,7 +988,7 @@
 </histogram>
 
 <histogram base="true" name="Sync.UndecryptedEntitiesOnDataTypeDisabled"
-    units="sync entities" expires_after="2021-04-04">
+    units="sync entities" expires_after="2021-06-06">
   <owner>victorvianna@google.com</owner>
   <owner>treib@chromium.org</owner>
   <summary>
diff --git a/tools/metrics/histograms/histograms_xml/tab/histograms.xml b/tools/metrics/histograms/histograms_xml/tab/histograms.xml
index ae67c42..b2213f96 100644
--- a/tools/metrics/histograms/histograms_xml/tab/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/tab/histograms.xml
@@ -151,7 +151,7 @@
   </summary>
 </histogram>
 
-<histogram name="Tab.NewTab" enum="NewTabType" expires_after="2021-05-30">
+<histogram name="Tab.NewTab" enum="NewTabType" expires_after="2021-06-06">
   <owner>tbergquist@chromium.org</owner>
   <owner>bsep@chromium.org</owner>
   <summary>
@@ -602,7 +602,7 @@
 </histogram>
 
 <histogram name="TabGroups.SessionsPerGroup" units="sessions"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>yusufo@chromium.org</owner>
   <owner>wychen@chromium.org</owner>
   <summary>
@@ -645,7 +645,7 @@
 </histogram>
 
 <histogram name="TabGroups.UserGroupCount" units="groups"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>yusufo@chromium.org</owner>
   <owner>wychen@chromium.org</owner>
   <summary>
@@ -666,7 +666,7 @@
 </histogram>
 
 <histogram name="TabGroups.UserNamedGroupCount" units="groups"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>yusufo@chromium.org</owner>
   <owner>wychen@chromium.org</owner>
   <summary>
@@ -2528,7 +2528,7 @@
 </histogram>
 
 <histogram name="TabStrip.TabCountOnPageLoad" units="tabs"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>yusufo@chromium.org</owner>
   <owner>wychen@chromium.org</owner>
   <summary>
diff --git a/tools/metrics/histograms/histograms_xml/translate/histograms.xml b/tools/metrics/histograms/histograms_xml/translate/histograms.xml
index 108d3cb..3e6c8f8c 100644
--- a/tools/metrics/histograms/histograms_xml/translate/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/translate/histograms.xml
@@ -42,7 +42,7 @@
 </histogram>
 
 <histogram name="Translate.BubbleUiEvent" enum="TranslateBubbleUiEvent"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>groby@google.com</owner>
   <owner>chrome-language@google.com</owner>
   <summary>Tracks UI events related to the translate bubble.</summary>
@@ -61,7 +61,7 @@
 </histogram>
 
 <histogram name="Translate.CLD3.LanguageDetected" enum="CLD3LanguageCode"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>frechette@chromium.org</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -71,7 +71,7 @@
 </histogram>
 
 <histogram name="Translate.CLD3.LanguagePercentage" units="%"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>frechette@chromium.org</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -92,14 +92,14 @@
 </histogram>
 
 <histogram name="Translate.CompactInfobar.Event" enum="TranslateCompactUIEvent"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>anthonyvd@chromium.org</owner>
   <owner>chrome-language@google.com</owner>
   <summary>Various user actions performed in the translate infobar.</summary>
 </histogram>
 
 <histogram name="Translate.CompactInfobar.Language.AlwaysTranslate"
-    enum="CLD3LanguageCode" expires_after="2021-04-04">
+    enum="CLD3LanguageCode" expires_after="2021-06-06">
   <owner>anthonyvd@chromium.org</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -118,7 +118,7 @@
 </histogram>
 
 <histogram name="Translate.CompactInfobar.Language.NeverTranslate"
-    enum="CLD3LanguageCode" expires_after="2021-04-04">
+    enum="CLD3LanguageCode" expires_after="2021-06-06">
   <owner>anthonyvd@chromium.org</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -128,7 +128,7 @@
 </histogram>
 
 <histogram name="Translate.CompactInfobar.Language.PageNotIn"
-    enum="CLD3LanguageCode" expires_after="2021-04-04">
+    enum="CLD3LanguageCode" expires_after="2021-06-06">
   <owner>anthonyvd@chromium.org</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -147,7 +147,7 @@
 </histogram>
 
 <histogram name="Translate.CompactInfobar.TranslationsPerPage"
-    units="translations" expires_after="2021-04-04">
+    units="translations" expires_after="2021-06-06">
   <owner>anthonyvd@chromium.org</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -168,7 +168,7 @@
 </histogram>
 
 <histogram name="Translate.ContentLanguage" enum="TranslateLanguage"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>kenjibaheux@google.com</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -178,7 +178,7 @@
 </histogram>
 
 <histogram name="Translate.DeclineTranslate" units="units"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>kenjibaheux@google.com</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -188,7 +188,7 @@
 </histogram>
 
 <histogram name="Translate.DeclineTranslateCloseInfobar" units="units"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>kenjibaheux@google.com</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -212,7 +212,7 @@
 </histogram>
 
 <histogram name="Translate.ExplicitLanguageAsk.Event"
-    enum="TranslateExplicitAskPromptEventType" expires_after="2021-04-04">
+    enum="TranslateExplicitAskPromptEventType" expires_after="2021-06-06">
   <owner>yyushkina@google.com</owner>
   <owner>anthonyvd@google.com</owner>
   <owner>chrome-language@google.com</owner>
@@ -223,7 +223,7 @@
 </histogram>
 
 <histogram name="Translate.ExplicitLanguageAsk.LanguageAdded"
-    enum="CLD3LanguageCode" expires_after="2021-04-04">
+    enum="CLD3LanguageCode" expires_after="2021-06-06">
   <owner>yyushkina@google.com</owner>
   <owner>anthonyvd@google.com</owner>
   <owner>chrome-language@google.com</owner>
@@ -234,7 +234,7 @@
 </histogram>
 
 <histogram name="Translate.ExplicitLanguageAsk.LanguageRemoved"
-    enum="CLD3LanguageCode" expires_after="2021-04-04">
+    enum="CLD3LanguageCode" expires_after="2021-06-06">
   <owner>yyushkina@google.com</owner>
   <owner>anthonyvd@google.com</owner>
   <owner>chrome-language@google.com</owner>
@@ -293,7 +293,7 @@
 </histogram>
 
 <histogram name="Translate.InitiationStatus.v2"
-    enum="TranslateInitiationStatus" expires_after="2021-04-04">
+    enum="TranslateInitiationStatus" expires_after="2021-06-06">
   <owner>kenjibaheux@google.com</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -304,7 +304,7 @@
 </histogram>
 
 <histogram name="Translate.LanguageDetection.ContentLength" units="characters"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>sclittle@chromium.org</owner>
   <owner>megjablon@chromium.org</owner>
   <owner>chrome-language@google.com</owner>
@@ -339,7 +339,7 @@
 </histogram>
 
 <histogram name="Translate.LanguageSettingsIsShown" enum="BooleanShown"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>frechette@chromium.org</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -382,7 +382,7 @@
 </histogram>
 
 <histogram name="Translate.MenuTranslation.IsAvailable" enum="BooleanAvailable"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>cuianthony@google.com</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -419,7 +419,7 @@
 </histogram>
 
 <histogram name="Translate.ModifyOriginalLang" units="units"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>kenjibaheux@google.com</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -429,7 +429,7 @@
 </histogram>
 
 <histogram name="Translate.ModifyTargetLang" units="units"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>kenjibaheux@google.com</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -439,7 +439,7 @@
 </histogram>
 
 <histogram name="Translate.NeverTranslateLang" units="units"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>kenjibaheux@google.com</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -449,7 +449,7 @@
 </histogram>
 
 <histogram name="Translate.NeverTranslateSite" units="units"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>kenjibaheux@google.com</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -472,7 +472,7 @@
 </histogram>
 
 <histogram name="Translate.PageLoad.FinalSourceLanguage"
-    enum="CLD3LanguageCode" expires_after="2021-04-04">
+    enum="CLD3LanguageCode" expires_after="2021-06-06">
   <owner>curranmax@google.com</owner>
   <owner>megjablon@google.com</owner>
   <owner>chrome-language@google.com</owner>
@@ -486,7 +486,7 @@
 </histogram>
 
 <histogram name="Translate.PageLoad.FinalState" enum="TranslateState"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>curranmax@google.com</owner>
   <owner>megjablon@google.com</owner>
   <owner>chrome-language@google.com</owner>
@@ -500,7 +500,7 @@
 </histogram>
 
 <histogram name="Translate.PageLoad.FinalTargetLanguage"
-    enum="CLD3LanguageCode" expires_after="2021-04-04">
+    enum="CLD3LanguageCode" expires_after="2021-06-06">
   <owner>curranmax@google.com</owner>
   <owner>megjablon@google.com</owner>
   <owner>chrome-language@google.com</owner>
@@ -528,7 +528,7 @@
 </histogram>
 
 <histogram name="Translate.PageLoad.InitialState" enum="TranslateState"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>curranmax@google.com</owner>
   <owner>megjablon@google.com</owner>
   <owner>chrome-language@google.com</owner>
@@ -572,7 +572,7 @@
 </histogram>
 
 <histogram name="Translate.PageLoad.NumReversions" units="reversions"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>curranmax@google.com</owner>
   <owner>megjablon@google.com</owner>
   <owner>chrome-language@google.com</owner>
@@ -585,7 +585,7 @@
 </histogram>
 
 <histogram name="Translate.PageLoad.NumTargetLanguageChanges"
-    units="target language changes" expires_after="2021-04-04">
+    units="target language changes" expires_after="2021-06-06">
   <owner>curranmax@google.com</owner>
   <owner>megjablon@google.com</owner>
   <owner>chrome-language@google.com</owner>
@@ -598,7 +598,7 @@
 </histogram>
 
 <histogram name="Translate.PageLoad.NumTranslations" units="translations"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>curranmax@google.com</owner>
   <owner>megjablon@google.com</owner>
   <owner>chrome-language@google.com</owner>
@@ -610,7 +610,7 @@
 </histogram>
 
 <histogram name="Translate.PageLoad.Ranker.Decision"
-    enum="TranslateRankerDecision" expires_after="2021-04-04">
+    enum="TranslateRankerDecision" expires_after="2021-06-06">
   <owner>curranmax@google.com</owner>
   <owner>megjablon@google.com</owner>
   <owner>chrome-language@google.com</owner>
@@ -623,7 +623,7 @@
 </histogram>
 
 <histogram name="Translate.PageLoad.Ranker.Version" units="version"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>curranmax@google.com</owner>
   <owner>megjablon@google.com</owner>
   <owner>chrome-language@google.com</owner>
@@ -635,7 +635,7 @@
 </histogram>
 
 <histogram name="Translate.PageLoad.TriggerDecision"
-    enum="TranslateTriggerDecision" expires_after="2021-04-04">
+    enum="TranslateTriggerDecision" expires_after="2021-06-06">
   <owner>curranmax@google.com</owner>
   <owner>megjablon@google.com</owner>
   <owner>chrome-language@google.com</owner>
@@ -754,7 +754,7 @@
 </histogram>
 
 <histogram name="Translate.RevertTranslation" units="units"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>kenjibaheux@google.com</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -764,7 +764,7 @@
 </histogram>
 
 <histogram name="Translate.ShowErrorUI" enum="TranslateError"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>kenjibaheux@google.com</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -789,7 +789,7 @@
 </histogram>
 
 <histogram name="Translate.SourceLanguage" enum="CLD3LanguageCode"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>yyushkina@google.com</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -799,7 +799,7 @@
 </histogram>
 
 <histogram name="Translate.TargetLanguage" enum="CLD3LanguageCode"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>yyushkina@google.com</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -809,7 +809,7 @@
 </histogram>
 
 <histogram name="Translate.TargetLanguage.Origin"
-    enum="TranslateTargetLanguageOrigin" expires_after="2021-04-04">
+    enum="TranslateTargetLanguageOrigin" expires_after="2021-06-06">
   <owner>megjablon@google.com</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -844,7 +844,7 @@
 </histogram>
 
 <histogram name="Translate.Translate" enum="BooleanTranslate"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>kenjibaheux@google.com</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -854,7 +854,7 @@
 </histogram>
 
 <histogram name="Translate.Translate.AMPCacheURL" enum="BooleanTranslate"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>sclittle@google.com</owner>
   <owner>megjablon@google.com</owner>
   <owner>chrome-language@google.com</owner>
@@ -948,7 +948,7 @@
 </histogram>
 
 <histogram name="Translate.UserActionDuration" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>kenjibaheux@google.com</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
diff --git a/tools/metrics/histograms/histograms_xml/uma/histograms.xml b/tools/metrics/histograms/histograms_xml/uma/histograms.xml
index 7588628c..1d58f77f 100644
--- a/tools/metrics/histograms/histograms_xml/uma/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/uma/histograms.xml
@@ -501,7 +501,7 @@
 </histogram>
 
 <histogram name="UMA.StructuredMetrics.EventRecordingState"
-    enum="StructuredMetricsEventRecordingState" expires_after="2021-04-04">
+    enum="StructuredMetricsEventRecordingState" expires_after="2021-06-06">
   <owner>tby@chromium.org</owner>
   <owner>rkaplow@chromium.org</owner>
   <owner>asvitkine@chromium.org</owner>
@@ -524,7 +524,7 @@
 </histogram>
 
 <histogram name="UMA.StructuredMetrics.KeyValidationState"
-    enum="StructuredMetricsKeyValidationState" expires_after="2021-04-04">
+    enum="StructuredMetricsKeyValidationState" expires_after="2021-06-06">
   <owner>tby@chromium.org</owner>
   <owner>rkaplow@chromium.org</owner>
   <owner>asvitkine@chromium.org</owner>
@@ -536,7 +536,7 @@
 </histogram>
 
 <histogram name="UMA.StructuredMetrics.NumEventsInUpload" units="count"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>tby@chromium.org</owner>
   <owner>rkaplow@chromium.org</owner>
   <owner>asvitkine@chromium.org</owner>
@@ -547,7 +547,7 @@
 </histogram>
 
 <histogram name="UMA.StructuredMetrics.PrefReadError"
-    enum="PrefServiceReadError" expires_after="2021-04-04">
+    enum="PrefServiceReadError" expires_after="2021-06-06">
   <owner>tby@chromium.org</owner>
   <owner>rkaplow@chromium.org</owner>
   <owner>asvitkine@chromium.org</owner>
@@ -571,7 +571,7 @@
 </histogram>
 
 <histogram name="UMA.TruncatedEvents.UserAction" units="events"
-    expires_after="2021-05-30">
+    expires_after="2021-06-06">
   <owner>rkaplow@chromium.org</owner>
   <owner>src/base/metrics/OWNERS</owner>
   <summary>
diff --git a/tools/metrics/histograms/histograms_xml/v8/histograms.xml b/tools/metrics/histograms/histograms_xml/v8/histograms.xml
index a666c16..fd77b72a 100644
--- a/tools/metrics/histograms/histograms_xml/v8/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/v8/histograms.xml
@@ -137,7 +137,7 @@
 </histogram>
 
 <histogram name="V8.CompileScript.CacheBehaviour" enum="V8CacheBehaviour"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>leszeks@chromium.org</owner>
   <owner>v8-runtime@google.com</owner>
   <summary>
@@ -148,7 +148,7 @@
 </histogram>
 
 <histogram name="V8.CompileScriptMicroSeconds" units="microseconds"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>leszeks@chromium.org</owner>
   <owner>v8-runtime@google.com</owner>
   <summary>
@@ -163,7 +163,7 @@
 </histogram>
 
 <histogram name="V8.CompileScriptMicroSeconds.BackgroundThread"
-    units="microseconds" expires_after="2021-04-04">
+    units="microseconds" expires_after="2021-06-06">
   <owner>leszeks@chromium.org</owner>
   <owner>rmcilroy@chromium.org</owner>
   <owner>v8-runtime@google.com</owner>
@@ -180,7 +180,7 @@
 </histogram>
 
 <histogram name="V8.CompileScriptMicroSeconds.ConsumeCache"
-    units="microseconds" expires_after="2021-04-04">
+    units="microseconds" expires_after="2021-06-06">
   <owner>leszeks@chromium.org</owner>
   <owner>v8-runtime@google.com</owner>
   <summary>
@@ -228,7 +228,7 @@
 </histogram>
 
 <histogram name="V8.CompileScriptMicroSeconds.NoCache.CacheTooCold"
-    units="microseconds" expires_after="2021-04-04">
+    units="microseconds" expires_after="2021-06-06">
   <owner>leszeks@chromium.org</owner>
   <owner>v8-runtime@google.com</owner>
   <summary>
@@ -292,7 +292,7 @@
 </histogram>
 
 <histogram name="V8.CompileScriptMicroSeconds.ProduceCache"
-    units="microseconds" expires_after="2021-04-04">
+    units="microseconds" expires_after="2021-06-06">
   <owner>leszeks@chromium.org</owner>
   <owner>v8-runtime@google.com</owner>
   <summary>
@@ -308,7 +308,7 @@
 </histogram>
 
 <histogram name="V8.CompileScriptMicroSeconds.StreamingFinalization"
-    units="microseconds" expires_after="2021-04-04">
+    units="microseconds" expires_after="2021-06-06">
   <owner>leszeks@chromium.org</owner>
   <owner>v8-runtime@google.com</owner>
   <summary>
@@ -362,7 +362,7 @@
   </summary>
 </histogram>
 
-<histogram name="V8.GCBackgroundMarking" units="ms" expires_after="2021-04-01">
+<histogram name="V8.GCBackgroundMarking" units="ms" expires_after="2021-06-06">
   <owner>ulan@chromium.org</owner>
   <owner>v8-memory-sheriffs@google.com</owner>
   <summary>
@@ -390,7 +390,7 @@
   </summary>
 </histogram>
 
-<histogram name="V8.GCCompactor" units="ms" expires_after="2021-04-01">
+<histogram name="V8.GCCompactor" units="ms" expires_after="2021-06-06">
   <owner>hpayer@chromium.org</owner>
   <owner>v8-memory-sheriffs@google.com</owner>
   <summary>Time spent in mark-sweep phase of GC.</summary>
@@ -406,7 +406,7 @@
 </histogram>
 
 <histogram name="V8.GCCompactorForeground" units="ms"
-    expires_after="2021-04-01">
+    expires_after="2021-06-06">
   <owner>hpayer@chromium.org</owner>
   <owner>v8-memory-sheriffs@google.com</owner>
   <summary>
@@ -414,7 +414,7 @@
   </summary>
 </histogram>
 
-<histogram name="V8.GCFinalizeMC" units="ms" expires_after="2021-04-01">
+<histogram name="V8.GCFinalizeMC" units="ms" expires_after="2021-06-06">
   <owner>ulan@chromium.org</owner>
   <owner>hpayer@chromium.org</owner>
   <owner>v8-memory-sheriffs@google.com</owner>
@@ -455,7 +455,7 @@
   </summary>
 </histogram>
 
-<histogram name="V8.GCFinalizeMC.Finish" units="ms" expires_after="2021-04-01">
+<histogram name="V8.GCFinalizeMC.Finish" units="ms" expires_after="2021-06-06">
   <owner>ulan@chromium.org</owner>
   <owner>hpayer@chromium.org</owner>
   <owner>v8-memory-sheriffs@google.com</owner>
@@ -518,7 +518,7 @@
 </histogram>
 
 <histogram name="V8.GCFinalizeMCReduceMemory" units="ms"
-    expires_after="2021-04-01">
+    expires_after="2021-06-06">
   <owner>ulan@chromium.org</owner>
   <owner>hpayer@chromium.org</owner>
   <owner>v8-memory-sheriffs@google.com</owner>
@@ -550,7 +550,7 @@
   </summary>
 </histogram>
 
-<histogram name="V8.GCIncrementalMarking" units="ms" expires_after="2021-04-01">
+<histogram name="V8.GCIncrementalMarking" units="ms" expires_after="2021-06-06">
   <owner>hpayer@chromium.org</owner>
   <owner>v8-memory-sheriffs@google.com</owner>
   <summary>Time spent doing incremental marking steps during GC.</summary>
@@ -564,21 +564,21 @@
 </histogram>
 
 <histogram name="V8.GCIncrementalMarkingReason" enum="GarbageCollectionReason"
-    expires_after="2021-04-01">
+    expires_after="2021-06-06">
   <owner>ulan@chromium.org</owner>
   <owner>v8-memory-sheriffs@google.com</owner>
   <summary>Reason an incremental marking was started in V8.</summary>
 </histogram>
 
 <histogram name="V8.GCIncrementalMarkingStart" units="ms"
-    expires_after="2021-04-01">
+    expires_after="2021-06-06">
   <owner>hpayer@chromium.org</owner>
   <owner>v8-memory-sheriffs@google.com</owner>
   <summary>Time spent in starting incremental marking.</summary>
 </histogram>
 
 <histogram name="V8.GCIncrementalMarkingSum" units="ms"
-    expires_after="2021-04-01">
+    expires_after="2021-06-06">
   <owner>ulan@chromium.org</owner>
   <owner>v8-memory-sheriffs@google.com</owner>
   <summary>
@@ -610,13 +610,13 @@
 </histogram>
 
 <histogram name="V8.GCMarkCompactReason" enum="GarbageCollectionReason"
-    expires_after="2021-04-01">
+    expires_after="2021-06-06">
   <owner>ulan@chromium.org</owner>
   <owner>v8-memory-sheriffs@google.com</owner>
   <summary>Reason a mark-compact garbage collection was started in V8.</summary>
 </histogram>
 
-<histogram name="V8.GCMarkingSum" units="ms" expires_after="2021-04-01">
+<histogram name="V8.GCMarkingSum" units="ms" expires_after="2021-06-06">
   <owner>mlippautz@chromium.org</owner>
   <owner>v8-memory-sheriffs@google.com</owner>
   <summary>
@@ -626,14 +626,14 @@
   </summary>
 </histogram>
 
-<histogram name="V8.GCScavenger" units="ms" expires_after="2021-04-01">
+<histogram name="V8.GCScavenger" units="ms" expires_after="2021-06-06">
   <owner>hpayer@chromium.org</owner>
   <owner>v8-memory-sheriffs@google.com</owner>
   <summary>Time spent in scavenging phase of GC.</summary>
 </histogram>
 
 <histogram name="V8.GCScavenger.ScavengeMain" units="ms"
-    expires_after="2021-04-01">
+    expires_after="2021-06-06">
   <owner>mlippautz@chromium.org</owner>
   <owner>v8-memory-sheriffs@google.com</owner>
   <summary>
@@ -666,7 +666,7 @@
 </histogram>
 
 <histogram name="V8.GCScavengerForeground" units="ms"
-    expires_after="2021-04-01">
+    expires_after="2021-06-06">
   <owner>hpayer@chromium.org</owner>
   <owner>v8-memory-sheriffs@google.com</owner>
   <summary>
@@ -781,7 +781,7 @@
 </histogram>
 
 <histogram name="V8.RegExpBacktracks" units="backtracks"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>jgruber@chromium.org</owner>
   <owner>mvstanton@chromium.org</owner>
   <summary>
diff --git a/tools/metrics/histograms/histograms_xml/web_apk/histograms.xml b/tools/metrics/histograms/histograms_xml/web_apk/histograms.xml
index 8c5bbf7..71a99b1 100644
--- a/tools/metrics/histograms/histograms_xml/web_apk/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/web_apk/histograms.xml
@@ -179,7 +179,7 @@
 </histogram>
 
 <histogram base="true" name="WebApk.ShellApkVersion2" units="units"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>hartmanng@chromium.org</owner>
   <owner>
     src/chrome/android/java/src/org/chromium/chrome/browser/webapps/OWNERS
@@ -250,7 +250,7 @@
 </histogram>
 
 <histogram name="WebApk.Update.GooglePlayUpdateResult"
-    enum="WebApkGooglePlayInstallResult" expires_after="2021-04-04">
+    enum="WebApkGooglePlayInstallResult" expires_after="2021-06-06">
   <owner>hartmanng@chromium.org</owner>
   <owner>
     src/chrome/android/java/src/org/chromium/chrome/browser/webapps/OWNERS
diff --git a/tools/metrics/histograms/histograms_xml/web_audio/histograms.xml b/tools/metrics/histograms/histograms_xml/web_audio/histograms.xml
index 8b711bf0..44bb7c0 100644
--- a/tools/metrics/histograms/histograms_xml/web_audio/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/web_audio/histograms.xml
@@ -118,7 +118,7 @@
 </histogram>
 
 <histogram name="WebAudio.AudioDestination.HardwareBufferSize" units="units"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>rtoy@chromium.org</owner>
   <owner>hongchan@chromium.org</owner>
   <summary>
diff --git a/tools/metrics/histograms/histograms_xml/web_core/histograms.xml b/tools/metrics/histograms/histograms_xml/web_core/histograms.xml
index ad0af26..88bba73 100644
--- a/tools/metrics/histograms/histograms_xml/web_core/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/web_core/histograms.xml
@@ -22,7 +22,7 @@
 <histograms>
 
 <histogram name="WebCore.DistillabilityUs" units="microseconds"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>wychen@chromium.org</owner>
   <owner>gilmanmh@google.com</owner>
   <summary>
@@ -768,35 +768,35 @@
 </histogram>
 
 <histogram name="WebCore.Scripts.Async.NotStreamingReason"
-    enum="NotStreamingReason" expires_after="2021-04-04">
+    enum="NotStreamingReason" expires_after="2021-06-06">
   <owner>leszeks@chromium.org</owner>
   <owner>v8-runtime@google.com</owner>
   <summary>Reason for not streaming an async script.</summary>
 </histogram>
 
 <histogram name="WebCore.Scripts.Async.StartedStreaming" enum="BooleanStreamed"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>leszeks@chromium.org</owner>
   <owner>v8-runtime@google.com</owner>
   <summary>Whether an async script was streamed or not.</summary>
 </histogram>
 
 <histogram name="WebCore.Scripts.Deferred.NotStreamingReason"
-    enum="NotStreamingReason" expires_after="2021-04-04">
+    enum="NotStreamingReason" expires_after="2021-06-06">
   <owner>leszeks@chromium.org</owner>
   <owner>v8-runtime@google.com</owner>
   <summary>Reason for not streaming a deferred script.</summary>
 </histogram>
 
 <histogram name="WebCore.Scripts.Deferred.StartedStreaming"
-    enum="BooleanStreamed" expires_after="2021-04-04">
+    enum="BooleanStreamed" expires_after="2021-06-06">
   <owner>leszeks@chromium.org</owner>
   <owner>v8-runtime@google.com</owner>
   <summary>Whether a deferred script was streamed or not.</summary>
 </histogram>
 
 <histogram name="WebCore.Scripts.Other.NotStreamingReason"
-    enum="NotStreamingReason" expires_after="2021-04-04">
+    enum="NotStreamingReason" expires_after="2021-06-06">
   <owner>leszeks@chromium.org</owner>
   <owner>v8-runtime@google.com</owner>
   <summary>
@@ -816,14 +816,14 @@
 </histogram>
 
 <histogram name="WebCore.Scripts.ParsingBlocking.NotStreamingReason"
-    enum="NotStreamingReason" expires_after="2021-04-04">
+    enum="NotStreamingReason" expires_after="2021-06-06">
   <owner>leszeks@chromium.org</owner>
   <owner>v8-runtime@google.com</owner>
   <summary>Reason for not streaming a parsing blocking script.</summary>
 </histogram>
 
 <histogram name="WebCore.Scripts.ParsingBlocking.StartedStreaming"
-    enum="BooleanStreamed" expires_after="2021-04-04">
+    enum="BooleanStreamed" expires_after="2021-06-06">
   <owner>leszeks@chromium.org</owner>
   <owner>v8-runtime@google.com</owner>
   <summary>Whether a parsing blocking script was streamed or not.</summary>
diff --git a/tools/metrics/histograms/histograms_xml/web_rtc/histograms.xml b/tools/metrics/histograms/histograms_xml/web_rtc/histograms.xml
index 795b46ea..1e8855d 100644
--- a/tools/metrics/histograms/histograms_xml/web_rtc/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/web_rtc/histograms.xml
@@ -1113,7 +1113,7 @@
 </histogram>
 
 <histogram name="WebRTC.PeerConnection.ConnectionState"
-    enum="IceConnectionStates" expires_after="2021-04-04">
+    enum="IceConnectionStates" expires_after="2021-06-06">
   <owner>qingsi@google.com</owner>
   <owner>jeroendb@google.com</owner>
   <summary>
@@ -1328,7 +1328,7 @@
 </histogram>
 
 <histogram name="WebRTC.PeerConnection.SdpFormatReceived"
-    enum="PeerConnectionSdpFormatReceived" expires_after="2021-04-04">
+    enum="PeerConnectionSdpFormatReceived" expires_after="2021-06-06">
   <owner>steveanton@chromium.org</owner>
   <owner>hta@chromium.org</owner>
   <owner>webrtc-dev@chromium.org</owner>
@@ -1345,7 +1345,7 @@
 </histogram>
 
 <histogram name="WebRTC.PeerConnection.SdpFormatReceivedAnswer"
-    enum="PeerConnectionSdpFormatReceived" expires_after="2021-04-04">
+    enum="PeerConnectionSdpFormatReceived" expires_after="2021-06-06">
   <owner>steveanton@chromium.org</owner>
   <owner>hta@chromium.org</owner>
   <owner>webrtc-dev@chromium.org</owner>
diff --git a/tools/perf/core/results_processor/compute_metrics.py b/tools/perf/core/results_processor/compute_metrics.py
index c35ae55..3cab84d2 100644
--- a/tools/perf/core/results_processor/compute_metrics.py
+++ b/tools/perf/core/results_processor/compute_metrics.py
@@ -108,10 +108,9 @@
     return
 
   start = time.time()
-  for metric in metrics:
-    histograms = trace_processor.RunMetric(
-        trace_processor_path, artifacts[CONCATENATED_PROTO_NAME]['filePath'],
-        metric, fetch_power_profile)
-    test_result['_histograms'].Merge(histograms)
+  histograms = trace_processor.RunMetrics(
+      trace_processor_path, artifacts[CONCATENATED_PROTO_NAME]['filePath'],
+      metrics, fetch_power_profile)
+  test_result['_histograms'].Merge(histograms)
   logging.info('%s: Computing TBMv3 metrics took %.3f seconds.' % (
       test_result['testPath'], time.time() - start))
diff --git a/tools/perf/core/results_processor/compute_metrics_unittest.py b/tools/perf/core/results_processor/compute_metrics_unittest.py
index 52c0774..0fb3463 100644
--- a/tools/perf/core/results_processor/compute_metrics_unittest.py
+++ b/tools/perf/core/results_processor/compute_metrics_unittest.py
@@ -18,7 +18,7 @@
 
 RUN_METRICS_METHOD = 'tracing.metrics.metric_runner.RunMetricOnSingleTrace'
 GETSIZE_METHOD = 'os.path.getsize'
-TRACE_PROCESSOR_METRIC_METHOD = 'core.tbmv3.trace_processor.RunMetric'
+TRACE_PROCESSOR_METRIC_METHOD = 'core.tbmv3.trace_processor.RunMetrics'
 
 
 class ComputeMetricsTest(unittest.TestCase):
diff --git a/tools/perf/core/results_processor/processor_test.py b/tools/perf/core/results_processor/processor_test.py
index 235be15a..d6bf253d 100644
--- a/tools/perf/core/results_processor/processor_test.py
+++ b/tools/perf/core/results_processor/processor_test.py
@@ -813,3 +813,44 @@
     self.assertEqual(hist1.unit, SAMPLE_HISTOGRAM_UNIT)
     hist2 = out_histograms.GetHistogramNamed('dummy::simple_field')
     self.assertEqual(hist2.unit, 'count_smallerIsBetter')
+
+  def testMultipleTBMv3Metrics(self):
+    self.SerializeIntermediateResults(
+        testing.TestResult(
+            'benchmark/story',
+            output_artifacts=[
+                self.CreateProtoTraceArtifact(),
+                self.CreateDiagnosticsArtifact(
+                    benchmarks=['benchmark'],
+                    osNames=['linux'],
+                    documentationUrls=[['documentation', 'url']])
+            ],
+            tags=['tbmv3:dummy_metric', 'tbmv3:test_chrome_metric'],
+            start_time='2009-02-13T23:31:30.987000Z',
+        ),
+    )
+
+    processor.main([
+        '--output-format', 'histograms',
+        '--output-dir', self.output_dir,
+        '--intermediate-dir', self.intermediate_dir,
+        '--results-label', 'label',
+        '--experimental-tbmv3-metrics',
+    ])
+
+    with open(os.path.join(
+        self.output_dir, histograms_output.OUTPUT_FILENAME)) as f:
+      results = json.load(f)
+
+    out_histograms = histogram_set.HistogramSet()
+    out_histograms.ImportDicts(results)
+
+    # We use two metrics for testing here. The dummy_metric is defined in
+    # tools/perf/core/tbmv3/metrics/dummy_metric_*.
+    # The test_chrome_metric is built into trace_processor, see source in
+    # third_party/perfetto/src/trace_processor/metrics/chrome/test_chrome_metric.sql.
+    hist1 = out_histograms.GetHistogramNamed('dummy::simple_field')
+    self.assertEqual(hist1.sample_values, [42])
+
+    hist2 = out_histograms.GetHistogramNamed('test_chrome::test_value')
+    self.assertEqual(hist2.sample_values, [1])
diff --git a/tools/perf/core/tbmv3/trace_processor.py b/tools/perf/core/tbmv3/trace_processor.py
index 19808bc..81dde1a 100644
--- a/tools/perf/core/tbmv3/trace_processor.py
+++ b/tools/perf/core/tbmv3/trace_processor.py
@@ -188,28 +188,30 @@
     return _PluckField(field_value, path_tail)
 
 
-def RunMetric(trace_processor_path, trace_file, metric_name,
-              fetch_power_profile=False):
-  """Run a TBMv3 metric using trace processor.
+def RunMetrics(trace_processor_path, trace_file, metric_names,
+               fetch_power_profile=False):
+  """Run TBMv3 metrics using trace processor.
 
   Args:
     trace_processor_path: path to the trace_processor executable.
     trace_file: path to the trace file.
-    metric_name: the metric name (the corresponding files must exist in
+    metric_names: a list of metric names (the corresponding files must exist in
         tbmv3/metrics directory).
 
   Returns:
     A HistogramSet with metric results.
   """
   trace_processor_path = _EnsureTraceProcessor(trace_processor_path)
-  metric_files = _CreateMetricFiles(metric_name)
-  if metric_files.internal_metric:
-    metric_name_arg = metric_name
-  else:
-    metric_name_arg = metric_files.sql
+  metric_name_args = []
+  for metric_name in metric_names:
+    metric_files = _CreateMetricFiles(metric_name)
+    if metric_files.internal_metric:
+      metric_name_args.append(metric_name)
+    else:
+      metric_name_args.append(metric_files.sql)
   command_args = [
       trace_processor_path,
-      '--run-metrics', metric_name_arg,
+      '--run-metrics', ','.join(metric_name_args),
       '--metrics-output', 'json',
       trace_file,
   ]
@@ -222,30 +224,38 @@
 
   histograms = histogram_set.HistogramSet()
   root_annotations = measurements.get('__annotations', {})
-  full_metric_name = 'perfetto.protos.' + metric_name
-  annotations = root_annotations.get(full_metric_name, None)
-  metric_proto = measurements.get(full_metric_name, None)
-  if metric_proto is None:
-    logging.warn("No metric found in the output.")
-    return histograms
-  elif annotations is None:
-    logging.info("Metric has no field with unit. Histograms will be empty.")
-    return histograms
-
-  for field in _LeafFieldAnnotations(annotations):
-    unit = field.field_options.get('unit', None)
-    if unit is None:
-      logging.debug('Skipping field %s to histograms because it has no unit',
-          field.name)
+  for metric_name in metric_names:
+    full_metric_name = 'perfetto.protos.' + metric_name
+    annotations = root_annotations.get(full_metric_name, None)
+    metric_proto = measurements.get(full_metric_name, None)
+    if metric_proto is None:
+      logging.warn("Metric not found in the output: %s", metric_name)
       continue
-    histogram_name = ':'.join([field.name for field in field.path_from_root])
-    samples = _PluckField(metric_proto, field.path_from_root)
-    scoped_histogram_name = _ScopedHistogramName(metric_name, histogram_name)
-    histograms.CreateHistogram(scoped_histogram_name, unit, samples)
+    elif annotations is None:
+      logging.info("Skipping metric %s because it has no field with unit.",
+                   metric_name)
+      continue
+
+    for field in _LeafFieldAnnotations(annotations):
+      unit = field.field_options.get('unit', None)
+      if unit is None:
+        logging.debug('Skipping field %s to histograms because it has no unit',
+            field.name)
+        continue
+      histogram_name = ':'.join([field.name for field in field.path_from_root])
+      samples = _PluckField(metric_proto, field.path_from_root)
+      scoped_histogram_name = _ScopedHistogramName(metric_name, histogram_name)
+      histograms.CreateHistogram(scoped_histogram_name, unit, samples)
 
   return histograms
 
 
+def RunMetric(trace_processor_path, trace_file, metric_name,
+              fetch_power_profile=False):
+  return RunMetrics(trace_processor_path, trace_file, [metric_name],
+                    fetch_power_profile)
+
+
 def ConvertProtoTraceToJson(trace_processor_path, proto_file, json_path):
   """Convert proto trace to json using trace processor.
 
diff --git a/tools/perf/expectations.config b/tools/perf/expectations.config
index a88dda8..714bc61 100644
--- a/tools/perf/expectations.config
+++ b/tools/perf/expectations.config
@@ -290,6 +290,7 @@
 crbug.com/1044682 [ desktop ] system_health.common_desktop/browse:tools:gmail-compose:2020 [ Skip ]
 crbug.com/1150432 [ linux ] system_health.common_desktop/long_running:tools:gmail-background [ Skip ]
 crbug.com/1154753 [ linux ] system_health.common_desktop/browse:media:imgur [ Skip ]
+crbug.com/1156571 [ mac-10.12 ] system_health.common_desktop/browse:news:nytimes:2020 [ Skip ]
 
 # Benchmark: system_health.common_mobile
 crbug.com/1007355 [ android-go android-webview ] system_health.common_mobile/load:media:imgur:2018 [ Skip ]
@@ -377,6 +378,7 @@
 crbug.com/1147969 [ fuchsia ] system_health.memory_desktop/multitab:misc:typical24 [ Skip ]
 crbug.com/1147969 [ fuchsia ] system_health.memory_desktop/multitab:misc:typical24:2018 [ Skip ]
 crbug.com/1154753 [ linux ] system_health.memory_desktop/browse:media:imgur [ Skip ]
+crbug.com/1156571 [ mac-10.12 ] system_health.memory_desktop/browse:news:nytimes:2020 [ Skip ]
 
 # Memory dumps don't work at the moment for Google Earth, see the issue.
 crbug.com/1057035 system_health.memory_desktop/browse:tools:earth:2020 [ Skip ]
diff --git a/ui/accessibility/extensions/chromevoxclassic/BUILD.gn b/ui/accessibility/extensions/chromevoxclassic/BUILD.gn
index e2f5a1e..acc5ac8 100644
--- a/ui/accessibility/extensions/chromevoxclassic/BUILD.gn
+++ b/ui/accessibility/extensions/chromevoxclassic/BUILD.gn
@@ -535,6 +535,7 @@
     "//chrome/test:test_support_ui",
     "//chrome/test/data:web_ui_test_bindings",
     "//chromeos/constants:constants",
+    "//components/webapps",
     "//content/test:test_support",
     "//extensions/browser:test_support",
     "//testing/gmock",
diff --git a/ui/accessibility/platform/inspect/tree_formatter.h b/ui/accessibility/platform/inspect/tree_formatter.h
index 41c7b9f..7b279016 100644
--- a/ui/accessibility/platform/inspect/tree_formatter.h
+++ b/ui/accessibility/platform/inspect/tree_formatter.h
@@ -29,10 +29,6 @@
 
   virtual ~AXTreeFormatter() = default;
 
-  // Appends default filters of the formatter.
-  virtual void AddDefaultFilters(
-      std::vector<AXPropertyFilter>* property_filters) = 0;
-
   // Returns true if the given text matches |allow| property filters, or false
   // if matches |deny| filter. Returns default value if doesn't match any
   // property filters.
@@ -60,10 +56,21 @@
   // Dumps accessibility tree.
   virtual std::string FormatTree(const base::Value& tree_node) const = 0;
 
+  // Propery filter predefined sets.
+  enum PropertyFilterSet {
+    // Empty set.
+    kFiltersEmptySet,
+
+    // Default filters set, defined by a formatter.
+    kFiltersDefaultSet,
+  };
+
   // Set regular expression filters that apply to each property of every node
-  // before it's output.
+  // before it's output. If a default filter set is given, then filters defined
+  // by the set are preappended to the given property filters.
   virtual void SetPropertyFilters(
-      const std::vector<AXPropertyFilter>& property_filters) = 0;
+      const std::vector<AXPropertyFilter>& property_filters,
+      PropertyFilterSet default_filters_set = kFiltersEmptySet) = 0;
 
   // Set regular expression filters that apply to every node before output.
   virtual void SetNodeFilters(
diff --git a/ui/base/l10n/l10n_util.cc b/ui/base/l10n/l10n_util.cc
index 629a3db..ab254d9 100644
--- a/ui/base/l10n/l10n_util.cc
+++ b/ui/base/l10n/l10n_util.cc
@@ -61,7 +61,6 @@
     "az",              // Azerbaijani
     "be",              // Belarusian
     "bg",              // Bulgarian
-    "bh",              // Bihari
     "bn",              // Bengali
     "br",              // Breton
     "bs",              // Bosnian
diff --git a/ui/file_manager/file_manager/foreground/js/ui/banners.js b/ui/file_manager/file_manager/foreground/js/ui/banners.js
index 5dd3d1b..6950681 100644
--- a/ui/file_manager/file_manager/foreground/js/ui/banners.js
+++ b/ui/file_manager/file_manager/foreground/js/ui/banners.js
@@ -21,12 +21,27 @@
 const DOWNLOADS_WARNING_DISMISSED_KEY = 'downloadsSpaceWarningDismissed';
 
 /**
+ * Key in localStorage to store the number of times the holding space welcome
+ * banner has shown. Note that if the user explicitly dismisses the banner then
+ * the value at this key will be `HOLDING_SPACE_WELCOME_BANNER_COUNTER_LIMIT`.
+ * @type {string}
+ */
+const HOLDING_SPACE_WELCOME_BANNER_COUNTER_KEY =
+    'holdingSpaceWelcomeBannerCounter';
+
+/**
  * Key in localStorage to store the number of sessions the Offline Info banner
  * message has shown in.
  */
 const OFFLINE_INFO_BANNER_COUNTER_KEY = 'driveOfflineInfoBannerCounter';
 
 /**
+ * Maximum times the holding space welcome banner could have shown.
+ * @type {number}
+ */
+const HOLDING_SPACE_WELCOME_BANNER_COUNTER_LIMIT = 3;
+
+/**
  * Maximum times Drive Welcome banner could have shown.
  */
 const WELCOME_HEADER_COUNTER_LIMIT = 25;
@@ -99,6 +114,11 @@
         'drive-connection-changed', this.onDriveConnectionChanged_.bind(this));
 
     chrome.storage.onChanged.addListener(this.onStorageChange_.bind(this));
+
+    /** @private {number} */
+    this.holdingSpaceWelcomeBannerCounter_ =
+        HOLDING_SPACE_WELCOME_BANNER_COUNTER_LIMIT;
+
     this.welcomeHeaderCounter_ = WELCOME_HEADER_COUNTER_LIMIT;
     this.warningDismissedCounter_ = 0;
     this.downloadsWarningDismissedTime_ = 0;
@@ -118,6 +138,7 @@
     this.ready_ = new Promise((resolve, reject) => {
       chrome.storage.local.get(
           [
+            HOLDING_SPACE_WELCOME_BANNER_COUNTER_KEY,
             WELCOME_HEADER_COUNTER_KEY,
             DRIVE_WARNING_DISMISSED_KEY,
             DOWNLOADS_WARNING_DISMISSED_KEY,
@@ -130,6 +151,10 @@
                   chrome.runtime.lastError.message);
               return;
             }
+            this.holdingSpaceWelcomeBannerCounter_ =
+                parseInt(
+                    values[HOLDING_SPACE_WELCOME_BANNER_COUNTER_KEY], 10) ||
+                0;
             this.welcomeHeaderCounter_ =
                 parseInt(values[WELCOME_HEADER_COUNTER_KEY], 10) || 0;
             this.warningDismissedCounter_ =
@@ -142,6 +167,7 @@
             // If it's in test, override the counter to show the header by
             // force.
             if (chrome.test) {
+              this.holdingSpaceWelcomeBannerCounter_ = 0;
               this.welcomeHeaderCounter_ = 0;
               this.warningDismissedCounter_ = 0;
               this.offlineInfoBannerCounter_ = 0;
@@ -182,6 +208,17 @@
   }
 
   /**
+   * @param {number} value How many times the holding space welcome banner
+   * has shown.
+   * @private
+   */
+  setHoldingSpaceWelcomeBannerCounter_(value) {
+    const values = {};
+    values[HOLDING_SPACE_WELCOME_BANNER_COUNTER_KEY] = value;
+    chrome.storage.local.set(values);
+  }
+
+  /**
    * @param {number} value How many times the Drive Welcome header banner
    * has shown.
    * @private
@@ -220,6 +257,11 @@
    * @private
    */
   onStorageChange_(changes, areaName) {
+    if (areaName == 'local' &&
+        HOLDING_SPACE_WELCOME_BANNER_COUNTER_KEY in changes) {
+      this.holdingSpaceWelcomeBannerCounter_ =
+          changes[HOLDING_SPACE_WELCOME_BANNER_COUNTER_KEY].newValue;
+    }
     if (areaName == 'local' && WELCOME_HEADER_COUNTER_KEY in changes) {
       this.welcomeHeaderCounter_ = changes[WELCOME_HEADER_COUNTER_KEY].newValue;
     }
@@ -506,6 +548,10 @@
   closeHoldingSpaceWelcomeBanner_() {
     assert(util.isHoldingSpaceEnabled());
     this.cleanupHoldingSpaceWelcomeBanner_();
+
+    // Stop showing the welcome banner.
+    this.setHoldingSpaceWelcomeBannerCounter_(
+        HOLDING_SPACE_WELCOME_BANNER_COUNTER_LIMIT);
   }
 
   /**
@@ -562,10 +608,32 @@
    * @private
    */
   async maybeShowHoldingSpaceWelcomeBanner_() {
-    if (util.isHoldingSpaceEnabled()) {
-      await this.ready_;
-      this.prepareAndShowHoldingSpaceWelcomeBanner_();
+    if (!util.isHoldingSpaceEnabled()) {
+      return;
     }
+
+    await this.ready_;
+
+    // The holding space banner should not be shown after having been shown
+    // enough times to reach the defined limit. Note that if the user explicitly
+    // dismisses the banner the counter will be set to the limit to prevent any
+    // additional showings.
+    if (this.holdingSpaceWelcomeBannerCounter_ >=
+        HOLDING_SPACE_WELCOME_BANNER_COUNTER_LIMIT) {
+      return;
+    }
+
+    // If the holding space banner is already showing, don't increment the count
+    // of how many times it has been shown since this is likely only occurring
+    // due to directory change or some other event in which the banner never
+    // disappeared from the user's view.
+    if (!this.holdingSpaceWelcomeBanner_.hasAttribute('hidden')) {
+      return;
+    }
+
+    this.setHoldingSpaceWelcomeBannerCounter_(
+        this.holdingSpaceWelcomeBannerCounter_ + 1);
+    this.prepareAndShowHoldingSpaceWelcomeBanner_();
   }
 
   /**
diff --git a/ui/file_manager/integration_tests/file_manager/holding_space.js b/ui/file_manager/integration_tests/file_manager/holding_space.js
index ad1a808..8dd5be0 100644
--- a/ui/file_manager/integration_tests/file_manager/holding_space.js
+++ b/ui/file_manager/integration_tests/file_manager/holding_space.js
@@ -34,3 +34,61 @@
   // Check: the holding space welcome banner should be hidden.
   await remoteCall.waitForElement(appId, '.holding-space-welcome[hidden]');
 };
+
+/**
+ * Tests that the holding space welcome banner will not continue to show after
+ * having been explicitly dismissed by the user.
+ */
+testcase.holdingSpaceWelcomeBannerWontShowAfterBeingDismissed = async () => {
+  // Open Files app on Downloads.
+  const appId = await setupAndWaitUntilReady(RootPath.DOWNLOADS);
+
+  // Check: the holding space welcome banner should appear.
+  await remoteCall.waitForElement(
+      appId, '.holding-space-welcome:not([hidden])');
+
+  // Dismiss the holding space welcome banner.
+  await remoteCall.waitAndClickElement(
+      appId, '.holding-space-welcome cr-button.text-button');
+
+  // Check: the holding space welcome banner should be hidden.
+  await remoteCall.waitForElement(appId, '.holding-space-welcome[hidden]');
+
+  // Change to My Files folder.
+  await navigateWithDirectoryTree(appId, '/My files');
+
+  // Check: the holding space welcome banner should still be hidden.
+  await remoteCall.waitForElement(appId, '.holding-space-welcome[hidden]');
+};
+
+/**
+ * Tests that the holding space welcome banner will not continue to show after
+ * having been shown enough times to reach the limit.
+ */
+testcase.holdingSpaceWelcomeBannerWontShowAfterReachingLimit = async () => {
+  // Open Files app on Downloads.
+  const appId = await setupAndWaitUntilReady(RootPath.DOWNLOADS);
+
+  // Check: the holding space welcome banner should appear.
+  await remoteCall.waitForElement(
+      appId, '.holding-space-welcome:not([hidden])');
+
+  // Open two new windows on Downloads.
+  const windowIds = await Promise.all(
+      [openNewWindow(RootPath.DOWNLOADS), openNewWindow(RootPath.DOWNLOADS)]);
+
+  // Check: the holding space welcome banner should appear for both windows.
+  await Promise.all([
+    remoteCall.waitForElement(
+        windowIds[0], '.holding-space-welcome:not([hidden])'),
+    remoteCall.waitForElement(
+        windowIds[1], '.holding-space-welcome:not([hidden])')
+  ]);
+
+  // Open a fourth window on Downloads.
+  windowIds.push(await openNewWindow(RootPath.DOWNLOADS));
+
+  // Check: the holding space welcome banner should be hidden.
+  await remoteCall.waitForElement(
+      windowIds[2], '.holding-space-welcome[hidden]');
+};
diff --git a/ui/ozone/platform/wayland/host/wayland_toplevel_window.cc b/ui/ozone/platform/wayland/host/wayland_toplevel_window.cc
index 309fc6c8f..40325672 100644
--- a/ui/ozone/platform/wayland/host/wayland_toplevel_window.cc
+++ b/ui/ozone/platform/wayland/host/wayland_toplevel_window.cc
@@ -409,6 +409,19 @@
   connection()->window_drag_controller()->StartDragSession();
 }
 
+void WaylandToplevelWindow::SetImmersiveFullscreenStatus(bool status) {
+  if (aura_surface_) {
+    auto mode = status ? ZAURA_SURFACE_FULLSCREEN_MODE_IMMERSIVE
+                       : ZAURA_SURFACE_FULLSCREEN_MODE_PLAIN;
+    zaura_surface_set_fullscreen_mode(aura_surface_.get(), mode);
+  } else {
+    // TODO(https://crbug.com/1113900): Implement AuraShell support for
+    // non-browser windows and replace this if-else clause by a DCHECK.
+    NOTIMPLEMENTED_LOG_ONCE()
+        << "Implement AuraShell support for non-browser windows.";
+  }
+}
+
 void WaylandToplevelWindow::TriggerStateChanges() {
   if (!shell_surface_)
     return;
@@ -473,8 +486,7 @@
   if (connection()->zaura_shell() && !aura_surface_) {
     aura_surface_.reset(zaura_shell_get_aura_surface(
         connection()->zaura_shell()->wl_object(), root_surface()->surface()));
-    zaura_surface_set_fullscreen_mode(aura_surface_.get(),
-                                      ZAURA_SURFACE_FULLSCREEN_MODE_IMMERSIVE);
+    SetImmersiveFullscreenStatus(false);
   }
 }
 
diff --git a/ui/ozone/platform/wayland/host/wayland_toplevel_window.h b/ui/ozone/platform/wayland/host/wayland_toplevel_window.h
index a9eff34..a6f2b82 100644
--- a/ui/ozone/platform/wayland/host/wayland_toplevel_window.h
+++ b/ui/ozone/platform/wayland/host/wayland_toplevel_window.h
@@ -88,6 +88,7 @@
 
   // WaylandExtension:
   void StartWindowDraggingSessionIfNeeded() override;
+  void SetImmersiveFullscreenStatus(bool status) override;
 
   void TriggerStateChanges();
   void SetWindowState(PlatformWindowState state);
diff --git a/ui/platform_window/extensions/wayland_extension.h b/ui/platform_window/extensions/wayland_extension.h
index 36e34420..57109ba 100644
--- a/ui/platform_window/extensions/wayland_extension.h
+++ b/ui/platform_window/extensions/wayland_extension.h
@@ -18,6 +18,12 @@
   // platform drag-and-drop session.
   virtual void StartWindowDraggingSessionIfNeeded() = 0;
 
+  // Signals the underneath platform that browser is entering (or exiting)
+  // 'immersive fullscreen mode'.
+  // Under lacros, it controls for instance interaction with the system shelf
+  // widget, when browser goes in fullscreen.
+  virtual void SetImmersiveFullscreenStatus(bool status) = 0;
+
  protected:
   virtual ~WaylandExtension();
 
diff --git a/url/android/test/java/src/org/chromium/url/JUnitTestGURLs.java b/url/android/test/java/src/org/chromium/url/JUnitTestGURLs.java
index a5ef4e3..b541020 100644
--- a/url/android/test/java/src/org/chromium/url/JUnitTestGURLs.java
+++ b/url/android/test/java/src/org/chromium/url/JUnitTestGURLs.java
@@ -26,6 +26,10 @@
     public static final String EXAMPLE_URL = "https://www.example.com";
     public static final String URL_1 = "https://www.one.com";
     public static final String URL_2 = "https://www.two.com";
+    public static final String SEARCH_URL = "https://www.google.com/search?q=test";
+    public static final String INITIAL_URL = "https://initial.com";
+    public static final String SPECULATED_URL = "https://speculated.com";
+    public static final String NTP_URL = "chrome://newtab";
 
     // Map of URL string to GURL serialization.
     /* package */ static final Map<String, String> sGURLMap;
@@ -40,6 +44,18 @@
         map.put(URL_2,
                 "78,1,true,0,5,0,-1,0,-1,8,11,0,-1,19,1,0,-1,0,-1,"
                         + "false,false,https://www.two.com/");
+        map.put(SEARCH_URL,
+                "94,1,true,0,5,0,-1,0,-1,8,14,0,-1,22,7,30,6,0,-1,"
+                        + "false,false,https://www.google.com/search?q=test");
+        map.put(INITIAL_URL,
+                "78,1,true,0,5,0,-1,0,-1,8,11,0,-1,19,1,0,-1,0,-1,"
+                        + "false,false,https://initial.com/");
+        map.put(SPECULATED_URL,
+                "81,1,true,0,5,0,-1,0,-1,8,14,0,-1,22,1,0,-1,0,-1,"
+                        + "false,false,https://speculated.com/");
+        map.put(NTP_URL,
+                "73,1,true,0,6,0,-1,0,-1,9,6,0,-1,15,1,0,-1,0,-1,"
+                        + "false,false,chrome://newtab/");
         sGURLMap = Collections.unmodifiableMap(map);
     }
 
diff --git a/weblayer/browser/android/javatests/src/org/chromium/weblayer/test/FullscreenCallbackPrivateTest.java b/weblayer/browser/android/javatests/src/org/chromium/weblayer/test/FullscreenCallbackPrivateTest.java
index d9331eff..264c6a7 100644
--- a/weblayer/browser/android/javatests/src/org/chromium/weblayer/test/FullscreenCallbackPrivateTest.java
+++ b/weblayer/browser/android/javatests/src/org/chromium/weblayer/test/FullscreenCallbackPrivateTest.java
@@ -40,9 +40,7 @@
         String url = mActivityTestRule.getTestDataURL("fullscreen.html");
         mActivity = mActivityTestRule.launchShellWithUrl(url);
         Assert.assertNotNull(mActivity);
-        mDelegate = new TestFullscreenCallback();
-        TestThreadUtils.runOnUiThreadBlocking(
-                () -> { mActivity.getTab().setFullscreenCallback(mDelegate); });
+        mDelegate = new TestFullscreenCallback(mActivityTestRule);
     }
 
     private TestWebLayer getTestWebLayer() {
diff --git a/weblayer/browser/android/javatests/src/org/chromium/weblayer/test/FullscreenCallbackTest.java b/weblayer/browser/android/javatests/src/org/chromium/weblayer/test/FullscreenCallbackTest.java
index 1f5c9bc..65eaa1c 100644
--- a/weblayer/browser/android/javatests/src/org/chromium/weblayer/test/FullscreenCallbackTest.java
+++ b/weblayer/browser/android/javatests/src/org/chromium/weblayer/test/FullscreenCallbackTest.java
@@ -12,7 +12,6 @@
 import org.junit.runner.RunWith;
 
 import org.chromium.base.test.util.CallbackHelper;
-import org.chromium.base.test.util.DisabledTest;
 import org.chromium.content_public.browser.test.util.TestThreadUtils;
 import org.chromium.weblayer.Browser;
 import org.chromium.weblayer.BrowserControlsOffsetCallback;
@@ -31,13 +30,11 @@
     private TestFullscreenCallback mDelegate;
 
     // Launch WL and triggers html fullscreen.
-    private void enterFullscren() {
+    private void enterFullscreen() {
         String url = mActivityTestRule.getTestDataURL("fullscreen.html");
         mActivity = mActivityTestRule.launchShellWithUrl(url);
         Assert.assertNotNull(mActivity);
-        mDelegate = new TestFullscreenCallback();
-        TestThreadUtils.runOnUiThreadBlocking(
-                () -> { mActivity.getTab().setFullscreenCallback(mDelegate); });
+        mDelegate = new TestFullscreenCallback(mActivityTestRule);
 
         // First touch enters fullscreen.
         EventUtils.simulateTouchCenterOfView(mActivity.getWindow().getDecorView());
@@ -47,9 +44,8 @@
 
     @Test
     @SmallTest
-    @DisabledTest(message = "crbug.com/1133893")
     public void testFullscreen() {
-        enterFullscren();
+        enterFullscreen();
         // Second touch exits.
         EventUtils.simulateTouchCenterOfView(mActivity.getWindow().getDecorView());
         mDelegate.waitForExitFullscreen();
@@ -59,7 +55,7 @@
     @Test
     @SmallTest
     public void testExitFullscreenWhenDelegateCleared() {
-        enterFullscren();
+        enterFullscreen();
         // Clearing the FullscreenCallback should exit fullscreen.
         TestThreadUtils.runOnUiThreadBlocking(
                 () -> { mActivity.getTab().setFullscreenCallback(null); });
@@ -70,7 +66,7 @@
     @Test
     @SmallTest
     public void testExitFullscreenUsingRunnable() {
-        enterFullscren();
+        enterFullscreen();
         // Running the runnable supplied to the delegate should exit fullscreen.
         TestThreadUtils.runOnUiThreadBlocking(mDelegate.mExitFullscreenRunnable);
         mDelegate.waitForExitFullscreen();
@@ -80,7 +76,7 @@
     @Test
     @SmallTest
     public void testExitFullscreenWhenTabDestroyed() {
-        enterFullscren();
+        enterFullscreen();
         // Destroying the tab should exit fullscreen.
         TestThreadUtils.runOnUiThreadBlocking(
                 () -> { mActivity.getTab().getBrowser().destroyTab(mActivity.getTab()); });
@@ -94,7 +90,7 @@
     @Test
     @SmallTest
     public void testDestroyFragmentWhileFullscreen() {
-        enterFullscren();
+        enterFullscreen();
         TestThreadUtils.runOnUiThreadBlocking(() -> { mActivity.destroyFragment(); });
     }
 
@@ -121,7 +117,7 @@
         // Ensure the fragment is not recreated as otherwise things bounce around more.
         mActivityTestRule.setRetainInstance(true);
         Assert.assertNotNull(mActivity);
-        mDelegate = new TestFullscreenCallback();
+        mDelegate = new TestFullscreenCallback(mActivityTestRule);
         CallbackHelper callbackHelper = new CallbackHelper();
         // The offsets may move around during rotation. Wait for reattachment before installing
         // the BrowserControlsOffsetCallback.
@@ -133,17 +129,10 @@
                                 new BrowserControlsOffsetCallbackImpl(callbackHelper));
                     }
                 });
-        TestThreadUtils.runOnUiThreadBlocking(
-                () -> { mActivity.getTab().setFullscreenCallback(mDelegate); });
-
         EventUtils.simulateTouchCenterOfView(mActivity.getWindow().getDecorView());
         mDelegate.waitForFullscreen();
         Assert.assertEquals(1, mDelegate.mEnterFullscreenCount);
 
-        // There should be a fullscreen element.
-        Assert.assertTrue(mActivityTestRule.executeScriptAndExtractBoolean(
-                "document.fullscreenElement != null"));
-
         // Rotation should trigger the view being totally hidden.
         callbackHelper.waitForFirst();
     }
diff --git a/weblayer/browser/android/javatests/src/org/chromium/weblayer/test/SiteSettingsTest.java b/weblayer/browser/android/javatests/src/org/chromium/weblayer/test/SiteSettingsTest.java
index b7c55114..4f42a67 100644
--- a/weblayer/browser/android/javatests/src/org/chromium/weblayer/test/SiteSettingsTest.java
+++ b/weblayer/browser/android/javatests/src/org/chromium/weblayer/test/SiteSettingsTest.java
@@ -28,7 +28,6 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import org.chromium.base.test.util.DisabledTest;
 import org.chromium.weblayer.SettingsTestUtils;
 import org.chromium.weblayer.SiteSettingsActivity;
 
@@ -87,7 +86,6 @@
     @Test
     @SmallTest
     @MinWebLayerVersion(84)
-    @DisabledTest(message = "TODO(crbug.com/1150676): Fix flakiness.")
     public void testSingleSiteSoundPopupLaunches() throws InterruptedException {
         mSettingsTestRule.launchActivity(SettingsTestUtils.createIntentForSiteSettingsSingleWebsite(
                 mSettingsTestRule.getContext(), PROFILE_NAME, /*isIncognito=*/false, GOOGLE_URL));
@@ -100,7 +98,6 @@
     @Test
     @SmallTest
     @MinWebLayerVersion(84)
-    @DisabledTest(message = "TODO(crbug.com/1150676): Fix flakiness.")
     public void testSingleSiteClearPopupLaunches() throws InterruptedException {
         mSettingsTestRule.launchActivity(SettingsTestUtils.createIntentForSiteSettingsSingleWebsite(
                 mSettingsTestRule.getContext(), PROFILE_NAME, /*isIncognito=*/false, GOOGLE_URL));
@@ -114,7 +111,6 @@
     @Test
     @SmallTest
     @MinWebLayerVersion(84)
-    @DisabledTest(message = "TODO(crbug.com/1128184): Fix flakiness.")
     public void testSingleSiteLocationAccess() throws InterruptedException {
         try {
             Intents.init();
@@ -123,13 +119,13 @@
                             mSettingsTestRule.getContext(), PROFILE_NAME, /*isIncognito=*/false,
                             GOOGLE_URL));
 
-            onView(withText("Location")).perform(click());
-
             Matcher<Intent> settingsMatcher =
                     IntentMatchers.hasAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
             intending(settingsMatcher)
                     .respondWith(new ActivityResult(Activity.RESULT_OK, new Intent()));
 
+            onView(withText("Location")).perform(click());
+
             intended(settingsMatcher);
         } finally {
             Intents.release();
diff --git a/weblayer/browser/android/javatests/src/org/chromium/weblayer/test/SmokeTest.java b/weblayer/browser/android/javatests/src/org/chromium/weblayer/test/SmokeTest.java
index 2c46680..8434771 100644
--- a/weblayer/browser/android/javatests/src/org/chromium/weblayer/test/SmokeTest.java
+++ b/weblayer/browser/android/javatests/src/org/chromium/weblayer/test/SmokeTest.java
@@ -74,9 +74,10 @@
         PhantomReference<InstrumentationActivity> reference;
         {
             InstrumentationActivity activity = mActivityTestRule.launchShellWithUrl("about:blank");
-            TestThreadUtils.runOnUiThreadBlocking(() -> {
-                activity.getTab().setFullscreenCallback(new TestFullscreenCallback());
-            });
+            // This installs a fullscreen callback, and is to ensure setting a fullscreen callback
+            // doesn't leak.
+            TestFullscreenCallback fullscreenCallback =
+                    new TestFullscreenCallback(mActivityTestRule);
             mActivityTestRule.recreateActivity();
             boolean destroyed =
                     TestThreadUtils.runOnUiThreadBlockingNoException(() -> activity.isDestroyed());
diff --git a/weblayer/browser/android/javatests/src/org/chromium/weblayer/test/TestFullscreenCallback.java b/weblayer/browser/android/javatests/src/org/chromium/weblayer/test/TestFullscreenCallback.java
index 9ad36a37..9b91c34b 100644
--- a/weblayer/browser/android/javatests/src/org/chromium/weblayer/test/TestFullscreenCallback.java
+++ b/weblayer/browser/android/javatests/src/org/chromium/weblayer/test/TestFullscreenCallback.java
@@ -5,11 +5,16 @@
 package org.chromium.weblayer.test;
 
 import org.hamcrest.Matchers;
+import org.junit.Assert;
 
+import org.chromium.base.test.util.CallbackHelper;
 import org.chromium.base.test.util.Criteria;
 import org.chromium.base.test.util.CriteriaHelper;
+import org.chromium.content_public.browser.test.util.TestThreadUtils;
 import org.chromium.weblayer.FullscreenCallback;
 
+import java.util.concurrent.TimeoutException;
+
 /**
  * FullscreenCallback implementation for tests.
  */
@@ -17,24 +22,52 @@
     public int mEnterFullscreenCount;
     public int mExitFullscreenCount;
     public Runnable mExitFullscreenRunnable;
+    private int mCallCountToWaitFor;
+    private final InstrumentationActivityTestRule mTestRule;
+    private final CallbackHelper mCallbackHelper;
+
+    public TestFullscreenCallback(InstrumentationActivityTestRule testRule) {
+        mTestRule = testRule;
+        mCallbackHelper = new CallbackHelper();
+        TestThreadUtils.runOnUiThreadBlocking(
+                () -> { mTestRule.getActivity().getTab().setFullscreenCallback(this); });
+    }
 
     @Override
     public void onEnterFullscreen(Runnable exitFullscreenRunner) {
         mEnterFullscreenCount++;
         mExitFullscreenRunnable = exitFullscreenRunner;
+        mCallbackHelper.notifyCalled();
     }
 
     @Override
     public void onExitFullscreen() {
         mExitFullscreenCount++;
+        mCallbackHelper.notifyCalled();
     }
 
     public void waitForFullscreen() {
-        CriteriaHelper.pollUiThread(
-                () -> Criteria.checkThat(mEnterFullscreenCount, Matchers.is(1)));
+        waitForFullscreenImpl(true);
     }
 
     public void waitForExitFullscreen() {
-        CriteriaHelper.pollUiThread(() -> Criteria.checkThat(mExitFullscreenCount, Matchers.is(1)));
+        waitForFullscreenImpl(false);
+    }
+
+    private void waitForFullscreenImpl(boolean isFullscreen) {
+        try {
+            mCallbackHelper.waitForCallback(mCallCountToWaitFor++);
+        } catch (TimeoutException e) {
+            Assert.fail("Timeout waiting for fullscreen change");
+            return;
+        }
+        // Handles tests that destroy tab.
+        if (mTestRule.getActivity().getTab() == null) return;
+        CriteriaHelper.pollInstrumentationThread(
+                () -> { Criteria.checkThat(isPageFullscreen(), Matchers.is(isFullscreen)); });
+    }
+
+    private boolean isPageFullscreen() {
+        return mTestRule.executeScriptAndExtractBoolean("document.fullscreenElement != null");
     }
 }