[Flang][experimental] Improve Umpire support (llvm#2112)

Co-authored-by: Sankisa, Krishna (Chaitanya) <[email protected]>

Author: mjklemm

clang/lib/Driver/ToolChains/Flang.cpp

@@ -833,8 +833,11 @@ void Flang::ConstructJob(Compilation &C, const JobAction &JA,
 
   addFortranDialectOptions(Args, CmdArgs);
 
-  if (Args.hasArg(options::OPT_ffast_amd_memory_allocator))
+  if (Args.hasArg(options::OPT_ffast_amd_memory_allocator)) {
     CmdArgs.push_back("-ffast-amd-memory-allocator");
+    CmdArgs.push_back("-mmlir");
+    CmdArgs.push_back("-use-alloc-runtime");
+  }
 
   // 'flang -E' always produces output that is suitable for use as fixed form
   // Fortran. However it is only valid free form source if the original is also

flang-rt/lib/amd/amd_alloc.cpp

@@ -33,7 +33,6 @@
 
 namespace Fortran::runtime::amd {
 
-extern bool amdAllocatorEnabled; // connects to descriptor.h
 static bool debugEnabled;
 static umpire_resourcemanager resourceManager;
 static umpire_allocator memoryPool;
@@ -75,7 +74,7 @@ void registerUmpireAllocator(
         pool.c_str());
   }
 #endif // ALLOC_DEBUG
-  // Configure a dynanmically growing memory pool.
+  // Configure a dynamically growing memory pool.
   umpire_allocator allocator;
   umpire_resourcemanager_get_instance(&resourceManager);
   umpire_resourcemanager_get_allocator_by_name(
@@ -181,9 +180,6 @@ void RTDEF(AMDRegisterAllocator)() {
     }
     registerUmpireAllocator(allocSpec.second, initialSize, blockSize);
   }
-
-  // enable the allocator in the allocator infrastructure
-  amdAllocatorEnabled = true;
 }
 
 void RTDEF(AMDAllocatableSetAllocIdx)(Descriptor &descriptor, int pos) {

flang/test/Lower/AMDGPU/allocate_runtime_alloc_idx.f90

@@ -1,4 +1,4 @@
-! RUN: %flang -target amdgcn-- -ffast-amd-memory-allocator -mmlir -use-alloc-runtime -S -emit-llvm %s -o - | FileCheck %s --check-prefix=CHECK
+! RUN: %flang -target amdgcn-- -ffast-amd-memory-allocator -S -emit-llvm %s -o - | FileCheck %s --check-prefix=CHECK
 subroutine allocate_deallocate()
   real, allocatable :: x
 ! CHECK: call void @_FortranAAMDAllocatableSetAllocIdx({{.*}}, i32 1)