| Message ID | 20240719-xtheadvector-v5-12-4b485fc7d55f@rivosinc.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | riscv: Add support for xtheadvector | expand |
| Context | Check | Description |
|---|---|---|
| conchuod/vmtest-fixes-PR | fail | merge-conflict |
On Fri, Jul 19, 2024 at 09:19:07AM GMT, Charlie Jenkins wrote: > Overhaul the riscv vector tests to use kselftest_harness to help the > test cases correctly report the results and decouple the individual test > cases from each other. With this refactoring, only run the test cases is > vector is reported and properly report the test case as skipped > otherwise. The v_initval_nolibc test was previously not checking if > vector was supported and used a function (malloc) which invalidates > the state of the vector registers. > > Signed-off-by: Charlie Jenkins <charlie@rivosinc.com> > --- > tools/testing/selftests/riscv/abi/ptrace | Bin 0 -> 759368 bytes > tools/testing/selftests/riscv/vector/.gitignore | 3 +- > tools/testing/selftests/riscv/vector/Makefile | 17 +- > .../selftests/riscv/vector/v_exec_initval_nolibc.c | 84 +++++++ > tools/testing/selftests/riscv/vector/v_helpers.c | 56 +++++ > tools/testing/selftests/riscv/vector/v_helpers.h | 5 + > tools/testing/selftests/riscv/vector/v_initval.c | 16 ++ > .../selftests/riscv/vector/v_initval_nolibc.c | 68 ------ > .../testing/selftests/riscv/vector/vstate_prctl.c | 266 ++++++++++++--------- > 9 files changed, 324 insertions(+), 191 deletions(-) > > diff --git a/tools/testing/selftests/riscv/abi/ptrace b/tools/testing/selftests/riscv/abi/ptrace > new file mode 100755 > index 000000000000..2b03e77b4dcf > Binary files /dev/null and b/tools/testing/selftests/riscv/abi/ptrace differ > diff --git a/tools/testing/selftests/riscv/vector/.gitignore b/tools/testing/selftests/riscv/vector/.gitignore > index 9ae7964491d5..7d9c87cd0649 100644 > --- a/tools/testing/selftests/riscv/vector/.gitignore > +++ b/tools/testing/selftests/riscv/vector/.gitignore > @@ -1,3 +1,4 @@ > vstate_exec_nolibc > vstate_prctl > -v_initval_nolibc > +v_initval > +v_exec_initval_nolibc > diff --git a/tools/testing/selftests/riscv/vector/Makefile b/tools/testing/selftests/riscv/vector/Makefile > index bfff0ff4f3be..995746359477 100644 > --- a/tools/testing/selftests/riscv/vector/Makefile > +++ b/tools/testing/selftests/riscv/vector/Makefile > @@ -2,18 +2,27 @@ > # Copyright (C) 2021 ARM Limited > # Originally tools/testing/arm64/abi/Makefile > > -TEST_GEN_PROGS := vstate_prctl v_initval_nolibc > -TEST_GEN_PROGS_EXTENDED := vstate_exec_nolibc > +TEST_GEN_PROGS := v_initval vstate_prctl > +TEST_GEN_PROGS_EXTENDED := vstate_exec_nolibc v_exec_initval_nolibc sys_hwprobe.o v_helpers.o > > include ../../lib.mk > > -$(OUTPUT)/vstate_prctl: vstate_prctl.c ../hwprobe/sys_hwprobe.S > +$(OUTPUT)/sys_hwprobe.o: ../hwprobe/sys_hwprobe.S > + $(CC) -static -c -o$@ $(CFLAGS) $^ > + > +$(OUTPUT)/v_helpers.o: v_helpers.c > + $(CC) -static -c -o$@ $(CFLAGS) $^ > + > +$(OUTPUT)/vstate_prctl: vstate_prctl.c $(OUTPUT)/sys_hwprobe.o $(OUTPUT)/v_helpers.o > $(CC) -static -o$@ $(CFLAGS) $(LDFLAGS) $^ > > $(OUTPUT)/vstate_exec_nolibc: vstate_exec_nolibc.c > $(CC) -nostdlib -static -include ../../../../include/nolibc/nolibc.h \ > -Wall $(CFLAGS) $(LDFLAGS) $^ -o $@ -lgcc > > -$(OUTPUT)/v_initval_nolibc: v_initval_nolibc.c > +$(OUTPUT)/v_initval: v_initval.c $(OUTPUT)/sys_hwprobe.o $(OUTPUT)/v_helpers.o > + $(CC) -static -o$@ $(CFLAGS) $(LDFLAGS) $^ > + > +$(OUTPUT)/v_exec_initval_nolibc: v_exec_initval_nolibc.c > $(CC) -nostdlib -static -include ../../../../include/nolibc/nolibc.h \ > -Wall $(CFLAGS) $(LDFLAGS) $^ -o $@ -lgcc > diff --git a/tools/testing/selftests/riscv/vector/v_exec_initval_nolibc.c b/tools/testing/selftests/riscv/vector/v_exec_initval_nolibc.c > new file mode 100644 > index 000000000000..74b13806baf0 > --- /dev/null > +++ b/tools/testing/selftests/riscv/vector/v_exec_initval_nolibc.c > @@ -0,0 +1,84 @@ > +// SPDX-License-Identifier: GPL-2.0-only > +/* > + * Get values of vector registers as soon as the program starts to test if > + * is properly cleaning the values before starting a new program. Vector > + * registers are caller saved, so no function calls may happen before reading > + * the values. To further ensure consistency, this file is compiled without > + * libc and without auto-vectorization. > + * > + * To be "clean" all values must be either all ones or all zeroes. > + */ > + > +#define __stringify_1(x...) #x > +#define __stringify(x...) __stringify_1(x) > + > +int main(int argc, char **argv) > +{ > + char prev_value = 0, value; > + unsigned long vl; > + int first = 1; > + > + asm volatile ( > + ".option push\n\t" > + ".option arch, +v\n\t" > + "vsetvli %[vl], x0, e8, m1, ta, ma\n\t" > + ".option pop\n\t" > + : [vl] "=r" (vl) > + ); > + > +#define CHECK_VECTOR_REGISTER(register) ({ \ > + for (int i = 0; i < vl; i++) { \ > + asm volatile ( \ > + ".option push\n\t" \ > + ".option arch, +v\n\t" \ > + "vmv.x.s %0, " __stringify(register) "\n\t" \ > + "vsrl.vi " __stringify(register) ", " __stringify(register) ", 8\n\t" \ > + ".option pop\n\t" \ > + : "=r" (value)); \ > + if (first) { \ > + first = 0; \ > + } else if (value != prev_value || !(value == 0x00 || value == 0xff)) { \ > + printf("Register " __stringify(register) " values not clean! value: %u\n", value); \ > + exit(-1); \ I think we should ensure all tests in tools/testing/selftests/riscv/ use TAP output, exiting with ksft_finished(), or at least exit with 0 for success. For example, vstate_exec_nolibc exits with 2 for success since it exits with the return value of prctl(PR_RISCV_V_GET_CONTROL). And vstate_prctl.c exits with several different negative values, which means it'll exit with several different values around 255. To figure what went wrong, one will have to convert those exit codes to the original negative values in order to look them up. Having these types of inconsistent exit values complicates QA. Thanks, drew
On Mon, Jul 22, 2024 at 01:47:29PM -0500, Andrew Jones wrote: > On Fri, Jul 19, 2024 at 09:19:07AM GMT, Charlie Jenkins wrote: > > Overhaul the riscv vector tests to use kselftest_harness to help the > > test cases correctly report the results and decouple the individual test > > cases from each other. With this refactoring, only run the test cases is > > vector is reported and properly report the test case as skipped > > otherwise. The v_initval_nolibc test was previously not checking if > > vector was supported and used a function (malloc) which invalidates > > the state of the vector registers. > > > > Signed-off-by: Charlie Jenkins <charlie@rivosinc.com> > > --- > > tools/testing/selftests/riscv/abi/ptrace | Bin 0 -> 759368 bytes > > tools/testing/selftests/riscv/vector/.gitignore | 3 +- > > tools/testing/selftests/riscv/vector/Makefile | 17 +- > > .../selftests/riscv/vector/v_exec_initval_nolibc.c | 84 +++++++ > > tools/testing/selftests/riscv/vector/v_helpers.c | 56 +++++ > > tools/testing/selftests/riscv/vector/v_helpers.h | 5 + > > tools/testing/selftests/riscv/vector/v_initval.c | 16 ++ > > .../selftests/riscv/vector/v_initval_nolibc.c | 68 ------ > > .../testing/selftests/riscv/vector/vstate_prctl.c | 266 ++++++++++++--------- > > 9 files changed, 324 insertions(+), 191 deletions(-) > > > > diff --git a/tools/testing/selftests/riscv/abi/ptrace b/tools/testing/selftests/riscv/abi/ptrace > > new file mode 100755 > > index 000000000000..2b03e77b4dcf > > Binary files /dev/null and b/tools/testing/selftests/riscv/abi/ptrace differ > > diff --git a/tools/testing/selftests/riscv/vector/.gitignore b/tools/testing/selftests/riscv/vector/.gitignore > > index 9ae7964491d5..7d9c87cd0649 100644 > > --- a/tools/testing/selftests/riscv/vector/.gitignore > > +++ b/tools/testing/selftests/riscv/vector/.gitignore > > @@ -1,3 +1,4 @@ > > vstate_exec_nolibc > > vstate_prctl > > -v_initval_nolibc > > +v_initval > > +v_exec_initval_nolibc > > diff --git a/tools/testing/selftests/riscv/vector/Makefile b/tools/testing/selftests/riscv/vector/Makefile > > index bfff0ff4f3be..995746359477 100644 > > --- a/tools/testing/selftests/riscv/vector/Makefile > > +++ b/tools/testing/selftests/riscv/vector/Makefile > > @@ -2,18 +2,27 @@ > > # Copyright (C) 2021 ARM Limited > > # Originally tools/testing/arm64/abi/Makefile > > > > -TEST_GEN_PROGS := vstate_prctl v_initval_nolibc > > -TEST_GEN_PROGS_EXTENDED := vstate_exec_nolibc > > +TEST_GEN_PROGS := v_initval vstate_prctl > > +TEST_GEN_PROGS_EXTENDED := vstate_exec_nolibc v_exec_initval_nolibc sys_hwprobe.o v_helpers.o > > > > include ../../lib.mk > > > > -$(OUTPUT)/vstate_prctl: vstate_prctl.c ../hwprobe/sys_hwprobe.S > > +$(OUTPUT)/sys_hwprobe.o: ../hwprobe/sys_hwprobe.S > > + $(CC) -static -c -o$@ $(CFLAGS) $^ > > + > > +$(OUTPUT)/v_helpers.o: v_helpers.c > > + $(CC) -static -c -o$@ $(CFLAGS) $^ > > + > > +$(OUTPUT)/vstate_prctl: vstate_prctl.c $(OUTPUT)/sys_hwprobe.o $(OUTPUT)/v_helpers.o > > $(CC) -static -o$@ $(CFLAGS) $(LDFLAGS) $^ > > > > $(OUTPUT)/vstate_exec_nolibc: vstate_exec_nolibc.c > > $(CC) -nostdlib -static -include ../../../../include/nolibc/nolibc.h \ > > -Wall $(CFLAGS) $(LDFLAGS) $^ -o $@ -lgcc > > > > -$(OUTPUT)/v_initval_nolibc: v_initval_nolibc.c > > +$(OUTPUT)/v_initval: v_initval.c $(OUTPUT)/sys_hwprobe.o $(OUTPUT)/v_helpers.o > > + $(CC) -static -o$@ $(CFLAGS) $(LDFLAGS) $^ > > + > > +$(OUTPUT)/v_exec_initval_nolibc: v_exec_initval_nolibc.c > > $(CC) -nostdlib -static -include ../../../../include/nolibc/nolibc.h \ > > -Wall $(CFLAGS) $(LDFLAGS) $^ -o $@ -lgcc > > diff --git a/tools/testing/selftests/riscv/vector/v_exec_initval_nolibc.c b/tools/testing/selftests/riscv/vector/v_exec_initval_nolibc.c > > new file mode 100644 > > index 000000000000..74b13806baf0 > > --- /dev/null > > +++ b/tools/testing/selftests/riscv/vector/v_exec_initval_nolibc.c > > @@ -0,0 +1,84 @@ > > +// SPDX-License-Identifier: GPL-2.0-only > > +/* > > + * Get values of vector registers as soon as the program starts to test if > > + * is properly cleaning the values before starting a new program. Vector > > + * registers are caller saved, so no function calls may happen before reading > > + * the values. To further ensure consistency, this file is compiled without > > + * libc and without auto-vectorization. > > + * > > + * To be "clean" all values must be either all ones or all zeroes. > > + */ > > + > > +#define __stringify_1(x...) #x > > +#define __stringify(x...) __stringify_1(x) > > + > > +int main(int argc, char **argv) > > +{ > > + char prev_value = 0, value; > > + unsigned long vl; > > + int first = 1; > > + > > + asm volatile ( > > + ".option push\n\t" > > + ".option arch, +v\n\t" > > + "vsetvli %[vl], x0, e8, m1, ta, ma\n\t" > > + ".option pop\n\t" > > + : [vl] "=r" (vl) > > + ); > > + > > +#define CHECK_VECTOR_REGISTER(register) ({ \ > > + for (int i = 0; i < vl; i++) { \ > > + asm volatile ( \ > > + ".option push\n\t" \ > > + ".option arch, +v\n\t" \ > > + "vmv.x.s %0, " __stringify(register) "\n\t" \ > > + "vsrl.vi " __stringify(register) ", " __stringify(register) ", 8\n\t" \ > > + ".option pop\n\t" \ > > + : "=r" (value)); \ > > + if (first) { \ > > + first = 0; \ > > + } else if (value != prev_value || !(value == 0x00 || value == 0xff)) { \ > > + printf("Register " __stringify(register) " values not clean! value: %u\n", value); \ > > + exit(-1); \ > > I think we should ensure all tests in tools/testing/selftests/riscv/ use > TAP output, exiting with ksft_finished(), or at least exit with 0 for > success. For example, vstate_exec_nolibc exits with 2 for success since > it exits with the return value of prctl(PR_RISCV_V_GET_CONTROL). And > vstate_prctl.c exits with several different negative values, which means > it'll exit with several different values around 255. To figure what went > wrong, one will have to convert those exit codes to the original negative > values in order to look them up. Having these types of inconsistent exit > values complicates QA. > > Thanks, > drew I do not follow. I am using the kselftest_harness (tools/testing/selftests/kselftest_harness.h) that does output using the TAP format. vstate_exec_nolibc is not a test in itself but is a helper. The Makefile for the vector tests describes this as: TEST_GEN_PROGS := v_initval vstate_prctl If you run the riscv collection of tests with: $ ./run_kselftest.sh --collection riscv You will see that the only vector test cases are v_initval and vstate_prctl, which both output as expected in TAP format. I do see that I messed up the return type of the is_vector_supported() function, I had meant to change that to a bool from an int since RISCV_HWPROBE_EXT_ZVE32X is greater than 32 bits. I will send a new version. - Charlie
On Mon, Jul 22, 2024 at 02:14:44PM GMT, Charlie Jenkins wrote: > On Mon, Jul 22, 2024 at 01:47:29PM -0500, Andrew Jones wrote: > > On Fri, Jul 19, 2024 at 09:19:07AM GMT, Charlie Jenkins wrote: > > > Overhaul the riscv vector tests to use kselftest_harness to help the > > > test cases correctly report the results and decouple the individual test > > > cases from each other. With this refactoring, only run the test cases is > > > vector is reported and properly report the test case as skipped > > > otherwise. The v_initval_nolibc test was previously not checking if > > > vector was supported and used a function (malloc) which invalidates > > > the state of the vector registers. > > > > > > Signed-off-by: Charlie Jenkins <charlie@rivosinc.com> > > > --- > > > tools/testing/selftests/riscv/abi/ptrace | Bin 0 -> 759368 bytes > > > tools/testing/selftests/riscv/vector/.gitignore | 3 +- > > > tools/testing/selftests/riscv/vector/Makefile | 17 +- > > > .../selftests/riscv/vector/v_exec_initval_nolibc.c | 84 +++++++ > > > tools/testing/selftests/riscv/vector/v_helpers.c | 56 +++++ > > > tools/testing/selftests/riscv/vector/v_helpers.h | 5 + > > > tools/testing/selftests/riscv/vector/v_initval.c | 16 ++ > > > .../selftests/riscv/vector/v_initval_nolibc.c | 68 ------ > > > .../testing/selftests/riscv/vector/vstate_prctl.c | 266 ++++++++++++--------- > > > 9 files changed, 324 insertions(+), 191 deletions(-) > > > > > > diff --git a/tools/testing/selftests/riscv/abi/ptrace b/tools/testing/selftests/riscv/abi/ptrace > > > new file mode 100755 > > > index 000000000000..2b03e77b4dcf > > > Binary files /dev/null and b/tools/testing/selftests/riscv/abi/ptrace differ > > > diff --git a/tools/testing/selftests/riscv/vector/.gitignore b/tools/testing/selftests/riscv/vector/.gitignore > > > index 9ae7964491d5..7d9c87cd0649 100644 > > > --- a/tools/testing/selftests/riscv/vector/.gitignore > > > +++ b/tools/testing/selftests/riscv/vector/.gitignore > > > @@ -1,3 +1,4 @@ > > > vstate_exec_nolibc > > > vstate_prctl > > > -v_initval_nolibc > > > +v_initval > > > +v_exec_initval_nolibc > > > diff --git a/tools/testing/selftests/riscv/vector/Makefile b/tools/testing/selftests/riscv/vector/Makefile > > > index bfff0ff4f3be..995746359477 100644 > > > --- a/tools/testing/selftests/riscv/vector/Makefile > > > +++ b/tools/testing/selftests/riscv/vector/Makefile > > > @@ -2,18 +2,27 @@ > > > # Copyright (C) 2021 ARM Limited > > > # Originally tools/testing/arm64/abi/Makefile > > > > > > -TEST_GEN_PROGS := vstate_prctl v_initval_nolibc > > > -TEST_GEN_PROGS_EXTENDED := vstate_exec_nolibc > > > +TEST_GEN_PROGS := v_initval vstate_prctl > > > +TEST_GEN_PROGS_EXTENDED := vstate_exec_nolibc v_exec_initval_nolibc sys_hwprobe.o v_helpers.o > > > > > > include ../../lib.mk > > > > > > -$(OUTPUT)/vstate_prctl: vstate_prctl.c ../hwprobe/sys_hwprobe.S > > > +$(OUTPUT)/sys_hwprobe.o: ../hwprobe/sys_hwprobe.S > > > + $(CC) -static -c -o$@ $(CFLAGS) $^ > > > + > > > +$(OUTPUT)/v_helpers.o: v_helpers.c > > > + $(CC) -static -c -o$@ $(CFLAGS) $^ > > > + > > > +$(OUTPUT)/vstate_prctl: vstate_prctl.c $(OUTPUT)/sys_hwprobe.o $(OUTPUT)/v_helpers.o > > > $(CC) -static -o$@ $(CFLAGS) $(LDFLAGS) $^ > > > > > > $(OUTPUT)/vstate_exec_nolibc: vstate_exec_nolibc.c > > > $(CC) -nostdlib -static -include ../../../../include/nolibc/nolibc.h \ > > > -Wall $(CFLAGS) $(LDFLAGS) $^ -o $@ -lgcc > > > > > > -$(OUTPUT)/v_initval_nolibc: v_initval_nolibc.c > > > +$(OUTPUT)/v_initval: v_initval.c $(OUTPUT)/sys_hwprobe.o $(OUTPUT)/v_helpers.o > > > + $(CC) -static -o$@ $(CFLAGS) $(LDFLAGS) $^ > > > + > > > +$(OUTPUT)/v_exec_initval_nolibc: v_exec_initval_nolibc.c > > > $(CC) -nostdlib -static -include ../../../../include/nolibc/nolibc.h \ > > > -Wall $(CFLAGS) $(LDFLAGS) $^ -o $@ -lgcc > > > diff --git a/tools/testing/selftests/riscv/vector/v_exec_initval_nolibc.c b/tools/testing/selftests/riscv/vector/v_exec_initval_nolibc.c > > > new file mode 100644 > > > index 000000000000..74b13806baf0 > > > --- /dev/null > > > +++ b/tools/testing/selftests/riscv/vector/v_exec_initval_nolibc.c > > > @@ -0,0 +1,84 @@ > > > +// SPDX-License-Identifier: GPL-2.0-only > > > +/* > > > + * Get values of vector registers as soon as the program starts to test if > > > + * is properly cleaning the values before starting a new program. Vector > > > + * registers are caller saved, so no function calls may happen before reading > > > + * the values. To further ensure consistency, this file is compiled without > > > + * libc and without auto-vectorization. > > > + * > > > + * To be "clean" all values must be either all ones or all zeroes. > > > + */ > > > + > > > +#define __stringify_1(x...) #x > > > +#define __stringify(x...) __stringify_1(x) > > > + > > > +int main(int argc, char **argv) > > > +{ > > > + char prev_value = 0, value; > > > + unsigned long vl; > > > + int first = 1; > > > + > > > + asm volatile ( > > > + ".option push\n\t" > > > + ".option arch, +v\n\t" > > > + "vsetvli %[vl], x0, e8, m1, ta, ma\n\t" > > > + ".option pop\n\t" > > > + : [vl] "=r" (vl) > > > + ); > > > + > > > +#define CHECK_VECTOR_REGISTER(register) ({ \ > > > + for (int i = 0; i < vl; i++) { \ > > > + asm volatile ( \ > > > + ".option push\n\t" \ > > > + ".option arch, +v\n\t" \ > > > + "vmv.x.s %0, " __stringify(register) "\n\t" \ > > > + "vsrl.vi " __stringify(register) ", " __stringify(register) ", 8\n\t" \ > > > + ".option pop\n\t" \ > > > + : "=r" (value)); \ > > > + if (first) { \ > > > + first = 0; \ > > > + } else if (value != prev_value || !(value == 0x00 || value == 0xff)) { \ > > > + printf("Register " __stringify(register) " values not clean! value: %u\n", value); \ > > > + exit(-1); \ > > > > I think we should ensure all tests in tools/testing/selftests/riscv/ use > > TAP output, exiting with ksft_finished(), or at least exit with 0 for > > success. For example, vstate_exec_nolibc exits with 2 for success since > > it exits with the return value of prctl(PR_RISCV_V_GET_CONTROL). And > > vstate_prctl.c exits with several different negative values, which means > > it'll exit with several different values around 255. To figure what went > > wrong, one will have to convert those exit codes to the original negative > > values in order to look them up. Having these types of inconsistent exit > > values complicates QA. > > > > Thanks, > > drew > > I do not follow. I am using the kselftest_harness > (tools/testing/selftests/kselftest_harness.h) that does output using the > TAP format. vstate_exec_nolibc is not a test in itself but is a helper. Ah, this was my misunderstanding, as I'm used to all files with main() being independent tests and I only grepped exit codes. I'll have to look to see how this all fits together. > The Makefile for the vector tests describes this as: > > TEST_GEN_PROGS := v_initval vstate_prctl > > If you run the riscv collection of tests with: > > $ ./run_kselftest.sh --collection riscv I'll look later, but I hope those tests can also be run standalone and still get TAP output. Thanks, drew > > You will see that the only vector test cases are v_initval and > vstate_prctl, which both output as expected in TAP format. > > I do see that I messed up the return type of the is_vector_supported() > function, I had meant to change that to a bool from an int since > RISCV_HWPROBE_EXT_ZVE32X is greater than 32 bits. I will send a new > version. > > - Charlie >
On Mon, Jul 22, 2024 at 05:08:22PM -0500, Andrew Jones wrote: > On Mon, Jul 22, 2024 at 02:14:44PM GMT, Charlie Jenkins wrote: > > On Mon, Jul 22, 2024 at 01:47:29PM -0500, Andrew Jones wrote: > > > On Fri, Jul 19, 2024 at 09:19:07AM GMT, Charlie Jenkins wrote: > > > > Overhaul the riscv vector tests to use kselftest_harness to help the > > > > test cases correctly report the results and decouple the individual test > > > > cases from each other. With this refactoring, only run the test cases is > > > > vector is reported and properly report the test case as skipped > > > > otherwise. The v_initval_nolibc test was previously not checking if > > > > vector was supported and used a function (malloc) which invalidates > > > > the state of the vector registers. > > > > > > > > Signed-off-by: Charlie Jenkins <charlie@rivosinc.com> > > > > --- > > > > tools/testing/selftests/riscv/abi/ptrace | Bin 0 -> 759368 bytes > > > > tools/testing/selftests/riscv/vector/.gitignore | 3 +- > > > > tools/testing/selftests/riscv/vector/Makefile | 17 +- > > > > .../selftests/riscv/vector/v_exec_initval_nolibc.c | 84 +++++++ > > > > tools/testing/selftests/riscv/vector/v_helpers.c | 56 +++++ > > > > tools/testing/selftests/riscv/vector/v_helpers.h | 5 + > > > > tools/testing/selftests/riscv/vector/v_initval.c | 16 ++ > > > > .../selftests/riscv/vector/v_initval_nolibc.c | 68 ------ > > > > .../testing/selftests/riscv/vector/vstate_prctl.c | 266 ++++++++++++--------- > > > > 9 files changed, 324 insertions(+), 191 deletions(-) > > > > > > > > diff --git a/tools/testing/selftests/riscv/abi/ptrace b/tools/testing/selftests/riscv/abi/ptrace > > > > new file mode 100755 > > > > index 000000000000..2b03e77b4dcf > > > > Binary files /dev/null and b/tools/testing/selftests/riscv/abi/ptrace differ > > > > diff --git a/tools/testing/selftests/riscv/vector/.gitignore b/tools/testing/selftests/riscv/vector/.gitignore > > > > index 9ae7964491d5..7d9c87cd0649 100644 > > > > --- a/tools/testing/selftests/riscv/vector/.gitignore > > > > +++ b/tools/testing/selftests/riscv/vector/.gitignore > > > > @@ -1,3 +1,4 @@ > > > > vstate_exec_nolibc > > > > vstate_prctl > > > > -v_initval_nolibc > > > > +v_initval > > > > +v_exec_initval_nolibc > > > > diff --git a/tools/testing/selftests/riscv/vector/Makefile b/tools/testing/selftests/riscv/vector/Makefile > > > > index bfff0ff4f3be..995746359477 100644 > > > > --- a/tools/testing/selftests/riscv/vector/Makefile > > > > +++ b/tools/testing/selftests/riscv/vector/Makefile > > > > @@ -2,18 +2,27 @@ > > > > # Copyright (C) 2021 ARM Limited > > > > # Originally tools/testing/arm64/abi/Makefile > > > > > > > > -TEST_GEN_PROGS := vstate_prctl v_initval_nolibc > > > > -TEST_GEN_PROGS_EXTENDED := vstate_exec_nolibc > > > > +TEST_GEN_PROGS := v_initval vstate_prctl > > > > +TEST_GEN_PROGS_EXTENDED := vstate_exec_nolibc v_exec_initval_nolibc sys_hwprobe.o v_helpers.o > > > > > > > > include ../../lib.mk > > > > > > > > -$(OUTPUT)/vstate_prctl: vstate_prctl.c ../hwprobe/sys_hwprobe.S > > > > +$(OUTPUT)/sys_hwprobe.o: ../hwprobe/sys_hwprobe.S > > > > + $(CC) -static -c -o$@ $(CFLAGS) $^ > > > > + > > > > +$(OUTPUT)/v_helpers.o: v_helpers.c > > > > + $(CC) -static -c -o$@ $(CFLAGS) $^ > > > > + > > > > +$(OUTPUT)/vstate_prctl: vstate_prctl.c $(OUTPUT)/sys_hwprobe.o $(OUTPUT)/v_helpers.o > > > > $(CC) -static -o$@ $(CFLAGS) $(LDFLAGS) $^ > > > > > > > > $(OUTPUT)/vstate_exec_nolibc: vstate_exec_nolibc.c > > > > $(CC) -nostdlib -static -include ../../../../include/nolibc/nolibc.h \ > > > > -Wall $(CFLAGS) $(LDFLAGS) $^ -o $@ -lgcc > > > > > > > > -$(OUTPUT)/v_initval_nolibc: v_initval_nolibc.c > > > > +$(OUTPUT)/v_initval: v_initval.c $(OUTPUT)/sys_hwprobe.o $(OUTPUT)/v_helpers.o > > > > + $(CC) -static -o$@ $(CFLAGS) $(LDFLAGS) $^ > > > > + > > > > +$(OUTPUT)/v_exec_initval_nolibc: v_exec_initval_nolibc.c > > > > $(CC) -nostdlib -static -include ../../../../include/nolibc/nolibc.h \ > > > > -Wall $(CFLAGS) $(LDFLAGS) $^ -o $@ -lgcc > > > > diff --git a/tools/testing/selftests/riscv/vector/v_exec_initval_nolibc.c b/tools/testing/selftests/riscv/vector/v_exec_initval_nolibc.c > > > > new file mode 100644 > > > > index 000000000000..74b13806baf0 > > > > --- /dev/null > > > > +++ b/tools/testing/selftests/riscv/vector/v_exec_initval_nolibc.c > > > > @@ -0,0 +1,84 @@ > > > > +// SPDX-License-Identifier: GPL-2.0-only > > > > +/* > > > > + * Get values of vector registers as soon as the program starts to test if > > > > + * is properly cleaning the values before starting a new program. Vector > > > > + * registers are caller saved, so no function calls may happen before reading > > > > + * the values. To further ensure consistency, this file is compiled without > > > > + * libc and without auto-vectorization. > > > > + * > > > > + * To be "clean" all values must be either all ones or all zeroes. > > > > + */ > > > > + > > > > +#define __stringify_1(x...) #x > > > > +#define __stringify(x...) __stringify_1(x) > > > > + > > > > +int main(int argc, char **argv) > > > > +{ > > > > + char prev_value = 0, value; > > > > + unsigned long vl; > > > > + int first = 1; > > > > + > > > > + asm volatile ( > > > > + ".option push\n\t" > > > > + ".option arch, +v\n\t" > > > > + "vsetvli %[vl], x0, e8, m1, ta, ma\n\t" > > > > + ".option pop\n\t" > > > > + : [vl] "=r" (vl) > > > > + ); > > > > + > > > > +#define CHECK_VECTOR_REGISTER(register) ({ \ > > > > + for (int i = 0; i < vl; i++) { \ > > > > + asm volatile ( \ > > > > + ".option push\n\t" \ > > > > + ".option arch, +v\n\t" \ > > > > + "vmv.x.s %0, " __stringify(register) "\n\t" \ > > > > + "vsrl.vi " __stringify(register) ", " __stringify(register) ", 8\n\t" \ > > > > + ".option pop\n\t" \ > > > > + : "=r" (value)); \ > > > > + if (first) { \ > > > > + first = 0; \ > > > > + } else if (value != prev_value || !(value == 0x00 || value == 0xff)) { \ > > > > + printf("Register " __stringify(register) " values not clean! value: %u\n", value); \ > > > > + exit(-1); \ > > > > > > I think we should ensure all tests in tools/testing/selftests/riscv/ use > > > TAP output, exiting with ksft_finished(), or at least exit with 0 for > > > success. For example, vstate_exec_nolibc exits with 2 for success since > > > it exits with the return value of prctl(PR_RISCV_V_GET_CONTROL). And > > > vstate_prctl.c exits with several different negative values, which means > > > it'll exit with several different values around 255. To figure what went > > > wrong, one will have to convert those exit codes to the original negative > > > values in order to look them up. Having these types of inconsistent exit > > > values complicates QA. > > > > > > Thanks, > > > drew > > > > I do not follow. I am using the kselftest_harness > > (tools/testing/selftests/kselftest_harness.h) that does output using the > > TAP format. vstate_exec_nolibc is not a test in itself but is a helper. > > Ah, this was my misunderstanding, as I'm used to all files with main() > being independent tests and I only grepped exit codes. I'll have to look > to see how this all fits together. > > > The Makefile for the vector tests describes this as: > > > > TEST_GEN_PROGS := v_initval vstate_prctl > > > > If you run the riscv collection of tests with: > > > > $ ./run_kselftest.sh --collection riscv > > I'll look later, but I hope those tests can also be run standalone and > still get TAP output. > > Thanks, > drew Yes, running v_initval and vstate_prctl standalone does provide TAP output. - Charlie > > > > > You will see that the only vector test cases are v_initval and > > vstate_prctl, which both output as expected in TAP format. > > > > I do see that I messed up the return type of the is_vector_supported() > > function, I had meant to change that to a bool from an int since > > RISCV_HWPROBE_EXT_ZVE32X is greater than 32 bits. I will send a new > > version. > > > > - Charlie > >
diff --git a/tools/testing/selftests/riscv/abi/ptrace b/tools/testing/selftests/riscv/abi/ptrace new file mode 100755 index 000000000000..2b03e77b4dcf Binary files /dev/null and b/tools/testing/selftests/riscv/abi/ptrace differ diff --git a/tools/testing/selftests/riscv/vector/.gitignore b/tools/testing/selftests/riscv/vector/.gitignore index 9ae7964491d5..7d9c87cd0649 100644 --- a/tools/testing/selftests/riscv/vector/.gitignore +++ b/tools/testing/selftests/riscv/vector/.gitignore @@ -1,3 +1,4 @@ vstate_exec_nolibc vstate_prctl -v_initval_nolibc +v_initval +v_exec_initval_nolibc diff --git a/tools/testing/selftests/riscv/vector/Makefile b/tools/testing/selftests/riscv/vector/Makefile index bfff0ff4f3be..995746359477 100644 --- a/tools/testing/selftests/riscv/vector/Makefile +++ b/tools/testing/selftests/riscv/vector/Makefile @@ -2,18 +2,27 @@ # Copyright (C) 2021 ARM Limited # Originally tools/testing/arm64/abi/Makefile -TEST_GEN_PROGS := vstate_prctl v_initval_nolibc -TEST_GEN_PROGS_EXTENDED := vstate_exec_nolibc +TEST_GEN_PROGS := v_initval vstate_prctl +TEST_GEN_PROGS_EXTENDED := vstate_exec_nolibc v_exec_initval_nolibc sys_hwprobe.o v_helpers.o include ../../lib.mk -$(OUTPUT)/vstate_prctl: vstate_prctl.c ../hwprobe/sys_hwprobe.S +$(OUTPUT)/sys_hwprobe.o: ../hwprobe/sys_hwprobe.S + $(CC) -static -c -o$@ $(CFLAGS) $^ + +$(OUTPUT)/v_helpers.o: v_helpers.c + $(CC) -static -c -o$@ $(CFLAGS) $^ + +$(OUTPUT)/vstate_prctl: vstate_prctl.c $(OUTPUT)/sys_hwprobe.o $(OUTPUT)/v_helpers.o $(CC) -static -o$@ $(CFLAGS) $(LDFLAGS) $^ $(OUTPUT)/vstate_exec_nolibc: vstate_exec_nolibc.c $(CC) -nostdlib -static -include ../../../../include/nolibc/nolibc.h \ -Wall $(CFLAGS) $(LDFLAGS) $^ -o $@ -lgcc -$(OUTPUT)/v_initval_nolibc: v_initval_nolibc.c +$(OUTPUT)/v_initval: v_initval.c $(OUTPUT)/sys_hwprobe.o $(OUTPUT)/v_helpers.o + $(CC) -static -o$@ $(CFLAGS) $(LDFLAGS) $^ + +$(OUTPUT)/v_exec_initval_nolibc: v_exec_initval_nolibc.c $(CC) -nostdlib -static -include ../../../../include/nolibc/nolibc.h \ -Wall $(CFLAGS) $(LDFLAGS) $^ -o $@ -lgcc diff --git a/tools/testing/selftests/riscv/vector/v_exec_initval_nolibc.c b/tools/testing/selftests/riscv/vector/v_exec_initval_nolibc.c new file mode 100644 index 000000000000..74b13806baf0 --- /dev/null +++ b/tools/testing/selftests/riscv/vector/v_exec_initval_nolibc.c @@ -0,0 +1,84 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Get values of vector registers as soon as the program starts to test if + * is properly cleaning the values before starting a new program. Vector + * registers are caller saved, so no function calls may happen before reading + * the values. To further ensure consistency, this file is compiled without + * libc and without auto-vectorization. + * + * To be "clean" all values must be either all ones or all zeroes. + */ + +#define __stringify_1(x...) #x +#define __stringify(x...) __stringify_1(x) + +int main(int argc, char **argv) +{ + char prev_value = 0, value; + unsigned long vl; + int first = 1; + + asm volatile ( + ".option push\n\t" + ".option arch, +v\n\t" + "vsetvli %[vl], x0, e8, m1, ta, ma\n\t" + ".option pop\n\t" + : [vl] "=r" (vl) + ); + +#define CHECK_VECTOR_REGISTER(register) ({ \ + for (int i = 0; i < vl; i++) { \ + asm volatile ( \ + ".option push\n\t" \ + ".option arch, +v\n\t" \ + "vmv.x.s %0, " __stringify(register) "\n\t" \ + "vsrl.vi " __stringify(register) ", " __stringify(register) ", 8\n\t" \ + ".option pop\n\t" \ + : "=r" (value)); \ + if (first) { \ + first = 0; \ + } else if (value != prev_value || !(value == 0x00 || value == 0xff)) { \ + printf("Register " __stringify(register) " values not clean! value: %u\n", value); \ + exit(-1); \ + } \ + prev_value = value; \ + } \ +}) + + CHECK_VECTOR_REGISTER(v0); + CHECK_VECTOR_REGISTER(v1); + CHECK_VECTOR_REGISTER(v2); + CHECK_VECTOR_REGISTER(v3); + CHECK_VECTOR_REGISTER(v4); + CHECK_VECTOR_REGISTER(v5); + CHECK_VECTOR_REGISTER(v6); + CHECK_VECTOR_REGISTER(v7); + CHECK_VECTOR_REGISTER(v8); + CHECK_VECTOR_REGISTER(v9); + CHECK_VECTOR_REGISTER(v10); + CHECK_VECTOR_REGISTER(v11); + CHECK_VECTOR_REGISTER(v12); + CHECK_VECTOR_REGISTER(v13); + CHECK_VECTOR_REGISTER(v14); + CHECK_VECTOR_REGISTER(v15); + CHECK_VECTOR_REGISTER(v16); + CHECK_VECTOR_REGISTER(v17); + CHECK_VECTOR_REGISTER(v18); + CHECK_VECTOR_REGISTER(v19); + CHECK_VECTOR_REGISTER(v20); + CHECK_VECTOR_REGISTER(v21); + CHECK_VECTOR_REGISTER(v22); + CHECK_VECTOR_REGISTER(v23); + CHECK_VECTOR_REGISTER(v24); + CHECK_VECTOR_REGISTER(v25); + CHECK_VECTOR_REGISTER(v26); + CHECK_VECTOR_REGISTER(v27); + CHECK_VECTOR_REGISTER(v28); + CHECK_VECTOR_REGISTER(v29); + CHECK_VECTOR_REGISTER(v30); + CHECK_VECTOR_REGISTER(v31); + +#undef CHECK_VECTOR_REGISTER + + return 0; +} diff --git a/tools/testing/selftests/riscv/vector/v_helpers.c b/tools/testing/selftests/riscv/vector/v_helpers.c new file mode 100644 index 000000000000..ca7525e8274e --- /dev/null +++ b/tools/testing/selftests/riscv/vector/v_helpers.c @@ -0,0 +1,56 @@ +// SPDX-License-Identifier: GPL-2.0-only + +#include "../hwprobe/hwprobe.h" +#include <stdlib.h> +#include <stdio.h> +#include <unistd.h> +#include <sys/wait.h> + +int is_vector_supported(void) +{ + struct riscv_hwprobe pair; + + pair.key = RISCV_HWPROBE_KEY_IMA_EXT_0; + riscv_hwprobe(&pair, 1, 0, NULL, 0); + return pair.value & RISCV_HWPROBE_EXT_ZVE32X; +} + +int launch_test(char *next_program, int test_inherit) +{ + char *exec_argv[3], *exec_envp[1]; + int rc, pid, status; + + pid = fork(); + if (pid < 0) { + printf("fork failed %d", pid); + return -1; + } + + if (!pid) { + exec_argv[0] = next_program; + exec_argv[1] = test_inherit != 0 ? "x" : NULL; + exec_argv[2] = NULL; + exec_envp[0] = NULL; + /* launch the program again to check inherit */ + rc = execve(next_program, exec_argv, exec_envp); + if (rc) { + perror("execve"); + printf("child execve failed %d\n", rc); + exit(-1); + } + } + + rc = waitpid(-1, &status, 0); + if (rc < 0) { + printf("waitpid failed\n"); + return -3; + } + + if ((WIFEXITED(status) && WEXITSTATUS(status) == -1) || + WIFSIGNALED(status)) { + printf("child exited abnormally\n"); + return -4; + } + + return WEXITSTATUS(status); +} diff --git a/tools/testing/selftests/riscv/vector/v_helpers.h b/tools/testing/selftests/riscv/vector/v_helpers.h new file mode 100644 index 000000000000..88719c4be496 --- /dev/null +++ b/tools/testing/selftests/riscv/vector/v_helpers.h @@ -0,0 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +int is_vector_supported(void); + +int launch_test(char *next_program, int test_inherit); diff --git a/tools/testing/selftests/riscv/vector/v_initval.c b/tools/testing/selftests/riscv/vector/v_initval.c new file mode 100644 index 000000000000..f38b5797fa31 --- /dev/null +++ b/tools/testing/selftests/riscv/vector/v_initval.c @@ -0,0 +1,16 @@ +// SPDX-License-Identifier: GPL-2.0-only + +#include "../../kselftest_harness.h" +#include "v_helpers.h" + +#define NEXT_PROGRAM "./v_exec_initval_nolibc" + +TEST(v_initval) +{ + if (!is_vector_supported()) + SKIP(return, "Vector not supported"); + + ASSERT_EQ(0, launch_test(NEXT_PROGRAM, 0)); +} + +TEST_HARNESS_MAIN diff --git a/tools/testing/selftests/riscv/vector/v_initval_nolibc.c b/tools/testing/selftests/riscv/vector/v_initval_nolibc.c deleted file mode 100644 index 1dd94197da30..000000000000 --- a/tools/testing/selftests/riscv/vector/v_initval_nolibc.c +++ /dev/null @@ -1,68 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only - -#include "../../kselftest.h" -#define MAX_VSIZE (8192 * 32) - -void dump(char *ptr, int size) -{ - int i = 0; - - for (i = 0; i < size; i++) { - if (i != 0) { - if (i % 16 == 0) - printf("\n"); - else if (i % 8 == 0) - printf(" "); - } - printf("%02x ", ptr[i]); - } - printf("\n"); -} - -int main(void) -{ - int i; - unsigned long vl; - char *datap, *tmp; - - datap = malloc(MAX_VSIZE); - if (!datap) { - ksft_test_result_fail("fail to allocate memory for size = %d\n", MAX_VSIZE); - exit(-1); - } - - tmp = datap; - asm volatile ( - ".option push\n\t" - ".option arch, +v\n\t" - "vsetvli %0, x0, e8, m8, ta, ma\n\t" - "vse8.v v0, (%2)\n\t" - "add %1, %2, %0\n\t" - "vse8.v v8, (%1)\n\t" - "add %1, %1, %0\n\t" - "vse8.v v16, (%1)\n\t" - "add %1, %1, %0\n\t" - "vse8.v v24, (%1)\n\t" - ".option pop\n\t" - : "=&r" (vl), "=r" (tmp) : "r" (datap) : "memory"); - - ksft_print_msg("vl = %lu\n", vl); - - if (datap[0] != 0x00 && datap[0] != 0xff) { - ksft_test_result_fail("v-regesters are not properly initialized\n"); - dump(datap, vl * 4); - exit(-1); - } - - for (i = 1; i < vl * 4; i++) { - if (datap[i] != datap[0]) { - ksft_test_result_fail("detect stale values on v-regesters\n"); - dump(datap, vl * 4); - exit(-2); - } - } - - free(datap); - ksft_exit_pass(); - return 0; -} diff --git a/tools/testing/selftests/riscv/vector/vstate_prctl.c b/tools/testing/selftests/riscv/vector/vstate_prctl.c index 895177f6bf4c..850a0caa226e 100644 --- a/tools/testing/selftests/riscv/vector/vstate_prctl.c +++ b/tools/testing/selftests/riscv/vector/vstate_prctl.c @@ -3,50 +3,13 @@ #include <unistd.h> #include <errno.h> #include <sys/wait.h> +#include <sys/types.h> +#include <stdlib.h> -#include "../hwprobe/hwprobe.h" -#include "../../kselftest.h" +#include "../../kselftest_harness.h" +#include "v_helpers.h" #define NEXT_PROGRAM "./vstate_exec_nolibc" -static int launch_test(int test_inherit) -{ - char *exec_argv[3], *exec_envp[1]; - int rc, pid, status; - - pid = fork(); - if (pid < 0) { - ksft_test_result_fail("fork failed %d", pid); - return -1; - } - - if (!pid) { - exec_argv[0] = NEXT_PROGRAM; - exec_argv[1] = test_inherit != 0 ? "x" : NULL; - exec_argv[2] = NULL; - exec_envp[0] = NULL; - /* launch the program again to check inherit */ - rc = execve(NEXT_PROGRAM, exec_argv, exec_envp); - if (rc) { - perror("execve"); - ksft_test_result_fail("child execve failed %d\n", rc); - exit(-1); - } - } - - rc = waitpid(-1, &status, 0); - if (rc < 0) { - ksft_test_result_fail("waitpid failed\n"); - return -3; - } - - if ((WIFEXITED(status) && WEXITSTATUS(status) == -1) || - WIFSIGNALED(status)) { - ksft_test_result_fail("child exited abnormally\n"); - return -4; - } - - return WEXITSTATUS(status); -} int test_and_compare_child(long provided, long expected, int inherit) { @@ -54,14 +17,13 @@ int test_and_compare_child(long provided, long expected, int inherit) rc = prctl(PR_RISCV_V_SET_CONTROL, provided); if (rc != 0) { - ksft_test_result_fail("prctl with provided arg %lx failed with code %d\n", - provided, rc); + printf("prctl with provided arg %lx failed with code %d\n", + provided, rc); return -1; } - rc = launch_test(inherit); + rc = launch_test(NEXT_PROGRAM, inherit); if (rc != expected) { - ksft_test_result_fail("Test failed, check %d != %ld\n", rc, - expected); + printf("Test failed, check %d != %ld\n", rc, expected); return -2; } return 0; @@ -70,112 +32,180 @@ int test_and_compare_child(long provided, long expected, int inherit) #define PR_RISCV_V_VSTATE_CTRL_CUR_SHIFT 0 #define PR_RISCV_V_VSTATE_CTRL_NEXT_SHIFT 2 -int main(void) +TEST(get_control_no_v) { - struct riscv_hwprobe pair; - long flag, expected; long rc; - pair.key = RISCV_HWPROBE_KEY_IMA_EXT_0; - rc = riscv_hwprobe(&pair, 1, 0, NULL, 0); - if (rc < 0) { - ksft_test_result_fail("hwprobe() failed with %ld\n", rc); - return -1; - } + if (is_vector_supported()) + SKIP(return, "Test expects vector to be not supported"); - if (pair.key != RISCV_HWPROBE_KEY_IMA_EXT_0) { - ksft_test_result_fail("hwprobe cannot probe RISCV_HWPROBE_KEY_IMA_EXT_0\n"); - return -2; - } + rc = prctl(PR_RISCV_V_GET_CONTROL); + EXPECT_EQ(-1, rc) TH_LOG("GET_CONTROL should fail on kernel/hw without ZVE32X"); + EXPECT_EQ(EINVAL, errno) TH_LOG("GET_CONTROL should fail on kernel/hw without ZVE32X"); +} - if (!(pair.value & RISCV_HWPROBE_EXT_ZVE32X)) { - rc = prctl(PR_RISCV_V_GET_CONTROL); - if (rc != -1 || errno != EINVAL) { - ksft_test_result_fail("GET_CONTROL should fail on kernel/hw without ZVE32X\n"); - return -3; - } - - rc = prctl(PR_RISCV_V_SET_CONTROL, PR_RISCV_V_VSTATE_CTRL_ON); - if (rc != -1 || errno != EINVAL) { - ksft_test_result_fail("SET_CONTROL should fail on kernel/hw without ZVE32X\n"); - return -4; - } - - ksft_test_result_skip("Vector not supported\n"); - return 0; - } +TEST(set_control_no_v) +{ + long rc; + + if (is_vector_supported()) + SKIP(return, "Test expects vector to be not supported"); + + rc = prctl(PR_RISCV_V_SET_CONTROL, PR_RISCV_V_VSTATE_CTRL_ON); + EXPECT_EQ(-1, rc) TH_LOG("SET_CONTROL should fail on kernel/hw without ZVE32X"); + EXPECT_EQ(EINVAL, errno) TH_LOG("SET_CONTROL should fail on kernel/hw without ZVE32X"); +} + +TEST(vstate_on_current) +{ + long flag; + long rc; + + if (!is_vector_supported()) + SKIP(return, "Vector not supported"); flag = PR_RISCV_V_VSTATE_CTRL_ON; rc = prctl(PR_RISCV_V_SET_CONTROL, flag); - if (rc != 0) { - ksft_test_result_fail("Enabling V for current should always success\n"); - return -5; - } + EXPECT_EQ(0, rc) TH_LOG("Enabling V for current should always success"); +} + +TEST(vstate_off_eperm) +{ + long flag; + long rc; + + if (!is_vector_supported()) + SKIP(return, "Vector not supported"); flag = PR_RISCV_V_VSTATE_CTRL_OFF; rc = prctl(PR_RISCV_V_SET_CONTROL, flag); - if (rc != -1 || errno != EPERM) { - ksft_test_result_fail("Disabling current's V alive must fail with EPERM(%d)\n", - errno); - return -5; - } + EXPECT_EQ(EPERM, errno) TH_LOG("Disabling current's V alive must fail with EPERM(%d)", errno); + EXPECT_EQ(-1, rc) TH_LOG("Disabling current's V alive must fail with EPERM(%d)", errno); +} + +TEST(vstate_on_no_nesting) +{ + long flag; + + if (!is_vector_supported()) + SKIP(return, "Vector not supported"); /* Turn on next's vector explicitly and test */ flag = PR_RISCV_V_VSTATE_CTRL_ON << PR_RISCV_V_VSTATE_CTRL_NEXT_SHIFT; - if (test_and_compare_child(flag, PR_RISCV_V_VSTATE_CTRL_ON, 0)) - return -6; + + EXPECT_EQ(0, test_and_compare_child(flag, PR_RISCV_V_VSTATE_CTRL_ON, 0)); +} + +TEST(vstate_off_nesting) +{ + long flag; + + if (!is_vector_supported()) + SKIP(return, "Vector not supported"); /* Turn off next's vector explicitly and test */ flag = PR_RISCV_V_VSTATE_CTRL_OFF << PR_RISCV_V_VSTATE_CTRL_NEXT_SHIFT; - if (test_and_compare_child(flag, PR_RISCV_V_VSTATE_CTRL_OFF, 0)) - return -7; + + EXPECT_EQ(0, test_and_compare_child(flag, PR_RISCV_V_VSTATE_CTRL_OFF, 1)); +} + +TEST(vstate_on_inherit_no_nesting) +{ + long flag, expected; + + if (!is_vector_supported()) + SKIP(return, "Vector not supported"); + + /* Turn on next's vector explicitly and test no inherit */ + flag = PR_RISCV_V_VSTATE_CTRL_ON << PR_RISCV_V_VSTATE_CTRL_NEXT_SHIFT; + flag |= PR_RISCV_V_VSTATE_CTRL_INHERIT; + expected = flag | PR_RISCV_V_VSTATE_CTRL_ON; + + EXPECT_EQ(0, test_and_compare_child(flag, expected, 0)); +} + +TEST(vstate_on_inherit) +{ + long flag, expected; + + if (!is_vector_supported()) + SKIP(return, "Vector not supported"); /* Turn on next's vector explicitly and test inherit */ flag = PR_RISCV_V_VSTATE_CTRL_ON << PR_RISCV_V_VSTATE_CTRL_NEXT_SHIFT; flag |= PR_RISCV_V_VSTATE_CTRL_INHERIT; expected = flag | PR_RISCV_V_VSTATE_CTRL_ON; - if (test_and_compare_child(flag, expected, 0)) - return -8; - if (test_and_compare_child(flag, expected, 1)) - return -9; + EXPECT_EQ(0, test_and_compare_child(flag, expected, 1)); +} + +TEST(vstate_off_inherit_no_nesting) +{ + long flag, expected; + + if (!is_vector_supported()) + SKIP(return, "Vector not supported"); + + /* Turn off next's vector explicitly and test no inherit */ + flag = PR_RISCV_V_VSTATE_CTRL_OFF << PR_RISCV_V_VSTATE_CTRL_NEXT_SHIFT; + flag |= PR_RISCV_V_VSTATE_CTRL_INHERIT; + expected = flag | PR_RISCV_V_VSTATE_CTRL_OFF; + + EXPECT_EQ(0, test_and_compare_child(flag, expected, 0)); +} + +TEST(vstate_off_inherit) +{ + long flag, expected; + + if (!is_vector_supported()) + SKIP(return, "Vector not supported"); /* Turn off next's vector explicitly and test inherit */ flag = PR_RISCV_V_VSTATE_CTRL_OFF << PR_RISCV_V_VSTATE_CTRL_NEXT_SHIFT; flag |= PR_RISCV_V_VSTATE_CTRL_INHERIT; expected = flag | PR_RISCV_V_VSTATE_CTRL_OFF; - if (test_and_compare_child(flag, expected, 0)) - return -10; - if (test_and_compare_child(flag, expected, 1)) - return -11; + EXPECT_EQ(0, test_and_compare_child(flag, expected, 1)); +} + +/* arguments should fail with EINVAL */ +TEST(inval_set_control_1) +{ + int rc; + + if (!is_vector_supported()) + SKIP(return, "Vector not supported"); - /* arguments should fail with EINVAL */ rc = prctl(PR_RISCV_V_SET_CONTROL, 0xff0); - if (rc != -1 || errno != EINVAL) { - ksft_test_result_fail("Undefined control argument should return EINVAL\n"); - return -12; - } + EXPECT_EQ(-1, rc); + EXPECT_EQ(EINVAL, errno); +} + +/* arguments should fail with EINVAL */ +TEST(inval_set_control_2) +{ + int rc; + + if (!is_vector_supported()) + SKIP(return, "Vector not supported"); rc = prctl(PR_RISCV_V_SET_CONTROL, 0x3); - if (rc != -1 || errno != EINVAL) { - ksft_test_result_fail("Undefined control argument should return EINVAL\n"); - return -12; - } + EXPECT_EQ(-1, rc); + EXPECT_EQ(EINVAL, errno); +} - rc = prctl(PR_RISCV_V_SET_CONTROL, 0xc); - if (rc != -1 || errno != EINVAL) { - ksft_test_result_fail("Undefined control argument should return EINVAL\n"); - return -12; - } +/* arguments should fail with EINVAL */ +TEST(inval_set_control_3) +{ + int rc; - rc = prctl(PR_RISCV_V_SET_CONTROL, 0xc); - if (rc != -1 || errno != EINVAL) { - ksft_test_result_fail("Undefined control argument should return EINVAL\n"); - return -12; - } + if (!is_vector_supported()) + SKIP(return, "Vector not supported"); - ksft_test_result_pass("tests for riscv_v_vstate_ctrl pass\n"); - ksft_exit_pass(); - return 0; + rc = prctl(PR_RISCV_V_SET_CONTROL, 0xc); + EXPECT_EQ(-1, rc); + EXPECT_EQ(EINVAL, errno); } + +TEST_HARNESS_MAIN
Overhaul the riscv vector tests to use kselftest_harness to help the test cases correctly report the results and decouple the individual test cases from each other. With this refactoring, only run the test cases is vector is reported and properly report the test case as skipped otherwise. The v_initval_nolibc test was previously not checking if vector was supported and used a function (malloc) which invalidates the state of the vector registers. Signed-off-by: Charlie Jenkins <charlie@rivosinc.com> --- tools/testing/selftests/riscv/abi/ptrace | Bin 0 -> 759368 bytes tools/testing/selftests/riscv/vector/.gitignore | 3 +- tools/testing/selftests/riscv/vector/Makefile | 17 +- .../selftests/riscv/vector/v_exec_initval_nolibc.c | 84 +++++++ tools/testing/selftests/riscv/vector/v_helpers.c | 56 +++++ tools/testing/selftests/riscv/vector/v_helpers.h | 5 + tools/testing/selftests/riscv/vector/v_initval.c | 16 ++ .../selftests/riscv/vector/v_initval_nolibc.c | 68 ------ .../testing/selftests/riscv/vector/vstate_prctl.c | 266 ++++++++++++--------- 9 files changed, 324 insertions(+), 191 deletions(-)