-
Notifications
You must be signed in to change notification settings - Fork 14.3k
[RISCV][NFCI] Rename rv32+rv64 testcases #120717
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.
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
Conversation
All these testcases were called `rv32<something>.s`, but had equivalent RUN lines for both riscv32 and riscv64. This made it hard to add tests which are only valid on one of riscv32 or riscv64. This change makes the tests follow a naming convention: - `rv32*.s` means a test for riscv32-specific behaviour - `rv64*.s` means a test for riscv64-specific behaviour - `rv*.s` (without 64 or 32) means a test for both base architectures - the majority of tests/behaviour.
@llvm/pr-subscribers-mc @llvm/pr-subscribers-backend-risc-v Author: Sam Elliott (lenary) ChangesAll these testcases were called This change makes the tests follow a naming convention:
This should make it easier to add and name extension-specific tests which do depend on the base architecture. Full diff: https://github.com/llvm/llvm-project/pull/120717.diff 50 Files Affected:
diff --git a/llvm/test/MC/RISCV/rv32c-valid.s b/llvm/test/MC/RISCV/rvc-valid.s
similarity index 100%
rename from llvm/test/MC/RISCV/rv32c-valid.s
rename to llvm/test/MC/RISCV/rvc-valid.s
diff --git a/llvm/test/MC/RISCV/rv32d-valid.s b/llvm/test/MC/RISCV/rvd-valid.s
similarity index 100%
rename from llvm/test/MC/RISCV/rv32d-valid.s
rename to llvm/test/MC/RISCV/rvd-valid.s
diff --git a/llvm/test/MC/RISCV/rv32e-invalid.s b/llvm/test/MC/RISCV/rve-invalid.s
similarity index 100%
rename from llvm/test/MC/RISCV/rv32e-invalid.s
rename to llvm/test/MC/RISCV/rve-invalid.s
diff --git a/llvm/test/MC/RISCV/rv32e-valid.s b/llvm/test/MC/RISCV/rve-valid.s
similarity index 100%
rename from llvm/test/MC/RISCV/rv32e-valid.s
rename to llvm/test/MC/RISCV/rve-valid.s
diff --git a/llvm/test/MC/RISCV/rv32f-valid.s b/llvm/test/MC/RISCV/rvf-valid.s
similarity index 100%
rename from llvm/test/MC/RISCV/rv32f-valid.s
rename to llvm/test/MC/RISCV/rvf-valid.s
diff --git a/llvm/test/MC/RISCV/rv32i-valid.s b/llvm/test/MC/RISCV/rvi-valid.s
similarity index 100%
rename from llvm/test/MC/RISCV/rv32i-valid.s
rename to llvm/test/MC/RISCV/rvi-valid.s
diff --git a/llvm/test/MC/RISCV/rv32ih-aliases-valid.s b/llvm/test/MC/RISCV/rvih-aliases-valid.s
similarity index 100%
rename from llvm/test/MC/RISCV/rv32ih-aliases-valid.s
rename to llvm/test/MC/RISCV/rvih-aliases-valid.s
diff --git a/llvm/test/MC/RISCV/rv32ih-valid.s b/llvm/test/MC/RISCV/rvih-valid.s
similarity index 100%
rename from llvm/test/MC/RISCV/rv32ih-valid.s
rename to llvm/test/MC/RISCV/rvih-valid.s
diff --git a/llvm/test/MC/RISCV/rv32m-valid.s b/llvm/test/MC/RISCV/rvm-valid.s
similarity index 100%
rename from llvm/test/MC/RISCV/rv32m-valid.s
rename to llvm/test/MC/RISCV/rvm-valid.s
diff --git a/llvm/test/MC/RISCV/rv32xtheadbs-valid.s b/llvm/test/MC/RISCV/rvxtheadbs-valid.s
similarity index 100%
rename from llvm/test/MC/RISCV/rv32xtheadbs-valid.s
rename to llvm/test/MC/RISCV/rvxtheadbs-valid.s
diff --git a/llvm/test/MC/RISCV/rv32zaamo-valid.s b/llvm/test/MC/RISCV/rvzaamo-valid.s
similarity index 100%
rename from llvm/test/MC/RISCV/rv32zaamo-valid.s
rename to llvm/test/MC/RISCV/rvzaamo-valid.s
diff --git a/llvm/test/MC/RISCV/rv32zacas-valid.s b/llvm/test/MC/RISCV/rvzacas-valid.s
similarity index 100%
rename from llvm/test/MC/RISCV/rv32zacas-valid.s
rename to llvm/test/MC/RISCV/rvzacas-valid.s
diff --git a/llvm/test/MC/RISCV/rv32zalasr-valid.s b/llvm/test/MC/RISCV/rvzalasr-valid.s
similarity index 100%
rename from llvm/test/MC/RISCV/rv32zalasr-valid.s
rename to llvm/test/MC/RISCV/rvzalasr-valid.s
diff --git a/llvm/test/MC/RISCV/rv32zalrsc-valid.s b/llvm/test/MC/RISCV/rvzalrsc-valid.s
similarity index 100%
rename from llvm/test/MC/RISCV/rv32zalrsc-valid.s
rename to llvm/test/MC/RISCV/rvzalrsc-valid.s
diff --git a/llvm/test/MC/RISCV/rv32zba-valid.s b/llvm/test/MC/RISCV/rvzba-valid.s
similarity index 100%
rename from llvm/test/MC/RISCV/rv32zba-valid.s
rename to llvm/test/MC/RISCV/rvzba-valid.s
diff --git a/llvm/test/MC/RISCV/rv32zbb-valid.s b/llvm/test/MC/RISCV/rvzbb-valid.s
similarity index 100%
rename from llvm/test/MC/RISCV/rv32zbb-valid.s
rename to llvm/test/MC/RISCV/rvzbb-valid.s
diff --git a/llvm/test/MC/RISCV/rv32zbc-valid.s b/llvm/test/MC/RISCV/rvzbc-valid.s
similarity index 100%
rename from llvm/test/MC/RISCV/rv32zbc-valid.s
rename to llvm/test/MC/RISCV/rvzbc-valid.s
diff --git a/llvm/test/MC/RISCV/rv32zbkb-valid.s b/llvm/test/MC/RISCV/rvzbkb-valid.s
similarity index 100%
rename from llvm/test/MC/RISCV/rv32zbkb-valid.s
rename to llvm/test/MC/RISCV/rvzbkb-valid.s
diff --git a/llvm/test/MC/RISCV/rv32zbkc-valid.s b/llvm/test/MC/RISCV/rvzbkc-valid.s
similarity index 100%
rename from llvm/test/MC/RISCV/rv32zbkc-valid.s
rename to llvm/test/MC/RISCV/rvzbkc-valid.s
diff --git a/llvm/test/MC/RISCV/rv32zbkx-valid.s b/llvm/test/MC/RISCV/rvzbkx-valid.s
similarity index 100%
rename from llvm/test/MC/RISCV/rv32zbkx-valid.s
rename to llvm/test/MC/RISCV/rvzbkx-valid.s
diff --git a/llvm/test/MC/RISCV/rv32zbs-valid.s b/llvm/test/MC/RISCV/rvzbs-valid.s
similarity index 100%
rename from llvm/test/MC/RISCV/rv32zbs-valid.s
rename to llvm/test/MC/RISCV/rvzbs-valid.s
diff --git a/llvm/test/MC/RISCV/rv32zcb-invalid.s b/llvm/test/MC/RISCV/rvzcb-invalid.s
similarity index 100%
rename from llvm/test/MC/RISCV/rv32zcb-invalid.s
rename to llvm/test/MC/RISCV/rvzcb-invalid.s
diff --git a/llvm/test/MC/RISCV/rv32zcb-valid.s b/llvm/test/MC/RISCV/rvzcb-valid.s
similarity index 100%
rename from llvm/test/MC/RISCV/rv32zcb-valid.s
rename to llvm/test/MC/RISCV/rvzcb-valid.s
diff --git a/llvm/test/MC/RISCV/rv32zcmt-invalid.s b/llvm/test/MC/RISCV/rvzcmt-invalid.s
similarity index 100%
rename from llvm/test/MC/RISCV/rv32zcmt-invalid.s
rename to llvm/test/MC/RISCV/rvzcmt-invalid.s
diff --git a/llvm/test/MC/RISCV/rv32zcmt-valid.s b/llvm/test/MC/RISCV/rvzcmt-valid.s
similarity index 100%
rename from llvm/test/MC/RISCV/rv32zcmt-valid.s
rename to llvm/test/MC/RISCV/rvzcmt-valid.s
diff --git a/llvm/test/MC/RISCV/rv32zdinx-valid.s b/llvm/test/MC/RISCV/rvzdinx-valid.s
similarity index 100%
rename from llvm/test/MC/RISCV/rv32zdinx-valid.s
rename to llvm/test/MC/RISCV/rvzdinx-valid.s
diff --git a/llvm/test/MC/RISCV/rv32zfbfmin-invalid.s b/llvm/test/MC/RISCV/rvzfbfmin-invalid.s
similarity index 100%
rename from llvm/test/MC/RISCV/rv32zfbfmin-invalid.s
rename to llvm/test/MC/RISCV/rvzfbfmin-invalid.s
diff --git a/llvm/test/MC/RISCV/rv32zfbfmin-valid.s b/llvm/test/MC/RISCV/rvzfbfmin-valid.s
similarity index 100%
rename from llvm/test/MC/RISCV/rv32zfbfmin-valid.s
rename to llvm/test/MC/RISCV/rvzfbfmin-valid.s
diff --git a/llvm/test/MC/RISCV/rv32zfh-valid.s b/llvm/test/MC/RISCV/rvzfh-valid.s
similarity index 100%
rename from llvm/test/MC/RISCV/rv32zfh-valid.s
rename to llvm/test/MC/RISCV/rvzfh-valid.s
diff --git a/llvm/test/MC/RISCV/rv32zfhmin-invalid.s b/llvm/test/MC/RISCV/rvzfhmin-invalid.s
similarity index 100%
rename from llvm/test/MC/RISCV/rv32zfhmin-invalid.s
rename to llvm/test/MC/RISCV/rvzfhmin-invalid.s
diff --git a/llvm/test/MC/RISCV/rv32zfhmin-valid.s b/llvm/test/MC/RISCV/rvzfhmin-valid.s
similarity index 100%
rename from llvm/test/MC/RISCV/rv32zfhmin-valid.s
rename to llvm/test/MC/RISCV/rvzfhmin-valid.s
diff --git a/llvm/test/MC/RISCV/rv32zfinx-valid.s b/llvm/test/MC/RISCV/rvzfinx-valid.s
similarity index 100%
rename from llvm/test/MC/RISCV/rv32zfinx-valid.s
rename to llvm/test/MC/RISCV/rvzfinx-valid.s
diff --git a/llvm/test/MC/RISCV/rv32zhinx-valid.s b/llvm/test/MC/RISCV/rvzhinx-valid.s
similarity index 100%
rename from llvm/test/MC/RISCV/rv32zhinx-valid.s
rename to llvm/test/MC/RISCV/rvzhinx-valid.s
diff --git a/llvm/test/MC/RISCV/rv32zhinxmin-valid.s b/llvm/test/MC/RISCV/rvzhinxmin-valid.s
similarity index 100%
rename from llvm/test/MC/RISCV/rv32zhinxmin-valid.s
rename to llvm/test/MC/RISCV/rvzhinxmin-valid.s
diff --git a/llvm/test/MC/RISCV/rv32zicbom-invalid.s b/llvm/test/MC/RISCV/rvzicbom-invalid.s
similarity index 100%
rename from llvm/test/MC/RISCV/rv32zicbom-invalid.s
rename to llvm/test/MC/RISCV/rvzicbom-invalid.s
diff --git a/llvm/test/MC/RISCV/rv32zicbom-valid.s b/llvm/test/MC/RISCV/rvzicbom-valid.s
similarity index 100%
rename from llvm/test/MC/RISCV/rv32zicbom-valid.s
rename to llvm/test/MC/RISCV/rvzicbom-valid.s
diff --git a/llvm/test/MC/RISCV/rv32zicbop-invalid.s b/llvm/test/MC/RISCV/rvzicbop-invalid.s
similarity index 100%
rename from llvm/test/MC/RISCV/rv32zicbop-invalid.s
rename to llvm/test/MC/RISCV/rvzicbop-invalid.s
diff --git a/llvm/test/MC/RISCV/rv32zicbop-valid.s b/llvm/test/MC/RISCV/rvzicbop-valid.s
similarity index 100%
rename from llvm/test/MC/RISCV/rv32zicbop-valid.s
rename to llvm/test/MC/RISCV/rvzicbop-valid.s
diff --git a/llvm/test/MC/RISCV/rv32zicboz-invalid.s b/llvm/test/MC/RISCV/rvzicboz-invalid.s
similarity index 100%
rename from llvm/test/MC/RISCV/rv32zicboz-invalid.s
rename to llvm/test/MC/RISCV/rvzicboz-invalid.s
diff --git a/llvm/test/MC/RISCV/rv32zicboz-valid.s b/llvm/test/MC/RISCV/rvzicboz-valid.s
similarity index 100%
rename from llvm/test/MC/RISCV/rv32zicboz-valid.s
rename to llvm/test/MC/RISCV/rvzicboz-valid.s
diff --git a/llvm/test/MC/RISCV/rv32zicond-invalid.s b/llvm/test/MC/RISCV/rvzicond-invalid.s
similarity index 100%
rename from llvm/test/MC/RISCV/rv32zicond-invalid.s
rename to llvm/test/MC/RISCV/rvzicond-invalid.s
diff --git a/llvm/test/MC/RISCV/rv32zicond-valid.s b/llvm/test/MC/RISCV/rvzicond-valid.s
similarity index 100%
rename from llvm/test/MC/RISCV/rv32zicond-valid.s
rename to llvm/test/MC/RISCV/rvzicond-valid.s
diff --git a/llvm/test/MC/RISCV/rv32zihintntl-invalid.s b/llvm/test/MC/RISCV/rvzihintntl-invalid.s
similarity index 100%
rename from llvm/test/MC/RISCV/rv32zihintntl-invalid.s
rename to llvm/test/MC/RISCV/rvzihintntl-invalid.s
diff --git a/llvm/test/MC/RISCV/rv32zihintntl-valid.s b/llvm/test/MC/RISCV/rvzihintntl-valid.s
similarity index 100%
rename from llvm/test/MC/RISCV/rv32zihintntl-valid.s
rename to llvm/test/MC/RISCV/rvzihintntl-valid.s
diff --git a/llvm/test/MC/RISCV/rv32zihintntlc-invalid.s b/llvm/test/MC/RISCV/rvzihintntlc-invalid.s
similarity index 100%
rename from llvm/test/MC/RISCV/rv32zihintntlc-invalid.s
rename to llvm/test/MC/RISCV/rvzihintntlc-invalid.s
diff --git a/llvm/test/MC/RISCV/rv32zihintntlc-valid.s b/llvm/test/MC/RISCV/rvzihintntlc-valid.s
similarity index 100%
rename from llvm/test/MC/RISCV/rv32zihintntlc-valid.s
rename to llvm/test/MC/RISCV/rvzihintntlc-valid.s
diff --git a/llvm/test/MC/RISCV/rv32zihintpause-valid.s b/llvm/test/MC/RISCV/rvzihintpause-valid.s
similarity index 100%
rename from llvm/test/MC/RISCV/rv32zihintpause-valid.s
rename to llvm/test/MC/RISCV/rvzihintpause-valid.s
diff --git a/llvm/test/MC/RISCV/rv32zknh-valid.s b/llvm/test/MC/RISCV/rvzknh-valid.s
similarity index 100%
rename from llvm/test/MC/RISCV/rv32zknh-valid.s
rename to llvm/test/MC/RISCV/rvzknh-valid.s
diff --git a/llvm/test/MC/RISCV/rv32zksed-valid.s b/llvm/test/MC/RISCV/rvzksed-valid.s
similarity index 100%
rename from llvm/test/MC/RISCV/rv32zksed-valid.s
rename to llvm/test/MC/RISCV/rvzksed-valid.s
diff --git a/llvm/test/MC/RISCV/rv32zksh-valid.s b/llvm/test/MC/RISCV/rvzksh-valid.s
similarity index 100%
rename from llvm/test/MC/RISCV/rv32zksh-valid.s
rename to llvm/test/MC/RISCV/rvzksh-valid.s
|
LGTM |
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.
LGTM.
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/141/builds/4954 Here is the relevant piece of the build log for the reference
|
All these testcases were called
rv32<something>.s
, but had equivalent RUN lines for both riscv32 and riscv64. This made it hard to add tests which are only valid on one of riscv32 or riscv64.This change makes the tests follow a naming convention:
rv32*.s
means a test for riscv32-specific behaviourrv64*.s
means a test for riscv64-specific behaviourrv*.s
(without 64 or 32) means a test for both base architectures - the majority of tests/behaviour.This should make it easier to add and name extension-specific tests which do depend on the base architecture.