Skip to content

Commit

Permalink
[x86][MC] Fix movdir64b addressing
Browse files Browse the repository at this point in the history
This patch is to fix the [[ #63045 | issue 63045]].

Look at the following code:
```
int main(int argc, char *argv[]) {
    int arr[1000];
    __asm movdir64b rax, ZMMWORD PTR [arr]
    return 0;
}
```
Compiling this code using `clang -O0 -fasm-blocks bug.c` gives the a linker error.

The problem seems to be in the generated assembly. Following is the out put of `clang -S -O0 -fasm-blocks bug.c`:
```
movq %rsi, -16(%rbp)
#APP

movdir64b arr, %rax

#NO_APP
xorl %eax, %eax
```
The symbol `arr` should be replaced with some address like `-4(%rbp)`.

This makes me believe that issue is not in the linker, but with the ASM parser.

This issue originates with patch [D145893](https://reviews.llvm.org/D145893). And that's why reverting it fixes the issue. More specifically, the function [isMem512_GR64()](https://github.com/llvm/llvm-project/blob/ff471dcf7669b1ad7903a44d0773bef4eb175eb9/llvm/lib/Target/X86/AsmParser/X86Operand.h#L404) within the [llvm/lib/Target/X86/AsmParser/X86Operand.h](https://github.com/llvm/llvm-project/blob/main/llvm/lib/Target/X86/AsmParser/X86Operand.h) file.

Reviewed By: skan

Differential Revision: https://reviews.llvm.org/D151863
  • Loading branch information
akshaykhadse committed Jun 8, 2023
1 parent 32791f1 commit 15f15ab
Show file tree
Hide file tree
Showing 5 changed files with 56 additions and 4 deletions.
7 changes: 7 additions & 0 deletions clang/test/CodeGen/ms-inline-asm-64.c
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,10 @@ void t5(void) {
// CHECK-SAME: jmp ${1:P}
// CHECK-SAME: "*m,*m,~{dirflag},~{fpsr},~{flags}"(ptr elementtype(void (...)) @bar, ptr elementtype(void (...)) @bar)
}

void t47(void) {
// CHECK-LABEL: define{{.*}} void @t47
int arr[1000];
__asm movdir64b rax, zmmword ptr [arr]
// CHECK: call void asm sideeffect inteldialect "movdir64b rax, zmmword ptr $0", "*m,~{dirflag},~{fpsr},~{flags}"(ptr elementtype([1000 x i32]) %arr)
}
7 changes: 7 additions & 0 deletions clang/test/CodeGen/ms-inline-asm.c
Original file line number Diff line number Diff line change
Expand Up @@ -675,6 +675,13 @@ void t46(void) {
// CHECK: call void asm sideeffect inteldialect "add eax, [eax + $$-128]", "~{eax},~{flags},~{dirflag},~{fpsr},~{flags}"()
}

void t47(void) {
// CHECK-LABEL: define{{.*}} void @t47
int arr[1000];
__asm movdir64b eax, zmmword ptr [arr]
// CHECK: call void asm sideeffect inteldialect "movdir64b eax, zmmword ptr $0", "*m,~{dirflag},~{fpsr},~{flags}"(ptr elementtype([1000 x i32]) %arr)
}

void dot_operator(void){
// CHECK-LABEL: define{{.*}} void @dot_operator
__asm { mov eax, 3[ebx]A.b}
Expand Down
4 changes: 0 additions & 4 deletions llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1776,10 +1776,6 @@ bool X86AsmParser::CreateMemForMSInlineAsm(
BaseReg && IndexReg));
return false;
}
// Otherwise, we set the base register to a non-zero value
// if we don't know the actual value at this time. This is necessary to
// get the matching correct in some cases.
BaseReg = BaseReg ? BaseReg : 1;
Operands.push_back(X86Operand::CreateMem(
getPointerWidth(), SegReg, Disp, BaseReg, IndexReg, Scale, Start, End,
Size,
Expand Down
21 changes: 21 additions & 0 deletions llvm/test/CodeGen/X86/inline-asm-movdir64b-x86_64.ll
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 2
; RUN: llc < %s -mtriple=x86_64-unknown-unknown -mattr=+movdir64b | FileCheck %s --check-prefix=X64

define void @test_movdir64b() {
; X64-LABEL: test_movdir64b:
; X64: # %bb.0: # %entry
; X64-NEXT: subq $3880, %rsp # imm = 0xF28
; X64-NEXT: .cfi_def_cfa_offset 3888
; X64-NEXT: #APP
; X64-EMPTY:
; X64-NEXT: movdir64b -{{[0-9]+}}(%rsp), %rax
; X64-EMPTY:
; X64-NEXT: #NO_APP
; X64-NEXT: addq $3880, %rsp # imm = 0xF28
; X64-NEXT: .cfi_def_cfa_offset 8
; X64-NEXT: retq
entry:
%arr = alloca [1000 x i32], align 16
call void asm sideeffect inteldialect "movdir64b rax, zmmword ptr $0", "*m,~{dirflag},~{fpsr},~{flags}"(ptr elementtype([1000 x i32]) %arr)
ret void
}
21 changes: 21 additions & 0 deletions llvm/test/CodeGen/X86/inline-asm-movdir64b.ll
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 2
; RUN: llc < %s -mtriple=i686-unknown-unknown -mattr=+movdir64b | FileCheck %s --check-prefix=X86

define void @test_movdir64b() {
; X86-LABEL: test_movdir64b:
; X86: # %bb.0: # %entry
; X86-NEXT: subl $4000, %esp # imm = 0xFA0
; X86-NEXT: .cfi_def_cfa_offset 4004
; X86-NEXT: #APP
; X86-EMPTY:
; X86-NEXT: movdir64b (%esp), %eax
; X86-EMPTY:
; X86-NEXT: #NO_APP
; X86-NEXT: addl $4000, %esp # imm = 0xFA0
; X86-NEXT: .cfi_def_cfa_offset 4
; X86-NEXT: retl
entry:
%arr = alloca [1000 x i32], align 4
call void asm sideeffect inteldialect "movdir64b eax, zmmword ptr $0", "*m,~{dirflag},~{fpsr},~{flags}"(ptr elementtype([1000 x i32]) %arr)
ret void
}

0 comments on commit 15f15ab

Please sign in to comment.