Revert "[Downstream change] Cherry-pick of [TargetParser] Normalize "aarch64-amazon-linux" to "aarch64-amazon-linux-gnu" (#535)"

This reverts commit 956585f.

Author: pawosm-arm

llvm/include/llvm/TargetParser/Triple.h

@@ -197,9 +197,7 @@ class Triple {
     SUSE,
     OpenEmbedded,
     Intel,
-    // Downstream issue: #533 (Amazon Linux still not recognized correctly)
-    Amazon,
-    LastVendorType = Amazon
+    LastVendorType = Intel
   };
   enum OSType {
     UnknownOS,

llvm/lib/TargetParser/Triple.cpp

@@ -271,9 +271,6 @@ StringRef Triple::getVendorTypeName(VendorType Kind) {
   case PC: return "pc";
   case SCEI: return "scei";
   case SUSE: return "suse";
-  // Downstream issue: #533 (Amazon Linux still not recognized correctly)
-  case Amazon:
-    return "amazon";
   }
 
   llvm_unreachable("Invalid VendorType!");
@@ -672,8 +669,6 @@ static Triple::VendorType parseVendor(StringRef VendorName) {
       .Case("suse", Triple::SUSE)
       .Case("oe", Triple::OpenEmbedded)
       .Case("intel", Triple::Intel)
-      // Downstream issue: #533 (Amazon Linux still not recognized correctly)
-      .Case("amazon", Triple::Amazon)
       .Default(Triple::UnknownVendor);
 }
 
@@ -1306,14 +1301,6 @@ std::string Triple::normalize(StringRef Str, CanonicalForm Form) {
   if (Vendor == Triple::SUSE && Environment == llvm::Triple::GNUEABI)
     Components[3] = "gnueabihf";
 
-  // Downstream issue: #533 (Amazon Linux still not recognized correctly)
-  // Amazon Linux uses a "gnu" environment by default.
-  if (Environment == Triple::UnknownEnvironment && Vendor == Triple::Amazon &&
-      OS == Triple::Linux) {
-    Components.resize(4);
-    Components[3] = "gnu";
-  }
-
   if (OS == Triple::Win32) {
     Components.resize(4);
     Components[2] = "windows";

llvm/test/CodeGen/AArch64/veclib-llvm.sincos.ll

@@ -1,10 +1,6 @@
 ; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --filter "(bl|ptrue)" --version 5
 ; RUN: llc -mtriple=aarch64-gnu-linux -mattr=+neon,+sve -vector-library=sleefgnuabi < %s | FileCheck %s -check-prefix=SLEEF
 ; RUN: llc -mtriple=aarch64-gnu-linux -mattr=+neon,+sve -vector-library=ArmPL < %s | FileCheck %s -check-prefix=ARMPL
-; NOTE: Downstream issue: #533 (Amazon Linux still not recognized correctly)
-; Check we expand to a vector library call on aarch64-amazon-linux:
-; RUN: llc -mtriple=aarch64-amazon-linux -mattr=+neon,+sve -vector-library=sleefgnuabi < %s | FileCheck %s -check-prefix=SLEEF
-; RUN: llc -mtriple=aarch64-amazon-linux -mattr=+neon,+sve -vector-library=ArmPL < %s | FileCheck %s -check-prefix=ARMPL
 
 define void @test_sincos_v4f32(<4 x float> %x, ptr noalias %out_sin, ptr noalias %out_cos) {
 ; SLEEF-LABEL: test_sincos_v4f32:

llvm/test/Transforms/LoopVectorize/AArch64/multiple-result-intrinsics.ll

@@ -1,13 +1,8 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --filter "(:|sincos|modf|extractvalue|store)" --version 5
 ; RUN: opt -passes=loop-vectorize -mtriple=aarch64-gnu-linux -mcpu=neoverse-v1 -mattr=+sve < %s -S -o - -debug-only=loop-vectorize 2>%t.1 | FileCheck %s --check-prefix=CHECK
 ; RUN: opt -passes=loop-vectorize -mtriple=aarch64-gnu-linux -mcpu=neoverse-v1 -mattr=+sve -vector-library=ArmPL < %s -S -o - -debug-only=loop-vectorize 2>%t.2 | FileCheck %s --check-prefix=CHECK-ARMPL
-; NOTE: Downstream issue: #533 (Amazon Linux still not recognized correctly)
-; RUN: opt -passes=loop-vectorize -mtriple=aarch64-amazon-linux -mcpu=neoverse-v1 -mattr=+sve -vector-library=ArmPL < %s -S -o - -debug-only=loop-vectorize 2>%t.3 | FileCheck %s --check-prefix=CHECK-ARMPL
 ; RUN: FileCheck --input-file=%t.1 --check-prefix=CHECK-COST %s
 ; RUN: FileCheck --input-file=%t.2 --check-prefix=CHECK-COST-ARMPL %s
-; NOTE: Downstream issue: #533 (Amazon Linux still not recognized correctly)
-; Check we vectorize the functions with the vector-library on aarch64-amazon-linux:
-; RUN: FileCheck --input-file=%t.3 --check-prefix=CHECK-COST-ARMPL %s
 ; REQUIRES: asserts
 
 ; CHECK-COST-LABEL: sincos_f32

llvm/unittests/TargetParser/TripleTest.cpp

@@ -126,12 +126,6 @@ TEST(TripleTest, ParsedIDs) {
   EXPECT_EQ(Triple::Hurd, T.getOS());
   EXPECT_EQ(Triple::GNU, T.getEnvironment());
 
-  // Downstream issue: #533 (Amazon Linux still not recognized correctly)
-  T = Triple("aarch64-amazon-linux");
-  EXPECT_EQ(Triple::aarch64, T.getArch());
-  EXPECT_EQ(Triple::Amazon, T.getVendor());
-  EXPECT_EQ(Triple::Linux, T.getOS());
-
   T = Triple("arm-unknown-linux-android16");
   EXPECT_EQ(Triple::arm, T.getArch());
   EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
@@ -1442,12 +1436,6 @@ TEST(TripleTest, Normalization) {
 
   EXPECT_EQ("x86_64-unknown-linux-gnu", Triple::normalize("x86_64-gnu-linux"));
 
-  // Downstream issue: #533 (Amazon Linux still not recognized correctly)
-  EXPECT_EQ("aarch64-amazon-linux-gnu",
-            Triple::normalize("aarch64-amazon-linux"));
-  EXPECT_EQ("x86_64-amazon-linux-gnu",
-            Triple::normalize("x86_64-amazon-linux"));
-
   EXPECT_EQ("a-unknown-unknown",
             Triple::normalize("a", Triple::CanonicalForm::THREE_IDENT));
   EXPECT_EQ("a-b-unknown",