Unify more barrel shift notation

slothy-optimizer · Oct 7, 2024 · 0936a8b · 0936a8b
1 parent fae0590
commit 0936a8b
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/examples/naive/armv7m/basemul_acc_32_16_kyber.s b/examples/naive/armv7m/basemul_acc_32_16_kyber.s
@@ -57,7 +57,7 @@ basemul_asm_acc_opt_32_16:
  smladx res1, poly0, poly1, res1
  plant_red q, qa, qinv, res1
 
- pkhtb res0, res1, res0, asr#16
+ pkhtb res0, res1, res0, asr #16
  str res0, [rptr], #4
 
  ldr poly0, [aptr], #4
@@ -72,7 +72,7 @@ basemul_asm_acc_opt_32_16:
  smladx res1, poly0, poly1, res1
  plant_red q, qa, qinv, res1
 
- pkhtb res0, res1, res0, asr#16
+ pkhtb res0, res1, res0, asr #16
  str res0, [rptr], #4
 
  subs.w loop, #1

diff --git a/examples/naive/armv7m/frombytes_mul_acc_32_16_kyber.s b/examples/naive/armv7m/frombytes_mul_acc_32_16_kyber.s
@@ -20,7 +20,7 @@
  smladx \res0, \poly0, \poly1, \res0
  plant_red \q, \qa, \qinv, \res0
 
- pkhtb \res0, \res0, \tmp, asr#16
+ pkhtb \res0, \res0, \tmp, asr #16
  str \res0, [\rptr], #4
 
  neg \zeta, \zeta
@@ -38,7 +38,7 @@
  smladx \res0, \poly0, \poly3, \res0
  plant_red \q, \qa, \qinv, \res0
 
- pkhtb \res0, \res0, \tmp, asr#16
+ pkhtb \res0, \res0, \tmp, asr #16
  str \res0, [\rptr], #4
 .endm 
 

diff --git a/examples/naive/armv7m/intt_769_dilithium.s b/examples/naive/armv7m/intt_769_dilithium.s
@@ -37,15 +37,15 @@
  smulwt \a, \twiddle, \a
  smlabt \tmp, \tmp, \q, \qa
  smlabt \a, \a, \q, \qa
- pkhtb \a, \a, \tmp, asr#16
+ pkhtb \a, \a, \tmp, asr #16
 .endm
 
 .macro doublebutterfly_plant a0, a1, twiddle, tmp, q, qa
  smulwb \tmp, \twiddle, \a1
  smulwt \a1, \twiddle, \a1
  smlabt \tmp, \tmp, \q, \qa
  smlabt \a1, \a1, \q, \qa
- pkhtb \tmp, \a1, \tmp, asr#16
+ pkhtb \tmp, \a1, \tmp, asr #16
  usub16 \a1, \a0, \tmp
  uadd16 \a0, \a0, \tmp
 .endm
@@ -105,7 +105,7 @@
  smulwt \c2, \twiddle1, \c2
  smlabt \tmp, \tmp, \q, \qa
  smlabt \c2, \c2, \q, \qa
- pkhtb \tmp, \c2, \tmp, asr#16
+ pkhtb \tmp, \c2, \tmp, asr #16
  ssub16.w \c6, \tmp2, \tmp 
  sadd16.w \c2, \tmp2, \tmp
  //c6, c2: 4.5q

diff --git a/examples/naive/armv7m/intt_kyber.s b/examples/naive/armv7m/intt_kyber.s
@@ -30,23 +30,23 @@
  smulwt \a, \plantconst, \a
  smlabt \tmp, \tmp, \q, \qa
  smlabt \a, \a, \q, \qa
- pkhtb \a, \a, \tmp, asr#16
+ pkhtb \a, \a, \tmp, asr #16
 .endm
 
 .macro mul_twiddle_plant a, twiddle, tmp, q, qa
  smulwb \tmp, \twiddle, \a
  smulwt \a, \twiddle, \a
  smlabt \tmp, \tmp, \q, \qa
  smlabt \a, \a, \q, \qa
- pkhtb \a, \a, \tmp, asr#16
+ pkhtb \a, \a, \tmp, asr #16
 .endm
 
 .macro doublebutterfly_plant a0, a1, twiddle, tmp, q, qa
  smulwb \tmp, \twiddle, \a1
  smulwt \a1, \twiddle, \a1
  smlabt \tmp, \tmp, \q, \qa
  smlabt \a1, \a1, \q, \qa
- pkhtb \tmp, \a1, \tmp, asr#16
+ pkhtb \tmp, \a1, \tmp, asr #16
  usub16 \a1, \a0, \tmp
  uadd16 \a0, \a0, \tmp
 .endm
@@ -113,7 +113,7 @@
  smulwt \c2, \twiddle1, \c2
  smlabt \tmp, \tmp, \q, \qa
  smlabt \c2, \c2, \q, \qa
- pkhtb \tmp, \c2, \tmp, asr#16
+ pkhtb \tmp, \c2, \tmp, asr #16
  ssub16.w \c6, \tmp2, \tmp 
  sadd16.w \c2, \tmp2, \tmp
  //c6, c2: 4.5q

diff --git a/examples/naive/armv7m/ntt_769_dilithium.s b/examples/naive/armv7m/ntt_769_dilithium.s
@@ -37,15 +37,15 @@
  smulwt \a, \twiddle, \a
  smlabt \tmp, \tmp, \q, \qa
  smlabt \a, \a, \q, \qa
- pkhtb \a, \a, \tmp, asr#16
+ pkhtb \a, \a, \tmp, asr #16
 .endm
 
 .macro doublebutterfly_plant a0, a1, twiddle, tmp, q, qa
  smulwb \tmp, \twiddle, \a1
  smulwt \a1, \twiddle, \a1
  smlabt \tmp, \tmp, \q, \qa
  smlabt \a1, \a1, \q, \qa
- pkhtb \tmp, \a1, \tmp, asr#16
+ pkhtb \tmp, \a1, \tmp, asr #16
  usub16 \a1, \a0, \tmp
  uadd16 \a0, \a0, \tmp
 .endm

diff --git a/examples/naive/armv7m/pointwise_769_asymmetric_dilithium.s b/examples/naive/armv7m/pointwise_769_asymmetric_dilithium.s
@@ -52,15 +52,15 @@ small_asymmetric_mul_asm_769:
  smuadx r5, r4, r5
  plant_red r12, r14, r11, r5
 
- pkhtb r5, r5, r6, asr#16
+ pkhtb r5, r5, r6, asr #16
  str.w r5, [r0], #width
 
  smuad r6, r7, r9
  plant_red r12, r14, r11, r6
  smuadx r8, r7, r8
  plant_red r12, r14, r11, r8
 
- pkhtb r8, r8, r6, asr#16
+ pkhtb r8, r8, r6, asr #16
  str.w r8, [r0], #width
  _asymmetric_mul_16_loop_end:
  cmp.w r0, r10