[flang] review update

Procedure ieee_support_standard is an inquiry function, not an elemental
function. Account for that, and make similar adjustments for other inquiry
and transformational functions.

Author: vdonaldson

flang/include/flang/Optimizer/Builder/IntrinsicCall.h

@@ -313,7 +313,8 @@ struct IntrinsicLibrary {
                                         llvm::ArrayRef<fir::ExtendedValue>);
   fir::ExtendedValue genIeeeSupportHalting(mlir::Type,
                                            llvm::ArrayRef<fir::ExtendedValue>);
-  mlir::Value genIeeeSupportRounding(mlir::Type, llvm::ArrayRef<mlir::Value>);
+  fir::ExtendedValue genIeeeSupportRounding(mlir::Type,
+                                            llvm::ArrayRef<fir::ExtendedValue>);
   fir::ExtendedValue genIeeeSupportStandard(mlir::Type,
                                             llvm::ArrayRef<fir::ExtendedValue>);
   template <mlir::arith::CmpIPredicate pred>

flang/lib/Evaluate/intrinsics.cpp

@@ -1022,45 +1022,35 @@ static const IntrinsicInterface genericIntrinsicFunction[]{
     {"__builtin_ieee_next_up", {{"x", SameReal}}, SameReal},
     {"__builtin_ieee_real", {{"a", AnyIntOrReal}, DefaultingKIND}, KINDReal},
     {"__builtin_ieee_support_datatype",
-        {{"x", AnyReal, Rank::elemental, Optionality::optional}},
-        DefaultLogical},
+        {{"x", AnyReal, Rank::known, Optionality::optional}}, DefaultLogical},
     {"__builtin_ieee_support_denormal",
-        {{"x", AnyReal, Rank::elemental, Optionality::optional}},
-        DefaultLogical},
+        {{"x", AnyReal, Rank::known, Optionality::optional}}, DefaultLogical},
     {"__builtin_ieee_support_divide",
-        {{"x", AnyReal, Rank::elemental, Optionality::optional}},
-        DefaultLogical},
+        {{"x", AnyReal, Rank::known, Optionality::optional}}, DefaultLogical},
     {"__builtin_ieee_support_flag",
         {{"flag", IeeeFlagType, Rank::scalar},
-            {"x", AnyReal, Rank::elemental, Optionality::optional}},
+            {"x", AnyReal, Rank::known, Optionality::optional}},
         DefaultLogical},
     {"__builtin_ieee_support_halting", {{"flag", IeeeFlagType, Rank::scalar}},
         DefaultLogical},
     {"__builtin_ieee_support_inf",
-        {{"x", AnyReal, Rank::elemental, Optionality::optional}},
-        DefaultLogical},
+        {{"x", AnyReal, Rank::known, Optionality::optional}}, DefaultLogical},
     {"__builtin_ieee_support_io",
-        {{"x", AnyReal, Rank::elemental, Optionality::optional}},
-        DefaultLogical},
+        {{"x", AnyReal, Rank::known, Optionality::optional}}, DefaultLogical},
     {"__builtin_ieee_support_nan",
-        {{"x", AnyReal, Rank::elemental, Optionality::optional}},
-        DefaultLogical},
+        {{"x", AnyReal, Rank::known, Optionality::optional}}, DefaultLogical},
     {"__builtin_ieee_support_rounding",
         {{"round_value", IeeeRoundType, Rank::scalar},
-            {"x", AnyReal, Rank::elemental, Optionality::optional}},
+            {"x", AnyReal, Rank::known, Optionality::optional}},
         DefaultLogical},
     {"__builtin_ieee_support_sqrt",
-        {{"x", AnyReal, Rank::elemental, Optionality::optional}},
-        DefaultLogical},
+        {{"x", AnyReal, Rank::known, Optionality::optional}}, DefaultLogical},
     {"__builtin_ieee_support_standard",
-        {{"x", AnyReal, Rank::elemental, Optionality::optional}},
-        DefaultLogical},
+        {{"x", AnyReal, Rank::known, Optionality::optional}}, DefaultLogical},
     {"__builtin_ieee_support_subnormal",
-        {{"x", AnyReal, Rank::elemental, Optionality::optional}},
-        DefaultLogical},
+        {{"x", AnyReal, Rank::known, Optionality::optional}}, DefaultLogical},
     {"__builtin_ieee_support_underflow_control",
-        {{"x", AnyReal, Rank::elemental, Optionality::optional}},
-        DefaultLogical},
+        {{"x", AnyReal, Rank::known, Optionality::optional}}, DefaultLogical},
     {"__builtin_numeric_storage_size", {}, DefaultInt},
 };
 

