[llvm-ifs] Fixing hardcoding of PlatformKind for TBD generation

[plotfi]

Summary

@cishida noticed I had hardcoded PlatformKind in my TBD generation in my first commit of llvm-ifs. This is a differential to get that rectified.

Any pointers on what the proper triple for BridgeOS should be would be helpful.

[cishida]

bridgeOS hasn't been added to llvm triple yet, so it's fine to exclude it for now.
also I have a patch I'm adding very soon that takes in llvm::triple and does the arch/platform mapping so you won't need to. I'll update this file when it comes out.

[cishida]

LGTM

[plotfi]

In D67255#1660946, @cishida wrote:

bridgeOS hasn't been added to llvm triple yet, so it's fine to exclude it for now.
also I have a patch I'm adding very soon that takes in llvm::triple and does the arch/platform mapping so you won't need to. I'll update this file when it comes out.

Awesome. Thanks @cishida 🙏

llvm/trunk/test/tools/llvm-ifs/ios-tbd.ifs

+# RUN: llvm-ifs --action write-bin -o - %s | FileCheck %s
+
+# CHECK: --- !tapi-tbd-v3
+# CHECK-NEXT: archs:           [ arm64 ]
+# CHECK-NEXT: platform:        ios
+# CHECK-NEXT: flags:           [ flat_namespace, not_app_extension_safe ]
+# CHECK-NEXT: install-name:    ''
+# CHECK-NEXT: current-version: 0
+# CHECK-NEXT: compatibility-version: 0
+# CHECK-NEXT: objc-constraint: none
+# CHECK-NEXT: exports:
+# CHECK-NEXT:   - archs:           [ arm64 ]
+# CHECK-NEXT:     symbols:         [ __Z3fooi ]
+# CHECK-NEXT: ...
+
+--- !experimental-ifs-v1
+IfsVersion: 1.0
+Triple: arm64-apple-ios
+ObjectFileFormat: TBD
+Symbols:
+  __Z3fooi: { Type: Func }
+...

llvm/trunk/test/tools/llvm-ifs/macos-tbd.ifs

+# RUN: llvm-ifs --action write-bin -o - %s | FileCheck %s
+
+# CHECK: --- !tapi-tbd-v3
+# CHECK-NEXT: archs:           [ arm64 ]
+# CHECK-NEXT: platform:        macosx
+# CHECK-NEXT: flags:           [ flat_namespace, not_app_extension_safe ]
+# CHECK-NEXT: install-name:    ''
+# CHECK-NEXT: current-version: 0
+# CHECK-NEXT: compatibility-version: 0
+# CHECK-NEXT: objc-constraint: none
+# CHECK-NEXT: exports:
+# CHECK-NEXT:   - archs:           [ arm64 ]
+# CHECK-NEXT:     symbols:         [ __Z3fooi ]
+# CHECK-NEXT: ...
+
+--- !experimental-ifs-v1
+IfsVersion: 1.0
+Triple: arm64-apple-macosx
+ObjectFileFormat: TBD
+Symbols:
+  __Z3fooi: { Type: Func }
+...

llvm/trunk/test/tools/llvm-ifs/tvos-tbd.ifs

+# RUN: llvm-ifs --action write-bin -o - %s | FileCheck %s
+
+# CHECK: --- !tapi-tbd-v3
+# CHECK-NEXT: archs:           [ arm64 ]
+# CHECK-NEXT: platform:        tvos
+# CHECK-NEXT: flags:           [ flat_namespace, not_app_extension_safe ]
+# CHECK-NEXT: install-name:    ''
+# CHECK-NEXT: current-version: 0
+# CHECK-NEXT: compatibility-version: 0
+# CHECK-NEXT: objc-constraint: none
+# CHECK-NEXT: exports:
+# CHECK-NEXT:   - archs:           [ arm64 ]
+# CHECK-NEXT:     symbols:         [ __Z3fooi ]
+# CHECK-NEXT: ...
+
+--- !experimental-ifs-v1
+IfsVersion: 1.0
+Triple: arm64-apple-tvos
+ObjectFileFormat: TBD
+Symbols:
+  __Z3fooi: { Type: Func }
+...

llvm/trunk/test/tools/llvm-ifs/watchos-tbd.ifs

+# RUN: llvm-ifs --action write-bin -o - %s | FileCheck %s
+
+# CHECK: --- !tapi-tbd-v3
+# CHECK-NEXT: archs:           [ arm64 ]
+# CHECK-NEXT: platform:        watchos
+# CHECK-NEXT: flags:           [ flat_namespace, not_app_extension_safe ]
+# CHECK-NEXT: install-name:    ''
+# CHECK-NEXT: current-version: 0
+# CHECK-NEXT: compatibility-version: 0
+# CHECK-NEXT: objc-constraint: none
+# CHECK-NEXT: exports:
+# CHECK-NEXT:   - archs:           [ arm64 ]
+# CHECK-NEXT:     symbols:         [ __Z3fooi ]
+# CHECK-NEXT: ...
+
+--- !experimental-ifs-v1
+IfsVersion: 1.0
+Triple: arm64-apple-watchos
+ObjectFileFormat: TBD
+Symbols:
+  __Z3fooi: { Type: Func }
+...

