aom: Remove crc32/ and neon/ directories in av1/encoder/arm

From 1ad5a42843c655af40156a09ae09845e33a60151 Mon Sep 17 00:00:00 2001
From: Salome Thirot <[EMAIL REDACTED]>
Date: Wed, 10 Apr 2024 14:12:49 +0100
Subject: [PATCH] Remove crc32/ and neon/ directories in av1/encoder/arm

The neon/ directory contains code for neon, neon_dotprod, neon_i8mm and
sve extensions, so it doesn't make sense anymore to have it. Move all
files under arm/ directly.

Change-Id: I56b6603d6f86a0053822553055a6efb06764f0c4
---
 av1/av1.cmake                                 | 54 +++++++++----------
 av1/encoder/arm/{neon => }/av1_error_neon.c   |  0
 av1/encoder/arm/{neon => }/av1_error_sve.c    |  0
 .../arm/{neon => }/av1_fwd_txfm2d_neon.c      |  0
 .../arm/{neon => }/av1_highbd_quantize_neon.c |  0
 av1/encoder/arm/{neon => }/av1_k_means_neon.c |  0
 .../{neon => }/av1_temporal_denoiser_neon.c   |  0
 av1/encoder/arm/{neon => }/cnn_neon.c         |  0
 av1/encoder/arm/{neon => }/encodetxb_neon.c   |  0
 av1/encoder/arm/{crc32 => }/hash_arm_crc32.c  |  0
 .../arm/{neon => }/highbd_fwd_txfm_neon.c     |  0
 .../arm/{neon => }/highbd_pickrst_neon.c      |  2 +-
 .../arm/{neon => }/highbd_pickrst_sve.c       |  2 +-
 .../arm/{neon => }/highbd_rdopt_neon.c        |  0
 .../{neon => }/highbd_temporal_filter_neon.c  |  0
 .../arm/{neon => }/hybrid_fwd_txfm_neon.c     |  0
 av1/encoder/arm/{neon => }/ml_neon.c          |  0
 av1/encoder/arm/{neon => }/pickrst_neon.c     |  2 +-
 av1/encoder/arm/{neon => }/pickrst_neon.h     |  6 +--
 av1/encoder/arm/{neon => }/pickrst_sve.c      |  2 +-
 av1/encoder/arm/{neon => }/pickrst_sve.h      |  6 +--
 av1/encoder/arm/{neon => }/quantize_neon.c    |  0
 av1/encoder/arm/{neon => }/rdopt_neon.c       |  0
 .../arm/{neon => }/reconinter_enc_neon.c      |  0
 av1/encoder/arm/{neon => }/shift_neon.h       |  6 +--
 .../arm/{neon => }/temporal_filter_neon.c     |  0
 .../{neon => }/temporal_filter_neon_dotprod.c |  0
 av1/encoder/arm/{neon => }/txfm_neon.h        |  6 +--
 av1/encoder/arm/{neon => }/wedge_utils_neon.c |  0
 av1/encoder/arm/{neon => }/wedge_utils_sve.c  |  0
 30 files changed, 43 insertions(+), 43 deletions(-)
 rename av1/encoder/arm/{neon => }/av1_error_neon.c (100%)
 rename av1/encoder/arm/{neon => }/av1_error_sve.c (100%)
 rename av1/encoder/arm/{neon => }/av1_fwd_txfm2d_neon.c (100%)
 rename av1/encoder/arm/{neon => }/av1_highbd_quantize_neon.c (100%)
 rename av1/encoder/arm/{neon => }/av1_k_means_neon.c (100%)
 rename av1/encoder/arm/{neon => }/av1_temporal_denoiser_neon.c (100%)
 rename av1/encoder/arm/{neon => }/cnn_neon.c (100%)
 rename av1/encoder/arm/{neon => }/encodetxb_neon.c (100%)
 rename av1/encoder/arm/{crc32 => }/hash_arm_crc32.c (100%)
 rename av1/encoder/arm/{neon => }/highbd_fwd_txfm_neon.c (100%)
 rename av1/encoder/arm/{neon => }/highbd_pickrst_neon.c (99%)
 rename av1/encoder/arm/{neon => }/highbd_pickrst_sve.c (99%)
 rename av1/encoder/arm/{neon => }/highbd_rdopt_neon.c (100%)
 rename av1/encoder/arm/{neon => }/highbd_temporal_filter_neon.c (100%)
 rename av1/encoder/arm/{neon => }/hybrid_fwd_txfm_neon.c (100%)
 rename av1/encoder/arm/{neon => }/ml_neon.c (100%)
 rename av1/encoder/arm/{neon => }/pickrst_neon.c (99%)
 rename av1/encoder/arm/{neon => }/pickrst_neon.h (97%)
 rename av1/encoder/arm/{neon => }/pickrst_sve.c (99%)
 rename av1/encoder/arm/{neon => }/pickrst_sve.h (97%)
 rename av1/encoder/arm/{neon => }/quantize_neon.c (100%)
 rename av1/encoder/arm/{neon => }/rdopt_neon.c (100%)
 rename av1/encoder/arm/{neon => }/reconinter_enc_neon.c (100%)
 rename av1/encoder/arm/{neon => }/shift_neon.h (93%)
 rename av1/encoder/arm/{neon => }/temporal_filter_neon.c (100%)
 rename av1/encoder/arm/{neon => }/temporal_filter_neon_dotprod.c (100%)
 rename av1/encoder/arm/{neon => }/txfm_neon.h (86%)
 rename av1/encoder/arm/{neon => }/wedge_utils_neon.c (100%)
 rename av1/encoder/arm/{neon => }/wedge_utils_sve.c (100%)

