Re: [PATCH 2/8] aarch64: Fix spelling of BRANCH_LEN_N_1KiB

[Karl Meakin]

On 04/08/2025 22:18, Richard Henderson wrote:

One kilobyte not one kilobit.

gcc:
        * config/aarch64/aarch64.md (BRANCH_LEN_N_1KiB): Rename
        from BRANCH_LEN_N_1Kib.
---
  gcc/config/aarch64/aarch64.md | 20 ++++++++++----------
  1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/gcc/config/aarch64/aarch64.md b/gcc/config/aarch64/aarch64.md
index b3e76158688..2fffd175b96 100644
--- a/gcc/config/aarch64/aarch64.md
+++ b/gcc/config/aarch64/aarch64.md
@@ -725,8 +725,8 @@
      (BRANCH_LEN_N_32KiB -32768)

;; +/- 1KiB. Used by CBB<cond>, CBH<cond>, CB<cond>.

-    (BRANCH_LEN_P_1Kib  1020)
-    (BRANCH_LEN_N_1Kib -1024)
+    (BRANCH_LEN_P_1KiB  1020)
+    (BRANCH_LEN_N_1KiB -1024)
    ]
  )

@@ -898,16 +898,16 @@

    [(set_attr "type" "branch")
     (set (attr "length")
        (if_then_else (and (ge (minus (match_dup 2) (pc))
-                              (const_int BRANCH_LEN_N_1Kib))
+                              (const_int BRANCH_LEN_N_1KiB))
                           (lt (minus (match_dup 2) (pc))
-                              (const_int BRANCH_LEN_P_1Kib)))
+                              (const_int BRANCH_LEN_P_1KiB)))
                      (const_int 4)
                      (const_int 8)))
     (set (attr "far_branch")
        (if_then_else (and (ge (minus (match_dup 2) (pc))
-                              (const_int BRANCH_LEN_N_1Kib))
+                              (const_int BRANCH_LEN_N_1KiB))
                           (lt (minus (match_dup 2) (pc))
-                              (const_int BRANCH_LEN_P_1Kib)))
+                              (const_int BRANCH_LEN_P_1KiB)))
                      (const_string "no")
                      (const_string "yes")))]
  )
@@ -929,16 +929,16 @@
    [(set_attr "type" "branch")
     (set (attr "length")
        (if_then_else (and (ge (minus (match_dup 2) (pc))
-                              (const_int BRANCH_LEN_N_1Kib))
+                              (const_int BRANCH_LEN_N_1KiB))
                           (lt (minus (match_dup 2) (pc))
-                              (const_int BRANCH_LEN_P_1Kib)))
+                              (const_int BRANCH_LEN_P_1KiB)))
                      (const_int 4)
                      (const_int 8)))
     (set (attr "far_branch")
        (if_then_else (and (ge (minus (match_dup 2) (pc))
-                              (const_int BRANCH_LEN_N_1Kib))
+                              (const_int BRANCH_LEN_N_1KiB))
                           (lt (minus (match_dup 2) (pc))
-                              (const_int BRANCH_LEN_P_1Kib)))
+                              (const_int BRANCH_LEN_P_1KiB)))
                      (const_string "no")
                      (const_string "yes")))]
  )

ok