flang/lib/Optimizer/Builder/IntrinsicCall.cpp

@@ -456,9 +456,18 @@ static constexpr IntrinsicHandler handlers[]{
      &I::genIeeeSupportFlag,
      {{{"flag", asValue}, {"x", asInquired, handleDynamicOptional}}},
      /*isElemental=*/false},
-    {"ieee_support_halting", &I::genIeeeSupportHalting},
-    {"ieee_support_rounding", &I::genIeeeSupportRounding},
-    {"ieee_support_standard", &I::genIeeeSupportStandard},
+    {"ieee_support_halting",
+     &I::genIeeeSupportHalting,
+     {{{"flag", asValue}}},
+     /*isElemental=*/false},
+    {"ieee_support_rounding",
+     &I::genIeeeSupportRounding,
+     {{{"round_value", asValue}, {"x", asInquired, handleDynamicOptional}}},
+     /*isElemental=*/false},
+    {"ieee_support_standard",
+     &I::genIeeeSupportStandard,
+     {{{"flag", asValue}, {"x", asInquired, handleDynamicOptional}}},
+     /*isElemental=*/false},
     {"ieee_unordered", &I::genIeeeUnordered},
     {"ieee_value", &I::genIeeeValue},
     {"ieor", &I::genIeor},
@@ -5614,7 +5623,7 @@ IntrinsicLibrary::genIeeeSupportFlag(mlir::Type resultType,
   // is therefore ignored. Standard flags are all supported. The nonstandard
   // DENORM extension is not supported, at least for now.
   assert(args.size() == 1 || args.size() == 2);
-  auto [fieldRef, fieldTy] = getFieldRef(builder, loc, fir::getBase(args[0]));
+  auto [fieldRef, fieldTy] = getFieldRef(builder, loc, getBase(args[0]));
   mlir::Value flag = builder.create<fir::LoadOp>(loc, fieldRef);
   mlir::Value mask = builder.createIntegerConstant( // values are powers of 2
       loc, fieldTy,
@@ -5646,9 +5655,8 @@ fir::ExtendedValue IntrinsicLibrary::genIeeeSupportHalting(
 }
 
 // IEEE_SUPPORT_ROUNDING
-mlir::Value
-IntrinsicLibrary::genIeeeSupportRounding(mlir::Type resultType,
-                                         llvm::ArrayRef<mlir::Value> args) {
+fir::ExtendedValue IntrinsicLibrary::genIeeeSupportRounding(
+    mlir::Type resultType, llvm::ArrayRef<fir::ExtendedValue> args) {
   // Check if floating point rounding mode ROUND_VALUE is supported.
   // Rounding is supported either for all type kinds or none.
   // An optional X kind argument is therefore ignored.
@@ -5659,7 +5667,7 @@ IntrinsicLibrary::genIeeeSupportRounding(mlir::Type resultType,
   //  3 - toward negative infinity [supported]
   //  4 - to nearest, ties away from zero [not supported]
   assert(args.size() == 1 || args.size() == 2);
-  auto [fieldRef, fieldTy] = getFieldRef(builder, loc, args[0]);
+  auto [fieldRef, fieldTy] = getFieldRef(builder, loc, getBase(args[0]));
   mlir::Value mode = builder.create<fir::LoadOp>(loc, fieldRef);
   mlir::Value lbOk = builder.create<mlir::arith::CmpIOp>(
       loc, mlir::arith::CmpIPredicate::sge, mode,