[LLParser] Support symbolic address space numbers

[arichardson]

Summary

This allows the LLParser to also accept "A", "G", and "P" in addrspace
usages. "A" will be replaced by the alloca address space defined in the
globals, "G" by the default globals address space and "P" by the program
address space. This makes it easier to write tests that use different
address space and only only vary the RUN: lines. Currently, the only
alternative is to pre-process the sources with a tool such as sed

Importantly, these new string values are only accepted in .ll files and
not stored in the bitcode format, so it does not round-trip via llvm-as
and llvm-dis (see newly added test).

[nikic]

I'm fine with this addition. Should probably get a mention in LangRef as well?

[arsenm]

Seems mildly convenient for some lit tests

llvm/test/Assembler/symbolic-addrspace.ll

23

Can you also test some cases where the string doesn't match the expected address space (e.g. alloca("G"))

51

Can you also test the error if it's a number in a string, e.g. "0"

[arichardson]

• Add LangRef update
• Add requested additional tests

[arichardson]

drop accidental diff

[nikic]

LGTM

llvm/lib/AsmParser/LLParser.cpp

 
 /// parseOptionalAddrSpace
 ///   := /*empty*/
 ///   := 'addrspace' '(' uint32 ')'
 bool LLParser::parseOptionalAddrSpace(unsigned &AddrSpace, unsigned DefaultAS) {
   AddrSpace = DefaultAS;
   if (!EatIfPresent(lltok::kw_addrspace))
     return false;
+
+  auto ParseAddrspaceValue = [&](unsigned &AddrSpace) -> bool {
+    if (Lex.getKind() == lltok::StringConstant) {
+      auto AddrSpaceStr = Lex.getStrVal();
+      if (AddrSpaceStr == "A") {
+        AddrSpace = M->getDataLayout().getAllocaAddrSpace();
+      } else if (AddrSpaceStr == "G") {
+        AddrSpace = M->getDataLayout().getDefaultGlobalsAddressSpace();
+      } else if (AddrSpaceStr == "P") {
+        AddrSpace = M->getDataLayout().getProgramAddressSpace();
+      } else {
+        return tokError("invalid symbolic addrspace '" + AddrSpaceStr + "'");
+      }
+      Lex.Lex();
+      return false;
+    } else if (Lex.getKind() != lltok::APSInt) {
+      return tokError("expected integer or string constant");
+    }
+    return parseUInt32(AddrSpace);
+  };
+
   return parseToken(lltok::lparen, "expected '(' in address space") ||
-         parseUInt32(AddrSpace) ||
+         ParseAddrspaceValue(AddrSpace) ||
          parseToken(lltok::rparen, "expected ')' in address space");
 }
 
 /// parseStringAttribute
 ///   := StringConstant
 ///   := StringConstant '=' StringConstant
 bool LLParser::parseStringAttribute(AttrBuilder &B) {
   std::string Attr = Lex.getStrVal();

llvm/test/Assembler/symbolic-addrspace.ll

+;; Check that we can parse symbolic addres space constants "A", "G", "P".
+;; NB: These do not round-trip via llvm-as, they are purely for initial parsing
+;; and will be converted to a numerical constant that does not depend on the
+;; datalayout by the .ll parser.
+; RUN: split-file %s %t --leading-lines
+; RUN: llvm-as < %t/valid.ll | llvm-dis | FileCheck %s
+; RUN: not llvm-as < %t/bad-not-string.ll 2>&1
+; RUN: not llvm-as < %t/bad-not-string.ll 2>&1 | FileCheck %s --check-prefix=ERR-NOT-STR
+; RUN: not llvm-as < %t/bad-unknown-char.ll 2>&1 | FileCheck %s --check-prefix=ERR-BAD-CHAR
+; RUN: not llvm-as < %t/bad-multiple-valid-chars.ll 2>&1 | FileCheck %s --check-prefix=ERR-MULTIPLE-CHARS
+; RUN: not llvm-as < %t/bad-using-at-symbol.ll 2>&1 | FileCheck %s --check-prefix=ERR-AT-SYMBOL
+
+;--- valid.ll
+target datalayout = "A1-G2-P3"
+; CHECK: target datalayout = "A1-G2-P3"
+
+; CHECK: @str = private addrspace(2) constant [4 x i8] c"str\00"
+@str = private addrspace("G") constant [4 x i8] c"str\00"
+
+define void @foo() {
+  ; CHECK: %alloca = alloca i32, align 4, addrspace(1)
+  %alloca = alloca i32, addrspace("A")
+  ret void
+}
+
+; CHECK: define void @bar() addrspace(3) {
+define void @bar() addrspace("P") {
+  ; CHECK: call addrspace(3) void @foo()
+  call addrspace("P") void @foo()
+  ret void
+}
+
+;--- bad-not-string.ll
+target datalayout = "G2"
+@str = private addrspace(D) constant [4 x i8] c"str\00"
+; ERR-NOT-STR: [[#@LINE-1]]:26: error: expected integer or string constant
+
+;--- bad-unknown-char.ll
+target datalayout = "G2"
+@str = private addrspace("D") constant [4 x i8] c"str\00"
+; ERR-BAD-CHAR: [[#@LINE-1]]:26: error: invalid symbolic addrspace 'D'
+
+;--- bad-multiple-valid-chars.ll
+target datalayout = "A1-G2"
+@str = private addrspace("AG") constant [4 x i8] c"str\00"
+; ERR-MULTIPLE-CHARS: [[#@LINE-1]]:26: error: invalid symbolic addrspace 'AG'
+
+;--- bad-using-at-symbol.ll
+target datalayout = "A1-G2"
+@str = private addrspace(@A) constant [4 x i8] c"str\00"
+; ERR-AT-SYMBOL: [[#@LINE-1]]:26: error: expected integer or string constant