From c3825fdf24804e5bccdfeeca96837ec437b59d79 Mon Sep 17 00:00:00 2001 From: Andrei Safronov Date: Wed, 25 Dec 2024 02:50:07 +0300 Subject: [PATCH 1/2] [Xtensa] Fix Code Density test. Fix dissambler test for Code Density feature. --- .../MC/Disassembler/Xtensa/code_density.txt | 58 ++++++++----------- 1 file changed, 24 insertions(+), 34 deletions(-) diff --git a/llvm/test/MC/Disassembler/Xtensa/code_density.txt b/llvm/test/MC/Disassembler/Xtensa/code_density.txt index eac236a4f3081..627c04a3c68bd 100644 --- a/llvm/test/MC/Disassembler/Xtensa/code_density.txt +++ b/llvm/test/MC/Disassembler/Xtensa/code_density.txt @@ -1,4 +1,5 @@ -# RUN: llvm-mc -triple=xtensa -mattr=+density -disassemble %s | FileCheck --check-prefix=CHECK-DENSITY %s +# RUN: llvm-mc -triple=xtensa -mattr=+density -disassemble < %s | FileCheck -check-prefixes=CHECK-DENSITY %s +# RUN: not llvm-mc -triple=xtensa -disassemble < %s 2>&1 | FileCheck --implicit-check-not=warning: -check-prefixes=CHECK-CORE %s #------------------------------------------------------------------------------ # Verify that binary code is correctly disassembled with @@ -6,57 +7,46 @@ # density option generates warnings. #------------------------------------------------------------------------------ -0x4a 0x23 +[0x4a, 0x23] # CHECK-DENSITY: add.n a2, a3, a4 -# CHECK-CORE: [[#@LINE-2]]:1: warning: invalid instruction encoding -# CHECK-CORE: [[#@LINE-3]]:6: warning: invalid instruction encoding +# CHECK-CORE: [[#@LINE-2]]:2: warning: invalid instruction encoding -0x3b 0x23 +[0x3b, 0x23] # CHECK-DENSITY: addi.n a2, a3, 3 -# CHECK-CORE: [[#@LINE-2]]:1: warning: invalid instruction encoding -# CHECK-CORE: [[#@LINE-3]]:6: warning: invalid instruction encoding +# CHECK-CORE: [[#@LINE-2]]:2: warning: invalid instruction encoding -0x9c 0x03 +[0x9c, 0x03] # CHECK-DENSITY: beqz.n a3, . +20 -# CHECK-CORE: [[#@LINE-2]]:1: warning: invalid instruction encoding -# CHECK-CORE: [[#@LINE-3]]:6: warning: invalid instruction encoding +# CHECK-CORE: [[#@LINE-2]]:2: warning: invalid instruction encoding -0xcc 0xe3 +[0xcc, 0xe3] # CHECK-DENSITY: bnez.n a3, . +18 -# CHECK-CORE: [[#@LINE-2]]:1: warning: invalid instruction encoding -# CHECK-CORE: [[#@LINE-3]]:6: warning: invalid instruction encoding +# CHECK-CORE: [[#@LINE-2]]:2: warning: invalid instruction encoding -0x6d 0xf0 +[0x6d, 0xf0] # CHECK-DENSITY: ill.n -# CHECK-CORE: [[#@LINE-2]]:1: warning: invalid instruction encoding -# CHECK-CORE: [[#@LINE-3]]:6: warning: invalid instruction encoding +# CHECK-CORE: [[#@LINE-2]]:2: warning: invalid instruction encoding -0x28 0x33 +[0x28, 0x33] # CHECK-DENSITY: l32i.n a2, a3, 12 -# CHECK-CORE: [[#@LINE-2]]:1: warning: invalid instruction encoding -# CHECK-CORE: [[#@LINE-3]]:6: warning: invalid instruction encoding +# CHECK-CORE: [[#@LINE-2]]:2: warning: invalid instruction encoding -0x2d 0x03 +[0x2d, 0x03] # CHECK-DENSITY: mov.n a2, a3 -# CHECK-CORE: [[#@LINE-2]]:1: warning: invalid instruction encoding -# CHECK-CORE: [[#@LINE-3]]:6: warning: invalid instruction encoding +# CHECK-CORE: [[#@LINE-2]]:2: warning: invalid instruction encoding -0x0d 0xf0 +[0x0d, 0xf0] # CHECK-DENSITY: ret.n -# CHECK-CORE: [[#@LINE-2]]:1: warning: invalid instruction encoding -# CHECK-CORE: [[#@LINE-3]]:6: warning: invalid instruction encoding +# CHECK-CORE: [[#@LINE-2]]:2: warning: invalid instruction encoding -0x29 0x33 +[0x29, 0x33] # CHECK-DENSITY: s32i.n a2, a3, 12 -# CHECK-CORE: [[#@LINE-2]]:1: warning: invalid instruction encoding -# CHECK-CORE: [[#@LINE-3]]:6: warning: invalid instruction encoding +# CHECK-CORE: [[#@LINE-2]]:2: warning: invalid instruction encoding -0x6c 0x02 +[0x6c, 0x02] # CHECK-DENSITY: movi.n a2, -32 -# CHECK-CORE: [[#@LINE-2]]:1: warning: invalid instruction encoding -# CHECK-CORE: [[#@LINE-3]]:6: warning: invalid instruction encoding +# CHECK-CORE: [[#@LINE-2]]:2: warning: invalid instruction encoding -0x3d 0xf0 +[0x3d, 0xf0] # CHECK-DENSITY: nop.n -# CHECK-CORE: [[#@LINE-2]]:1: warning: invalid instruction encoding -# CHECK-CORE: [[#@LINE-3]]:6: warning: invalid instruction encoding +# CHECK-CORE: [[#@LINE-2]]:2: warning: invalid instruction encoding From 4bd932c28f4790b3ed481ace170b9f25b97592ca Mon Sep 17 00:00:00 2001 From: Andrei Safronov Date: Wed, 25 Dec 2024 11:18:30 +0300 Subject: [PATCH 2/2] [Xtensa] Minor fixes. --- llvm/test/MC/Disassembler/Xtensa/code_density.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/llvm/test/MC/Disassembler/Xtensa/code_density.txt b/llvm/test/MC/Disassembler/Xtensa/code_density.txt index 627c04a3c68bd..833dd52e584b2 100644 --- a/llvm/test/MC/Disassembler/Xtensa/code_density.txt +++ b/llvm/test/MC/Disassembler/Xtensa/code_density.txt @@ -1,5 +1,5 @@ -# RUN: llvm-mc -triple=xtensa -mattr=+density -disassemble < %s | FileCheck -check-prefixes=CHECK-DENSITY %s -# RUN: not llvm-mc -triple=xtensa -disassemble < %s 2>&1 | FileCheck --implicit-check-not=warning: -check-prefixes=CHECK-CORE %s +# RUN: llvm-mc -triple=xtensa -mattr=+density -disassemble %s | FileCheck -check-prefixes=CHECK-DENSITY %s +# RUN: not llvm-mc -triple=xtensa -disassemble %s 2>&1 | FileCheck --implicit-check-not=warning: -check-prefixes=CHECK-CORE %s #------------------------------------------------------------------------------ # Verify that binary code is correctly disassembled with