Skip to content

[Clang][RISCV] Add Zicfilp CFI unlabeled scheme preprocessor macros #109600

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
May 19, 2025
Merged

[Clang][RISCV] Add Zicfilp CFI unlabeled scheme preprocessor macros #109600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
93617b9
[clang][RISCV] Add Zicfilp CFI unlabeled scheme preprocessor macros
mylai-mtk May 10, 2024
b79b9cb
fixup: Remove redundant macro contents
mylai-mtk Feb 17, 2025
0e9b50c
fixup: Move tests of macros from CodeGen dir to Preprocessor dir
mylai-mtk Feb 17, 2025
9269dc9
fixup: Add tests for default branch label scheme
mylai-mtk Feb 17, 2025
e3620c3
fixup: Add tests for `-fcf-protection=full`
mylai-mtk Feb 17, 2025
f71d80b
fixup: Remove useless line in test and rename test file itself
mylai-mtk Feb 17, 2025
4e6c610
fixup: Drop adding func-sig macro for now
mylai-mtk May 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions clang/lib/Basic/Targets/RISCV.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,25 @@ void RISCVTargetInfo::getTargetDefines(const LangOptions &Opts,

if (Opts.CFProtectionReturn && ISAInfo->hasExtension("zicfiss"))
Builder.defineMacro("__riscv_shadow_stack");

if (Opts.CFProtectionBranch) {
auto Scheme = Opts.getCFBranchLabelScheme();
if (Scheme == CFBranchLabelSchemeKind::Default)
Scheme = getDefaultCFBranchLabelScheme();

Builder.defineMacro("__riscv_landing_pad");
switch (Scheme) {
case CFBranchLabelSchemeKind::Unlabeled:
Builder.defineMacro("__riscv_landing_pad_unlabeled");
break;
case CFBranchLabelSchemeKind::FuncSig:
// TODO: Define macros after the func-sig scheme is implemented
break;
case CFBranchLabelSchemeKind::Default:
llvm_unreachable("default cf-branch-label scheme should already be "
"transformed to other scheme");
}
}
}

static constexpr int NumRVVBuiltins =
Expand Down
83 changes: 83 additions & 0 deletions clang/test/Preprocessor/riscv-cf-protection-branch.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
// RUN: %clang --target=riscv32 -menable-experimental-extensions \
// RUN: -march=rv32i_zicfilp1p0 -fcf-protection=branch \
// RUN: -mcf-branch-label-scheme=unlabeled -E -dM %s -o - | FileCheck \
// RUN: --check-prefixes=LPAD-MACRO,UNLABELED-MACRO %s

// RUN: %clang --target=riscv32 -menable-experimental-extensions \
// RUN: -march=rv32i_zicfilp1p0 -fcf-protection=full \
// RUN: -mcf-branch-label-scheme=unlabeled -E -dM %s -o - | FileCheck \
// RUN: --check-prefixes=LPAD-MACRO,UNLABELED-MACRO %s

// RUN: %clang --target=riscv32 -menable-experimental-extensions \
// RUN: -march=rv32i_zicfilp1p0 -E -dM %s -o - 2>&1 | \
// RUN: FileCheck --check-prefixes=NO-MACRO %s

// RUN: %clang --target=riscv32 -menable-experimental-extensions \
// RUN: -march=rv32i_zicfilp1p0 -mcf-branch-label-scheme=unlabeled -E -dM %s \
// RUN: -o - 2>&1 | FileCheck --check-prefixes=NO-MACRO %s

// RUN: %clang --target=riscv32 -menable-experimental-extensions \
// RUN: -march=rv32i_zicfilp1p0 -mcf-branch-label-scheme=func-sig -E -dM %s \
// RUN: -o - 2>&1 | FileCheck --check-prefixes=NO-MACRO %s

// RUN: %clang --target=riscv32 -fcf-protection=branch \
// RUN: -mcf-branch-label-scheme=unlabeled -E -dM -emit-llvm %s -o - | \
// RUN: FileCheck --check-prefixes=LPAD-MACRO,UNLABELED-MACRO %s

