[PATCH] D85527: [AIX] Generate unique module id based on PID and timestamp

[Xiangling Liao via Phabricator via llvm-commits]

Xiangling_L updated this revision to Diff 285431.
Xiangling_L added a comment.

Use itostr for signed integer value ;


CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D85527/new/

https://reviews.llvm.org/D85527

Files:
  llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
  llvm/test/CodeGen/PowerPC/aix-static-init-no-unique-module-id.ll


Index: llvm/test/CodeGen/PowerPC/aix-static-init-no-unique-module-id.ll
===================================================================
--- llvm/test/CodeGen/PowerPC/aix-static-init-no-unique-module-id.ll
+++ llvm/test/CodeGen/PowerPC/aix-static-init-no-unique-module-id.ll
@@ -1,5 +1,5 @@
-; RUN: not --crash llc -mtriple powerpc-ibm-aix-xcoff -o - %s 2>&1 | FileCheck %s
-; RUN: not --crash llc -mtriple powerpc64-ibm-aix-xcoff -o - %s 2>&1 | FileCheck %s
+; RUN: llc -mtriple powerpc-ibm-aix-xcoff < %s | FileCheck %s
+; RUN: llc -mtriple powerpc64-ibm-aix-xcoff < %s | FileCheck %s
 
 @llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 65535, void ()* @foo, i8* null }]
 
@@ -7,4 +7,18 @@
   ret void
 }
 
-; CHECK: LLVM ERROR: cannot produce a unique identifier for this module based on strong external symbols
+; FIXME: Adjust the comment after we use source file full path to generate unique
+; module id instead.
+; Use PID and timestamp to generate a unique module id when strong external
+; symbols are not available in current module. The module id generated in this
+; way is not reproducible. A function name sample would be:
+; __sinit80000000_clang_1006931596810495_0.
+
+; CHECK:         .lglobl        foo[DS]
+; CHECK:         .lglobl        .foo
+; CHECK:         .csect foo[DS]
+; CHECK: __sinit80000000_clang_[[MODULEID:[0-9]+]]_0:
+; CHECK: .foo:
+; CHECK: .__sinit80000000_clang_[[MODULEID]]_0:
+; CHECK: .globl	__sinit80000000_clang_[[MODULEID]]_0
+; CHECK: .globl	.__sinit80000000_clang_[[MODULEID]]_0
Index: llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
===================================================================
--- llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
+++ llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
@@ -64,6 +64,7 @@
 #include "llvm/Support/CodeGen.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/ErrorHandling.h"
+#include "llvm/Support/Process.h"
 #include "llvm/Support/TargetRegistry.h"
 #include "llvm/Support/raw_ostream.h"
 #include "llvm/Target/TargetMachine.h"
@@ -1863,13 +1864,16 @@
       // names.
       if (GlobalUniqueModuleId.empty()) {
         GlobalUniqueModuleId = getUniqueModuleId(&M);
-        // FIXME: We need to figure out what to hash on or encode into the
-        // unique ID we need.
-        if (GlobalUniqueModuleId.compare("") == 0)
-          llvm::report_fatal_error(
-              "cannot produce a unique identifier for this module based on"
-              " strong external symbols");
-        GlobalUniqueModuleId = GlobalUniqueModuleId.substr(1);
+        if (GlobalUniqueModuleId.compare("") != 0)
+          // TODO: Use source file full path to generate the unique id.
+          GlobalUniqueModuleId = GlobalUniqueModuleId.substr(1);
+        else
+          // Use PID and current time as unique module id when we cannot
+          // generate one based on a module's strong external symbols.
+          // FIXME: Adjust the comment accordingly after we use source file full
+          // path instead.
+          GlobalUniqueModuleId = llvm::itostr(sys::Process::getProcessId()) +
+                                 llvm::itostr(time(nullptr));
       }
 
       emitSpecialLLVMGlobal(&G);


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D85527.285431.patch
Type: text/x-patch
Size: 3237 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200813/31fd5f0c/attachment.bin>