Pass the host CPU name and feature string to
LLVMCreateDisasmCPUFeatures() instead of using LLVMCreateDisasm(), so
the disassembler correctly decodes CPU-specific instructions and
extensions such as RISC-V compressed and vector instructions.

Signed-off-by: Varun R Mallya <[email protected]>
---
 tools/testing/selftests/bpf/jit_disasm_helpers.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/tools/testing/selftests/bpf/jit_disasm_helpers.c 
b/tools/testing/selftests/bpf/jit_disasm_helpers.c
index 364c557c5115..3558fe10e28c 100644
--- a/tools/testing/selftests/bpf/jit_disasm_helpers.c
+++ b/tools/testing/selftests/bpf/jit_disasm_helpers.c
@@ -96,10 +96,19 @@ static int disasm_one_func(FILE *text_out, uint8_t *image, 
__u32 len)
        __u32 *label_pc, pc;
        int i, cnt, err = 0;
        char buf[64];
+       char *cpu, *features;
 
        triple = LLVMGetDefaultTargetTriple();
-       ctx = LLVMCreateDisasm(triple, &labels, 0, NULL, lookup_symbol);
-       if (!ASSERT_OK_PTR(ctx, "LLVMCreateDisasm")) {
+
+       cpu = LLVMGetHostCPUName();
+       features = LLVMGetHostCPUFeatures();
+
+       ctx = LLVMCreateDisasmCPUFeatures(triple, cpu, features, &labels, 0, 
NULL, lookup_symbol);
+
+       LLVMDisposeMessage(cpu);
+       LLVMDisposeMessage(features);
+
+       if (!ASSERT_OK_PTR(ctx, "LLVMCreateDisasmCPUFeatures")) {
                err = -EINVAL;
                goto out;
        }
-- 
2.54.0


Reply via email to