diff --git a/av1/av1.cmake b/av1/av1.cmake
index f156a1926f..c057856733 100644
--- a/av1/av1.cmake
+++ b/av1/av1.cmake
@@ -354,33 +354,33 @@ list(APPEND AOM_AV1_ENCODER_INTRIN_AVX2
             "${AOM_ROOT}/av1/encoder/x86/ml_avx2.c")
 
 list(APPEND AOM_AV1_ENCODER_INTRIN_NEON
-            "${AOM_ROOT}/av1/encoder/arm/neon/av1_error_neon.c"
-            "${AOM_ROOT}/av1/encoder/arm/neon/av1_fwd_txfm2d_neon.c"
-            "${AOM_ROOT}/av1/encoder/arm/neon/av1_highbd_quantize_neon.c"
-            "${AOM_ROOT}/av1/encoder/arm/neon/av1_k_means_neon.c"
-            "${AOM_ROOT}/av1/encoder/arm/neon/cnn_neon.c"
-            "${AOM_ROOT}/av1/encoder/arm/neon/encodetxb_neon.c"
-            "${AOM_ROOT}/av1/encoder/arm/neon/highbd_fwd_txfm_neon.c"
-            "${AOM_ROOT}/av1/encoder/arm/neon/hybrid_fwd_txfm_neon.c"
-            "${AOM_ROOT}/av1/encoder/arm/neon/ml_neon.c"
-            "${AOM_ROOT}/av1/encoder/arm/neon/pickrst_neon.c"
-            "${AOM_ROOT}/av1/encoder/arm/neon/pickrst_neon.h"
-            "${AOM_ROOT}/av1/encoder/arm/neon/quantize_neon.c"
-            "${AOM_ROOT}/av1/encoder/arm/neon/rdopt_neon.c"
-            "${AOM_ROOT}/av1/encoder/arm/neon/reconinter_enc_neon.c"
-            "${AOM_ROOT}/av1/encoder/arm/neon/temporal_filter_neon.c"
-            "${AOM_ROOT}/av1/encoder/arm/neon/wedge_utils_neon.c")
+            "${AOM_ROOT}/av1/encoder/arm/av1_error_neon.c"
+            "${AOM_ROOT}/av1/encoder/arm/av1_fwd_txfm2d_neon.c"
+            "${AOM_ROOT}/av1/encoder/arm/av1_highbd_quantize_neon.c"
+            "${AOM_ROOT}/av1/encoder/arm/av1_k_means_neon.c"
+            "${AOM_ROOT}/av1/encoder/arm/cnn_neon.c"
+            "${AOM_ROOT}/av1/encoder/arm/encodetxb_neon.c"
+            "${AOM_ROOT}/av1/encoder/arm/highbd_fwd_txfm_neon.c"
+            "${AOM_ROOT}/av1/encoder/arm/hybrid_fwd_txfm_neon.c"
+            "${AOM_ROOT}/av1/encoder/arm/ml_neon.c"
+            "${AOM_ROOT}/av1/encoder/arm/pickrst_neon.c"
+            "${AOM_ROOT}/av1/encoder/arm/pickrst_neon.h"
+            "${AOM_ROOT}/av1/encoder/arm/quantize_neon.c"
+            "${AOM_ROOT}/av1/encoder/arm/rdopt_neon.c"
+            "${AOM_ROOT}/av1/encoder/arm/reconinter_enc_neon.c"
+            "${AOM_ROOT}/av1/encoder/arm/temporal_filter_neon.c"
+            "${AOM_ROOT}/av1/encoder/arm/wedge_utils_neon.c")
 
 list(APPEND AOM_AV1_ENCODER_INTRIN_NEON_DOTPROD
-            "${AOM_ROOT}/av1/encoder/arm/neon/temporal_filter_neon_dotprod.c")
+            "${AOM_ROOT}/av1/encoder/arm/temporal_filter_neon_dotprod.c")
 
 list(APPEND AOM_AV1_ENCODER_INTRIN_SVE
-            "${AOM_ROOT}/av1/encoder/arm/neon/av1_error_sve.c"
-            "${AOM_ROOT}/av1/encoder/arm/neon/pickrst_sve.c"
-            "${AOM_ROOT}/av1/encoder/arm/neon/wedge_utils_sve.c")
+            "${AOM_ROOT}/av1/encoder/arm/av1_error_sve.c"
+            "${AOM_ROOT}/av1/encoder/arm/pickrst_sve.c"
+            "${AOM_ROOT}/av1/encoder/arm/wedge_utils_sve.c")
 
 list(APPEND AOM_AV1_ENCODER_INTRIN_ARM_CRC32
-            "${AOM_ROOT}/av1/encoder/arm/crc32/hash_arm_crc32.c")
+            "${AOM_ROOT}/av1/encoder/arm/hash_arm_crc32.c")
 
 list(APPEND AOM_AV1_COMMON_INTRIN_NEON
             "${AOM_ROOT}/av1/common/arm/av1_inv_txfm_neon.c"
@@ -452,7 +452,7 @@ if(CONFIG_AV1_TEMPORAL_DENOISING)
               "${AOM_ROOT}/av1/encoder/x86/av1_temporal_denoiser_sse2.c")
 
   list(APPEND AOM_AV1_ENCODER_INTRIN_NEON
-              "${AOM_ROOT}/av1/encoder/arm/neon/av1_temporal_denoiser_neon.c")
+              "${AOM_ROOT}/av1/encoder/arm/av1_temporal_denoiser_neon.c")
 endif()
 
 if(CONFIG_AV1_HIGHBITDEPTH)
