[flang][nfc] Support volatility in Fir ops (llvm#134858)

Part two of merging llvm#132486. Support volatility in fir ops. * Introduce a new operation fir.volatile_cast, whose only purpose is to add or take away the volatility of an SSA value's type. The types must be otherwise identical, and any other type conversions must be handled by fir.convert. fir.convert will give an error if the volatility of the inputs does not match, such that all changes to volatility must be handled explicitly through fir.volatile_cast. * Add memory effects to ops that read from or write to memory. The precedent for this comes from the LLVM dialect (feb7bea) where llvm.load/store ops with the volatile attribute report read/write effects to a generic memory resource. This change is similar in spirit but different in two ways: the volatility of an operation is determined by the type of its memref, not an attribute on the op, and the memory effects of a load- or store-like operation on a volatile reference type are reported against a particular memory resource, `VolatileMemoryResource`. This is so MLIR optimizations are able to reorder operations that are not volatile around operations that are, which we believe more precisely models LLVM's volatile memory semantics. @vzakhari suggested this in llvm#132486 citing LangRef. See https://llvm.org/docs/LangRef.html#volatile-memory-accesses Changes needed to generate IR with volatile types are not included in this change, so it should be non-functional, containing only the changes to Fir ops and op utilities that will be needed once we enable lowering to generate volatile types.

Author: ashermancinelli

flang/include/flang/Optimizer/Builder/FIRBuilder.h

@@ -397,6 +397,11 @@ class FirOpBuilder : public mlir::OpBuilder, public mlir::OpBuilder::Listener {
  mlir::Value createConvert(mlir::Location loc, mlir::Type toTy,
  mlir::Value val);
 
+ /// Create a fir.convert op with a volatile cast if the source value's type
+ /// does not match the target type's volatility.
+ mlir::Value createConvertWithVolatileCast(mlir::Location loc, mlir::Type toTy,
+ mlir::Value val);
+
  /// Create a fir.store of \p val into \p addr. A lazy conversion
  /// of \p val to the element type of \p addr is created if needed.
  void createStoreWithConvert(mlir::Location loc, mlir::Value val,

flang/include/flang/Optimizer/Dialect/FIROps.h

@@ -50,6 +50,12 @@ struct DebuggingResource
  mlir::StringRef getName() final { return "DebuggingResource"; }
 };
 
+/// Model operations which read from/write to volatile memory
+struct VolatileMemoryResource
+ : public mlir::SideEffects::Resource::Base<VolatileMemoryResource> {
+ mlir::StringRef getName() final { return "VolatileMemoryResource"; }
+};
+
 class CoordinateIndicesAdaptor;
 using IntOrValue = llvm::PointerUnion<mlir::IntegerAttr, mlir::Value>;
 

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

@@ -286,7 +286,8 @@ def fir_FreeMemOp : fir_Op<"freemem", [MemoryEffects<[MemFree]>]> {
  let assemblyFormat = "$heapref attr-dict `:` qualified(type($heapref))";
 }
 
-def fir_LoadOp : fir_OneResultOp<"load", [FirAliasTagOpInterface]> {
+def fir_LoadOp : fir_OneResultOp<"load", [FirAliasTagOpInterface,
+ DeclareOpInterfaceMethods<MemoryEffectsOpInterface>]> {
  let summary = "load a value from a memory reference";
  let description = [{
  Load a value from a memory reference into an ssa-value (virtual register).
@@ -302,7 +303,7 @@ def fir_LoadOp : fir_OneResultOp<"load", [FirAliasTagOpInterface]> {
  or null.
  }];
 
- let arguments = (ins Arg<AnyReferenceLike, "", [MemRead]>:$memref,
+ let arguments = (ins AnyReferenceLike:$memref,
  OptionalAttr<LLVM_TBAATagArrayAttr>:$tbaa);
 
  let builders = [OpBuilder<(ins "mlir::Value":$refVal)>,
@@ -315,7 +316,8 @@ def fir_LoadOp : fir_OneResultOp<"load", [FirAliasTagOpInterface]> {
  }];
 }
 
-def fir_StoreOp : fir_Op<"store", [FirAliasTagOpInterface]> {
+def fir_StoreOp : fir_Op<"store", [FirAliasTagOpInterface,
+ DeclareOpInterfaceMethods<MemoryEffectsOpInterface>]> {
  let summary = "store an SSA-value to a memory location";
 
  let description = [{
@@ -335,7 +337,7 @@ def fir_StoreOp : fir_Op<"store", [FirAliasTagOpInterface]> {
  }];
 
  let arguments = (ins AnyType:$value,
- Arg<AnyReferenceLike, "", [MemWrite]>:$memref,
+ AnyReferenceLike:$memref,
  OptionalAttr<LLVM_TBAATagArrayAttr>:$tbaa);
 
  let builders = [OpBuilder<(ins "mlir::Value":$value, "mlir::Value":$memref)>];
@@ -348,7 +350,7 @@ def fir_StoreOp : fir_Op<"store", [FirAliasTagOpInterface]> {
  }];
 }
 
-def fir_CopyOp : fir_Op<"copy", []> {
+def fir_CopyOp : fir_Op<"copy", [DeclareOpInterfaceMethods<MemoryEffectsOpInterface>]> {
  let summary = "copy constant size memory";
 
  let description = [{
@@ -369,8 +371,8 @@ def fir_CopyOp : fir_Op<"copy", []> {
  TODO: add FirAliasTagOpInterface to carry TBAA.
  }];
 
- let arguments = (ins Arg<AnyRefOfConstantSizeAggregateType, "", [MemRead]>:$source,
- Arg<AnyRefOfConstantSizeAggregateType, "", [MemWrite]>:$destination,
+ let arguments = (ins AnyRefOfConstantSizeAggregateType:$source,
+ AnyRefOfConstantSizeAggregateType:$destination,
  OptionalAttr<UnitAttr>:$no_overlap);
 
  let builders = [OpBuilder<(ins "mlir::Value":$source,
@@ -1373,7 +1375,8 @@ def fir_BoxTypeDescOp : fir_SimpleOneResultOp<"box_tdesc", [NoMemoryEffect]> {
 // !- Merge the new and old values into the memory for "A"
 // array_merge_store <updated A> to <A's address>
 
-def fir_ArrayLoadOp : fir_Op<"array_load", [AttrSizedOperandSegments]> {
+def fir_ArrayLoadOp : fir_Op<"array_load", [AttrSizedOperandSegments,
+ DeclareOpInterfaceMethods<MemoryEffectsOpInterface>]> {
 
  let summary = "Load an array as a value.";
 
@@ -1412,7 +1415,7 @@ def fir_ArrayLoadOp : fir_Op<"array_load", [AttrSizedOperandSegments]> {
  }];
 
  let arguments = (ins
- Arg<AnyRefOrBox, "", [MemRead]>:$memref,
+ AnyRefOrBox:$memref,
  Optional<AnyShapeOrShiftType>:$shape,
  Optional<fir_SliceType>:$slice,
  Variadic<AnyIntegerType>:$typeparams
@@ -1624,7 +1627,7 @@ def fir_ArrayAccessOp : fir_Op<"array_access", [AttrSizedOperandSegments,
 
  It is only possible to use `array_access` on an `array_load` result value or
  a value that can be trace back transitively to an `array_load` as the
- dominating source. Other array operation such as `array_amend` can be in
+ dominating source. Other array operations such as `array_amend` can be in
  between.
 
  TODO: The above restriction is not enforced. The design of the operation
@@ -1685,7 +1688,7 @@ def fir_ArrayAmendOp : fir_Op<"array_amend", [NoMemoryEffect]> {
 }
 
 def fir_ArrayMergeStoreOp : fir_Op<"array_merge_store",
- [AttrSizedOperandSegments]> {
+ [AttrSizedOperandSegments, DeclareOpInterfaceMethods<MemoryEffectsOpInterface>]> {
 
  let summary = "Store merged array value to memory.";
 
@@ -1714,7 +1717,7 @@ def fir_ArrayMergeStoreOp : fir_Op<"array_merge_store",
  let arguments = (ins
  fir_SequenceType:$original,
  fir_SequenceType:$sequence,
- Arg<AnyRefOrBox, "", [MemWrite]>:$memref,
+ AnyRefOrBox:$memref,
  Optional<fir_SliceType>:$slice,
  Variadic<AnyIntegerType>:$typeparams
  );
@@ -2752,6 +2755,22 @@ def fir_AddrOfOp : fir_OneResultOp<"address_of", [NoMemoryEffect]> {
  let assemblyFormat = "`(` $symbol `)` attr-dict `:` type($resTy)";
 }
 
+def fir_VolatileCastOp : fir_SimpleOneResultOp<"volatile_cast", [NoMemoryEffect]> {
+ let summary = "cast between volatile and non-volatile types";
+ let description = [{
+ Cast between volatile and non-volatile types. The types must be otherwise
+ identical. A value's volatility cannot be changed by a fir.convert operation.
+ Reinterpreting a value as volatile must be done explicitly using this operation.
+ }];
+ let arguments = (ins AnyRefOrBox:$value);
+ let results = (outs AnyRefOrBox:$res);
+ let assemblyFormat = [{
+ $value attr-dict `:` functional-type($value, results)
+ }];
+ let hasVerifier = 1;
+ let hasFolder = 1;
+}
+
 def fir_ConvertOp : fir_SimpleOneResultOp<"convert", [NoMemoryEffect]> {
  let summary = "encapsulates all Fortran entity type conversions";
 

flang/include/flang/Optimizer/Dialect/FIROpsSupport.h

@@ -15,13 +15,26 @@
 
 namespace fir {
 
-/// Return true iff the Operation is a non-volatile LoadOp or ArrayLoadOp.
-inline bool nonVolatileLoad(mlir::Operation *op) {
- if (auto load = mlir::dyn_cast<fir::LoadOp>(op))
- return !load->getAttr("volatile");
- if (auto arrLoad = mlir::dyn_cast<fir::ArrayLoadOp>(op))
- return !arrLoad->getAttr("volatile");
- return false;
+/// The LLVM dialect represents volatile memory accesses as read and write
+/// effects to an unknown memory location, but this may be overly conservative.
+/// LLVM Language Reference only specifies that volatile memory accesses
+/// must not be reordered relative to other volatile memory accesses, so it
+/// is more precise to use a separate memory resource for volatile memory
+/// accesses.
+inline void addVolatileMemoryEffects(
+ mlir::TypeRange type,
+ llvm::SmallVectorImpl<
+ mlir::SideEffects::EffectInstance<mlir::MemoryEffects::Effect>>
+ &effects) {
+ for (mlir::Type t : type) {
+ if (fir::isa_volatile_type(t)) {
+ effects.emplace_back(mlir::MemoryEffects::Read::get(),
+ fir::VolatileMemoryResource::get());
+ effects.emplace_back(mlir::MemoryEffects::Write::get(),
+ fir::VolatileMemoryResource::get());
+ break;
+ }
+ }
 }
 
 /// Return true iff the Operation is a call.

flang/lib/Lower/ConvertExprToHLFIR.cpp

@@ -415,8 +415,13 @@ class HlfirDesignatorBuilder {
  .Case<fir::SequenceType>([&](fir::SequenceType seqTy) -> mlir::Type {
  return fir::SequenceType::get(seqTy.getShape(), newEleTy);
  })
- .Case<fir::PointerType, fir::HeapType, fir::ReferenceType, fir::BoxType,
- fir::ClassType>([&](auto t) -> mlir::Type {
+ .Case<fir::ReferenceType, fir::BoxType, fir::ClassType>(
+ [&](auto t) -> mlir::Type {
+ using FIRT = decltype(t);
+ return FIRT::get(changeElementType(t.getEleTy(), newEleTy),
+ t.isVolatile());
+ })
+ .Case<fir::PointerType, fir::HeapType>([&](auto t) -> mlir::Type {
  using FIRT = decltype(t);
  return FIRT::get(changeElementType(t.getEleTy(), newEleTy));
  })

flang/lib/Optimizer/Builder/FIRBuilder.cpp

@@ -577,6 +577,17 @@ mlir::Value fir::FirOpBuilder::convertWithSemantics(
  return createConvert(loc, toTy, val);
 }
 
+mlir::Value fir::FirOpBuilder::createConvertWithVolatileCast(mlir::Location loc,
+ mlir::Type toTy,
+ mlir::Value val) {
+ if (fir::isa_volatile_type(val.getType()) != fir::isa_volatile_type(toTy)) {
+ mlir::Type volatileAdjustedType = fir::updateTypeWithVolatility(
+ val.getType(), fir::isa_volatile_type(toTy));
+ val = create<fir::VolatileCastOp>(loc, volatileAdjustedType, val);
+ }
+ return createConvert(loc, toTy, val);
+}
+
 mlir::Value fir::factory::createConvert(mlir::OpBuilder &builder,
  mlir::Location loc, mlir::Type toTy,
  mlir::Value val) {
@@ -739,19 +750,20 @@ mlir::Value fir::FirOpBuilder::createBox(mlir::Location loc,
  << itemAddr.getType();
  llvm_unreachable("not a memory reference type");
  }
+ const bool isVolatile = fir::isa_volatile_type(itemAddr.getType());
  mlir::Type boxTy;
  mlir::Value tdesc;
  // Avoid to wrap a box/class with box/class.
  if (mlir::isa<fir::BaseBoxType>(elementType)) {
  boxTy = elementType;
  } else {
- boxTy = fir::BoxType::get(elementType);
+ boxTy = fir::BoxType::get(elementType, isVolatile);
  if (isPolymorphic) {
  elementType = fir::updateTypeForUnlimitedPolymorphic(elementType);
  if (isAssumedType)
- boxTy = fir::BoxType::get(elementType);
+ boxTy = fir::BoxType::get(elementType, isVolatile);
  else
- boxTy = fir::ClassType::get(elementType);
+ boxTy = fir::ClassType::get(elementType, isVolatile);
  }
  }