commit fd392d384d67604f019241b439de27a45f55aa86
author Eric Schweitz <eschweitz@nvidia.com> Tue Feb 09 09:50:08 2021 -0800
committer Copybara-Service <copybara-worker@google.com> Fri Feb 19 01:01:40 2021 -0800
tree 2be03ed4e7058e47c5fdf8803dab7277ca3b489a
parent 783cc0ad607d879da1af78c06bf839078a1be2ce

[flang][fir] Updates to internal name uniquer.

https://github.com/flang-compiler/f18-llvm-project/pull/474

Differential Revision: https://reviews.llvm.org/D96361

GitOrigin-RevId: e090182fe153c9ceea50b1807f8ca5c13729e402

include/flang/Optimizer/Support/InternalNames.h

diff --git a/include/flang/Optimizer/Support/InternalNames.h b/include/flang/Optimizer/Support/InternalNames.h
index 33583d6..b2d741c 100644
--- a/include/flang/Optimizer/Support/InternalNames.h
+++ b/include/flang/Optimizer/Support/InternalNames.h
@@ -32,6 +32,7 @@
   /// The sort of the unique name
   enum class NameKind {
     NOT_UNIQUED,
+    BLOCK_DATA_NAME,
     COMMON,
     CONSTANT,
     DERIVED_TYPE,
@@ -63,6 +64,9 @@
   /// Unique a common block name
   std::string doCommonBlock(llvm::StringRef name);
 
+  /// Unique a block data unit name
+  std::string doBlockData(llvm::StringRef name);
+
   /// Unique a (global) constant name
   std::string doConstant(llvm::ArrayRef<llvm::StringRef> modules,
                          llvm::Optional<llvm::StringRef> host,

lib/Optimizer/Support/InternalNames.cpp

diff --git a/lib/Optimizer/Support/InternalNames.cpp b/lib/Optimizer/Support/InternalNames.cpp
index bbe1c78..5b12787 100644
--- a/lib/Optimizer/Support/InternalNames.cpp
+++ b/lib/Optimizer/Support/InternalNames.cpp
@@ -7,6 +7,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "flang/Optimizer/Support/InternalNames.h"
+#include "flang/Optimizer/Dialect/FIRType.h"
+#include "mlir/IR/BuiltinTypes.h"
 #include "mlir/IR/Diagnostics.h"
 #include "llvm/Support/CommandLine.h"
 
@@ -97,6 +99,11 @@
   return result.append("B").append(toLower(name));
 }
 
+std::string fir::NameUniquer::doBlockData(llvm::StringRef name) {
+  std::string result = prefix();
+  return result.append("L").append(toLower(name));
+}
+
 std::string
 fir::NameUniquer::doConstant(llvm::ArrayRef<llvm::StringRef> modules,
                              llvm::Optional<llvm::StringRef> host,
@@ -237,6 +244,10 @@
           name = readName(uniq, i, i + 1, end);
         }
         break;
+      case 'L':
+        nk = NameKind::BLOCK_DATA_NAME;
+        name = readName(uniq, i, i + 1, end);
+        break;
       case 'P':
         nk = NameKind::PROCEDURE;
         name = readName(uniq, i, i + 1, end);

unittests/Optimizer/InternalNamesTest.cpp

diff --git a/unittests/Optimizer/InternalNamesTest.cpp b/unittests/Optimizer/InternalNamesTest.cpp
index 07373ee..0f22fee 100644
--- a/unittests/Optimizer/InternalNamesTest.cpp
+++ b/unittests/Optimizer/InternalNamesTest.cpp
@@ -46,6 +46,16 @@
       << "Possible error: DeconstructedName mismatch";
 }
 
+TEST(InternalNamesTest, doBlockDataTest) {
+  NameUniquer obj;
+  std::string actual = obj.doBlockData("blockdatatest");
+  std::string actualBlank = obj.doBlockData("");
+  std::string expectedMangledName = "_QLblockdatatest";
+  std::string expectedMangledNameBlank = "_QL";
+  ASSERT_EQ(actual, expectedMangledName);
+  ASSERT_EQ(actualBlank, expectedMangledNameBlank);
+}
+
 TEST(InternalNamesTest, doCommonBlockTest) {
   NameUniquer obj;
   std::string actual = obj.doCommonBlock("hello");