BPF: Change callx insn encoding

[yonghong-song]

Currently, the kernel verifier unsupported callx insn used the 32-bit imm field to store the target register. On the other hand, gcc used the dst_reg field to store the target register. The gcc encoding is better. This patch adjusted the coding to be the same as gcc.

[llvmbot]

@llvm/pr-subscribers-mc

Author: None (yonghong-song)

Changes

Currently, the kernel verifier unsupported callx insn used the 32-bit imm field to store the target register. On the other hand, gcc used the dst_reg field to store the target register. The gcc encoding is better. This patch adjusted the coding to be the same as gcc.

---

Full diff: https://github.com/llvm/llvm-project/pull/81546.diff

3 Files Affected:

• (modified) llvm/lib/Target/BPF/AsmParser/BPFAsmParser.cpp (+1)
• (modified) llvm/lib/Target/BPF/BPFInstrInfo.td (+2-2)
• (modified) llvm/test/MC/BPF/insn-unit.s (+3)

diff --git a/llvm/lib/Target/BPF/AsmParser/BPFAsmParser.cpp b/llvm/lib/Target/BPF/AsmParser/BPFAsmParser.cpp
index 90697c6645be2f..0d1eef60c3b550 100644
--- a/llvm/lib/Target/BPF/AsmParser/BPFAsmParser.cpp
+++ b/llvm/lib/Target/BPF/AsmParser/BPFAsmParser.cpp
@@ -229,6 +229,7 @@ struct BPFOperand : public MCParsedAsmOperand {
     return StringSwitch<bool>(Name.lower())
         .Case("if", true)
         .Case("call", true)
+        .Case("callx", true)
         .Case("goto", true)
         .Case("gotol", true)
         .Case("*", true)
diff --git a/llvm/lib/Target/BPF/BPFInstrInfo.td b/llvm/lib/Target/BPF/BPFInstrInfo.td
index 7d443a34490146..690d53420718ff 100644
--- a/llvm/lib/Target/BPF/BPFInstrInfo.td
+++ b/llvm/lib/Target/BPF/BPFInstrInfo.td
@@ -622,9 +622,9 @@ class CALLX<string OpcodeStr>
                    (ins GPR:$BrDst),
                    !strconcat(OpcodeStr, " $BrDst"),
                    []> {
-  bits<32> BrDst;
+  bits<4> BrDst;
 
-  let Inst{31-0} = BrDst;
+  let Inst{51-48} = BrDst;
   let BPFClass = BPF_JMP;
 }
 
diff --git a/llvm/test/MC/BPF/insn-unit.s b/llvm/test/MC/BPF/insn-unit.s
index 58342cda7cc0ad..224eb7381aa234 100644
--- a/llvm/test/MC/BPF/insn-unit.s
+++ b/llvm/test/MC/BPF/insn-unit.s
@@ -61,6 +61,9 @@
 // CHECK-32: c3 92 10 00 00 00 00 00 	lock *(u32 *)(r2 + 16) += w9
 // CHECK: db a3 e2 ff 00 00 00 00 	lock *(u64 *)(r3 - 30) += r10
 
+  callx r2
+// CHECK: 8d 02 00 00 00 00 00 00 	callx r2
+
 // ======== BPF_JMP Class ========
   if r1 & r2 goto Llabel0    // BPF_JSET  | BPF_X
   if r1 & 0xffff goto Llabel0    // BPF_JSET  | BPF_K

[yonghong-song]

cc @jemarch

[yonghong-song]

Windows test failed. The following are failed tests:

********************
Failed Tests (30):
  MLIR :: python/dialects/affine.py
  MLIR :: python/dialects/amdgpu.py
  MLIR :: python/dialects/arith_dialect.py
  MLIR :: python/dialects/arith_llvm.py
  MLIR :: python/dialects/cf.py
  MLIR :: python/dialects/func.py
  MLIR :: python/dialects/linalg/opdsl/arguments.py
  MLIR :: python/dialects/linalg/opdsl/assignments.py
  MLIR :: python/dialects/linalg/opdsl/doctests.py
  MLIR :: python/dialects/linalg/opdsl/emit_convolution.py
  MLIR :: python/dialects/linalg/opdsl/emit_matmul.py
  MLIR :: python/dialects/linalg/opdsl/emit_pooling.py
  MLIR :: python/dialects/linalg/opdsl/metadata.py
  MLIR :: python/dialects/linalg/opdsl/shape_maps_iteration.py
  MLIR :: python/dialects/linalg/opdsl/test_core_named_ops.py
  MLIR :: python/dialects/linalg/ops.py
  MLIR :: python/dialects/memref.py
  MLIR :: python/dialects/ml_program.py
  MLIR :: python/dialects/nvgpu.py
  MLIR :: python/dialects/python_test.py
  MLIR :: python/dialects/scf.py
  MLIR :: python/dialects/tensor.py
  MLIR :: python/dialects/transform_bufferization_ext.py
  MLIR :: python/dialects/transform_extras.py
  MLIR :: python/ir/blocks.py
  MLIR :: python/ir/builtin_types.py
  MLIR :: python/ir/diagnostic_handler.py
  MLIR :: python/ir/dialects.py
  MLIR :: python/ir/operation.py
  MLIR :: python/pass_manager.py
Testing Time: 63.76s
Total Discovered Tests: 2561
  Skipped          :    2 (0.08%)
  Unsupported      :  324 (12.65%)
  Passed           : 2202 (85.98%)
  Expectedly Failed:    1 (0.04%)
  Unresolved       :    2 (0.08%)
  Failed           :   30 (1.17%)

They are all MLIR python tests, and these failures are not really related to this patch.

[hawkinsw]

I am waiting for a compile to finish, but I wanted to say that it looks right to me. The following is a test case from binutils:

  28:   8d 06 00 00 00 00 00 00         callr %r6

Note: The mnemonic will change.

Otherwise, everything looks good! Thanks again.