[flang-commits] [flang] e090182 - [flang][fir] Updates to internal name uniquer.

[Eric Schweitz via flang-commits]

Author: Eric Schweitz
Date: 2021-02-09T14:43:33-08:00
New Revision: e090182fe153c9ceea50b1807f8ca5c13729e402

URL: https://github.com/llvm/llvm-project/commit/e090182fe153c9ceea50b1807f8ca5c13729e402
DIFF: https://github.com/llvm/llvm-project/commit/e090182fe153c9ceea50b1807f8ca5c13729e402.diff

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

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

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

Added: 
    

Modified: 
    flang/include/flang/Optimizer/Support/InternalNames.h
    flang/lib/Optimizer/Support/InternalNames.cpp
    flang/unittests/Optimizer/InternalNamesTest.cpp

Removed: 
    


################################################################################
diff  --git a/flang/include/flang/Optimizer/Support/InternalNames.h b/flang/include/flang/Optimizer/Support/InternalNames.h
index 33583d6c660b..b2d741c9e403 100644
--- a/flang/include/flang/Optimizer/Support/InternalNames.h
+++ b/flang/include/flang/Optimizer/Support/InternalNames.h
@@ -32,6 +32,7 @@ struct NameUniquer {
   /// The sort of the unique name
   enum class NameKind {
     NOT_UNIQUED,
+    BLOCK_DATA_NAME,
     COMMON,
     CONSTANT,
     DERIVED_TYPE,
@@ -63,6 +64,9 @@ struct NameUniquer {
   /// 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,

diff  --git a/flang/lib/Optimizer/Support/InternalNames.cpp b/flang/lib/Optimizer/Support/InternalNames.cpp
index bbe1c7888496..5b12787860ab 100644
--- a/flang/lib/Optimizer/Support/InternalNames.cpp
+++ b/flang/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 @@ std::string fir::NameUniquer::doCommonBlock(llvm::StringRef name) {
   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 @@ fir::NameUniquer::deconstruct(llvm::StringRef uniq) {
           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);

diff  --git a/flang/unittests/Optimizer/InternalNamesTest.cpp b/flang/unittests/Optimizer/InternalNamesTest.cpp
index 07373ee173c0..0f22fee47950 100644
--- a/flang/unittests/Optimizer/InternalNamesTest.cpp
+++ b/flang/unittests/Optimizer/InternalNamesTest.cpp
@@ -46,6 +46,16 @@ void validateDeconstructedName(
       << "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");