[OpenMP][NVPTX] Handle additional invalid PTX characters

[sandoval]

Summary

For OpenMP offload, Clang emits global symbols containing the string
'<captured>', which contains characters that are invalid in PTX.
Extend the existing pass that replaces '.' and '@' characters with
'_$_' to also replace '<' and '>' characters.

[cchen]

LGTM

llvm/lib/Target/NVPTX/NVPTXAssignValidGlobalNames.cpp

bool NVPTXAssignValidGlobalNames::runOnModule(Module &M) {
 
   return true;
 }
 
 std::string NVPTXAssignValidGlobalNames::cleanUpName(StringRef Name) {
   std::string ValidName;
   raw_string_ostream ValidNameStream(ValidName);
   for (char C : Name) {
-    if (C == '.' || C == '@') {
+    if (C == '.' || C == '@' || C == '<' || C == '>') {
       ValidNameStream << "_$_";
     } else {
       ValidNameStream << C;
     }
   }
 
   return ValidNameStream.str();
 }
 
 ModulePass *llvm::createNVPTXAssignValidGlobalNamesPass() {
   return new NVPTXAssignValidGlobalNames();
 }

llvm/test/CodeGen/NVPTX/symbol-naming.ll

 ; RUN: llc < %s -march=nvptx -mattr=+ptx60 -mcpu=sm_30 | FileCheck %s
 ; RUN: llc < %s -march=nvptx64 -mattr=+ptx60 -mcpu=sm_30 | FileCheck %s
 ; RUN: %if ptxas && !ptxas-12.0 %{ llc < %s -march=nvptx -mattr=+ptx60 -mcpu=sm_30 | %ptxas-verify %}
 ; RUN: %if ptxas %{ llc < %s -march=nvptx64 -mattr=+ptx60 -mcpu=sm_30 | %ptxas-verify %}
 
 ; Verify that the NVPTX target removes invalid symbol names prior to emitting
 ; PTX.
 
 ; CHECK-NOT: .str
+; CHECK-NOT: <str>
 ; CHECK-NOT: .function.
 
 ; CHECK-DAG: _$_str
+; CHECK-DAG: _$_str_$_
 ; CHECK-DAG: _$_str1
 
 ; CHECK-DAG: _$_function_$_
 ; CHECK-DAG: _$_function_$_2
 
 target datalayout = "e-i64:64-v16:16-v32:32-n16:32:64"
 target triple = "nvptx64-unknown-unknown"
 
 
 @.str = private unnamed_addr constant [13 x i8] c"%d %f %c %d\0A\00", align 1
+@"<str>" = private unnamed_addr constant [13 x i8] c"%d %f %c %d\0A\00", align 1
 @_$_str = private unnamed_addr constant [13 x i8] c"%d %f %c %d\0A\00", align 1
 
 
 ; Function Attrs: nounwind
 define internal void @.function.() {
 entry:
   %call = call i32 (ptr, ...) @printf(ptr @.str)
+  %call2 = call i32 (ptr, ...) @printf(ptr @"<str>")
   ret void
 }
 
 ; Function Attrs: nounwind
 define internal void @_$_function_$_() {
 entry:
   %call = call i32 (ptr, ...) @printf(ptr @_$_str)
+  %call2 = call i32 (ptr, ...) @printf(ptr @"<str>")
   ret void
 }
 
 ; Function Attrs: nounwind
 define void @global_function() {
 entry:
   call void @.function.()
   call void @_$_function_$_()
   ret void
 }
 
 declare i32 @printf(ptr, ...)