This is an archive of the discontinued LLVM Phabricator instance.

llvm/include/llvm/BinaryFormat/ELFRelocs/LoongArch.def
104	I have to self-censor a few swear words. They added this `R_LARCH_32_PCREL` in a later commit but with irrelevant commit message subject, so I ignored it. I'll fix shortly.

jhenderson added inline comments.Aug 9 2022, 12:55 AM

llvm/include/llvm/BinaryFormat/ELFRelocs/LoongArch.def
64–65	The "And finally" risks more relocs being added in the future, thus meaning this set is no longer the final set, and the comment going stale. Similarly, in 10+ years time, "new-style" may not sound particularly right. I'd probably just go simply with "Relocs whose processing do not require a stack machine."

Harbormaster completed remote builds in B180099: Diff 451052.Aug 9 2022, 2:25 AM

Address @SixWeining and @jhenderson's comments.

Seems good to me, but please wait for @SixWeining (I don't know anything about LoongArch).

xen0n marked 2 inline comments as done.Aug 9 2022, 6:26 AM

xen0n added inline comments.

llvm/include/llvm/BinaryFormat/ELFRelocs/LoongArch.def
64–65	Fair point. I was thinking by the time a third batch of reloc types are added the maintainer could adjust the comment while at it, but of course the previous wording is a bit biased (the LoongArch open-source community almost unanimously hated the previous reloc design with a passion, including me of course). Adjusted.
104	Done

LGTM. Thanks.

This revision is now accepted and ready to land.Aug 9 2022, 6:53 AM

Harbormaster completed remote builds in B180157: Diff 451130.Aug 9 2022, 9:42 AM

MaskRay accepted this revision.Aug 9 2022, 11:15 AM

This revision was landed with ongoing or failed builds.Aug 10 2022, 7:46 PM

Closed by commit rG0c8bfbb37484: [LoongArch] Define the new-style reloc types (authored by WANG Xuerui <git@xen0n.name>, committed by SixWeining). · Explain Why

This revision was automatically updated to reflect the committed changes.

SixWeining added a commit: rG0c8bfbb37484: [LoongArch] Define the new-style reloc types.

Revision Contents

Path

Size

llvm/

include/

llvm/

BinaryFormat/

ELFRelocs/

LoongArch.def

43 lines

test/

tools/

llvm-readobj/

ELF/

reloc-types-loongarch64.test

74 lines

unittests/

Object/

ELFTest.cpp

74 lines

Diff 451705

llvm/include/llvm/BinaryFormat/ELFRelocs/LoongArch.def

	Show First 20 Lines • Show All 54 Lines • ▼ Show 20 Lines
	ELF_RELOC(R_LARCH_ADD64, 51)			ELF_RELOC(R_LARCH_ADD64, 51)
	ELF_RELOC(R_LARCH_SUB8, 52)			ELF_RELOC(R_LARCH_SUB8, 52)
	ELF_RELOC(R_LARCH_SUB16, 53)			ELF_RELOC(R_LARCH_SUB16, 53)
	ELF_RELOC(R_LARCH_SUB24, 54)			ELF_RELOC(R_LARCH_SUB24, 54)
	ELF_RELOC(R_LARCH_SUB32, 55)			ELF_RELOC(R_LARCH_SUB32, 55)
	ELF_RELOC(R_LARCH_SUB64, 56)			ELF_RELOC(R_LARCH_SUB64, 56)
	ELF_RELOC(R_LARCH_GNU_VTINHERIT, 57)			ELF_RELOC(R_LARCH_GNU_VTINHERIT, 57)
	ELF_RELOC(R_LARCH_GNU_VTENTRY, 58)			ELF_RELOC(R_LARCH_GNU_VTENTRY, 58)

				// Relocs whose processing do not require a stack machine.
				//
				jhendersonUnsubmitted Not Done Reply Inline Actions The "And finally" risks more relocs being added in the future, thus meaning this set is no longer the final set, and the comment going stale. Similarly, in 10+ years time, "new-style" may not sound particularly right. I'd probably just go simply with "Relocs whose processing do not require a stack machine." jhenderson: The "And finally" risks more relocs being added in the future, thus meaning this set is no…
				xen0nAuthorUnsubmitted Done Reply Inline Actions Fair point. I was thinking by the time a third batch of reloc types are added the maintainer could adjust the comment while at it, but of course the previous wording is a bit biased (the LoongArch open-source community almost unanimously hated the previous reloc design with a passion, including me of course). Adjusted. xen0n: Fair point. I was thinking by the time a third batch of reloc types are added the maintainer…
				// Spec addition: https://github.com/loongson/LoongArch-Documentation/pull/57
				// Binutils commit 6d13722a97cee3fd397e116bde3bcedbb1e220be
				// and commit 9801120721c3a702ce3bd50433ef920f92a83502
				ELF_RELOC(R_LARCH_B16, 64)
				ELF_RELOC(R_LARCH_B21, 65)
				ELF_RELOC(R_LARCH_B26, 66)
				ELF_RELOC(R_LARCH_ABS_HI20, 67)
				ELF_RELOC(R_LARCH_ABS_LO12, 68)
				ELF_RELOC(R_LARCH_ABS64_LO20, 69)
				ELF_RELOC(R_LARCH_ABS64_HI12, 70)
				ELF_RELOC(R_LARCH_PCALA_HI20, 71)
				ELF_RELOC(R_LARCH_PCALA_LO12, 72)
				ELF_RELOC(R_LARCH_PCALA64_LO20, 73)
				ELF_RELOC(R_LARCH_PCALA64_HI12, 74)
				ELF_RELOC(R_LARCH_GOT_PC_HI20, 75)
				ELF_RELOC(R_LARCH_GOT_PC_LO12, 76)
				ELF_RELOC(R_LARCH_GOT64_PC_LO20, 77)
				ELF_RELOC(R_LARCH_GOT64_PC_HI12, 78)
				ELF_RELOC(R_LARCH_GOT_HI20, 79)
				ELF_RELOC(R_LARCH_GOT_LO12, 80)
				ELF_RELOC(R_LARCH_GOT64_LO20, 81)
				ELF_RELOC(R_LARCH_GOT64_HI12, 82)
				ELF_RELOC(R_LARCH_TLS_LE_HI20, 83)
				ELF_RELOC(R_LARCH_TLS_LE_LO12, 84)
				ELF_RELOC(R_LARCH_TLS_LE64_LO20, 85)
				ELF_RELOC(R_LARCH_TLS_LE64_HI12, 86)
				ELF_RELOC(R_LARCH_TLS_IE_PC_HI20, 87)
				ELF_RELOC(R_LARCH_TLS_IE_PC_LO12, 88)
				ELF_RELOC(R_LARCH_TLS_IE64_PC_LO20, 89)
				ELF_RELOC(R_LARCH_TLS_IE64_PC_HI12, 90)
				ELF_RELOC(R_LARCH_TLS_IE_HI20, 91)
				ELF_RELOC(R_LARCH_TLS_IE_LO12, 92)
				ELF_RELOC(R_LARCH_TLS_IE64_LO20, 93)
				ELF_RELOC(R_LARCH_TLS_IE64_HI12, 94)
				ELF_RELOC(R_LARCH_TLS_LD_PC_HI20, 95)
				ELF_RELOC(R_LARCH_TLS_LD_HI20, 96)
				ELF_RELOC(R_LARCH_TLS_GD_PC_HI20, 97)
				ELF_RELOC(R_LARCH_TLS_GD_HI20, 98)
				ELF_RELOC(R_LARCH_32_PCREL, 99)
				SixWeiningUnsubmitted Done Reply Inline Actions https://loongson.github.io/LoongArch-Documentation/LoongArch-ELF-ABI-EN.html#_relocations Is `R_LARCH_32_PCREL (99)` removed? SixWeining: https://loongson.github.io/LoongArch-Documentation/LoongArch-ELF-ABI-EN.html#_relocations Is…
				xen0nAuthorUnsubmitted Done Reply Inline Actions I have to self-censor a few swear words. They added this `R_LARCH_32_PCREL` in a later commit but with irrelevant commit message subject, so I ignored it. I'll fix shortly. xen0n: I have to self-censor a few swear words. They added this `R_LARCH_32_PCREL` in [[ https…
				xen0nAuthorUnsubmitted Done Reply Inline Actions Done xen0n: Done
				ELF_RELOC(R_LARCH_RELAX, 100)

llvm/test/tools/llvm-readobj/ELF/reloc-types-loongarch64.test

Show First 20 Lines • Show All 50 Lines • ▼ Show 20 Lines
# CHECK: Type: R_LARCH_ADD64 (51)		# CHECK: Type: R_LARCH_ADD64 (51)
# CHECK: Type: R_LARCH_SUB8 (52)		# CHECK: Type: R_LARCH_SUB8 (52)
# CHECK: Type: R_LARCH_SUB16 (53)		# CHECK: Type: R_LARCH_SUB16 (53)
# CHECK: Type: R_LARCH_SUB24 (54)		# CHECK: Type: R_LARCH_SUB24 (54)
# CHECK: Type: R_LARCH_SUB32 (55)		# CHECK: Type: R_LARCH_SUB32 (55)
# CHECK: Type: R_LARCH_SUB64 (56)		# CHECK: Type: R_LARCH_SUB64 (56)
# CHECK: Type: R_LARCH_GNU_VTINHERIT (57)		# CHECK: Type: R_LARCH_GNU_VTINHERIT (57)
# CHECK: Type: R_LARCH_GNU_VTENTRY (58)		# CHECK: Type: R_LARCH_GNU_VTENTRY (58)
		# CHECK: Type: R_LARCH_B16 (64)
		# CHECK: Type: R_LARCH_B21 (65)
		# CHECK: Type: R_LARCH_B26 (66)
		# CHECK: Type: R_LARCH_ABS_HI20 (67)
		# CHECK: Type: R_LARCH_ABS_LO12 (68)
		# CHECK: Type: R_LARCH_ABS64_LO20 (69)
		# CHECK: Type: R_LARCH_ABS64_HI12 (70)
		# CHECK: Type: R_LARCH_PCALA_HI20 (71)
		# CHECK: Type: R_LARCH_PCALA_LO12 (72)
		# CHECK: Type: R_LARCH_PCALA64_LO20 (73)
		# CHECK: Type: R_LARCH_PCALA64_HI12 (74)
		# CHECK: Type: R_LARCH_GOT_PC_HI20 (75)
		# CHECK: Type: R_LARCH_GOT_PC_LO12 (76)
		# CHECK: Type: R_LARCH_GOT64_PC_LO20 (77)
		# CHECK: Type: R_LARCH_GOT64_PC_HI12 (78)
		# CHECK: Type: R_LARCH_GOT_HI20 (79)
		# CHECK: Type: R_LARCH_GOT_LO12 (80)
		# CHECK: Type: R_LARCH_GOT64_LO20 (81)
		# CHECK: Type: R_LARCH_GOT64_HI12 (82)
		# CHECK: Type: R_LARCH_TLS_LE_HI20 (83)
		# CHECK: Type: R_LARCH_TLS_LE_LO12 (84)
		# CHECK: Type: R_LARCH_TLS_LE64_LO20 (85)
		# CHECK: Type: R_LARCH_TLS_LE64_HI12 (86)
		# CHECK: Type: R_LARCH_TLS_IE_PC_HI20 (87)
		# CHECK: Type: R_LARCH_TLS_IE_PC_LO12 (88)
		# CHECK: Type: R_LARCH_TLS_IE64_PC_LO20 (89)
		# CHECK: Type: R_LARCH_TLS_IE64_PC_HI12 (90)
		# CHECK: Type: R_LARCH_TLS_IE_HI20 (91)
		# CHECK: Type: R_LARCH_TLS_IE_LO12 (92)
		# CHECK: Type: R_LARCH_TLS_IE64_LO20 (93)
		# CHECK: Type: R_LARCH_TLS_IE64_HI12 (94)
		# CHECK: Type: R_LARCH_TLS_LD_PC_HI20 (95)
		# CHECK: Type: R_LARCH_TLS_LD_HI20 (96)
		# CHECK: Type: R_LARCH_TLS_GD_PC_HI20 (97)
		# CHECK: Type: R_LARCH_TLS_GD_HI20 (98)
		# CHECK: Type: R_LARCH_32_PCREL (99)
		# CHECK: Type: R_LARCH_RELAX (100)

--- !ELF		--- !ELF
FileHeader:		FileHeader:
Class: ELFCLASS64		Class: ELFCLASS64
Data: ELFDATA2LSB		Data: ELFDATA2LSB
Type: ET_REL		Type: ET_REL
Machine: EM_LOONGARCH		Machine: EM_LOONGARCH
Sections:		Sections:
▲ Show 20 Lines • Show All 47 Lines • ▼ Show 20 Lines	Relocations:
- Type: R_LARCH_ADD64		- Type: R_LARCH_ADD64
- Type: R_LARCH_SUB8		- Type: R_LARCH_SUB8
- Type: R_LARCH_SUB16		- Type: R_LARCH_SUB16
- Type: R_LARCH_SUB24		- Type: R_LARCH_SUB24
- Type: R_LARCH_SUB32		- Type: R_LARCH_SUB32
- Type: R_LARCH_SUB64		- Type: R_LARCH_SUB64
- Type: R_LARCH_GNU_VTINHERIT		- Type: R_LARCH_GNU_VTINHERIT
- Type: R_LARCH_GNU_VTENTRY		- Type: R_LARCH_GNU_VTENTRY
		- Type: R_LARCH_B16
		- Type: R_LARCH_B21
		- Type: R_LARCH_B26
		- Type: R_LARCH_ABS_HI20
		- Type: R_LARCH_ABS_LO12
		- Type: R_LARCH_ABS64_LO20
		- Type: R_LARCH_ABS64_HI12
		- Type: R_LARCH_PCALA_HI20
		- Type: R_LARCH_PCALA_LO12
		- Type: R_LARCH_PCALA64_LO20
		- Type: R_LARCH_PCALA64_HI12
		- Type: R_LARCH_GOT_PC_HI20
		- Type: R_LARCH_GOT_PC_LO12
		- Type: R_LARCH_GOT64_PC_LO20
		- Type: R_LARCH_GOT64_PC_HI12
		- Type: R_LARCH_GOT_HI20
		- Type: R_LARCH_GOT_LO12
		- Type: R_LARCH_GOT64_LO20
		- Type: R_LARCH_GOT64_HI12
		- Type: R_LARCH_TLS_LE_HI20
		- Type: R_LARCH_TLS_LE_LO12
		- Type: R_LARCH_TLS_LE64_LO20
		- Type: R_LARCH_TLS_LE64_HI12
		- Type: R_LARCH_TLS_IE_PC_HI20
		- Type: R_LARCH_TLS_IE_PC_LO12
		- Type: R_LARCH_TLS_IE64_PC_LO20
		- Type: R_LARCH_TLS_IE64_PC_HI12
		- Type: R_LARCH_TLS_IE_HI20
		- Type: R_LARCH_TLS_IE_LO12
		- Type: R_LARCH_TLS_IE64_LO20
		- Type: R_LARCH_TLS_IE64_HI12
		- Type: R_LARCH_TLS_LD_PC_HI20
		- Type: R_LARCH_TLS_LD_HI20
		- Type: R_LARCH_TLS_GD_PC_HI20
		- Type: R_LARCH_TLS_GD_HI20
		- Type: R_LARCH_32_PCREL
		- Type: R_LARCH_RELAX

llvm/unittests/Object/ELFTest.cpp

Show First 20 Lines • Show All 153 Lines • ▼ Show 20 Lines	TEST(ELFTest, getELFRelocationTypeNameForLoongArch) {
EXPECT_EQ("R_LARCH_SUB32",		EXPECT_EQ("R_LARCH_SUB32",
getELFRelocationTypeName(EM_LOONGARCH, R_LARCH_SUB32));		getELFRelocationTypeName(EM_LOONGARCH, R_LARCH_SUB32));
EXPECT_EQ("R_LARCH_SUB64",		EXPECT_EQ("R_LARCH_SUB64",
getELFRelocationTypeName(EM_LOONGARCH, R_LARCH_SUB64));		getELFRelocationTypeName(EM_LOONGARCH, R_LARCH_SUB64));
EXPECT_EQ("R_LARCH_GNU_VTINHERIT",		EXPECT_EQ("R_LARCH_GNU_VTINHERIT",
getELFRelocationTypeName(EM_LOONGARCH, R_LARCH_GNU_VTINHERIT));		getELFRelocationTypeName(EM_LOONGARCH, R_LARCH_GNU_VTINHERIT));
EXPECT_EQ("R_LARCH_GNU_VTENTRY",		EXPECT_EQ("R_LARCH_GNU_VTENTRY",
getELFRelocationTypeName(EM_LOONGARCH, R_LARCH_GNU_VTENTRY));		getELFRelocationTypeName(EM_LOONGARCH, R_LARCH_GNU_VTENTRY));
		EXPECT_EQ("R_LARCH_B16",
		getELFRelocationTypeName(EM_LOONGARCH, R_LARCH_B16));
		EXPECT_EQ("R_LARCH_B21",
		getELFRelocationTypeName(EM_LOONGARCH, R_LARCH_B21));
		EXPECT_EQ("R_LARCH_B26",
		getELFRelocationTypeName(EM_LOONGARCH, R_LARCH_B26));
		EXPECT_EQ("R_LARCH_ABS_HI20",
		getELFRelocationTypeName(EM_LOONGARCH, R_LARCH_ABS_HI20));
		EXPECT_EQ("R_LARCH_ABS_LO12",
		getELFRelocationTypeName(EM_LOONGARCH, R_LARCH_ABS_LO12));
		EXPECT_EQ("R_LARCH_ABS64_LO20",
		getELFRelocationTypeName(EM_LOONGARCH, R_LARCH_ABS64_LO20));
		EXPECT_EQ("R_LARCH_ABS64_HI12",
		getELFRelocationTypeName(EM_LOONGARCH, R_LARCH_ABS64_HI12));
		EXPECT_EQ("R_LARCH_PCALA_HI20",
		getELFRelocationTypeName(EM_LOONGARCH, R_LARCH_PCALA_HI20));
		EXPECT_EQ("R_LARCH_PCALA_LO12",
		getELFRelocationTypeName(EM_LOONGARCH, R_LARCH_PCALA_LO12));
		EXPECT_EQ("R_LARCH_PCALA64_LO20",
		getELFRelocationTypeName(EM_LOONGARCH, R_LARCH_PCALA64_LO20));
		EXPECT_EQ("R_LARCH_PCALA64_HI12",
		getELFRelocationTypeName(EM_LOONGARCH, R_LARCH_PCALA64_HI12));
		EXPECT_EQ("R_LARCH_GOT_PC_HI20",
		getELFRelocationTypeName(EM_LOONGARCH, R_LARCH_GOT_PC_HI20));
		EXPECT_EQ("R_LARCH_GOT_PC_LO12",
		getELFRelocationTypeName(EM_LOONGARCH, R_LARCH_GOT_PC_LO12));
		EXPECT_EQ("R_LARCH_GOT64_PC_LO20",
		getELFRelocationTypeName(EM_LOONGARCH, R_LARCH_GOT64_PC_LO20));
		EXPECT_EQ("R_LARCH_GOT64_PC_HI12",
		getELFRelocationTypeName(EM_LOONGARCH, R_LARCH_GOT64_PC_HI12));
		EXPECT_EQ("R_LARCH_GOT_HI20",
		getELFRelocationTypeName(EM_LOONGARCH, R_LARCH_GOT_HI20));
		EXPECT_EQ("R_LARCH_GOT_LO12",
		getELFRelocationTypeName(EM_LOONGARCH, R_LARCH_GOT_LO12));
		EXPECT_EQ("R_LARCH_GOT64_LO20",
		getELFRelocationTypeName(EM_LOONGARCH, R_LARCH_GOT64_LO20));
		EXPECT_EQ("R_LARCH_GOT64_HI12",
		getELFRelocationTypeName(EM_LOONGARCH, R_LARCH_GOT64_HI12));
		EXPECT_EQ("R_LARCH_TLS_LE_HI20",
		getELFRelocationTypeName(EM_LOONGARCH, R_LARCH_TLS_LE_HI20));
		EXPECT_EQ("R_LARCH_TLS_LE_LO12",
		getELFRelocationTypeName(EM_LOONGARCH, R_LARCH_TLS_LE_LO12));
		EXPECT_EQ("R_LARCH_TLS_LE64_LO20",
		getELFRelocationTypeName(EM_LOONGARCH, R_LARCH_TLS_LE64_LO20));
		EXPECT_EQ("R_LARCH_TLS_LE64_HI12",
		getELFRelocationTypeName(EM_LOONGARCH, R_LARCH_TLS_LE64_HI12));
		EXPECT_EQ("R_LARCH_TLS_IE_PC_HI20",
		getELFRelocationTypeName(EM_LOONGARCH, R_LARCH_TLS_IE_PC_HI20));
		EXPECT_EQ("R_LARCH_TLS_IE_PC_LO12",
		getELFRelocationTypeName(EM_LOONGARCH, R_LARCH_TLS_IE_PC_LO12));
		EXPECT_EQ("R_LARCH_TLS_IE64_PC_LO20",
		getELFRelocationTypeName(EM_LOONGARCH, R_LARCH_TLS_IE64_PC_LO20));
		EXPECT_EQ("R_LARCH_TLS_IE64_PC_HI12",
		getELFRelocationTypeName(EM_LOONGARCH, R_LARCH_TLS_IE64_PC_HI12));
		EXPECT_EQ("R_LARCH_TLS_IE_HI20",
		getELFRelocationTypeName(EM_LOONGARCH, R_LARCH_TLS_IE_HI20));
		EXPECT_EQ("R_LARCH_TLS_IE_LO12",
		getELFRelocationTypeName(EM_LOONGARCH, R_LARCH_TLS_IE_LO12));
		EXPECT_EQ("R_LARCH_TLS_IE64_LO20",
		getELFRelocationTypeName(EM_LOONGARCH, R_LARCH_TLS_IE64_LO20));
		EXPECT_EQ("R_LARCH_TLS_IE64_HI12",
		getELFRelocationTypeName(EM_LOONGARCH, R_LARCH_TLS_IE64_HI12));
		EXPECT_EQ("R_LARCH_TLS_LD_PC_HI20",
		getELFRelocationTypeName(EM_LOONGARCH, R_LARCH_TLS_LD_PC_HI20));
		EXPECT_EQ("R_LARCH_TLS_LD_HI20",
		getELFRelocationTypeName(EM_LOONGARCH, R_LARCH_TLS_LD_HI20));
		EXPECT_EQ("R_LARCH_TLS_GD_PC_HI20",
		getELFRelocationTypeName(EM_LOONGARCH, R_LARCH_TLS_GD_PC_HI20));
		EXPECT_EQ("R_LARCH_TLS_GD_HI20",
		getELFRelocationTypeName(EM_LOONGARCH, R_LARCH_TLS_GD_HI20));
		EXPECT_EQ("R_LARCH_32_PCREL",
		getELFRelocationTypeName(EM_LOONGARCH, R_LARCH_32_PCREL));
		EXPECT_EQ("R_LARCH_RELAX",
		getELFRelocationTypeName(EM_LOONGARCH, R_LARCH_RELAX));
}		}

TEST(ELFTest, getELFRelativeRelocationType) {		TEST(ELFTest, getELFRelativeRelocationType) {
EXPECT_EQ(ELF::R_VE_RELATIVE, getELFRelativeRelocationType(EM_VE));		EXPECT_EQ(ELF::R_VE_RELATIVE, getELFRelativeRelocationType(EM_VE));
}		}

// This is a test for the DataRegion helper struct, defined in ELF.h header.		// This is a test for the DataRegion helper struct, defined in ELF.h header.
TEST(ELFTest, DataRegionTest) {		TEST(ELFTest, DataRegionTest) {
Show All 29 Lines

This is an archive of the discontinued LLVM Phabricator instance.

[LoongArch] Define the new-style reloc typesClosedPublic

Details

Diff Detail

Event Timeline

Revision Contents

Diff 451705

llvm/include/llvm/BinaryFormat/ELFRelocs/LoongArch.def

llvm/test/tools/llvm-readobj/ELF/reloc-types-loongarch64.test

llvm/unittests/Object/ELFTest.cpp

[LoongArch] Define the new-style reloc types
ClosedPublic