@@ -499,12 +499,12 @@ if(CONFIG_AV1_HIGHBITDEPTH)
               "${AOM_ROOT}/av1/encoder/x86/highbd_temporal_filter_avx2.c")
 
   list(APPEND AOM_AV1_ENCODER_INTRIN_NEON
-              "${AOM_ROOT}/av1/encoder/arm/neon/highbd_pickrst_neon.c"
-              "${AOM_ROOT}/av1/encoder/arm/neon/highbd_rdopt_neon.c"
-              "${AOM_ROOT}/av1/encoder/arm/neon/highbd_temporal_filter_neon.c")
+              "${AOM_ROOT}/av1/encoder/arm/highbd_pickrst_neon.c"
+              "${AOM_ROOT}/av1/encoder/arm/highbd_rdopt_neon.c"
+              "${AOM_ROOT}/av1/encoder/arm/highbd_temporal_filter_neon.c")
 
   list(APPEND AOM_AV1_ENCODER_INTRIN_SVE
-              "${AOM_ROOT}/av1/encoder/arm/neon/highbd_pickrst_sve.c")
+              "${AOM_ROOT}/av1/encoder/arm/highbd_pickrst_sve.c")
 endif()
 
 if(CONFIG_ACCOUNTING)
@@ -530,7 +530,7 @@ if(CONFIG_REALTIME_ONLY)
                    "${AOM_ROOT}/av1/encoder/x86/cnn_avx2.c")
 
   list(REMOVE_ITEM AOM_AV1_ENCODER_INTRIN_NEON
-                   "${AOM_ROOT}/av1/encoder/arm/neon/cnn_neon.c")
+                   "${AOM_ROOT}/av1/encoder/arm/cnn_neon.c")
 
   list(REMOVE_ITEM AOM_AV1_ENCODER_SOURCES
                    "${AOM_ROOT}/av1/encoder/cnn.c"
diff --git a/av1/encoder/arm/neon/av1_error_neon.c b/av1/encoder/arm/av1_error_neon.c
similarity index 100%
rename from av1/encoder/arm/neon/av1_error_neon.c
rename to av1/encoder/arm/av1_error_neon.c
diff --git a/av1/encoder/arm/neon/av1_error_sve.c b/av1/encoder/arm/av1_error_sve.c
similarity index 100%
rename from av1/encoder/arm/neon/av1_error_sve.c
rename to av1/encoder/arm/av1_error_sve.c
diff --git a/av1/encoder/arm/neon/av1_fwd_txfm2d_neon.c b/av1/encoder/arm/av1_fwd_txfm2d_neon.c
similarity index 100%
rename from av1/encoder/arm/neon/av1_fwd_txfm2d_neon.c
rename to av1/encoder/arm/av1_fwd_txfm2d_neon.c
diff --git a/av1/encoder/arm/neon/av1_highbd_quantize_neon.c b/av1/encoder/arm/av1_highbd_quantize_neon.c
similarity index 100%
rename from av1/encoder/arm/neon/av1_highbd_quantize_neon.c
rename to av1/encoder/arm/av1_highbd_quantize_neon.c
diff --git a/av1/encoder/arm/neon/av1_k_means_neon.c b/av1/encoder/arm/av1_k_means_neon.c
similarity index 100%
rename from av1/encoder/arm/neon/av1_k_means_neon.c
rename to av1/encoder/arm/av1_k_means_neon.c
diff --git a/av1/encoder/arm/neon/av1_temporal_denoiser_neon.c b/av1/encoder/arm/av1_temporal_denoiser_neon.c
similarity index 100%
rename from av1/encoder/arm/neon/av1_temporal_denoiser_neon.c
rename to av1/encoder/arm/av1_temporal_denoiser_neon.c
diff --git a/av1/encoder/arm/neon/cnn_neon.c b/av1/encoder/arm/cnn_neon.c
similarity index 100%
rename from av1/encoder/arm/neon/cnn_neon.c
rename to av1/encoder/arm/cnn_neon.c
diff --git a/av1/encoder/arm/neon/encodetxb_neon.c b/av1/encoder/arm/encodetxb_neon.c
similarity index 100%
rename from av1/encoder/arm/neon/encodetxb_neon.c
rename to av1/encoder/arm/encodetxb_neon.c
diff --git a/av1/encoder/arm/crc32/hash_arm_crc32.c b/av1/encoder/arm/hash_arm_crc32.c
similarity index 100%
rename from av1/encoder/arm/crc32/hash_arm_crc32.c
rename to av1/encoder/arm/hash_arm_crc32.c
diff --git a/av1/encoder/arm/neon/highbd_fwd_txfm_neon.c b/av1/encoder/arm/highbd_fwd_txfm_neon.c
similarity index 100%
rename from av1/encoder/arm/neon/highbd_fwd_txfm_neon.c
rename to av1/encoder/arm/highbd_fwd_txfm_neon.c
diff --git a/av1/encoder/arm/neon/highbd_pickrst_neon.c b/av1/encoder/arm/highbd_pickrst_neon.c
similarity index 99%
rename from av1/encoder/arm/neon/highbd_pickrst_neon.c
rename to av1/encoder/arm/highbd_pickrst_neon.c
index 8b0d3bcc7e..d067a7616a 100644
--- a/av1/encoder/arm/neon/highbd_pickrst_neon.c
+++ b/av1/encoder/arm/highbd_pickrst_neon.c
@@ -15,7 +15,7 @@
 
 #include "aom_dsp/arm/mem_neon.h"
 #include "aom_dsp/arm/sum_neon.h"
-#include "av1/encoder/arm/neon/pickrst_neon.h"
+#include "av1/encoder/arm/pickrst_neon.h"
 #include "av1/encoder/pickrst.h"
 
 static INLINE void highbd_calc_proj_params_r0_r1_neon(
diff --git a/av1/encoder/arm/neon/highbd_pickrst_sve.c b/av1/encoder/arm/highbd_pickrst_sve.c
similarity index 99%
rename from av1/encoder/arm/neon/highbd_pickrst_sve.c
rename to av1/encoder/arm/highbd_pickrst_sve.c
index 3ffd6749dc..4f804c9052 100644
--- a/av1/encoder/arm/neon/highbd_pickrst_sve.c
+++ b/av1/encoder/arm/highbd_pickrst_sve.c
@@ -22,7 +22,7 @@
 #include "aom_dsp/arm/transpose_neon.h"
 #include "av1/common/restoration.h"
 #include "av1/encoder/pickrst.h"
-#include "av1/encoder/arm/neon/pickrst_sve.h"
+#include "av1/encoder/arm/pickrst_sve.h"
 
 static INLINE uint16_t find_average_sve(const uint16_t *src, int src_stride,
                                         int width, int height) {
diff --git a/av1/encoder/arm/neon/highbd_rdopt_neon.c b/av1/encoder/arm/highbd_rdopt_neon.c
similarity index 100%
rename from av1/encoder/arm/neon/highbd_rdopt_neon.c
rename to av1/encoder/arm/highbd_rdopt_neon.c
diff --git a/av1/encoder/arm/neon/highbd_temporal_filter_neon.c b/av1/encoder/arm/highbd_temporal_filter_neon.c
similarity index 100%
rename from av1/encoder/arm/neon/highbd_temporal_filter_neon.c
rename to av1/encoder/arm/highbd_temporal_filter_neon.c
diff --git a/av1/encoder/arm/neon/hybrid_fwd_txfm_neon.c b/av1/encoder/arm/hybrid_fwd_txfm_neon.c
similarity index 100%
rename from av1/encoder/arm/neon/hybrid_fwd_txfm_neon.c
rename to av1/encoder/arm/hybrid_fwd_txfm_neon.c
diff --git a/av1/encoder/arm/neon/ml_neon.c b/av1/encoder/arm/ml_neon.c
similarity index 100%
rename from av1/encoder/arm/neon/ml_neon.c
rename to av1/encoder/arm/ml_neon.c
diff --git a/av1/encoder/arm/neon/pickrst_neon.c b/av1/encoder/arm/pickrst_neon.c
similarity index 99%
rename from av1/encoder/arm/neon/pickrst_neon.c
rename to av1/encoder/arm/pickrst_neon.c
index 2e4761f9a4..85b980c2f0 100644
--- a/av1/encoder/arm/neon/pickrst_neon.c
+++ b/av1/encoder/arm/pickrst_neon.c
@@ -16,7 +16,7 @@
 
 #include "aom_dsp/arm/sum_neon.h"
 #include "av1/common/restoration.h"
-#include "av1/encoder/arm/neon/pickrst_neon.h"
+#include "av1/encoder/arm/pickrst_neon.h"
 #include "av1/encoder/pickrst.h"
 
 int64_t av1_lowbd_pixel_proj_error_neon(
diff --git a/av1/encoder/arm/neon/pickrst_neon.h b/av1/encoder/arm/pickrst_neon.h
similarity index 97%
rename from av1/encoder/arm/neon/pickrst_neon.h
rename to av1/encoder/arm/pickrst_neon.h
index 7b72dca34d..f9683840e1 100644
--- a/av1/encoder/arm/neon/pickrst_neon.h
+++ b/av1/encoder/arm/pickrst_neon.h
@@ -9,8 +9,8 @@
  * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
  */
 
-#ifndef AOM_AV1_ENCODER_ARM_NEON_PICKRST_NEON_H_
-#define AOM_AV1_ENCODER_ARM_NEON_PICKRST_NEON_H_
+#ifndef AOM_AV1_ENCODER_ARM_PICKRST_NEON_H_
+#define AOM_AV1_ENCODER_ARM_PICKRST_NEON_H_
 
 #include <arm_neon.h>
 
@@ -185,4 +185,4 @@ static INLINE void accumulate_and_clear(int64_t *dst, int32_t *src,
   } while (length > 0);
 }
 
-#endif  // AOM_AV1_ENCODER_ARM_NEON_PICKRST_NEON_H_
+#endif  // AOM_AV1_ENCODER_ARM_PICKRST_NEON_H_
diff --git a/av1/encoder/arm/neon/pickrst_sve.c b/av1/encoder/arm/pickrst_sve.c
similarity index 99%
rename from av1/encoder/arm/neon/pickrst_sve.c
rename to av1/encoder/arm/pickrst_sve.c
index 88aa135e25..e865dadd41 100644
--- a/av1/encoder/arm/neon/pickrst_sve.c
+++ b/av1/encoder/arm/pickrst_sve.c
@@ -22,7 +22,7 @@
 #include "aom_dsp/arm/transpose_neon.h"
 #include "av1/common/restoration.h"
 #include "av1/encoder/pickrst.h"
-#include "av1/encoder/arm/neon/pickrst_sve.h"
+#include "av1/encoder/arm/pickrst_sve.h"
 
 static INLINE uint8_t find_average_sve(const uint8_t *src, int src_stride,
                                        int width, int height) {
diff --git a/av1/encoder/arm/neon/pickrst_sve.h b/av1/encoder/arm/pickrst_sve.h
similarity index 97%
rename from av1/encoder/arm/neon/pickrst_sve.h
rename to av1/encoder/arm/pickrst_sve.h
index ffa737611e..97f08fc61e 100644
--- a/av1/encoder/arm/neon/pickrst_sve.h
+++ b/av1/encoder/arm/pickrst_sve.h
@@ -9,8 +9,8 @@
  * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
  */
 
-#ifndef AOM_AV1_ENCODER_ARM_NEON_PICKRST_SVE_H_
-#define AOM_AV1_ENCODER_ARM_NEON_PICKRST_SVE_H_
+#ifndef AOM_AV1_ENCODER_ARM_PICKRST_SVE_H_
+#define AOM_AV1_ENCODER_ARM_PICKRST_SVE_H_
 
 #include <arm_neon.h>
 #include <arm_sve.h>
@@ -148,4 +148,4 @@ static INLINE void compute_H_two_rows_win7(int16x8_t *dgd0, int16x8_t *dgd1,
   }
 }
 
-#endif  // AOM_AV1_ENCODER_ARM_NEON_PICKRST_SVE_H_
+#endif  // AOM_AV1_ENCODER_ARM_PICKRST_SVE_H_
diff --git a/av1/encoder/arm/neon/quantize_neon.c b/av1/encoder/arm/quantize_neon.c
similarity index 100%
rename from av1/encoder/arm/neon/quantize_neon.c
rename to av1/encoder/arm/quantize_neon.c
diff --git a/av1/encoder/arm/neon/rdopt_neon.c b/av1/encoder/arm/rdopt_neon.c
similarity index 100%
rename from av1/encoder/arm/neon/rdopt_neon.c
rename to av1/encoder/arm/rdopt_neon.c
diff --git a/av1/encoder/arm/neon/reconinter_enc_neon.c b/av1/encoder/arm/reconinter_enc_neon.c
similarity index 100%
rename from av1/encoder/arm/neon/reconinter_enc_neon.c
rename to av1/encoder/arm/reconinter_enc_neon.c
diff --git a/av1/encoder/arm/neon/shift_neon.h b/av1/encoder/arm/shift_neon.h
similarity index 93%
rename from av1/encoder/arm/neon/shift_neon.h
rename to av1/encoder/arm/shift_neon.h
index d73aef2f25..ad9fd9c671 100644
--- a/av1/encoder/arm/neon/shift_neon.h
+++ b/av1/encoder/arm/shift_neon.h
@@ -9,8 +9,8 @@
  * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
  */
 
-#ifndef AOM_AV1_ENCODER_ARM_NEON_SHIFT_NEON_H_
-#define AOM_AV1_ENCODER_ARM_NEON_SHIFT_NEON_H_
+#ifndef AOM_AV1_ENCODER_ARM_SHIFT_NEON_H_
+#define AOM_AV1_ENCODER_ARM_SHIFT_NEON_H_
 
 #include <arm_neon.h>
 
@@ -46,4 +46,4 @@ SHIFT_LOOP_HELPER(shift_right_1_round_s32_x4, int32x4_t, vrhaddq_s32,
 
 #undef SHIFT_LOOP_HELPER
 
-#endif  // AOM_AV1_ENCODER_ARM_NEON_SHIFT_NEON_H_
+#endif  // AOM_AV1_ENCODER_ARM_SHIFT_NEON_H_
diff --git a/av1/encoder/arm/neon/temporal_filter_neon.c b/av1/encoder/arm/temporal_filter_neon.c
similarity index 100%
rename from av1/encoder/arm/neon/temporal_filter_neon.c
rename to av1/encoder/arm/temporal_filter_neon.c
diff --git a/av1/encoder/arm/neon/temporal_filter_neon_dotprod.c b/av1/encoder/arm/temporal_filter_neon_dotprod.c
similarity index 100%
rename from av1/encoder/arm/neon/temporal_filter_neon_dotprod.c
rename to av1/encoder/arm/temporal_filter_neon_dotprod.c
diff --git a/av1/encoder/arm/neon/txfm_neon.h b/av1/encoder/arm/txfm_neon.h
similarity index 86%
rename from av1/encoder/arm/neon/txfm_neon.h
rename to av1/encoder/arm/txfm_neon.h
index 635364f46a..8b07dfb613 100644
--- a/av1/encoder/arm/neon/txfm_neon.h
+++ b/av1/encoder/arm/txfm_neon.h
@@ -9,8 +9,8 @@
  * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
  */
 
-#ifndef AOM_AV1_ENCODER_ARM_NEON_TXFM_NEON_H_
-#define AOM_AV1_ENCODER_ARM_NEON_TXFM_NEON_H_
+#ifndef AOM_AV1_ENCODER_ARM_TXFM_NEON_H_
+#define AOM_AV1_ENCODER_ARM_TXFM_NEON_H_
 
 #include "aom/aom_integer.h"  // For AOM_INLINE.
 
@@ -23,4 +23,4 @@ static AOM_INLINE void ud_adjust_input_and_stride(int ud_flip,
   }
 }
 
-#endif  // AOM_AV1_ENCODER_ARM_NEON_TXFM_NEON_H_
+#endif  // AOM_AV1_ENCODER_ARM_TXFM_NEON_H_
diff --git a/av1/encoder/arm/neon/wedge_utils_neon.c b/av1/encoder/arm/wedge_utils_neon.c
similarity index 100%
rename from av1/encoder/arm/neon/wedge_utils_neon.c
rename to av1/encoder/arm/wedge_utils_neon.c
diff --git a/av1/encoder/arm/neon/wedge_utils_sve.c b/av1/encoder/arm/wedge_utils_sve.c
similarity index 100%
rename from av1/encoder/arm/neon/wedge_utils_sve.c
rename to av1/encoder/arm/wedge_utils_sve.c