Add constant dimension array test for FIR

Author: Razvan Lupusoru

flang/test/Fir/OpenACC/pointer-like-interface-load.mlir

@@ -60,6 +60,16 @@ func.func @test_load_derived_type() {
 
 // -----
 
+func.func @test_load_constant_array() {
+  %ptr = fir.alloca !fir.array<10xf32> {test.ptr}
+  // CHECK: Successfully generated load for operation: %{{.*}} = fir.alloca !fir.array<10xf32> {test.ptr}
+  // CHECK: Loaded value type: !fir.array<10xf32>
+  // CHECK: Generated: %{{.*}} = fir.load %{{.*}} : !fir.ref<!fir.array<10xf32>>
+  return
+}
+
+// -----
+
 func.func @test_load_dynamic_array_fails() {
   %c10 = arith.constant 10 : index
   %ptr = fir.alloca !fir.array<?xf32>, %c10 {test.ptr}

flang/test/Fir/OpenACC/pointer-like-interface-store.mlir

@@ -50,6 +50,16 @@ func.func @test_store_with_type_conversion() {
 
 // -----
 
+func.func @test_store_constant_array() {
+  %val = fir.undefined !fir.array<10xf32> {test.value}
+  %ptr = fir.alloca !fir.array<10xf32> {test.ptr}
+  // CHECK: Successfully generated store for operation: %{{.*}} = fir.alloca !fir.array<10xf32> {test.ptr}
+  // CHECK: Generated: fir.store %{{.*}} to %{{.*}} : !fir.ref<!fir.array<10xf32>>
+  return
+}
+
+// -----
+
 func.func @test_store_dynamic_array_fails() {
   %c10 = arith.constant 10 : index
   %ptr = fir.alloca !fir.array<?xf32>, %c10 {test.ptr}

mlir/test/lib/Dialect/OpenACC/TestPointerLikeTypeInterface.cpp

@@ -78,7 +78,7 @@ struct TestPointerLikeTypeInterfacePass
   void testGenLoad(Operation *op, Value result, PointerLikeType pointerType,
                    OpBuilder &builder);
   void testGenStore(Operation *op, Value result, PointerLikeType pointerType,
-                    OpBuilder &builder);
+                    OpBuilder &builder, Value providedValue = {});
 
   struct PointerCandidate {
     Operation *op;
@@ -100,6 +100,8 @@ void TestPointerLikeTypeInterfacePass::runOnOperation() {
       testMode == "store") {
     // Collect all candidates first
     SmallVector<PointerCandidate> candidates;
+    // For store mode, also look for a test value to use
+    Value testValue;
     func.walk([&](Operation *op) {
       if (op->hasAttr("test.ptr")) {
         for (auto result : op->getResults()) {
@@ -110,6 +112,11 @@ void TestPointerLikeTypeInterfacePass::runOnOperation() {
           }
         }
       }
+      // Collect value marked with test.value for store tests
+      if (testMode == "store" && op->hasAttr("test.value")) {
+        if (op->getNumResults() > 0)
+          testValue = op->getResult(0);
+      }
     });
 
     // Now test all candidates
@@ -125,7 +132,7 @@ void TestPointerLikeTypeInterfacePass::runOnOperation() {
                     builder);
       else if (testMode == "store")
         testGenStore(candidate.op, candidate.result, candidate.pointerType,
-                     builder);
+                     builder, testValue);
     }
   } else if (testMode == "copy") {
     // Collect all source and destination candidates
@@ -341,7 +348,8 @@ void TestPointerLikeTypeInterfacePass::testGenLoad(Operation *op, Value result,
 
 void TestPointerLikeTypeInterfacePass::testGenStore(Operation *op, Value result,
                                                     PointerLikeType pointerType,
-                                                    OpBuilder &builder) {
+                                                    OpBuilder &builder,
+                                                    Value providedValue) {
   Location loc = op->getLoc();
 
   // Create a new builder with the listener and set insertion point
@@ -350,28 +358,32 @@ void TestPointerLikeTypeInterfacePass::testGenStore(Operation *op, Value result,
   newBuilder.setListener(&tracker);
   newBuilder.setInsertionPointAfter(op);
 
-  // Create a test value to store - use a constant matching the element type
-  Type elementType = pointerType.getElementType();
-  if (!elementType) {
-    llvm::errs() << "Failed to generate store for operation: ";
-    op->print(llvm::errs());
-    llvm::errs() << "\n";
-    return;
-  }
+  // Use provided value if available, otherwise create a constant
+  Value valueToStore = providedValue;
+  if (!valueToStore) {
+    // Create a test value to store - use a constant matching the element type
+    Type elementType = pointerType.getElementType();
+    if (!elementType) {
+      llvm::errs() << "Failed to generate store for operation: ";
+      op->print(llvm::errs());
+      llvm::errs() << "\n";
+      return;
+    }
 
-  Value valueToStore;
-  if (elementType.isIntOrIndex()) {
-    auto attr = newBuilder.getIntegerAttr(elementType, 42);
-    valueToStore =
-        arith::ConstantOp::create(newBuilder, loc, elementType, attr);
-  } else if (auto floatType = dyn_cast<FloatType>(elementType)) {
-    auto attr = newBuilder.getFloatAttr(floatType, 42.0);
-    valueToStore = arith::ConstantOp::create(newBuilder, loc, floatType, attr);
-  } else {
-    llvm::errs() << "Failed to generate store for operation: ";
-    op->print(llvm::errs());
-    llvm::errs() << "\n";
-    return;
+    if (elementType.isIntOrIndex()) {
+      auto attr = newBuilder.getIntegerAttr(elementType, 42);
+      valueToStore =
+          arith::ConstantOp::create(newBuilder, loc, elementType, attr);
+    } else if (auto floatType = dyn_cast<FloatType>(elementType)) {
+      auto attr = newBuilder.getFloatAttr(floatType, 42.0);
+      valueToStore =
+          arith::ConstantOp::create(newBuilder, loc, floatType, attr);
+    } else {
+      llvm::errs() << "Failed to generate store for operation: ";
+      op->print(llvm::errs());
+      llvm::errs() << "\n";
+      return;
+    }
   }
 
   // Call the genStore API