[AArch64][PAC][clang][ELF] Support PAuth ABI core info #85235
+274
−6
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1779,6 +1779,26 @@ void Clang::AddAArch64TargetArgs(const ArgList &Args, | |
|
|
||
| Args.addOptInFlag(CmdArgs, options::OPT_fptrauth_intrinsics, | ||
| options::OPT_fno_ptrauth_intrinsics); | ||
|
|
||
|
There was a problem hiding this comment. I'd delete blank lines for these similar There was a problem hiding this comment. Deleted, see b0f9a19 |
||
| Args.addOptInFlag(CmdArgs, options::OPT_fptrauth_calls, | ||
| options::OPT_fno_ptrauth_calls); | ||
|
|
||
| Args.addOptInFlag(CmdArgs, options::OPT_fptrauth_returns, | ||
| options::OPT_fno_ptrauth_returns); | ||
|
|
||
| Args.addOptInFlag(CmdArgs, options::OPT_fptrauth_auth_traps, | ||
| options::OPT_fno_ptrauth_auth_traps); | ||
|
|
||
| Args.addOptInFlag( | ||
| CmdArgs, options::OPT_fptrauth_vtable_pointer_address_discrimination, | ||
| options::OPT_fno_ptrauth_vtable_pointer_address_discrimination); | ||
|
|
||
| Args.addOptInFlag( | ||
| CmdArgs, options::OPT_fptrauth_vtable_pointer_type_discrimination, | ||
| options::OPT_fno_ptrauth_vtable_pointer_type_discrimination); | ||
|
|
||
| Args.addOptInFlag(CmdArgs, options::OPT_fptrauth_init_fini, | ||
| options::OPT_fno_ptrauth_init_fini); | ||
| } | ||
|
|
||
| void Clang::AddLoongArchTargetArgs(const ArgList &Args, | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| // RUN: %clang --target=aarch64-linux -S -emit-llvm -o - \ | ||
|
There was a problem hiding this comment. We prefer There was a problem hiding this comment. Fixed, thanks, see fdb26a1 |
||
| // RUN: -fptrauth-intrinsics \ | ||
| // RUN: -fptrauth-calls \ | ||
| // RUN: -fptrauth-returns \ | ||
| // RUN: -fptrauth-auth-traps \ | ||
| // RUN: -fptrauth-vtable-pointer-address-discrimination \ | ||
| // RUN: -fptrauth-vtable-pointer-type-discrimination \ | ||
| // RUN: -fptrauth-init-fini %s | \ | ||
| // RUN: FileCheck %s --check-prefix=ALL | ||
|
|
||
| // RUN: %clang --target=aarch64-linux -S -emit-llvm -o - \ | ||
| // RUN: -fptrauth-intrinsics %s | FileCheck %s --check-prefix=INTRIN | ||
|
|
||
| // RUN: %clang --target=aarch64-linux -S -emit-llvm -o - \ | ||
| // RUN: -fptrauth-calls %s | FileCheck %s --check-prefix=CALL | ||
|
|
||
| // RUN: %clang --target=aarch64-linux -S -emit-llvm -o - \ | ||
| // RUN: -fptrauth-returns %s | FileCheck %s --check-prefix=RET | ||
|
|
||
| // RUN: %clang --target=aarch64-linux -S -emit-llvm -o - \ | ||
| // RUN: -fptrauth-auth-traps %s | FileCheck %s --check-prefix=TRAP | ||
|
|
||
| // RUN: %clang --target=aarch64-linux -S -emit-llvm -o - \ | ||
| // RUN: -fptrauth-calls -fptrauth-vtable-pointer-address-discrimination %s | \ | ||
| // RUN: FileCheck %s --check-prefix=VPTRADDR | ||
|
|
||
| // RUN: %clang --target=aarch64-linux -S -emit-llvm -o - \ | ||
| // RUN: -fptrauth-calls -fptrauth-vtable-pointer-type-discrimination %s | \ | ||
| // RUN: FileCheck %s --check-prefix=VPTRTYPE | ||
|
|
||
| // RUN: %clang --target=aarch64-linux -S -emit-llvm -o - \ | ||
| // RUN: -fptrauth-calls -fptrauth-init-fini %s | \ | ||
| // RUN: FileCheck %s --check-prefix=INITFINI | ||
|
|
||
| // ALL: !{i32 1, !"aarch64-elf-pauthabi-platform", i32 268435458} | ||
| // ALL: !{i32 1, !"aarch64-elf-pauthabi-version", i32 127} | ||
|
|
||
| // INTRIN: !{i32 1, !"aarch64-elf-pauthabi-platform", i32 268435458} | ||
| // INTRIN: !{i32 1, !"aarch64-elf-pauthabi-version", i32 1} | ||
|
|
||
| // CALL: !{i32 1, !"aarch64-elf-pauthabi-platform", i32 268435458} | ||
| // CALL: !{i32 1, !"aarch64-elf-pauthabi-version", i32 2} | ||
|
|
||
| // RET: !{i32 1, !"aarch64-elf-pauthabi-platform", i32 268435458} | ||
| // RET: !{i32 1, !"aarch64-elf-pauthabi-version", i32 4} | ||
|
|
||
| // TRAP: !{i32 1, !"aarch64-elf-pauthabi-platform", i32 268435458} | ||
| // TRAP: !{i32 1, !"aarch64-elf-pauthabi-version", i32 8} | ||
|
|
||
| // VPTRADDR: !{i32 1, !"aarch64-elf-pauthabi-platform", i32 268435458} | ||
| // VPTRADDR: !{i32 1, !"aarch64-elf-pauthabi-version", i32 18} | ||
|
|
||
| // VPTRTYPE: !{i32 1, !"aarch64-elf-pauthabi-platform", i32 268435458} | ||
| // VPTRTYPE: !{i32 1, !"aarch64-elf-pauthabi-version", i32 34} | ||
|
|
||
| // INITFINI: !{i32 1, !"aarch64-elf-pauthabi-platform", i32 268435458} | ||
| // INITFINI: !{i32 1, !"aarch64-elf-pauthabi-version", i32 66} | ||
|
|
||
| void foo() {} | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,37 @@ | ||
| // RUN: %clang -### -c --target=aarch64 %s 2>&1 | FileCheck %s --check-prefix NONE | ||
| // NONE: "-cc1" | ||
| // NONE-NOT: "-fptrauth- | ||
|
|
||
| // RUN: %clang -### -c --target=aarch64 -fno-ptrauth-intrinsics -fptrauth-intrinsics %s 2>&1 | FileCheck %s --check-prefix=INTRIN | ||
| // INTRIN: "-cc1"{{.*}} "-fptrauth-intrinsics" | ||
|
|
||
| // RUN: %clang -### -c --target=aarch64 -fno-ptrauth-calls -fptrauth-calls %s 2>&1 | FileCheck %s --check-prefix=CALL | ||
|
There was a problem hiding this comment. The overhead of additional RUN lines perhaps overweigh There was a problem hiding this comment. I've measured timings on my machine, and we can potentially save about 0.1s if combine some of the RUN lines. It's noticeable, but there are tests like aarch64-fixed-x-register.c which contain a lot more similar RUN lines which can also be combined and we could save even more if enhance them. I suggest to merge this PR "as is" and probably submitting a subsequent PR which makes this test and some similar ones "lighter" if it's a big concern. As for me, keeping all the RUN lines can protect us from dummy typos and they probably are worth the time spent on them - but I don't mind combining the RUN lines if the extra overhead bothers many people. Please let me know if this approach is OK for you and I can merge the PR. If the clang driver test timings look too bad, I can also submit a corresponding issue so the context of the discussion is not lost. There was a problem hiding this comment. I think there is some value separating tests for codegen but the value is largely diminished for driver. So for driver, I'd hope that some grouping is made. If that's extra trouble to you, you can submit this as is and I will simplify it a bit. There was a problem hiding this comment. OK, this makes sense. Given that, I've combined 7 RUN lines for individual options into a single RUN line (so the file contains 3 RUN lines total now). See b0f9a19. |
||
| // CALL: "-cc1"{{.*}} "-fptrauth-calls" | ||
|
|
||
| // RUN: %clang -### -c --target=aarch64 -fno-ptrauth-returns -fptrauth-returns %s 2>&1 | FileCheck %s --check-prefix=RETURN | ||
| // RETURN: "-cc1"{{.*}} "-fptrauth-returns" | ||
|
|
||
| // RUN: %clang -### -c --target=aarch64 -fno-ptrauth-auth-traps -fptrauth-auth-traps %s 2>&1 | FileCheck %s --check-prefix=TRAP | ||
| // TRAP: "-cc1"{{.*}} "-fptrauth-auth-traps" | ||
|
|
||
| // RUN: %clang -### -c --target=aarch64 -fno-ptrauth-vtable-pointer-address-discrimination \ | ||
| // RUN: -fptrauth-vtable-pointer-address-discrimination %s 2>&1 | FileCheck %s --check-prefix=VPTRADDR | ||
| // VPTRADDR: "-cc1"{{.*}} "-fptrauth-vtable-pointer-address-discrimination" | ||
|
|
||
| // RUN: %clang -### -c --target=aarch64 -fno-ptrauth-vtable-pointer-type-discrimination \ | ||
| // RUN: -fptrauth-vtable-pointer-type-discrimination %s 2>&1 | FileCheck %s --check-prefix=VPTRTYPE | ||
| // VPTRTYPE: "-cc1"{{.*}} "-fptrauth-vtable-pointer-type-discrimination" | ||
|
|
||
| // RUN: %clang -### -c --target=aarch64 -fno-ptrauth-init-fini -fptrauth-init-fini %s 2>&1 | FileCheck %s --check-prefix=INITFINI | ||
| // INITFINI: "-cc1"{{.*}} "-fptrauth-init-fini" | ||
|
|
||
| // RUN: not %clang -### -c --target=x86_64 -fptrauth-intrinsics -fptrauth-calls -fptrauth-returns -fptrauth-auth-traps \ | ||
| // RUN: -fptrauth-vtable-pointer-address-discrimination -fptrauth-vtable-pointer-type-discrimination \ | ||
| // RUN: -fptrauth-init-fini %s 2>&1 | FileCheck %s --check-prefix=ERR | ||
| // ERR: error: unsupported option '-fptrauth-intrinsics' for target '{{.*}}' | ||
| // ERR-NEXT: error: unsupported option '-fptrauth-calls' for target '{{.*}}' | ||
| // ERR-NEXT: error: unsupported option '-fptrauth-returns' for target '{{.*}}' | ||
| // ERR-NEXT: error: unsupported option '-fptrauth-auth-traps' for target '{{.*}}' | ||
| // ERR-NEXT: error: unsupported option '-fptrauth-vtable-pointer-address-discrimination' for target '{{.*}}' | ||
| // ERR-NEXT: error: unsupported option '-fptrauth-vtable-pointer-type-discrimination' for target '{{.*}}' | ||
| // ERR-NEXT: error: unsupported option '-fptrauth-init-fini' for target '{{.*}}' | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Linux implies ELF. You can remove
getTriple().isOSBinFormatELF()There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK, but I'll leave an assertion against ELF here. Theoretically, we might have non-ELF binary format on Linux, while the Linux itself seems to have deprecated COFF and a.out support and llvm does not seem to support them as well. This assertion makes sense to me since (a) it makes things clear that we want to check both Linux and ELF (b) this will notify us if in future we have binary formats other than ELF supported on Linux.
See 37a4d9d