TSCUtility: support additional spellings for ARM #337
Conversation
compnerd
requested review from
aciidgh,
abertelrud,
neonichu,
friedbunny and
tomerd
as code owners
|
@swift-ci please test |
Sources/TSCUtility/Triple.swift
Outdated
| ] | ||
| if let match = candidates.first(where: { string.hasPrefix($0.key) })?.value { | ||
| if case let .armv7(core: _) = match { | ||
| if string.hasPrefix("armv7-a") || string.hasPrefix("armv7a") { |
There was a problem hiding this comment.
The init function won't accept armv7-a because it splits the triple into components delimited on -, (line 114) then you'll either read the a as the vendor, or emit an error because the triple has the wrong number of components.
There was a problem hiding this comment.
I think this is a good start. I kind of wonder if it shouldn't be generalized more than just for the core? There are a bunch of sub-architectures under armv7 alone. It might make sense really to make the arm case take an optional ARM sub arch, which would then include v7, v7a, v7s, v7k, etc... Thoughts?
ARM uses `armv[4-9]-?[arm]` as the arch field to encode the ISA version and the core type for ARMv7. Use the custom parsing logic similar to the other fields to accommodate the spelling.
|
@swift-ci please test |
| @@ -283,6 +329,78 @@ extension Triple { | |||
| } | |||
| } | |||
|
|
|||
| extension Triple.Arch: CustomStringConvertible { | |||
| public var description: String { | |||
| switch self { | |||
There was a problem hiding this comment.
More of a nit, but could we utilize the candidate array from parseArch() here for the non-armv7 cases? I think that would simplify the maintenance a bit.
| "arm64e": .arm64e, | ||
| "wasm32": .wasm32, | ||
| ] | ||
| if let match = candidates.first(where: { string.hasPrefix($0.key) })?.value { |
There was a problem hiding this comment.
Swift's Dictionary isn’t ordered, so we will run into random results here by using first(where:).
ARM uses
armv[4-9]-?[arm]as the arch field to encode the ISAversion and the core type for ARMv7. Use the custom parsing logic
similar to the other fields to accommodate the spelling.