Use UnitAttr instead of I32Attr

Author: Thirumalai-Shaktivel

flang/include/flang/Optimizer/Dialect/FIROps.td

@@ -368,15 +368,15 @@ def fir_PrefetchOp : fir_Op<"prefetch", []> {
 
   /// `memref' is the address to be prefetched
   /// `rw'          : rw specifier >
-  ///                  read is 0, write is 1
+  ///                  read is 0 (default), write is 1
   /// `localityHint': temporal locality specifier >
   ///                  value ranging from 0 - no locality to 3 - extremely local
   /// `cacheType'   : cache type specifier >
-  ///                  instruction cache is 0, data cache is 1
-  let arguments = (ins AnyReferenceLike:$memref,
-      ConfinedAttr<I32Attr, [IntMinValue<0>, IntMaxValue<1>]>:$rw,
+  ///                  instruction cache is 0 (default), data cache is 1
+  /// NOTE: The numerical values used here is in reference to the LLVM LangRef
+  let arguments = (ins AnyReferenceLike:$memref, UnitAttr:$rw,
       ConfinedAttr<I32Attr, [IntMinValue<0>, IntMaxValue<3>]>:$localityHint,
-      ConfinedAttr<I32Attr, [IntMinValue<0>, IntMaxValue<1>]>:$cacheType);
+      UnitAttr:$cacheType);
 
   let assemblyFormat = "$memref attr-dict `:` type(operands)";
 }
@@ -974,7 +974,7 @@ def fir_ReboxAssumedRankOp : fir_Op<"rebox_assumed_rank",
     Example:
     ```
       fir.rebox_assumed_rank %1 lbs zeroes : (!fir.box<!fir.array<*:f32>>) -> !fir.box<!fir.array<*:f32>>
-    ```    
+    ```
   }];
 
   let arguments = (ins

flang/lib/Optimizer/CodeGen/CodeGen.cpp

@@ -3353,9 +3353,11 @@ struct PrefetchOpConversion : public fir::FIROpConversion<fir::PrefetchOp> {
   llvm::LogicalResult
   matchAndRewrite(fir::PrefetchOp prefetch, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
-    mlir::IntegerAttr rw = prefetch.getRwAttr();
+    mlir::IntegerAttr rw = mlir::IntegerAttr::get(rewriter.getI32Type(),
+                                                  prefetch.getRwAttr() ? 1 : 0);
     mlir::IntegerAttr localityHint = prefetch.getLocalityHintAttr();
-    mlir::IntegerAttr cacheType = prefetch.getCacheTypeAttr();
+    mlir::IntegerAttr cacheType = mlir::IntegerAttr::get(
+        rewriter.getI32Type(), prefetch.getCacheTypeAttr() ? 1 : 0);
     mlir::LLVM::Prefetch::create(rewriter, prefetch.getLoc(),
                                  adaptor.getOperands().front(), rw,
                                  localityHint, cacheType);

flang/test/Lower/HLFIR/prefetch.f90

@@ -18,7 +18,7 @@ subroutine test_prefetch_01()
 
   a = 23
 
-  ! HLFIR: fir.prefetch %[[H_A]]#0 {cacheType = 1 : i32, localityHint = 3 : i32, rw = 0 : i32} : !fir.ref<!fir.array<256xi32>>
+  ! HLFIR: fir.prefetch %[[H_A]]#0 {cacheType, localityHint = 3 : i32} : !fir.ref<!fir.array<256xi32>>
   !dir$ prefetch a
   i = sum(a)
 
@@ -28,8 +28,8 @@ subroutine test_prefetch_01()
   ! HLFIR: %[[H_CON:.*]] = fir.convert %[[H_ADD]] : (i32) -> i64
   ! HLFIR: %[[H_DESIG:.*]] = hlfir.designate %[[H_A]]#0 (%[[H_CON]])  : (!fir.ref<!fir.array<256xi32>>, i64) -> !fir.ref<i32>
 
-  ! HLFIR: fir.prefetch %[[H_DESIG]] {cacheType = 1 : i32, localityHint = 3 : i32, rw = 0 : i32} : !fir.ref<i32>
-  ! HLFIR: fir.prefetch %[[H_J]]#0 {cacheType = 1 : i32, localityHint = 3 : i32, rw = 0 : i32} : !fir.ref<i32>
+  ! HLFIR: fir.prefetch %[[H_DESIG]] {cacheType, localityHint = 3 : i32} : !fir.ref<i32>
+  ! HLFIR: fir.prefetch %[[H_J]]#0 {cacheType, localityHint = 3 : i32} : !fir.ref<i32>
 
   do i = 1, (256 - 64)
     !dir$ prefetch a(i+64), j
@@ -45,17 +45,17 @@ subroutine test_prefetch_02(t1)
   integer, allocatable :: a(:, :)
 
   ! HLFIR: %[[H_DESIG_01:.*]] = hlfir.designate %[[H_ARG0]]#0{"a"}   shape {{.*}}
-  ! HLFIR: fir.prefetch %[[H_DESIG_01]] {cacheType = 1 : i32, localityHint = 3 : i32, rw = 0 : i32} : !fir.ref<!fir.array<256x256xi32>>
+  ! HLFIR: fir.prefetch %[[H_DESIG_01]] {cacheType, localityHint = 3 : i32} : !fir.ref<!fir.array<256x256xi32>>
   !dir$ prefetch t1%a
   a = t1%a ** 2
 
   do i = 1, 256
-    ! HLFIR: fir.prefetch %[[H_A]]#0 {cacheType = 1 : i32, localityHint = 3 : i32, rw = 0 : i32} : !fir.ref<!fir.box<!fir.heap<!fir.array<?x?xi32>>>>
+    ! HLFIR: fir.prefetch %[[H_A]]#0 {cacheType, localityHint = 3 : i32} : !fir.ref<!fir.box<!fir.heap<!fir.array<?x?xi32>>>>
     !dir$ prefetch a
     a(i, :) = a(i, :) + i
     do j = 1, 256
       ! HLFIR: %[[H_DESIG_02:.*]] = hlfir.designate %[[H_ARG0]]#0{"a"} {{.*}}
-      ! HLFIR: fir.prefetch %[[H_DESIG_02]] {cacheType = 1 : i32, localityHint = 3 : i32, rw = 0 : i32} : !fir.ref<i32>
+      ! HLFIR: fir.prefetch %[[H_DESIG_02]] {cacheType, localityHint = 3 : i32} : !fir.ref<i32>
       !dir$ prefetch t1%a(i, j)
       t1%a(i, j) = (a(i, j) + i*j) / t1%a(i, j)
     end do