commit fc67a86fec562e7c2c0dab28c1e6a25ee8cc04b0
author Zhi An Ng <zhin@google.com> Thu Jan 27 09:12:34 2022 -0800
committer XNNPACK Team <xnnpack-github-robot@google.com> Thu Jan 27 09:13:38 2022 -0800
tree 16fa4641366267280ec3a1e72057592f50934457
parent 6cc5b48226632356adf73f8980b02da14931bde9

Fix encoding of prfm

PiperOrigin-RevId: 424628305

src/jit/aarch64-assembler.cc

diff --git a/src/jit/aarch64-assembler.cc b/src/jit/aarch64-assembler.cc
index a38e747..62eb81c 100644
--- a/src/jit/aarch64-assembler.cc
+++ b/src/jit/aarch64-assembler.cc
@@ -280,7 +280,7 @@
     return;
   }
 
-  emit32(0xF9800000 | xn.offset << 10 | rn(xn.base) | static_cast<uint32_t>(prfop));
+  emit32(0xF9800000 | xn.offset >> 3 << 10 | rn(xn.base) | prfop);
 }
 
 void Assembler::ret() {

test/aarch64-assembler.cc

diff --git a/test/aarch64-assembler.cc b/test/aarch64-assembler.cc
index d52113b..ceb1282 100644
--- a/test/aarch64-assembler.cc
+++ b/test/aarch64-assembler.cc
@@ -54,6 +54,7 @@
   EXPECT_ERROR(Error::kInvalidOperand, a.ldr(x8, MemOperand(sp, 16, AddressingMode::kPostIndex)));
 
   CHECK_ENCODING(0xF98000A0, a.prfm(kPLDL1KEEP, mem[x5]));
+  CHECK_ENCODING(0xF98020A0, a.prfm(kPLDL1KEEP, mem[x5, 64]));
   EXPECT_ERROR(Error::kInvalidOperand, a.prfm(kPLDL1KEEP, mem[x5, -8]));
   EXPECT_ERROR(Error::kInvalidOperand, a.prfm(kPLDL1KEEP, mem[x5, 32761]));