Skip to content

Fix for extraction of extensions starting with 's'/ 'x'/ 'z' #277

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 2 commits into from
Mar 18, 2025
+56 −49
Merged

Fix for extraction of extensions starting with 's'/ 'x'/ 'z' #277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4ea7f4
Fix for extraction of extensions starting with 's','x','z' from targe…
AthiraRamakrishna Mar 16, 2025
1c440f3
Change test cases
AthiraRamakrishna Mar 18, 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
7 changes: 7 additions & 0 deletions riscv-target-parser/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,15 @@ This project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]

## [v0.1.1] - 2025-03-18
### Fixed

- Fix parsing of extensions starting with 's'/'x'/'z' from target features
- Updated the test cases accordingly

## [v0.1.0] - 2025-02-18

### Added

- First release.

2 changes: 1 addition & 1 deletion riscv-target-parser/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "riscv-target-parser"
version = "0.1.0"
version = "0.1.1"
rust-version = "1.61"
repository = "https://github.com/rust-embedded/riscv"
authors = ["The RISC-V Team <[email protected]>"]
Expand Down
96 changes: 48 additions & 48 deletions riscv-target-parser/src/extension.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,11 @@ impl<'a> TryFrom<&'a str> for Extension {
"v" => Ok(Extension::V),
"h" => Ok(Extension::H),
_ => {
if value.starts_with('Z') {
if value.starts_with('z') {
Ok(Extension::Z(value.to_string()))
} else if value.starts_with('S') {
} else if value.starts_with('s') {
Ok(Extension::S(value.to_string()))
} else if value.starts_with('X') {
} else if value.starts_with('x') {
Ok(Extension::X(value.to_string()))
} else {
Err(Self::Error::UnknownExtension(value))
Expand Down Expand Up @@ -163,7 +163,7 @@ impl<'a> TryFrom<&'a str> for Extensions {

while !value.is_empty() {
let extension =
if value.starts_with("Z") || value.starts_with("S") || value.starts_with("X") {
if value.starts_with("z") || value.starts_with("s") || value.starts_with("x") {
match value.find('_') {
Some(pos) => {
let (ext, _) = value.split_at(pos);
Expand Down Expand Up @@ -239,16 +239,16 @@ mod test {
assert_eq!(Extension::try_from("v"), Ok(Extension::V));
assert_eq!(Extension::try_from("h"), Ok(Extension::H));
assert_eq!(
Extension::try_from("Zicsr"),
Ok(Extension::Z("Zicsr".to_string()))
Extension::try_from("zicsr"),
Ok(Extension::Z("zicsr".to_string()))
);
assert_eq!(
Extension::try_from("Ssccfg"),
Ok(Extension::S("Ssccfg".to_string()))
Extension::try_from("ssccfg"),
Ok(Extension::S("ssccfg".to_string()))
);
assert_eq!(
Extension::try_from("XSifivecdiscarddlone"),
Ok(Extension::X("XSifivecdiscarddlone".to_string()))
Extension::try_from("xsifivecdiscarddlone"),
Ok(Extension::X("xsifivecdiscarddlone".to_string()))
);
assert_eq!(
Extension::try_from("unknown"),
Expand All @@ -270,11 +270,11 @@ mod test {
assert_eq!(Extension::P.to_string(), "p");
assert_eq!(Extension::V.to_string(), "v");
assert_eq!(Extension::H.to_string(), "h");
assert_eq!(Extension::Z("Zicsr".to_string()).to_string(), "Zicsr");
assert_eq!(Extension::S("Ssccfg".to_string()).to_string(), "Ssccfg");
assert_eq!(Extension::Z("zicsr".to_string()).to_string(), "zicsr");
assert_eq!(Extension::S("ssccfg".to_string()).to_string(), "ssccfg");
assert_eq!(
Extension::X("XSifivecdiscarddlone".to_string()).to_string(),
"XSifivecdiscarddlone"
Extension::X("xsifivecdiscarddlone".to_string()).to_string(),
"xsifivecdiscarddlone"
);
}

Expand All @@ -292,9 +292,9 @@ mod test {
Extension::P,
Extension::V,
Extension::H,
Extension::Z("Zicsr".to_string()),
Extension::S("Ssccfg".to_string()),
Extension::X("XSifivecdiscarddlone".to_string()),
Extension::Z("zicsr".to_string()),
Extension::S("ssccfg".to_string()),
Extension::X("xsifivecdiscarddlone".to_string()),
];
extensions.reverse();
extensions.sort();
Expand All @@ -312,9 +312,9 @@ mod test {
Extension::P,
Extension::V,
Extension::H,
Extension::Z("Zicsr".to_string()),
Extension::S("Ssccfg".to_string()),
Extension::X("XSifivecdiscarddlone".to_string()),
Extension::Z("zicsr".to_string()),
Extension::S("ssccfg".to_string()),
Extension::X("xsifivecdiscarddlone".to_string()),
]
);
}
Expand All @@ -328,11 +328,11 @@ mod test {
assert!(extensions.base_extension().is_none());

try_extensions =
Extensions::try_from("giemafdqcbpvhXSifivecdiscarddlone_Ssccfg_Zicsr_Zaamo_u");
Extensions::try_from("giemafdqcbpvhxsifivecdiscarddlone_ssccfg_zicsr_zaamo_u");
assert!(try_extensions.is_err());
assert_eq!(try_extensions, Err(Error::UnknownExtension("u")));

try_extensions = Extensions::try_from("geqcbpvhXSifivecdiscarddlone_Ssccfg_Zicsr_Zaamo_");
try_extensions = Extensions::try_from("geqcbpvhxsifivecdiscarddlone_ssccfg_zicsr_zaamo_");
assert!(try_extensions.is_ok());
extensions = try_extensions.unwrap();
assert_eq!(
Expand All @@ -350,16 +350,16 @@ mod test {
Extension::P,
Extension::V,
Extension::H,
Extension::Z("Zaamo".to_string()),
Extension::Z("Zicsr".to_string()),
Extension::S("Ssccfg".to_string()),
Extension::X("XSifivecdiscarddlone".to_string()),
Extension::Z("zaamo".to_string()),
Extension::Z("zicsr".to_string()),
Extension::S("ssccfg".to_string()),
Extension::X("xsifivecdiscarddlone".to_string()),
]
);
assert_eq!(extensions.base_extension(), Some(Extension::I));

try_extensions =
Extensions::try_from("iemafdqcbpvhXSifivecdiscarddlone_Ssccfg_Zicsr_Zaamo_");
Extensions::try_from("iemafdqcbpvhxsifivecdiscarddlone_ssccfg_zicsr_zaamo_");
assert!(try_extensions.is_ok());
extensions = try_extensions.unwrap();
assert_eq!(
Expand All @@ -377,16 +377,16 @@ mod test {
Extension::P,
Extension::V,
Extension::H,
Extension::Z("Zaamo".to_string()),
Extension::Z("Zicsr".to_string()),
Extension::S("Ssccfg".to_string()),
Extension::X("XSifivecdiscarddlone".to_string()),
Extension::Z("zaamo".to_string()),
Extension::Z("zicsr".to_string()),
Extension::S("ssccfg".to_string()),
Extension::X("xsifivecdiscarddlone".to_string()),
]
);
assert_eq!(extensions.base_extension(), Some(Extension::I));

try_extensions =
Extensions::try_from("emafdqcbpvhXSifivecdiscarddlone_Ssccfg_Zicsr_Zaamo_");
Extensions::try_from("emafdqcbpvhxsifivecdiscarddlone_ssccfg_zicsr_zaamo_");
assert!(try_extensions.is_ok());
extensions = try_extensions.unwrap();
assert_eq!(
Expand All @@ -403,10 +403,10 @@ mod test {
Extension::P,
Extension::V,
Extension::H,
Extension::Z("Zaamo".to_string()),
Extension::Z("Zicsr".to_string()),
Extension::S("Ssccfg".to_string()),
Extension::X("XSifivecdiscarddlone".to_string()),
Extension::Z("zaamo".to_string()),
Extension::Z("zicsr".to_string()),
Extension::S("ssccfg".to_string()),
Extension::X("xsifivecdiscarddlone".to_string()),
]
);
assert_eq!(extensions.base_extension(), Some(Extension::E));
Expand Down Expand Up @@ -452,43 +452,43 @@ mod test {
let mut extensions = Extensions::try_from("imafdc").unwrap();
assert_eq!(extensions.to_string(), "gc");

extensions.insert(Extension::try_from("Ssccfg").unwrap());
assert_eq!(extensions.to_string(), "gcSsccfg");
extensions.insert(Extension::try_from("ssccfg").unwrap());
assert_eq!(extensions.to_string(), "gcssccfg");

extensions.insert(Extension::try_from("Zicsr").unwrap());
assert_eq!(extensions.to_string(), "gcZicsr_Ssccfg");
extensions.insert(Extension::try_from("zicsr").unwrap());
assert_eq!(extensions.to_string(), "gczicsr_ssccfg");

extensions.insert(Extension::try_from("Zaamo").unwrap());
assert_eq!(extensions.to_string(), "gcZaamo_Zicsr_Ssccfg");
extensions.insert(Extension::try_from("zaamo").unwrap());
assert_eq!(extensions.to_string(), "gczaamo_zicsr_ssccfg");

extensions.insert(Extension::try_from("XSifivecdiscarddlone").unwrap());
extensions.insert(Extension::try_from("xsifivecdiscarddlone").unwrap());
assert_eq!(
extensions.to_string(),
"gcZaamo_Zicsr_Ssccfg_XSifivecdiscarddlone"
"gczaamo_zicsr_ssccfg_xsifivecdiscarddlone"
);

extensions.insert(Extension::try_from("e").unwrap());
assert_eq!(
extensions.to_string(),
"gecZaamo_Zicsr_Ssccfg_XSifivecdiscarddlone"
"geczaamo_zicsr_ssccfg_xsifivecdiscarddlone"
);

extensions.remove(&Extension::I);
assert_eq!(
extensions.to_string(),
"emafdcZaamo_Zicsr_Ssccfg_XSifivecdiscarddlone"
"emafdczaamo_zicsr_ssccfg_xsifivecdiscarddlone"
);

extensions.remove(&Extension::E);
assert_eq!(
extensions.to_string(),
"mafdcZaamo_Zicsr_Ssccfg_XSifivecdiscarddlone"
"mafdczaamo_zicsr_ssccfg_xsifivecdiscarddlone"
);

extensions.insert(Extension::I);
assert_eq!(
extensions.to_string(),
"gcZaamo_Zicsr_Ssccfg_XSifivecdiscarddlone"
"gczaamo_zicsr_ssccfg_xsifivecdiscarddlone"
);
}
}