// RUN: %clang --target=riscv32 -fcf-protection=full \
// RUN: -mcf-branch-label-scheme=unlabeled -E -dM -emit-llvm %s -o - | \
// RUN: FileCheck --check-prefixes=LPAD-MACRO,UNLABELED-MACRO %s

// RUN: %clang --target=riscv32 -E -dM %s -o - 2>&1 | \
// RUN: FileCheck --check-prefixes=NO-MACRO %s

// RUN: %clang --target=riscv32 -mcf-branch-label-scheme=unlabeled -E -dM %s \
// RUN: -o - 2>&1 | FileCheck --check-prefixes=NO-MACRO %s

// RUN: %clang --target=riscv32 -mcf-branch-label-scheme=func-sig -E -dM %s \
// RUN: -o - 2>&1 | FileCheck --check-prefixes=NO-MACRO %s

// RUN: %clang --target=riscv64 -menable-experimental-extensions \
// RUN: -march=rv64i_zicfilp1p0 -fcf-protection=branch \
// RUN: -mcf-branch-label-scheme=unlabeled -E -dM %s -o - | FileCheck \
// RUN: --check-prefixes=LPAD-MACRO,UNLABELED-MACRO %s

// RUN: %clang --target=riscv64 -menable-experimental-extensions \
// RUN: -march=rv64i_zicfilp1p0 -fcf-protection=full \
// RUN: -mcf-branch-label-scheme=unlabeled -E -dM %s -o - | FileCheck \
// RUN: --check-prefixes=LPAD-MACRO,UNLABELED-MACRO %s

// RUN: %clang --target=riscv64 -menable-experimental-extensions \
// RUN: -march=rv64i_zicfilp1p0 -E -dM %s -o - 2>&1 | \
// RUN: FileCheck --check-prefixes=NO-MACRO %s

// RUN: %clang --target=riscv64 -menable-experimental-extensions \
// RUN: -march=rv64i_zicfilp1p0 -mcf-branch-label-scheme=unlabeled -E -dM %s \
// RUN: -o - 2>&1 | FileCheck --check-prefixes=NO-MACRO %s

// RUN: %clang --target=riscv64 -menable-experimental-extensions \
// RUN: -march=rv64i_zicfilp1p0 -mcf-branch-label-scheme=func-sig -E -dM %s \
// RUN: -o - 2>&1 | FileCheck --check-prefixes=NO-MACRO %s

// RUN: %clang --target=riscv64 -fcf-protection=branch \
// RUN: -mcf-branch-label-scheme=unlabeled -E -dM %s -o - | FileCheck \
// RUN: --check-prefixes=LPAD-MACRO,UNLABELED-MACRO %s

// RUN: %clang --target=riscv64 -fcf-protection=full \
// RUN: -mcf-branch-label-scheme=unlabeled -E -dM %s -o - | FileCheck \
// RUN: --check-prefixes=LPAD-MACRO,UNLABELED-MACRO %s

// RUN: %clang --target=riscv64 -E -dM %s -o - 2>&1 | \
// RUN: FileCheck --check-prefixes=NO-MACRO %s

// RUN: %clang --target=riscv64 -mcf-branch-label-scheme=unlabeled -E -dM %s \
// RUN: -o - 2>&1 | FileCheck --check-prefixes=NO-MACRO %s

// RUN: %clang --target=riscv64 -mcf-branch-label-scheme=func-sig -E -dM %s \
// RUN: -o - 2>&1 | FileCheck --check-prefixes=NO-MACRO %s

// LPAD-MACRO: __riscv_landing_pad 1{{$}}
// UNLABELED-MACRO: __riscv_landing_pad_unlabeled 1{{$}}
// NO-MACRO-NOT: __riscv_landing_pad
// NO-MACRO-NOT: __riscv_landing_pad_unlabeled
// NO-MACRO-NOT: __riscv_landing_pad_func_sig