Skip to content

Commit 5b0f703

Browse files
committed
Revert "[ARM][FPEnv] Lowering of fpenv intrinsics"
This reverts commit d62f040. Some cuda buildbots start failing.
1 parent cc75e52 commit 5b0f703

File tree

4 files changed

+0
-41
lines changed

4 files changed

+0
-41
lines changed

llvm/include/llvm/Target/TargetSelectionDAG.td

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -617,9 +617,6 @@ def strict_uint_to_fp : SDNode<"ISD::STRICT_UINT_TO_FP",
617617
def strict_fsetcc : SDNode<"ISD::STRICT_FSETCC", SDTSetCC, [SDNPHasChain]>;
618618
def strict_fsetccs : SDNode<"ISD::STRICT_FSETCCS", SDTSetCC, [SDNPHasChain]>;
619619

620-
def get_fpenv : SDNode<"ISD::GET_FPENV", SDTGetFPStateOp, [SDNPHasChain]>;
621-
def set_fpenv : SDNode<"ISD::SET_FPENV", SDTSetFPStateOp, [SDNPHasChain]>;
622-
def reset_fpenv : SDNode<"ISD::RESET_FPENV", SDTNone, [SDNPHasChain]>;
623620
def get_fpmode : SDNode<"ISD::GET_FPMODE", SDTGetFPStateOp, [SDNPHasChain]>;
624621
def set_fpmode : SDNode<"ISD::SET_FPMODE", SDTSetFPStateOp, [SDNPHasChain]>;
625622
def reset_fpmode : SDNode<"ISD::RESET_FPMODE", SDTNone, [SDNPHasChain]>;

llvm/lib/Target/ARM/ARMISelLowering.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1411,9 +1411,6 @@ ARMTargetLowering::ARMTargetLowering(const TargetMachine &TM,
14111411
setOperationAction(ISD::BITCAST, MVT::i64, Custom);
14121412
setOperationAction(ISD::GET_ROUNDING, MVT::i32, Custom);
14131413
setOperationAction(ISD::SET_ROUNDING, MVT::Other, Custom);
1414-
setOperationAction(ISD::GET_FPENV, MVT::i32, Legal);
1415-
setOperationAction(ISD::SET_FPENV, MVT::i32, Legal);
1416-
setOperationAction(ISD::RESET_FPENV, MVT::Other, Legal);
14171414
}
14181415

14191416
// We want to custom lower some of our intrinsics.

llvm/lib/Target/ARM/ARMInstrVFP.td

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2670,11 +2670,6 @@ def : Pat<(f32 (vfp_f32f16imm:$imm)),
26702670
let Predicates = [HasFullFP16];
26712671
}
26722672

2673-
// Floating-point environment management.
2674-
def : Pat<(get_fpenv), (VMRS)>;
2675-
def : Pat<(set_fpenv GPRnopc:$Rt), (VMSR GPRnopc:$Rt)>;
2676-
def : Pat<(reset_fpenv), (VMSR 0)>;
2677-
26782673
//===----------------------------------------------------------------------===//
26792674
// Assembler aliases.
26802675
//

llvm/test/CodeGen/ARM/fpenv.ll

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -79,16 +79,6 @@ entry:
7979
ret i32 %fpenv
8080
}
8181

82-
define i32 @get_fpenv_02() nounwind {
83-
; CHECK-LABEL: get_fpenv_02:
84-
; CHECK: @ %bb.0: @ %entry
85-
; CHECK-NEXT: vmrs r0, fpscr
86-
; CHECK-NEXT: mov pc, lr
87-
entry:
88-
%fpenv = call i32 @llvm.get.fpenv.i32()
89-
ret i32 %fpenv
90-
}
91-
9282
define void @set_fpenv_01(i32 %fpenv) #0 {
9383
; CHECK-LABEL: set_fpenv_01:
9484
; CHECK: @ %bb.0: @ %entry
@@ -107,16 +97,6 @@ entry:
10797
ret void
10898
}
10999

110-
define void @set_fpenv_02(i32 %fpenv) nounwind {
111-
; CHECK-LABEL: set_fpenv_02:
112-
; CHECK: @ %bb.0: @ %entry
113-
; CHECK-NEXT: vmsr fpscr, r0
114-
; CHECK-NEXT: mov pc, lr
115-
entry:
116-
call void @llvm.set.fpenv.i32(i32 %fpenv)
117-
ret void
118-
}
119-
120100
define void @reset_fpenv_01() #0 {
121101
; CHECK-LABEL: reset_fpenv_01:
122102
; CHECK: @ %bb.0: @ %entry
@@ -131,16 +111,6 @@ entry:
131111
ret void
132112
}
133113

134-
define void @reset_fpenv_02() nounwind {
135-
; CHECK-LABEL: reset_fpenv_02:
136-
; CHECK: @ %bb.0: @ %entry
137-
; CHECK-NEXT: vmsr fpscr, #0
138-
; CHECK-NEXT: mov pc, lr
139-
entry:
140-
call void @llvm.reset.fpenv()
141-
ret void
142-
}
143-
144114
attributes #0 = { nounwind "use-soft-float"="true" }
145115

146116
declare void @llvm.set.rounding(i32)

0 commit comments

Comments
 (0)