byref printing and parsing

Author: ergawy

flang/lib/Optimizer/Dialect/FIROps.cpp

@@ -5254,17 +5254,21 @@ static mlir::ParseResult parseSpecifierList(
   if (failed(parser.parseLParen()))
     return mlir::failure();
 
+  llvm::SmallVector<bool> isByRefVec;
   llvm::SmallVector<mlir::SymbolRefAttr> spceifierSymbolVec;
   llvm::SmallVector<fir::ReduceAttr> attributes;
 
   if (failed(parser.parseCommaSeparatedList([&]() {
+        if (isReduce)
+          isByRefVec.push_back(
+              parser.parseOptionalKeyword("byref").succeeded());
+
         if (failed(parser.parseAttribute(spceifierSymbolVec.emplace_back())))
           return mlir::failure();
 
         if (isReduce &&
-            failed(parser.parseAttribute(attributes.emplace_back()))) {
+            failed(parser.parseAttribute(attributes.emplace_back())))
           return mlir::failure();
-        }
 
         if (parser.parseOperand(specifierOperands.emplace_back()) ||
             parser.parseArrow() ||
@@ -5301,6 +5305,13 @@ static mlir::ParseResult parseSpecifierList(
                               std::get<1>(operandType), result.operands))
       return mlir::failure();
 
+  if (isReduce)
+    result.addAttribute(
+        fir::DoConcurrentLoopOp::getReduceByrefAttrName(result.name),
+        isByRefVec.empty()
+            ? nullptr
+            : mlir::DenseBoolArrayAttr::get(builder.getContext(), isByRefVec));
+
   llvm::SmallVector<mlir::Attribute> symbolAttrs(spceifierSymbolVec.begin(),
                                                  spceifierSymbolVec.end());
   result.addAttribute(symsAttrName, builder.getArrayAttr(symbolAttrs));
@@ -5411,11 +5422,15 @@ void fir::DoConcurrentLoopOp::print(mlir::OpAsmPrinter &p) {
   if (!getReduceVars().empty()) {
     p << " reduce(";
     llvm::interleaveComma(
-        llvm::zip_equal(getReduceSymsAttr(), getReduceAttrsAttr(),
-                        getReduceVars(), getRegionReduceArgs()),
+        llvm::zip_equal(getReduceByrefAttr().asArrayRef(), getReduceSymsAttr(),
+                        getReduceAttrsAttr(), getReduceVars(),
+                        getRegionReduceArgs()),
         p, [&](auto it) {
-          p << std::get<0>(it) << " " << std::get<1>(it) << " "
-            << std::get<2>(it) << " -> " << std::get<3>(it);
+          if (std::get<0>(it))
+            p << "byref ";
+
+          p << std::get<1>(it) << " " << std::get<2>(it) << " "
+            << std::get<3>(it) << " -> " << std::get<4>(it);
         });
     p << " : ";
     llvm::interleaveComma(getReduceVars(), p,

flang/test/Fir/do_concurrent.fir

@@ -167,7 +167,7 @@ func.func @dc_reduce() {
   %4:2 = hlfir.declare %3 {uniq_name = "dc_reduce"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
   %c1 = arith.constant 1 : index 
   fir.do_concurrent {
-    fir.do_concurrent.loop (%arg0) = (%c1) to (%c1) step (%c1) reduce(@add_reduction_i32 #fir.reduce_attr<add> %4#0 -> %arg1 : !fir.ref<i32>) {
+    fir.do_concurrent.loop (%arg0) = (%c1) to (%c1) step (%c1) reduce(byref @add_reduction_i32 #fir.reduce_attr<add> %4#0 -> %arg1 : !fir.ref<i32>) {
     }
   }
   return
@@ -177,7 +177,7 @@ func.func @dc_reduce() {
 // CHECK:          %[[S_ALLOC:.*]] = fir.alloca i32 {bindc_name = "s", uniq_name = "dc_reduce"}
 // CHECK:          %[[S_DECL:.*]]:2 = hlfir.declare %[[S_ALLOC]] {uniq_name = "dc_reduce"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
 // CHECK:          fir.do_concurrent {
-// CHECK:            fir.do_concurrent.loop (%{{.*}}) = (%{{.*}}) to (%{{.*}}) step (%{{.*}}) reduce(@add_reduction_i32 #fir.reduce_attr<add> %[[S_DECL]]#0 -> %[[S_ARG:.*]] : !fir.ref<i32>) {
+// CHECK:            fir.do_concurrent.loop (%{{.*}}) = (%{{.*}}) to (%{{.*}}) step (%{{.*}}) reduce(byref @add_reduction_i32 #fir.reduce_attr<add> %[[S_DECL]]#0 -> %[[S_ARG:.*]] : !fir.ref<i32>) {
 // CHECK:            }
 // CHECK:          }
 // CHECK:          return