llvm/trunk/tools/llvm-ifs/llvm-ifs.cpp

static void inputOne(IO &IO, StringRef Key, std::set<IFSSymbol> &Set) {
     Set.insert(Sym);
   }
 
   static void output(IO &IO, std::set<IFSSymbol> &Set) {
     for (auto &Sym : Set)
       IO.mapRequired(Sym.Name.c_str(), const_cast<IFSSymbol &>(Sym));
   }
 };
-} // End yaml namespace
-} // End llvm namespace
+} // namespace yaml
+} // namespace llvm
 
 // A cumulative representation of ELF stubs.
 // Both textual and binary stubs will read into and write from this object.
 class IFSStub {
   // TODO: Add support for symbol versioning.
 public:
   VersionTuple IfsVersion;
   std::string Triple;
static void mapping(IO &IO, IFSStub &Stub) {
     IO.mapRequired("IfsVersion", Stub.IfsVersion);
     IO.mapOptional("Triple", Stub.Triple);
     IO.mapOptional("ObjectFileFormat", Stub.ObjectFileFormat);
     IO.mapOptional("SOName", Stub.SOName);
     IO.mapOptional("NeededLibs", Stub.NeededLibs);
     IO.mapRequired("Symbols", Stub.Symbols);
   }
 };
-} // End yaml namespace
-} // End llvm namespace
+} // namespace yaml
+} // namespace llvm
 
 static Expected<std::unique_ptr<IFSStub>> readInputFile(StringRef FilePath) {
   // Read in file.
   ErrorOr<std::unique_ptr<MemoryBuffer>> BufOrError =
       MemoryBuffer::getFileOrSTDIN(FilePath);
   if (!BufOrError)
     return createStringError(BufOrError.getError(), "Could not open `%s`",
                              FilePath.data());

 }
 
 int writeTbdStub(const llvm::Triple &T, const std::set<IFSSymbol> &Symbols,
                  const StringRef Format, raw_ostream &Out) {
   auto ArchOrError =
       [](const llvm::Triple &T) -> llvm::Expected<llvm::MachO::Architecture> {
     switch (T.getArch()) {
     default:
-      return createStringError(errc::not_supported, "Invalid Architecture.");
+      return createStringError(errc::not_supported, "Invalid Architecture.\n");
     case llvm::Triple::ArchType::x86:
       return AK_i386;
     case llvm::Triple::ArchType::x86_64:
       return AK_x86_64;
     case llvm::Triple::ArchType::arm:
       return AK_armv7;
     case llvm::Triple::ArchType::aarch64:
       return AK_arm64;
     }
   }(T);
 
+  auto PlatformKindOrError =
+      [](const llvm::Triple &T) -> llvm::Expected<llvm::MachO::PlatformKind> {
+    if (T.isMacOSX())
+      return llvm::MachO::PlatformKind::macOS;
+    if (T.isTvOS())
+      return llvm::MachO::PlatformKind::tvOS;
+    if (T.isWatchOS())
+      return llvm::MachO::PlatformKind::watchOS;
+    // Note: put isiOS last because tvOS and watchOS are also iOS according
+    // to the Triple.
+    if (T.isiOS())
+      return llvm::MachO::PlatformKind::iOS;
+
+    // TODO: Add an option for ForceTriple, but keep ForceFormat for now.
+    if (ForceFormat == "TBD")
+      return llvm::MachO::PlatformKind::macOS;
+
+    return createStringError(errc::not_supported, "Invalid Platform.\n");
+  }(T);
+
   if (!ArchOrError)
     return -1;
 
+  if (!PlatformKindOrError)
+    return -1;
+
   Architecture Arch = ArchOrError.get();
+  PlatformKind Plat = PlatformKindOrError.get();
 
   InterfaceFile File;
-  File.setFileType(FileType::TBD_V3);
+  File.setFileType(FileType::TBD_V3); // Only supporting v3 for now.
   File.setArchitectures(Arch);
-  File.setPlatform(PlatformKind::macOS);
+  File.setPlatform(Plat);
 
   for (const auto &Symbol : Symbols) {
     auto Name = Symbol.Name;
     auto Kind = SymbolKind::GlobalSymbol;
     switch (Symbol.Type) {
     default:
     case IFSSymbolType::NoType:
       Kind = SymbolKind::GlobalSymbol;