[PATCH] D149920: ms inline asm: recognize case-insensitive JMP and CALL as TargetLowering::C_Address
This revision was automatically updated to reflect the committed changes.
Closed by commit rG8afd831b456a: ms inline asm: recognize case-insensitive JMP
and CALL as TargetLowering… (authored by MaskRay).
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D149920/new/
https://reviews.llvm.org/D149920
Files:
clang/test/CodeGen/ms-inline-asm-functions.c
llvm/include/llvm/CodeGen/TargetLowering.h
llvm/lib/Target/X86/X86ISelLowering.cpp
llvm/test/CodeGen/X86/inline-asm-function-call-pic.ll
Index: llvm/test/CodeGen/X86/inline-asm-function-call-pic.ll
===
--- llvm/test/CodeGen/X86/inline-asm-function-call-pic.ll
+++ llvm/test/CodeGen/X86/inline-asm-function-call-pic.ll
@@ -15,6 +15,7 @@
; __asm {
; call static_func
; call extern_func
+; jmp extern_func
; shr eax, 0
; shr ebx, 0
; shr ecx, 0
@@ -40,6 +41,7 @@
; CHECK-EMPTY:
; CHECK-NEXT:calll static_func
; CHECK-NEXT:calll extern_func@PLT
+; CHECK-NEXT:jmp extern_func@PLT
; CHECK-NEXT:shrl $0, %eax
; CHECK-NEXT:shrl $0, %ebx
; CHECK-NEXT:shrl $0, %ecx
@@ -52,7 +54,8 @@
; CHECK-NEXT:#NO_APP
entry:
%call = tail call i32 @static_func()
- tail call void asm sideeffect inteldialect "call dword ptr ${0:P}\0A\09call dword ptr ${1:P}\0A\09shr eax, $$0\0A\09shr ebx, $$0\0A\09shr ecx, $$0\0A\09shr edx, $$0\0A\09shr edi, $$0\0A\09shr esi, $$0\0A\09shr ebp, $$0\0A\09shr esp, $$0", "*m,*m,~{eax},~{ebp},~{ebx},~{ecx},~{edi},~{edx},~{flags},~{esi},~{esp},~{dirflag},~{fpsr},~{flags}"(ptr nonnull elementtype(i32 (...)) @static_func, ptr nonnull elementtype(i32 (...)) @extern_func) #0
+;; We test call, CALL, and jmp.
+ tail call void asm sideeffect inteldialect "call ${0:P}\0A\09CALL ${1:P}\0A\09jmp ${1:P}\0A\09shr eax, $$0\0A\09shr ebx, $$0\0A\09shr ecx, $$0\0A\09shr edx, $$0\0A\09shr edi, $$0\0A\09shr esi, $$0\0A\09shr ebp, $$0\0A\09shr esp, $$0", "*m,*m,~{eax},~{ebp},~{ebx},~{ecx},~{edi},~{edx},~{flags},~{esi},~{esp},~{dirflag},~{fpsr},~{flags}"(ptr nonnull elementtype(i32 (...)) @static_func, ptr nonnull elementtype(i32 (...)) @extern_func) #0
ret void
}
Index: llvm/lib/Target/X86/X86ISelLowering.cpp
===
--- llvm/lib/Target/X86/X86ISelLowering.cpp
+++ llvm/lib/Target/X86/X86ISelLowering.cpp
@@ -33944,12 +33944,9 @@
// "call dword ptr "
auto TmpStr = AsmStr.substr(0, I);
I = TmpStr.rfind(':');
-if (I == StringRef::npos)
- return TmpStr;
-
-assert(I < TmpStr.size() && "Unexpected inline asm string!");
-auto Asm = TmpStr.drop_front(I + 1);
-return Asm;
+if (I != StringRef::npos)
+ TmpStr = TmpStr.substr(I + 1);
+return TmpStr.take_while(llvm::isAlpha);
}
return StringRef();
@@ -33957,12 +33954,13 @@
bool X86TargetLowering::isInlineAsmTargetBranch(
const SmallVectorImpl &AsmStrs, unsigned OpNo) const {
- StringRef InstrStr = getInstrStrFromOpNo(AsmStrs, OpNo);
-
- if (InstrStr.contains("call"))
-return true;
-
- return false;
+ // In a __asm block, __asm inst foo where inst is CALL or JMP should be
+ // changed from indirect TargetLowering::C_Memory to direct
+ // TargetLowering::C_Address.
+ // We don't need to special case LOOP* and Jcc, which cannot target a memory
+ // location.
+ StringRef Inst = getInstrStrFromOpNo(AsmStrs, OpNo);
+ return Inst.equals_insensitive("call") || Inst.equals_insensitive("jmp");
}
/// Provide custom lowering hooks for some operations.
Index: llvm/include/llvm/CodeGen/TargetLowering.h
===
--- llvm/include/llvm/CodeGen/TargetLowering.h
+++ llvm/include/llvm/CodeGen/TargetLowering.h
@@ -3624,15 +3624,13 @@
/// legal. It is frequently not legal in PIC relocation models.
virtual bool isOffsetFoldingLegal(const GlobalAddressSDNode *GA) const;
- /// Return true if the operand with index OpNo corresponding to a target
- /// branch, for example, in following case
+ /// On x86, return true if the operand with index OpNo is a CALL or JUMP
+ /// instruction, which can use either a memory constraint or an address
+ /// constraint. -fasm-blocks "__asm call foo" lowers to
+ /// call void asm sideeffect inteldialect "call ${0:P}", "*m..."
///
- /// call void asm "lea r8, $0\0A\09call qword ptr ${1:P}\0A\09ret",
- /// "*m,*m,~{r8},~{dirflag},~{fpsr},~{flags}"
- ///([9 x i32]* @Arr), void (...)* @sincos_asm)
- ///
- /// the operand $1 (sincos_asm) is target branch in inline asm, but the
- /// operand $0 (Arr) is not.
+ /// This function is used by a hack to choose the address constraint,
+ /// lowering to a direct call.
virtual bool
isInlineAsmTargetBranch(const SmallVectorImpl &AsmStrs,
unsigned OpNo) const {
Index: clang/test/CodeGen/ms-inlin
[PATCH] D149920: ms inline asm: recognize case-insensitive JMP and CALL as TargetLowering::C_Address
pengfei accepted this revision. pengfei added a comment. This revision is now accepted and ready to land. LGTM. Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D149920/new/ https://reviews.llvm.org/D149920 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D149920: ms inline asm: recognize case-insensitive JMP and CALL as TargetLowering::C_Address
MaskRay updated this revision to Diff 519744.
MaskRay marked an inline comment as done.
MaskRay added a comment.
fix a typo in a comment
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D149920/new/
https://reviews.llvm.org/D149920
Files:
clang/test/CodeGen/ms-inline-asm-functions.c
llvm/include/llvm/CodeGen/TargetLowering.h
llvm/lib/Target/X86/X86ISelLowering.cpp
llvm/test/CodeGen/X86/inline-asm-function-call-pic.ll
Index: llvm/test/CodeGen/X86/inline-asm-function-call-pic.ll
===
--- llvm/test/CodeGen/X86/inline-asm-function-call-pic.ll
+++ llvm/test/CodeGen/X86/inline-asm-function-call-pic.ll
@@ -15,6 +15,7 @@
; __asm {
; call static_func
; call extern_func
+; jmp extern_func
; shr eax, 0
; shr ebx, 0
; shr ecx, 0
@@ -40,6 +41,7 @@
; CHECK-EMPTY:
; CHECK-NEXT:calll static_func
; CHECK-NEXT:calll extern_func@PLT
+; CHECK-NEXT:jmp extern_func@PLT
; CHECK-NEXT:shrl $0, %eax
; CHECK-NEXT:shrl $0, %ebx
; CHECK-NEXT:shrl $0, %ecx
@@ -52,7 +54,8 @@
; CHECK-NEXT:#NO_APP
entry:
%call = tail call i32 @static_func()
- tail call void asm sideeffect inteldialect "call dword ptr ${0:P}\0A\09call dword ptr ${1:P}\0A\09shr eax, $$0\0A\09shr ebx, $$0\0A\09shr ecx, $$0\0A\09shr edx, $$0\0A\09shr edi, $$0\0A\09shr esi, $$0\0A\09shr ebp, $$0\0A\09shr esp, $$0", "*m,*m,~{eax},~{ebp},~{ebx},~{ecx},~{edi},~{edx},~{flags},~{esi},~{esp},~{dirflag},~{fpsr},~{flags}"(ptr nonnull elementtype(i32 (...)) @static_func, ptr nonnull elementtype(i32 (...)) @extern_func) #0
+;; We test call, CALL, and jmp.
+ tail call void asm sideeffect inteldialect "call ${0:P}\0A\09CALL ${1:P}\0A\09jmp ${1:P}\0A\09shr eax, $$0\0A\09shr ebx, $$0\0A\09shr ecx, $$0\0A\09shr edx, $$0\0A\09shr edi, $$0\0A\09shr esi, $$0\0A\09shr ebp, $$0\0A\09shr esp, $$0", "*m,*m,~{eax},~{ebp},~{ebx},~{ecx},~{edi},~{edx},~{flags},~{esi},~{esp},~{dirflag},~{fpsr},~{flags}"(ptr nonnull elementtype(i32 (...)) @static_func, ptr nonnull elementtype(i32 (...)) @extern_func) #0
ret void
}
Index: llvm/lib/Target/X86/X86ISelLowering.cpp
===
--- llvm/lib/Target/X86/X86ISelLowering.cpp
+++ llvm/lib/Target/X86/X86ISelLowering.cpp
@@ -33942,12 +33942,9 @@
// "call dword ptr "
auto TmpStr = AsmStr.substr(0, I);
I = TmpStr.rfind(':');
-if (I == StringRef::npos)
- return TmpStr;
-
-assert(I < TmpStr.size() && "Unexpected inline asm string!");
-auto Asm = TmpStr.drop_front(I + 1);
-return Asm;
+if (I != StringRef::npos)
+ TmpStr = TmpStr.substr(I + 1);
+return TmpStr.take_while(llvm::isAlpha);
}
return StringRef();
@@ -33955,12 +33952,13 @@
bool X86TargetLowering::isInlineAsmTargetBranch(
const SmallVectorImpl &AsmStrs, unsigned OpNo) const {
- StringRef InstrStr = getInstrStrFromOpNo(AsmStrs, OpNo);
-
- if (InstrStr.contains("call"))
-return true;
-
- return false;
+ // In a __asm block, __asm inst foo where inst is CALL or JMP should be
+ // changed from indirect TargetLowering::C_Memory to direct
+ // TargetLowering::C_Address.
+ // We don't need to special case LOOP* and Jcc, which cannot target a memory
+ // location.
+ StringRef Inst = getInstrStrFromOpNo(AsmStrs, OpNo);
+ return Inst.equals_insensitive("call") || Inst.equals_insensitive("jmp");
}
/// Provide custom lowering hooks for some operations.
Index: llvm/include/llvm/CodeGen/TargetLowering.h
===
--- llvm/include/llvm/CodeGen/TargetLowering.h
+++ llvm/include/llvm/CodeGen/TargetLowering.h
@@ -3624,15 +3624,13 @@
/// legal. It is frequently not legal in PIC relocation models.
virtual bool isOffsetFoldingLegal(const GlobalAddressSDNode *GA) const;
- /// Return true if the operand with index OpNo corresponding to a target
- /// branch, for example, in following case
+ /// On x86, return true if the operand with index OpNo is a CALL or JUMP
+ /// instruction, which can use either a memory constraint or an address
+ /// constraint. -fasm-blocks "__asm call foo" lowers to
+ /// call void asm sideeffect inteldialect "call ${0:P}", "*m..."
///
- /// call void asm "lea r8, $0\0A\09call qword ptr ${1:P}\0A\09ret",
- /// "*m,*m,~{r8},~{dirflag},~{fpsr},~{flags}"
- ///([9 x i32]* @Arr), void (...)* @sincos_asm)
- ///
- /// the operand $1 (sincos_asm) is target branch in inline asm, but the
- /// operand $0 (Arr) is not.
+ /// This function is used by a hack to choose the address constraint,
+ /// lowering to a direct call.
virtual bool
isInlineAsmTargetBranch(const SmallVectorImpl &AsmStrs,
unsigned OpNo) const {
Index: clang/test/CodeGen/ms-inline-asm-functions.c
[PATCH] D149920: ms inline asm: recognize case-insensitive JMP and CALL as TargetLowering::C_Address
pengfei added inline comments.
Comment at: llvm/lib/Target/X86/X86ISelLowering.cpp:33955
const SmallVectorImpl &AsmStrs, unsigned OpNo) const {
- StringRef InstrStr = getInstrStrFromOpNo(AsmStrs, OpNo);
-
- if (InstrStr.contains("call"))
-return true;
-
- return false;
+ // In a __asm block, __asm inst foo where inst is CALL or FOO should be
+ // changed from indirect TargetLowering::C_Memory to direct
JMP?
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D149920/new/
https://reviews.llvm.org/D149920
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D149920: ms inline asm: recognize case-insensitive JMP and CALL as TargetLowering::C_Address
MaskRay updated this revision to Diff 519734.
MaskRay retitled this revision from "ms inline asm: recognize "jmp" as
TargetLowering::C_Address" to "ms inline asm: recognize case-insensitive JMP
and CALL as TargetLowering::C_Address".
MaskRay edited the summary of this revision.
MaskRay added a comment.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.
better description
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D149920/new/
https://reviews.llvm.org/D149920
Files:
clang/test/CodeGen/ms-inline-asm-functions.c
llvm/include/llvm/CodeGen/TargetLowering.h
llvm/lib/Target/X86/X86ISelLowering.cpp
llvm/test/CodeGen/X86/inline-asm-function-call-pic.ll
Index: llvm/test/CodeGen/X86/inline-asm-function-call-pic.ll
===
--- llvm/test/CodeGen/X86/inline-asm-function-call-pic.ll
+++ llvm/test/CodeGen/X86/inline-asm-function-call-pic.ll
@@ -15,6 +15,7 @@
; __asm {
; call static_func
; call extern_func
+; jmp extern_func
; shr eax, 0
; shr ebx, 0
; shr ecx, 0
@@ -40,6 +41,7 @@
; CHECK-EMPTY:
; CHECK-NEXT:calll static_func
; CHECK-NEXT:calll extern_func@PLT
+; CHECK-NEXT:jmp extern_func@PLT
; CHECK-NEXT:shrl $0, %eax
; CHECK-NEXT:shrl $0, %ebx
; CHECK-NEXT:shrl $0, %ecx
@@ -52,7 +54,8 @@
; CHECK-NEXT:#NO_APP
entry:
%call = tail call i32 @static_func()
- tail call void asm sideeffect inteldialect "call dword ptr ${0:P}\0A\09call dword ptr ${1:P}\0A\09shr eax, $$0\0A\09shr ebx, $$0\0A\09shr ecx, $$0\0A\09shr edx, $$0\0A\09shr edi, $$0\0A\09shr esi, $$0\0A\09shr ebp, $$0\0A\09shr esp, $$0", "*m,*m,~{eax},~{ebp},~{ebx},~{ecx},~{edi},~{edx},~{flags},~{esi},~{esp},~{dirflag},~{fpsr},~{flags}"(ptr nonnull elementtype(i32 (...)) @static_func, ptr nonnull elementtype(i32 (...)) @extern_func) #0
+;; We test call, CALL, and jmp.
+ tail call void asm sideeffect inteldialect "call ${0:P}\0A\09CALL ${1:P}\0A\09jmp ${1:P}\0A\09shr eax, $$0\0A\09shr ebx, $$0\0A\09shr ecx, $$0\0A\09shr edx, $$0\0A\09shr edi, $$0\0A\09shr esi, $$0\0A\09shr ebp, $$0\0A\09shr esp, $$0", "*m,*m,~{eax},~{ebp},~{ebx},~{ecx},~{edi},~{edx},~{flags},~{esi},~{esp},~{dirflag},~{fpsr},~{flags}"(ptr nonnull elementtype(i32 (...)) @static_func, ptr nonnull elementtype(i32 (...)) @extern_func) #0
ret void
}
Index: llvm/lib/Target/X86/X86ISelLowering.cpp
===
--- llvm/lib/Target/X86/X86ISelLowering.cpp
+++ llvm/lib/Target/X86/X86ISelLowering.cpp
@@ -33942,12 +33942,9 @@
// "call dword ptr "
auto TmpStr = AsmStr.substr(0, I);
I = TmpStr.rfind(':');
-if (I == StringRef::npos)
- return TmpStr;
-
-assert(I < TmpStr.size() && "Unexpected inline asm string!");
-auto Asm = TmpStr.drop_front(I + 1);
-return Asm;
+if (I != StringRef::npos)
+ TmpStr = TmpStr.substr(I + 1);
+return TmpStr.take_while(llvm::isAlpha);
}
return StringRef();
@@ -33955,12 +33952,13 @@
bool X86TargetLowering::isInlineAsmTargetBranch(
const SmallVectorImpl &AsmStrs, unsigned OpNo) const {
- StringRef InstrStr = getInstrStrFromOpNo(AsmStrs, OpNo);
-
- if (InstrStr.contains("call"))
-return true;
-
- return false;
+ // In a __asm block, __asm inst foo where inst is CALL or FOO should be
+ // changed from indirect TargetLowering::C_Memory to direct
+ // TargetLowering::C_Address.
+ // We don't need to special case LOOP* and Jcc, which cannot target a memory
+ // location.
+ StringRef Inst = getInstrStrFromOpNo(AsmStrs, OpNo);
+ return Inst.equals_insensitive("call") || Inst.equals_insensitive("jmp");
}
/// Provide custom lowering hooks for some operations.
Index: llvm/include/llvm/CodeGen/TargetLowering.h
===
--- llvm/include/llvm/CodeGen/TargetLowering.h
+++ llvm/include/llvm/CodeGen/TargetLowering.h
@@ -3624,15 +3624,13 @@
/// legal. It is frequently not legal in PIC relocation models.
virtual bool isOffsetFoldingLegal(const GlobalAddressSDNode *GA) const;
- /// Return true if the operand with index OpNo corresponding to a target
- /// branch, for example, in following case
+ /// On x86, return true if the operand with index OpNo is a CALL or JUMP
+ /// instruction, which can use either a memory constraint or an address
+ /// constraint. -fasm-blocks "__asm call foo" lowers to
+ /// call void asm sideeffect inteldialect "call ${0:P}", "*m..."
///
- /// call void asm "lea r8, $0\0A\09call qword ptr ${1:P}\0A\09ret",
- /// "*m,*m,~{r8},~{dirflag},~{fpsr},~{flags}"
- ///([9 x i32]* @Arr), void (...)* @sincos_asm)
- ///
- /// the operand $1 (sincos_asm) is target branch in inline asm, but the
- /// operand $0 (Arr) is not.
+ /// This function is used by a hack to choose the address constraint,
