Address second round of review comments.

- Change setting per global code model on MCSymbol to the ASMPrinters
  initialization so it happens once.
- Add some globals without explicit code models to the lit test.

Author: mandlebug

llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp

@@ -501,25 +501,16 @@ static CodeModel::Model getCodeModel(const PPCSubtarget &S,
   return ModuleModel;
 }
 
-static void checkPerGlobalCodeModel(const GlobalValue *GV, MCSymbol *Sym) {
-  // ELF per global code model not supported yet.
-  if (!isa<MCSymbolXCOFF>(Sym))
-    return;
-
+static std::optional<CodeModel::Model>
+hasPerGlobalCodeModel(const GlobalValue *GV) {
   // Symbols that aren't global variables cannot have the attribute.
   if (!isa<GlobalVariable>(GV))
-    return;
-
-  const GlobalVariable *GVar = cast<GlobalVariable>(GV);
-  std::optional<CodeModel::Model> MaybeCM = GVar->getCodeModel();
+    return std::nullopt;
 
-  // No overriding atribute.
-  if (!MaybeCM)
-    return;
-
-  CodeModel::Model CM = *MaybeCM;
+  return cast<GlobalVariable>(GV)->getCodeModel();
+}
 
-  MCSymbolXCOFF *XSym = cast<MCSymbolXCOFF>(Sym);
+static void setOptionalCodeModel(MCSymbolXCOFF *XSym, CodeModel::Model CM) {
   switch (CM) {
   case CodeModel::Large:
     XSym->setPerSymbolCodeModel(MCSymbolXCOFF::CM_Large);
@@ -528,7 +519,7 @@ static void checkPerGlobalCodeModel(const GlobalValue *GV, MCSymbol *Sym) {
     XSym->setPerSymbolCodeModel(MCSymbolXCOFF::CM_Small);
     return;
   default:
-    report_fatal_error("Invlaid code model for AIX");
+    report_fatal_error("Invalid code model for AIX");
   }
 }
 
@@ -784,7 +775,6 @@ static MCSymbol *getMCSymbolForTOCPseudoMO(const MachineOperand &MO,
   case MachineOperand::MO_GlobalAddress: {
     const GlobalValue *GV = MO.getGlobal();
     MCSymbol *Sym = AP.getSymbol(GV);
-    checkPerGlobalCodeModel(GV, Sym);
     return Sym;
   }
   case MachineOperand::MO_ConstantPoolIndex:
@@ -3030,6 +3020,11 @@ bool PPCAIXAsmPrinter::doInitialization(Module &M) {
     }
 
     setCsectAlignment(&G);
+    std::optional<CodeModel::Model> OptionalCodeModel =
+        hasPerGlobalCodeModel(&G);
+    if (OptionalCodeModel)
+      setOptionalCodeModel(cast<MCSymbolXCOFF>(getSymbol(&G)),
+                           *OptionalCodeModel);
   }
 
   for (const auto &F : M)

llvm/test/CodeGen/PowerPC/aix-codemodel-attr.ll

@@ -1,20 +1,21 @@
 ; RUN: llc --verify-machineinstrs -mtriple powerpc-ibm-aix --code-model=small < \
-; RUN: %s | FileCheck --check-prefixes=CHECK,CHECK32 %s
+; RUN: %s | FileCheck --check-prefixes=CHECK,CHECK32,CHECK-SMALL,CHECK-SMALL32 %s
 
 ; RUN: llc --verify-machineinstrs -mtriple powerpc-ibm-aix --code-model=large < \
-; RUN: %s | FileCheck --check-prefixes=CHECK,CHECK32 %s
+; RUN: %s | FileCheck --check-prefixes=CHECK,CHECK32,CHECK-LARGE,CHECK-LARGE32 %s
 
 ; RUN: llc --verify-machineinstrs -mtriple powerpc64-ibm-aix --code-model=small < \
-; RUN: %s | FileCheck --check-prefixes=CHECK,CHECK64 %s
+; RUN: %s | FileCheck --check-prefixes=CHECK,CHECK64,CHECK-SMALL,CHECK-SMALL64 %s
 
 ; RUN: llc --verify-machineinstrs -mtriple powerpc64-ibm-aix --code-model=large < \
-; RUN: %s | FileCheck --check-prefixes=CHECK,CHECK64 %s
+; RUN: %s | FileCheck --check-prefixes=CHECK,CHECK64,CHECK-LARGE,CHECK-LARGE64 %s
 
 @a = external dso_local global i32, code_model "small", align 4
 @b = external dso_local global i32, code_model "large", align 4
 @c = dso_local global i32 55, code_model "small", align 4
 @d = dso_local global i32 41, code_model "large", align 4
-
+@e = external dso_local global i32, align 4
+@f = dso_local global i32 2748, align 4
 
 define i32 @A() local_unnamed_addr {
 entry:
@@ -58,6 +59,32 @@ entry:
 ; CHECK: lwz 3, 0([[ADDR]])
 ; CHECK: blr
 
+define i32 @E() {
+entry:
+  %0 = load i32, ptr @e, align 4
+  ret i32 %0
+}
+; CHECK-LARGE: addis [[HI:[0-9]+]], L..C[[TL_E:[0-9]+]]@u(2)
+; CHECK-LARGE32: lwz [[SCRATCH:[0-9]+]], L..C[[TL_E]]@l([[HI]])
+; CHECK-SMALL32: lwz [[SCRATCH:[0-9]+]], L..C[[TL_E:[0-9]+]](2)
+; CHECK-LARGE64: ld  [[SCRATCH:[0-9]+]], L..C[[TL_E]]@l([[HI]])
+; CHECK-SMALL64: ld  [[SCRATCH:[0-9]+]], L..C[[TL_E:[0-9]+]](2)
+; CHECK: lwz 3, 0([[SCRATCH]])
+; CHECK: blr
+
+define i32 @F() {
+entry:
+  %0 = load i32, ptr @f, align 4
+  ret i32 %0
+}
+; CHECK-LARGE: addis [[HI:[0-9]+]], L..C[[TL_F:[0-9]+]]@u(2)
+; CHECK-LARGE32: lwz [[SCRATCH:[0-9]+]], L..C[[TL_F]]@l([[HI]])
+; CHECK-SMALL32: lwz [[SCRATCH:[0-9]+]], L..C[[TL_F:[0-9]+]](2)
+; CHECK-LARGE64: ld [[SCRATCH:[0-9]+]], L..C[[TL_F]]@l([[HI]])
+; CHECK-SMALL64: ld  [[SCRATCH:[0-9]+]], L..C[[TL_F:[0-9]+]](2)
+; CHECK: lwz 3, 0([[SCRATCH]])
+; CHECK: blr
+
 define noundef nonnull ptr @addr_a() local_unnamed_addr {
 entry:
   ret ptr @a
@@ -94,11 +121,17 @@ entry:
 ; CHECK:   blr
 
 ;; Check TOC entires have correct storage mapping class
-; CHECK:  L..C[[TL_A]]:
-; CHECK:  .tc a[TC],a[UA]
-; CHECK:  L..C[[TL_B]]:
-; CHECK:  .tc b[TE],b[UA]
-; CHECK:  L..C[[TL_C]]:
-; CHECK:  .tc c[TC],c[RW]
-; CHECK:  L..C[[TL_D]]:
-; CHECK:  .tc d[TE],d[RW]
+; CHECK:         L..C[[TL_A]]:
+; CHECK:           .tc a[TC],a[UA]
+; CHECK:         L..C[[TL_B]]:
+; CHECK:           .tc b[TE],b[UA]
+; CHECK:         L..C[[TL_C]]:
+; CHECK:           .tc c[TC],c[RW]
+; CHECK:         L..C[[TL_D]]:
+; CHECK:           .tc d[TE],d[RW]
+; CHECK:         L..C[[TL_E]]:
+; CHECK-SMALL:     .tc e[TC],e[UA]
+; CHECK-LARGE:     .tc e[TE],e[UA]
+; CHECK:         L..C[[TL_F]]:
+; CHECK-SMALL:     .tc f[TC],f[RW]
+; CHECK-LARGE:     .tc f[TE],f[RW]