From 1324bb29f7ce9d29b82c66cb744ff41b5d3a00e5 Mon Sep 17 00:00:00 2001
From: Stefan Pintilie <stefanp@ca.ibm.com>
Date: Wed, 19 Jan 2022 09:33:18 -0600
Subject: [PATCH] [PowerPC] Fix issue with strict float to int conversion.

When doing the float to int conversion the strict conversion also needs to
retun a chain. This patch fixes that.

Reviewed By: nemanjai, #powerpc, qiucf

Differential Revision: https://reviews.llvm.org/D117464
---
 llvm/lib/Target/PowerPC/PPCISelLowering.cpp |  8 ++-
 llvm/test/CodeGen/PowerPC/aix-fptoint.ll    | 54 +++++++++++++++++++++
 2 files changed, 60 insertions(+), 2 deletions(-)
 create mode 100644 llvm/test/CodeGen/PowerPC/aix-fptoint.ll

diff --git a/llvm/lib/Target/PowerPC/PPCISelLowering.cpp b/llvm/lib/Target/PowerPC/PPCISelLowering.cpp
index 3f68a9b0fdd9..c1bfc11824d2 100644
--- a/llvm/lib/Target/PowerPC/PPCISelLowering.cpp
+++ b/llvm/lib/Target/PowerPC/PPCISelLowering.cpp
@@ -11178,13 +11178,17 @@ void PPCTargetLowering::ReplaceNodeResults(SDNode *N,
   case ISD::STRICT_FP_TO_SINT:
   case ISD::STRICT_FP_TO_UINT:
   case ISD::FP_TO_SINT:
-  case ISD::FP_TO_UINT:
+  case ISD::FP_TO_UINT: {
     // LowerFP_TO_INT() can only handle f32 and f64.
     if (N->getOperand(N->isStrictFPOpcode() ? 1 : 0).getValueType() ==
         MVT::ppcf128)
       return;
-    Results.push_back(LowerFP_TO_INT(SDValue(N, 0), DAG, dl));
+    SDValue LoweredValue = LowerFP_TO_INT(SDValue(N, 0), DAG, dl);
+    Results.push_back(LoweredValue);
+    if (N->isStrictFPOpcode())
+      Results.push_back(LoweredValue.getValue(1));
     return;
+  }
   case ISD::TRUNCATE: {
     if (!N->getValueType(0).isVector())
       return;
diff --git a/llvm/test/CodeGen/PowerPC/aix-fptoint.ll b/llvm/test/CodeGen/PowerPC/aix-fptoint.ll
new file mode 100644
index 000000000000..cb1d4cd182a7
--- /dev/null
+++ b/llvm/test/CodeGen/PowerPC/aix-fptoint.ll
@@ -0,0 +1,54 @@
+; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
+; RUN: llc -O3 -mtriple powerpc-ibm-aix -verify-machineinstrs < %s | FileCheck --check-prefix=32BIT %s
+; RUN: llc -O3 -mtriple powerpc64-ibm-aix -verify-machineinstrs < %s | FileCheck --check-prefix=64BIT %s
+
+; Function Attrs: nounwind strictfp
+define i64 @tester_s(double %d) local_unnamed_addr #0 {
+; 32BIT-LABEL: tester_s:
+; 32BIT:       # %bb.0: # %entry
+; 32BIT-NEXT:    xscvdpsxds 0, 1
+; 32BIT-NEXT:    stfd 0, -8(1)
+; 32BIT-NEXT:    lwz 3, -8(1)
+; 32BIT-NEXT:    lwz 4, -4(1)
+; 32BIT-NEXT:    blr
+;
+; 64BIT-LABEL: tester_s:
+; 64BIT:       # %bb.0: # %entry
+; 64BIT-NEXT:    xscvdpsxds 0, 1
+; 64BIT-NEXT:    stfd 0, -8(1)
+; 64BIT-NEXT:    ld 3, -8(1)
+; 64BIT-NEXT:    blr
+entry:
+  %conv = tail call i64 @llvm.experimental.constrained.fptosi.i64.f64(double %d, metadata !"fpexcept.ignore") #2
+  ret i64 %conv
+}
+
+; Function Attrs: nounwind strictfp
+define i64 @tester_u(double %d) local_unnamed_addr #0 {
+; 32BIT-LABEL: tester_u:
+; 32BIT:       # %bb.0: # %entry
+; 32BIT-NEXT:    xscvdpuxds 0, 1
+; 32BIT-NEXT:    stfd 0, -8(1)
+; 32BIT-NEXT:    lwz 3, -8(1)
+; 32BIT-NEXT:    lwz 4, -4(1)
+; 32BIT-NEXT:    blr
+;
+; 64BIT-LABEL: tester_u:
+; 64BIT:       # %bb.0: # %entry
+; 64BIT-NEXT:    xscvdpuxds 0, 1
+; 64BIT-NEXT:    stfd 0, -8(1)
+; 64BIT-NEXT:    ld 3, -8(1)
+; 64BIT-NEXT:    blr
+entry:
+  %conv = tail call i64 @llvm.experimental.constrained.fptoui.i64.f64(double %d, metadata !"fpexcept.ignore") #2
+  ret i64 %conv
+}
+
+; Function Attrs: nounwind
+declare i64 @llvm.experimental.constrained.fptosi.i64.f64(double, metadata) #1
+declare i64 @llvm.experimental.constrained.fptoui.i64.f64(double, metadata) #1
+
+attributes #0 = { nounwind strictfp "strictfp" "target-cpu"="pwr7" }
+attributes #1 = { nounwind }
+
+