Skip to content

RISC-V: Linux: Imply Zicntr from the IMA base behavior #1806

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 1 commit into from
May 30, 2025
Merged

RISC-V: Linux: Imply Zicntr from the IMA base behavior #1806

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 4 additions & 6 deletions crates/std_detect/src/detect/os/linux/riscv.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,18 +197,16 @@ pub(crate) fn detect_features() -> cache::Initializer {
// Query whether "I" base and extensions "M" and "A" (as in the ISA
// manual version 2.2) are enabled. "I" base at that time corresponds
// to "I", "Zicsr", "Zicntr" and "Zifencei" (as in the ISA manual version
// 20240411) and we chose to imply "Zicsr" and "Zifencei" (not "Zicntr")
// because there will be a separate RISCV_HWPROBE_EXT_ZICNTR constant to
// determine existence of the "Zicntr" extension in Linux 6.15 (as of rc1).
// "fence.i" ("Zifencei") is conditionally valid on the Linux userland
// (when CMODX is enabled).
// This is a requirement of `RISCV_HWPROBE_KEY_IMA_EXT_0`-based tests.
// 20240411).
// This is a current requirement of
// `RISCV_HWPROBE_KEY_IMA_EXT_0`-based tests.
let has_ima = (out[0].key != -1) && (out[0].value & RISCV_HWPROBE_BASE_BEHAVIOR_IMA != 0);
if !has_ima {
break 'hwprobe;
}
has_i |= has_ima;
enable_feature(Feature::zicsr, has_ima);
enable_feature(Feature::zicntr, has_ima);
enable_feature(Feature::zifencei, has_ima);
enable_feature(Feature::m, has_ima);
enable_feature(Feature::a, has_ima);
Expand Down