This is an archive of the discontinued LLVM Phabricator instance.

[AArch64] Make the TargetParser add CPU exts provided by the arch.
ClosedPublic

Authored by ab on May 2 2017, 6:01 PM.

Download Raw Diff

Details

Reviewers

Commits

rG9097967dd969: [AArch64] Make the TargetParser add CPU exts provided by the arch.
rL302078: [AArch64] Make the TargetParser add CPU exts provided by the arch.

Summary

Otherwise, each CPU has to manually specify the extensions it supports,
even though they have to be a superset of the base arch extensions.
And when there's redundant data there's stale data, so most of the CPUs
lie about the features they support (most don't list AEK_FP).

Instead, do the saner thing: add the optional extensions on top of the
base extensions provided by the architecture.

The ARM TargetParser has the same behavior.

Diff Detail

Repository: rL LLVM

Event Timeline

ab created this revision.May 2 2017, 6:01 PM

Herald added a subscriber: aemerson. · View Herald TranscriptMay 2 2017, 6:01 PM

I really thought it was there already! Thanks for the patch! LGTM.

--renato

unittests/Support/TargetParserTest.cpp
614 ↗	(On Diff #97533)	I wonder what's the use of AEK_INVALID...

This revision is now accepted and ready to land.May 3 2017, 10:45 AM

Closed by commit rL302078: [AArch64] Make the TargetParser add CPU exts provided by the arch. (authored by ab). · Explain WhyMay 3 2017, 1:47 PM

This revision was automatically updated to reflect the committed changes.

Thanks Renato!

unittests/Support/TargetParserTest.cpp
614 ↗	(On Diff #97533)	It's useful as a return value for completely unknown CPUs, no? 'invalid' is listed in the .def, so we only get AEK_NONE for that. I considered adding a test for a "foobar" CPU, and that should provide AEK_INVALID, but that doesn't seem like a very valuable test, so, eh!

Revision Contents

Path

Size

llvm/

trunk/

include/

llvm/

Support/

AArch64TargetParser.def

33 lines

lib/

Support/

TargetParser.cpp

2 lines

unittests/

Support/

TargetParserTest.cpp

36 lines

Diff 97727

llvm/trunk/include/llvm/Support/AArch64TargetParser.def

	Show First 20 Lines • Show All 45 Lines • ▼ Show 20 Lines
	AARCH64_ARCH_EXT_NAME("profile", AArch64::AEK_PROFILE, "+spe", "-spe")			AARCH64_ARCH_EXT_NAME("profile", AArch64::AEK_PROFILE, "+spe", "-spe")
	AARCH64_ARCH_EXT_NAME("ras", AArch64::AEK_RAS, "+ras", "-ras")			AARCH64_ARCH_EXT_NAME("ras", AArch64::AEK_RAS, "+ras", "-ras")
	#undef AARCH64_ARCH_EXT_NAME			#undef AARCH64_ARCH_EXT_NAME

	#ifndef AARCH64_CPU_NAME			#ifndef AARCH64_CPU_NAME
	#define AARCH64_CPU_NAME(NAME, ID, DEFAULT_FPU, IS_DEFAULT, DEFAULT_EXT)			#define AARCH64_CPU_NAME(NAME, ID, DEFAULT_FPU, IS_DEFAULT, DEFAULT_EXT)
	#endif			#endif
	AARCH64_CPU_NAME("cortex-a35", AK_ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false,			AARCH64_CPU_NAME("cortex-a35", AK_ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false,
	(AArch64::AEK_SIMD \| AArch64::AEK_CRC \| AArch64::AEK_CRYPTO))			(AArch64::AEK_CRC))
	AARCH64_CPU_NAME("cortex-a53", AK_ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, true,			AARCH64_CPU_NAME("cortex-a53", AK_ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, true,
	( AArch64::AEK_SIMD \| AArch64::AEK_CRC \| AArch64::AEK_CRYPTO))			(AArch64::AEK_CRC))
	AARCH64_CPU_NAME("cortex-a57", AK_ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false,			AARCH64_CPU_NAME("cortex-a57", AK_ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false,
	(AArch64::AEK_SIMD \| AArch64::AEK_CRC \| AArch64::AEK_CRYPTO))			(AArch64::AEK_CRC))
	AARCH64_CPU_NAME("cortex-a72", AK_ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false,			AARCH64_CPU_NAME("cortex-a72", AK_ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false,
	(AArch64::AEK_SIMD \| AArch64::AEK_CRC \| AArch64::AEK_CRYPTO))			(AArch64::AEK_CRC))
	AARCH64_CPU_NAME("cortex-a73", AK_ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false,			AARCH64_CPU_NAME("cortex-a73", AK_ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false,
	(AArch64::AEK_SIMD \| AArch64::AEK_CRC \| AArch64::AEK_CRYPTO))			(AArch64::AEK_CRC))
	AARCH64_CPU_NAME("cyclone", AK_ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false,			AARCH64_CPU_NAME("cyclone", AK_ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false,
	(AArch64::AEK_SIMD \| AArch64::AEK_CRYPTO))			(AArch64::AEK_NONE))
	AARCH64_CPU_NAME("exynos-m1", AK_ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false,			AARCH64_CPU_NAME("exynos-m1", AK_ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false,
	(AArch64::AEK_SIMD \| AArch64::AEK_CRC \| AArch64::AEK_CRYPTO))			(AArch64::AEK_CRC))
	AARCH64_CPU_NAME("exynos-m2", AK_ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false,			AARCH64_CPU_NAME("exynos-m2", AK_ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false,
	(AArch64::AEK_SIMD \| AArch64::AEK_CRC \| AArch64::AEK_CRYPTO))			(AArch64::AEK_CRC))
	AARCH64_CPU_NAME("exynos-m3", AK_ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false,			AARCH64_CPU_NAME("exynos-m3", AK_ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false,
	(AArch64::AEK_SIMD \| AArch64::AEK_CRC \| AArch64::AEK_CRYPTO))			(AArch64::AEK_CRC))
	AARCH64_CPU_NAME("falkor", AK_ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false,			AARCH64_CPU_NAME("falkor", AK_ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false,
	(AArch64::AEK_SIMD \| AArch64::AEK_CRC \| AArch64::AEK_CRYPTO))			(AArch64::AEK_CRC))
	AARCH64_CPU_NAME("kryo", AK_ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false,			AARCH64_CPU_NAME("kryo", AK_ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false,
	(AArch64::AEK_SIMD \| AArch64::AEK_CRC \| AArch64::AEK_CRYPTO))			(AArch64::AEK_CRC))
	AARCH64_CPU_NAME("thunderx2t99", AK_ARMV8_1A, FK_CRYPTO_NEON_FP_ARMV8, false,			AARCH64_CPU_NAME("thunderx2t99", AK_ARMV8_1A, FK_CRYPTO_NEON_FP_ARMV8, false,
	(AArch64::AEK_SIMD \| AArch64::AEK_LSE \| AArch64::AEK_CRC \|			(AArch64::AEK_NONE))
	AArch64::AEK_CRYPTO))
	AARCH64_CPU_NAME("thunderx", AK_ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false,			AARCH64_CPU_NAME("thunderx", AK_ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false,
	(AArch64::AEK_SIMD \| AArch64::AEK_CRC \| AArch64::AEK_CRYPTO \| AArch64::AEK_FP \| AArch64::AEK_PROFILE))			(AArch64::AEK_CRC \| AArch64::AEK_PROFILE))
	AARCH64_CPU_NAME("thunderxt88", AK_ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false,			AARCH64_CPU_NAME("thunderxt88", AK_ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false,
	(AArch64::AEK_SIMD \| AArch64::AEK_CRC \| AArch64::AEK_CRYPTO \| AArch64::AEK_FP \| AArch64::AEK_PROFILE))			(AArch64::AEK_CRC \| AArch64::AEK_PROFILE))
	AARCH64_CPU_NAME("thunderxt81", AK_ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false,			AARCH64_CPU_NAME("thunderxt81", AK_ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false,
	(AArch64::AEK_SIMD \| AArch64::AEK_CRC \| AArch64::AEK_CRYPTO \| AArch64::AEK_FP \| AArch64::AEK_PROFILE))			(AArch64::AEK_CRC \| AArch64::AEK_PROFILE))
	AARCH64_CPU_NAME("thunderxt83", AK_ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false,			AARCH64_CPU_NAME("thunderxt83", AK_ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false,
	(AArch64::AEK_SIMD \| AArch64::AEK_CRC \| AArch64::AEK_CRYPTO \| AArch64::AEK_FP \| AArch64::AEK_PROFILE))			(AArch64::AEK_CRC \| AArch64::AEK_PROFILE))
	// Invalid CPU			// Invalid CPU
	AARCH64_CPU_NAME("invalid", AK_INVALID, FK_INVALID, true, AArch64::AEK_INVALID)			AARCH64_CPU_NAME("invalid", AK_INVALID, FK_INVALID, true, AArch64::AEK_INVALID)
	#undef AARCH64_CPU_NAME			#undef AARCH64_CPU_NAME

llvm/trunk/lib/Support/TargetParser.cpp

	Show First 20 Lines • Show All 417 Lines • ▼ Show 20 Lines
	}			}

	unsigned llvm::AArch64::getDefaultExtensions(StringRef CPU, unsigned ArchKind) {			unsigned llvm::AArch64::getDefaultExtensions(StringRef CPU, unsigned ArchKind) {
	if (CPU == "generic")			if (CPU == "generic")
	return AArch64ARCHNames[ArchKind].ArchBaseExtensions;			return AArch64ARCHNames[ArchKind].ArchBaseExtensions;

	return StringSwitch<unsigned>(CPU)			return StringSwitch<unsigned>(CPU)
	#define AARCH64_CPU_NAME(NAME, ID, DEFAULT_FPU, IS_DEFAULT, DEFAULT_EXT) \			#define AARCH64_CPU_NAME(NAME, ID, DEFAULT_FPU, IS_DEFAULT, DEFAULT_EXT) \
	.Case(NAME, DEFAULT_EXT)			.Case(NAME, AArch64ARCHNames[(unsigned)ArchKind::ID].ArchBaseExtensions \| DEFAULT_EXT)
	#include "llvm/Support/AArch64TargetParser.def"			#include "llvm/Support/AArch64TargetParser.def"
	.Default(AArch64::AEK_INVALID);			.Default(AArch64::AEK_INVALID);
	}			}

	bool llvm::AArch64::getExtensionFeatures(unsigned Extensions,			bool llvm::AArch64::getExtensionFeatures(unsigned Extensions,
	std::vector<StringRef> &Features) {			std::vector<StringRef> &Features) {

	if (Extensions == AArch64::AEK_INVALID)			if (Extensions == AArch64::AEK_INVALID)
	▲ Show 20 Lines • Show All 407 Lines • Show Last 20 Lines

llvm/trunk/unittests/Support/TargetParserTest.cpp

Show First 20 Lines • Show All 605 Lines • ▼ Show 20 Lines	bool testAArch64CPU(StringRef CPUName, StringRef ExpectedArch,
pass &= AArch64::getCPUAttr(ArchKind).equals(CPUAttr);		pass &= AArch64::getCPUAttr(ArchKind).equals(CPUAttr);

return pass;		return pass;
}		}

TEST(TargetParserTest, testAArch64CPU) {		TEST(TargetParserTest, testAArch64CPU) {
EXPECT_TRUE(testAArch64CPU(		EXPECT_TRUE(testAArch64CPU(
"invalid", "invalid", "invalid",		"invalid", "invalid", "invalid",
AArch64::AEK_INVALID, ""));		AArch64::AEK_NONE, ""));
EXPECT_TRUE(testAArch64CPU(		EXPECT_TRUE(testAArch64CPU(
"generic", "invalid", "none",		"generic", "invalid", "none",
AArch64::AEK_NONE, ""));		AArch64::AEK_NONE, ""));

EXPECT_TRUE(testAArch64CPU(		EXPECT_TRUE(testAArch64CPU(
"cortex-a35", "armv8-a", "crypto-neon-fp-armv8",		"cortex-a35", "armv8-a", "crypto-neon-fp-armv8",
AArch64::AEK_CRC \| AArch64::AEK_CRYPTO \| AArch64::AEK_SIMD, "8-A"));		AArch64::AEK_CRC \| AArch64::AEK_CRYPTO \| AArch64::AEK_FP \|
		AArch64::AEK_SIMD, "8-A"));
EXPECT_TRUE(testAArch64CPU(		EXPECT_TRUE(testAArch64CPU(
"cortex-a53", "armv8-a", "crypto-neon-fp-armv8",		"cortex-a53", "armv8-a", "crypto-neon-fp-armv8",
AArch64::AEK_CRC \| AArch64::AEK_CRYPTO \| AArch64::AEK_SIMD, "8-A"));		AArch64::AEK_CRC \| AArch64::AEK_CRYPTO \| AArch64::AEK_FP \|
		AArch64::AEK_SIMD, "8-A"));
EXPECT_TRUE(testAArch64CPU(		EXPECT_TRUE(testAArch64CPU(
"cortex-a57", "armv8-a", "crypto-neon-fp-armv8",		"cortex-a57", "armv8-a", "crypto-neon-fp-armv8",
AArch64::AEK_CRC \| AArch64::AEK_CRYPTO \| AArch64::AEK_SIMD, "8-A"));		AArch64::AEK_CRC \| AArch64::AEK_CRYPTO \| AArch64::AEK_FP \|
		AArch64::AEK_SIMD, "8-A"));
EXPECT_TRUE(testAArch64CPU(		EXPECT_TRUE(testAArch64CPU(
"cortex-a72", "armv8-a", "crypto-neon-fp-armv8",		"cortex-a72", "armv8-a", "crypto-neon-fp-armv8",
AArch64::AEK_CRC \| AArch64::AEK_CRYPTO \| AArch64::AEK_SIMD, "8-A"));		AArch64::AEK_CRC \| AArch64::AEK_CRYPTO \| AArch64::AEK_FP \|
		AArch64::AEK_SIMD, "8-A"));
EXPECT_TRUE(testAArch64CPU(		EXPECT_TRUE(testAArch64CPU(
"cortex-a73", "armv8-a", "crypto-neon-fp-armv8",		"cortex-a73", "armv8-a", "crypto-neon-fp-armv8",
AArch64::AEK_CRC \| AArch64::AEK_CRYPTO \| AArch64::AEK_SIMD, "8-A"));		AArch64::AEK_CRC \| AArch64::AEK_CRYPTO \| AArch64::AEK_FP \|
		AArch64::AEK_SIMD, "8-A"));
EXPECT_TRUE(testAArch64CPU(		EXPECT_TRUE(testAArch64CPU(
"cyclone", "armv8-a", "crypto-neon-fp-armv8",		"cyclone", "armv8-a", "crypto-neon-fp-armv8",
AArch64::AEK_CRYPTO \| AArch64::AEK_SIMD, "8-A"));		AArch64::AEK_CRYPTO \| AArch64::AEK_FP \| AArch64::AEK_SIMD, "8-A"));
EXPECT_TRUE(testAArch64CPU(		EXPECT_TRUE(testAArch64CPU(
"exynos-m1", "armv8-a", "crypto-neon-fp-armv8",		"exynos-m1", "armv8-a", "crypto-neon-fp-armv8",
AArch64::AEK_CRC \| AArch64::AEK_CRYPTO \| AArch64::AEK_SIMD, "8-A"));		AArch64::AEK_CRC \| AArch64::AEK_CRYPTO \| AArch64::AEK_FP \|
		AArch64::AEK_SIMD, "8-A"));
EXPECT_TRUE(testAArch64CPU(		EXPECT_TRUE(testAArch64CPU(
"exynos-m2", "armv8-a", "crypto-neon-fp-armv8",		"exynos-m2", "armv8-a", "crypto-neon-fp-armv8",
AArch64::AEK_CRC \| AArch64::AEK_CRYPTO \| AArch64::AEK_SIMD, "8-A"));		AArch64::AEK_CRC \| AArch64::AEK_CRYPTO \| AArch64::AEK_FP \|
		AArch64::AEK_SIMD, "8-A"));
EXPECT_TRUE(testAArch64CPU(		EXPECT_TRUE(testAArch64CPU(
"exynos-m3", "armv8-a", "crypto-neon-fp-armv8",		"exynos-m3", "armv8-a", "crypto-neon-fp-armv8",
AArch64::AEK_CRC \| AArch64::AEK_CRYPTO \| AArch64::AEK_SIMD, "8-A"));		AArch64::AEK_CRC \| AArch64::AEK_CRYPTO \| AArch64::AEK_FP \|
		AArch64::AEK_SIMD, "8-A"));
EXPECT_TRUE(testAArch64CPU(		EXPECT_TRUE(testAArch64CPU(
"falkor", "armv8-a", "crypto-neon-fp-armv8",		"falkor", "armv8-a", "crypto-neon-fp-armv8",
AArch64::AEK_CRC \| AArch64::AEK_CRYPTO \| AArch64::AEK_SIMD, "8-A"));		AArch64::AEK_CRC \| AArch64::AEK_CRYPTO \| AArch64::AEK_FP \|
		AArch64::AEK_SIMD, "8-A"));
EXPECT_TRUE(testAArch64CPU(		EXPECT_TRUE(testAArch64CPU(
"kryo", "armv8-a", "crypto-neon-fp-armv8",		"kryo", "armv8-a", "crypto-neon-fp-armv8",
AArch64::AEK_CRC \| AArch64::AEK_CRYPTO \| AArch64::AEK_SIMD, "8-A"));		AArch64::AEK_CRC \| AArch64::AEK_CRYPTO \| AArch64::AEK_FP \|
		AArch64::AEK_SIMD, "8-A"));
EXPECT_TRUE(testAArch64CPU(		EXPECT_TRUE(testAArch64CPU(
"thunderx2t99", "armv8.1-a", "crypto-neon-fp-armv8",		"thunderx2t99", "armv8.1-a", "crypto-neon-fp-armv8",
AArch64::AEK_CRC \| AArch64::AEK_CRYPTO \| AArch64::AEK_LSE \|		AArch64::AEK_CRC \| AArch64::AEK_CRYPTO \| AArch64::AEK_LSE \|
AArch64::AEK_SIMD, "8.1-A"));		AArch64::AEK_FP \| AArch64::AEK_SIMD, "8.1-A"));
EXPECT_TRUE(testAArch64CPU(		EXPECT_TRUE(testAArch64CPU(
"thunderx", "armv8-a", "crypto-neon-fp-armv8",		"thunderx", "armv8-a", "crypto-neon-fp-armv8",
AArch64::AEK_CRC \| AArch64::AEK_CRYPTO \| AArch64::AEK_SIMD \|		AArch64::AEK_CRC \| AArch64::AEK_CRYPTO \| AArch64::AEK_SIMD \|
AArch64::AEK_FP \| AArch64::AEK_PROFILE,		AArch64::AEK_FP \| AArch64::AEK_PROFILE,
"8-A"));		"8-A"));
EXPECT_TRUE(testAArch64CPU(		EXPECT_TRUE(testAArch64CPU(
"thunderxt81", "armv8-a", "crypto-neon-fp-armv8",		"thunderxt81", "armv8-a", "crypto-neon-fp-armv8",
AArch64::AEK_CRC \| AArch64::AEK_CRYPTO \| AArch64::AEK_SIMD \|		AArch64::AEK_CRC \| AArch64::AEK_CRYPTO \| AArch64::AEK_SIMD \|
▲ Show 20 Lines • Show All 101 Lines • Show Last 20 Lines

This is an archive of the discontinued LLVM Phabricator instance.

[AArch64] Make the TargetParser add CPU exts provided by the arch.ClosedPublic

Details

Diff Detail

Event Timeline

Revision Contents

Diff 97727

llvm/trunk/include/llvm/Support/AArch64TargetParser.def

llvm/trunk/lib/Support/TargetParser.cpp

llvm/trunk/unittests/Support/TargetParserTest.cpp

[AArch64] Make the TargetParser add CPU exts provided by the arch.
ClosedPublic