Revert "Add support for maximumnum/minimumnum (AliveToolkit#1123)"

This reverts commit 4eef8dd.

Author: jmciver

ir/instr.cpp

@@ -641,8 +641,6 @@ void FpBinOp::print(ostream &os) const {
   case FMin:     str = "fmin "; break;
   case FMaximum: str = "fmaximum "; break;
   case FMinimum: str = "fminimum "; break;
-  case FMaximumnum: str = "fmaximumnum "; break;
-  case FMinimumnum: str = "fminimumnum "; break;
   case CopySign: str = "copysign "; break;
   }
   os << getName() << " = " << str << fmath << *lhs << ", " << rhs->getName();
@@ -909,21 +907,6 @@ StateValue FpBinOp::toSMT(State &s) const {
     };
     break;
 
-  case FMinimumnum:
-  case FMaximumnum:
-    fn = [&](const expr &a, const expr &b, const expr &rm) {
-      expr zpos = expr::mkNumber("0", a), zneg = expr::mkNumber("-0", a);
-      expr cmp = op == FMinimumnum ? a.fole(b) : a.foge(b);
-      expr neg_cond = op == FMinimumnum ? (a.isFPNegative() || b.isFPNegative())
-                                        : (a.isFPNegative() && b.isFPNegative());
-      expr e = expr::mkIf(a.isFPZero() && b.isFPZero(),
-                          expr::mkIf(neg_cond, zneg, zpos),
-                          expr::mkIf(cmp, a, b));
-
-      return expr::mkIf(a.isNaN(), b, expr::mkIf(b.isNaN(), a, e));
-    };
-    break;
-
   case CopySign:
     bitwise = true;
     fn = [](const expr &a, const expr &b, const expr &rm) {

ir/instr.h

@@ -71,7 +71,7 @@ class BinOp final : public Instr {
 class FpBinOp final : public Instr {
 public:
   enum Op { FAdd, FSub, FMul, FDiv, FRem, FMax, FMin, FMaximum, FMinimum,
-            FMaximumnum, FMinimumnum, CopySign };
+            CopySign };
 
 private:
   Value *lhs, *rhs;

llvm_util/llvm2alive.cpp

@@ -1022,8 +1022,6 @@ class llvm2alive_ : public llvm::InstVisitor<llvm2alive_, unique_ptr<Instr>> {
     case llvm::Intrinsic::maxnum:
     case llvm::Intrinsic::minimum:
     case llvm::Intrinsic::maximum:
-    case llvm::Intrinsic::minimumnum:
-    case llvm::Intrinsic::maximumnum:
     case llvm::Intrinsic::experimental_constrained_fadd:
     case llvm::Intrinsic::experimental_constrained_fsub:
     case llvm::Intrinsic::experimental_constrained_fmul:
@@ -1045,8 +1043,6 @@ class llvm2alive_ : public llvm::InstVisitor<llvm2alive_, unique_ptr<Instr>> {
       case llvm::Intrinsic::experimental_constrained_minimum: op = FpBinOp::FMinimum; break;
       case llvm::Intrinsic::maximum:
       case llvm::Intrinsic::experimental_constrained_maximum: op = FpBinOp::FMaximum; break;
-      case llvm::Intrinsic::minimumnum:                       op = FpBinOp::FMinimumnum; break;
-      case llvm::Intrinsic::maximumnum:                       op = FpBinOp::FMaximumnum; break;
       case llvm::Intrinsic::experimental_constrained_fadd:    op = FpBinOp::FAdd; break;
       case llvm::Intrinsic::experimental_constrained_fsub:    op = FpBinOp::FSub; break;
       case llvm::Intrinsic::experimental_constrained_fmul:    op = FpBinOp::FMul; break;

tests/unit/fp/fmaxmin.opt

@@ -155,71 +155,3 @@ Name: fminimum, -0, +0
 %t = fminimum float -0.0, float +0.0
   =>
 %t = float -0.0
-
-Name: fmaximumnum, constant prop.
-%t = fmaximumnum float 1.0, float 3.0
-  =>
-%t = float 3.0
-
-Name: fminimumnum, constant prop.
-%t = fminimumnum float 1.0, float 3.0
-  =>
-%t = float 1.0
-
-Name: fmaximumnum, LHS NaN
-%v = fdiv float 0.0, 0.0
-%t = fmaximumnum float %v, float 3.0
-  =>
-%t = float 3.0
-
-Name: fmaximumnum, RHS NaN
-%v = fdiv float 0.0, 0.0
-%t = fmaximumnum float 3.0, float %v
-  =>
-%t = float 3.0
-
-Name: fmaximumnum, BOTH NaN
-%v = fdiv float 0.0, 0.0
-%t = fmaximumnum float %v, float %v
-  =>
-%v = fdiv float 0.0, 0.0
-%t = float %v
-
-Name: fminimumnum, LHS NaN
-%v = fdiv float 0.0, 0.0
-%t = fminimumnum float %v, float 3.0
-  =>
-%t = float 3.0
-
-Name: fminimumnum, RHS NaN
-%v = fdiv float 0.0, 0.0
-%t = fminimumnum float 3.0, float %v
-  =>
-%t = float 3.0
-
-Name: fminimumnum, BOTH NaN
-%v = fdiv float 0.0, 0.0
-%t = fminimumnum float %v, float %v
-  =>
-%v = fdiv float 0.0, 0.0
-%t = float %v
-
-Name: fmaximumnum, +0, -0
-%t = fmaximumnum float +0.0, float -0.0
-  =>
-%t = float +0.0
-
-Name: fmaximumnum, -0, +0
-%t = fmaximumnum float -0.0, float +0.0
-  =>
-%t = float +0.0
-
-Name: fminimumnum, +0, -0
-%t = fminimumnum float +0.0, float -0.0
-  =>
-%t = float -0.0
-
-Name: fminimumnum, -0, +0
-%t = fminimumnum float -0.0, float +0.0
-  =>
-%t = float -0.0

tools/alive_lexer.re

@@ -237,8 +237,6 @@ space+ {
 "fmin" { return FMIN; }
 "fmaximum" { return FMAXIMUM; }
 "fminimum" { return FMINIMUM; }
-"fmaximumnum" { return FMAXIMUMNUM; }
-"fminimumnum" { return FMINIMUMNUM; }
 "extractelement" { return EXTRACTELEMENT; }
 "insertelement" { return INSERTELEMENT; }
 "shufflevector" { return SHUFFLEVECTOR; }

tools/alive_parser.cpp

@@ -663,8 +663,6 @@ static unsigned parse_binop_flags(token op_token) {
   case FMIN:
   case FMAXIMUM:
   case FMINIMUM:
-  case FMAXIMUMNUM:
-  case FMINIMUMNUM:
   case SREM:
   case UREM:
   case UADD_SAT:
@@ -789,8 +787,6 @@ static unique_ptr<Instr> parse_fp_binop(string_view name, token op_token) {
   case FMIN:     op = FpBinOp::FMin; break;
   case FMAXIMUM: op = FpBinOp::FMaximum; break;
   case FMINIMUM: op = FpBinOp::FMinimum; break;
-  case FMAXIMUMNUM: op = FpBinOp::FMaximumnum; break;
-  case FMINIMUMNUM: op = FpBinOp::FMinimumnum; break;
   default:
     UNREACHABLE();
   }
@@ -1224,8 +1220,6 @@ static unique_ptr<Instr> parse_instr(string_view name) {
   case FMIN:
   case FMAXIMUM:
   case FMINIMUM:
-  case FMAXIMUMNUM:
-  case FMINIMUMNUM:
     return parse_fp_binop(name, t);
   case BITREVERSE:
   case BSWAP:

tools/tokens.h

@@ -66,10 +66,8 @@ TOKEN(UMULFIXSAT)
 TOKEN(FMA)
 TOKEN(FMAX)
 TOKEN(FMAXIMUM)
-TOKEN(FMAXIMUMNUM)
 TOKEN(FMIN)
 TOKEN(FMINIMUM)
-TOKEN(FMINIMUMNUM)
 TOKEN(FSUB)
 TOKEN(GLOBAL_NAME)
 TOKEN(HALF)