From 57110b408d113dd18eb3c657d13020baa500b08e Mon Sep 17 00:00:00 2001
From: Elliot Saba <staticfloat@gmail.com>
Date: Wed, 23 Sep 2020 12:24:21 -0700
Subject: [PATCH] [BinaryPlatforms]: Remove overzealous verification (#37705)

Some of these verifications are a little over-zealous.  We don't
actually need `cuda` or `march` verification in here, since these will
be primarily externally-driven tags.
---
 base/binaryplatforms.jl | 20 +-------------------
 test/binaryplatforms.jl |  2 --
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/base/binaryplatforms.jl b/base/binaryplatforms.jl
index a657e26d74d63..a49e4db7b91a7 100644
--- a/base/binaryplatforms.jl
+++ b/base/binaryplatforms.jl
@@ -231,18 +231,10 @@ end
 # Simple equality definition; for compatibility testing, use `platforms_match()`
 Base.:(==)(a::AbstractPlatform, b::AbstractPlatform) = tags(a) == tags(b)
 
-const ARCHITECTURE_FLAGS = Dict(
-    "x86_64" => ["x86_64", "avx", "avx2", "avx512"],
-    "i686" => ["prescott"],
-    "armv7l" => ["armv7l", "neon", "vfp4"],
-    "armv6l" => ["generic"],
-    "aarch64" => ["armv8", "thunderx2", "carmel"],
-    "powerpc64le" => ["generic"],
-)
 function validate_tags(tags::Dict)
     throw_invalid_key(k) = throw(ArgumentError("Key \"$(k)\" cannot have value \"$(tags[k])\""))
     # Validate `arch`
-    if tags["arch"] ∉ keys(ARCHITECTURE_FLAGS)
+    if tags["arch"] ∉ ("x86_64", "i686", "armv7l", "armv6l", "aarch64", "powerpc64le")
         throw_invalid_key("arch")
     end
     # Validate `os`
@@ -301,16 +293,6 @@ function validate_tags(tags::Dict)
     if "cxxstring_abi" in keys(tags) && tags["cxxstring_abi"] ∉ ("cxx03", "cxx11")
         throw_invalid_key("cxxstring_abi")
     end
-
-    # Validate `march` is one of our recognized microarchitectures for the architecture we're advertising
-    if "march" in keys(tags) && tags["march"] ∉ ARCHITECTURE_FLAGS[tags["arch"]]
-        throw(ArgumentError("\"march\" cannot have value \"$(tags["march"])\" for arch $(tags["arch"])"))
-    end
-
-    # Validate `cuda` is a parsable `VersionNumber`
-    if "cuda" in keys(tags) && tryparse(VersionNumber, tags["cuda"]) === nothing
-        throw_version_number("cuda")
-    end
 end
 
 function set_compare_strategy!(p::Platform, key::String, f::Function)
diff --git a/test/binaryplatforms.jl b/test/binaryplatforms.jl
index 0628a709a1dab..f1c50df16ad11 100644
--- a/test/binaryplatforms.jl
+++ b/test/binaryplatforms.jl
@@ -181,8 +181,6 @@ end
     # Test extended attributes
     @test R("x86_64-linux-gnu-march+avx2") == P("x86_64", "linux"; march="avx2")
     @test R("x86_64-linux-gnu-march+x86_64-cuda+10.1") == P("x86_64", "linux"; march="x86_64", cuda="10.1")
-    @test_throws ArgumentError R("x86_64-linux-gnu-march+generic";)
-    @test_throws ArgumentError R("x86_64-linux-gnu-cuda+version")
 
     # Round-trip our little homie through `triplet()`
     @test parse(Platform, triplet(HostPlatform())) == HostPlatform()