[PatternMatch] enhance m_NaN() to ignore undef elements in vectors

rotateright · rotateright · commit 1dbb6b7282bc · 2018-03-12T22:18:47.000Z
llvm-svn: 327339
diff --git a/llvm/include/llvm/IR/PatternMatch.h b/llvm/include/llvm/IR/PatternMatch.h
@@ -157,17 +157,6 @@ struct match_any_zero {
 /// floating point constants, this will match negative zero and positive zero
 inline match_any_zero m_AnyZero() { return match_any_zero(); }
 
-struct match_nan {
-  template <typename ITy> bool match(ITy *V) {
-    if (const auto *C = dyn_cast<Constant>(V))
-      return C->isNaN();
-    return false;
-  }
-};
-
-/// Match an arbitrary NaN constant. This includes quiet and signalling nans.
-inline match_nan m_NaN() { return match_nan(); }
-
 struct apint_match {
   const APInt *&Res;
 
@@ -422,6 +411,14 @@ inline cstfp_pred_ty<is_neg_zero> m_NegZero() {
   return cstfp_pred_ty<is_neg_zero>();
 }
 
+struct is_nan {
+  bool isValue(const APFloat &C) { return C.isNaN(); }
+};
+// Match an arbitrary NaN constant. This includes quiet and signalling nans.
+inline cstfp_pred_ty<is_nan> m_NaN() {
+  return cstfp_pred_ty<is_nan>();
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 
 template <typename Class> struct bind_ty {
diff --git a/llvm/test/Transforms/InstSimplify/floating-point-compare.ll b/llvm/test/Transforms/InstSimplify/floating-point-compare.ll
@@ -356,17 +356,15 @@ define <2 x i1> @orderedCompareWithNaNVector(<2 x double> %A) {
 
 define <2 x i1> @orderedCompareWithNaNVector_undef_elt(<2 x double> %A) {
 ; CHECK-LABEL: @orderedCompareWithNaNVector_undef_elt(
-; CHECK-NEXT:    [[CMP:%.*]] = fcmp olt <2 x double> [[A:%.*]], <double 0xFFFFFFFFFFFFFFFF, double undef>
-; CHECK-NEXT:    ret <2 x i1> [[CMP]]
+; CHECK-NEXT:    ret <2 x i1> zeroinitializer
 ;
   %cmp = fcmp olt <2 x double> %A, <double 0xFFFFFFFFFFFFFFFF, double undef>
   ret <2 x i1> %cmp
 }
 
 define <2 x i1> @unorderedCompareWithNaNVector_undef_elt(<2 x double> %A) {
 ; CHECK-LABEL: @unorderedCompareWithNaNVector_undef_elt(
-; CHECK-NEXT:    [[CMP:%.*]] = fcmp ult <2 x double> [[A:%.*]], <double undef, double 0xFFFFFFFFFFFFFFFF>
-; CHECK-NEXT:    ret <2 x i1> [[CMP]]
+; CHECK-NEXT:    ret <2 x i1> <i1 true, i1 true>
 ;
   %cmp = fcmp ult <2 x double> %A, <double undef, double 0xFFFFFFFFFFFFFFFF>
   ret <2 x i1> %cmp

Original file line number	Diff line number	Diff line change
`@@ -356,17 +356,15 @@ define <2 x i1> @orderedCompareWithNaNVector(<2 x double> %A) {`
`356`	`356`
`357`	`357`	`define <2 x i1> @orderedCompareWithNaNVector_undef_elt(<2 x double> %A) {`
`358`	`358`	`; CHECK-LABEL: @orderedCompareWithNaNVector_undef_elt(`
`359`		`-; CHECK-NEXT: [[CMP:%.]] = fcmp olt <2 x double> [[A:%.]], <double 0xFFFFFFFFFFFFFFFF, double undef>`
`360`		`-; CHECK-NEXT: ret <2 x i1> [[CMP]]`
	`359`	`+; CHECK-NEXT: ret <2 x i1> zeroinitializer`
`361`	`360`	`;`
`362`	`361`	`%cmp = fcmp olt <2 x double> %A, <double 0xFFFFFFFFFFFFFFFF, double undef>`
`363`	`362`	`ret <2 x i1> %cmp`
`364`	`363`	`}`
`365`	`364`
`366`	`365`	`define <2 x i1> @unorderedCompareWithNaNVector_undef_elt(<2 x double> %A) {`
`367`	`366`	`; CHECK-LABEL: @unorderedCompareWithNaNVector_undef_elt(`
`368`		`-; CHECK-NEXT: [[CMP:%.]] = fcmp ult <2 x double> [[A:%.]], <double undef, double 0xFFFFFFFFFFFFFFFF>`
`369`		`-; CHECK-NEXT: ret <2 x i1> [[CMP]]`
	`367`	`+; CHECK-NEXT: ret <2 x i1> <i1 true, i1 true>`
`370`	`368`	`;`
`371`	`369`	`%cmp = fcmp ult <2 x double> %A, <double undef, double 0xFFFFFFFFFFFFFFFF>`
`372`	`370`	`ret <2 x i1> %cmp`