Exhaustively test all permutations of triple parts in TripleTest.

[dougk]

Summary

On account of evolution of the enum types, iteration over "everything" didn't really work.

[bkramer]

We can't use constexpr (yet), MSVC 2013 doesn't support it. Would it be possible to fold the Max values into the enums?

[dougk]

Changing 'constexpr' to 'const'

[chandlerc]

Just a minor tweak on my end.

include/llvm/ADT/Triple.h

87

In lots of other parts of LLVM, we add an extra "last" enum, I think I'd prefer that slightly.

[dougk]

use the 'Last<mumble>' idiom instead of a separate Max constant.

[dougk]

include/llvm/ADT/Triple.h

87

done. Thanks for the suggestion!

[chandlerc]

LGTM!

include/llvm/ADT/Triple.h

enum ArchType {
     amdil,      // AMDIL
     amdil64,    // AMDIL with 64-bit pointers
     hsail,      // AMD HSAIL
     hsail64,    // AMD HSAIL with 64-bit pointers
     spir,       // SPIR: standard portable IR for OpenCL 32-bit version
     spir64,     // SPIR: standard portable IR for OpenCL 64-bit version
     kalimba     // Kalimba: generic kalimba
   };
+  // Keep this in sync with the preceding list.
+  static constexpr ArchType ArchTypeMax = kalimba;
   enum SubArchType {
     NoSubArch,
 
     ARMSubArch_v8_1a,
     ARMSubArch_v8,
     ARMSubArch_v7,
     ARMSubArch_v7em,
     ARMSubArch_v7m,
enum VendorType {
     BGQ,
     Freescale,
     IBM,
     ImaginationTechnologies,
     MipsTechnologies,
     NVIDIA,
     CSR
   };
+  // Keep this in sync with the preceding list.
+  static constexpr VendorType VendorTypeMax = CSR;
   enum OSType {
     UnknownOS,
 
     CloudABI,
     Darwin,
     DragonFly,
     FreeBSD,
     IOS,
enum OSType {
     CNK,        // BG/P Compute-Node Kernel
     Bitrig,
     AIX,
     CUDA,       // NVIDIA CUDA
     NVCL,       // NVIDIA OpenCL
     AMDHSA,     // AMD HSA Runtime
     PS4
   };
+  // Keep this in sync with the preceding list.
+  static constexpr OSType OSTypeMax = PS4;
   enum EnvironmentType {
     UnknownEnvironment,
 
     GNU,
     GNUEABI,
     GNUEABIHF,
     GNUX32,
     CODE16,
     EABI,
     EABIHF,
     Android,
 
     MSVC,
     Itanium,
     Cygnus,
   };
+  // Keep this in sync with the preceding list.
+  static constexpr EnvironmentType EnvironmentTypeMax = Cygnus;
   enum ObjectFormatType {
     UnknownObjectFormat,
 
     COFF,
     ELF,
     MachO,
   };
 

unittests/ADT/TripleTest.cpp

TEST(TripleTest, Normalization) {
   EXPECT_EQ("-pc", Triple::normalize("pc"));
   EXPECT_EQ("--linux", Triple::normalize("linux"));
 
   EXPECT_EQ("x86_64--linux-gnu", Triple::normalize("x86_64-gnu-linux"));
 
   // Check that normalizing a permutated set of valid components returns a
   // triple with the unpermuted components.
   StringRef C[4];
-  for (int Arch = 1+Triple::UnknownArch; Arch <= Triple::amdil; ++Arch) {
+  for (int Arch = 1+Triple::UnknownArch; Arch <= Triple::ArchTypeMax; ++Arch) {
     C[0] = Triple::getArchTypeName(Triple::ArchType(Arch));
-    for (int Vendor = 1+Triple::UnknownVendor; Vendor <= Triple::PC;
+    for (int Vendor = 1+Triple::UnknownVendor; Vendor <= Triple::VendorTypeMax;
          ++Vendor) {
       C[1] = Triple::getVendorTypeName(Triple::VendorType(Vendor));
-      for (int OS = 1+Triple::UnknownOS; OS <= Triple::Minix; ++OS) {
+      for (int OS = 1+Triple::UnknownOS; OS <= Triple::OSTypeMax; ++OS) {
         if (OS == Triple::Win32)
           continue;
 
         C[2] = Triple::getOSTypeName(Triple::OSType(OS));
 
         std::string E = Join(C[0], C[1], C[2]);
         EXPECT_EQ(E, Triple::normalize(Join(C[0], C[1], C[2])));
 
         EXPECT_EQ(E, Triple::normalize(Join(C[0], C[2], C[1])));
         EXPECT_EQ(E, Triple::normalize(Join(C[1], C[2], C[0])));
         EXPECT_EQ(E, Triple::normalize(Join(C[1], C[0], C[2])));
         EXPECT_EQ(E, Triple::normalize(Join(C[2], C[0], C[1])));
         EXPECT_EQ(E, Triple::normalize(Join(C[2], C[1], C[0])));
 
-        for (int Env = 1 + Triple::UnknownEnvironment; Env <= Triple::Android;
+        for (int Env = 1 + Triple::UnknownEnvironment; Env <= Triple::EnvironmentTypeMax;
              ++Env) {
           C[3] = Triple::getEnvironmentTypeName(Triple::EnvironmentType(Env));
 
           std::string F = Join(C[0], C[1], C[2], C[3]);
           EXPECT_EQ(F, Triple::normalize(Join(C[0], C[1], C[2], C[3])));
 
           EXPECT_EQ(F, Triple::normalize(Join(C[0], C[1], C[3], C[2])));
           EXPECT_EQ(F, Triple::normalize(Join(C[0], C[2], C[3], C[1])));