From: Mark Brown <broonie@kernel.org>
To: Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will@kernel.org>,
Shuah Khan <skhan@linuxfoundation.org>,
Shuah Khan <shuah@kernel.org>
Cc: Alan Hayward <alan.hayward@arm.com>,
Luis Machado <luis.machado@arm.com>,
Salil Akerkar <Salil.Akerkar@arm.com>,
Basant Kumar Dwivedi <Basant.KumarDwivedi@arm.com>,
Szabolcs Nagy <szabolcs.nagy@arm.com>,
linux-arm-kernel@lists.infradead.org,
linux-kselftest@vger.kernel.org, Mark Brown <broonie@kernel.org>
Subject: [PATCH v4 28/33] kselftest/arm64: Extend vector configuration API tests to cover SME
Date: Thu, 21 Oct 2021 19:07:17 +0100 [thread overview]
Message-ID: <20211021180722.3699248-29-broonie@kernel.org> (raw)
In-Reply-To: <20211021180722.3699248-1-broonie@kernel.org>
Provide RDVL helpers for SME and extend the main vector configuration tests
to cover SME.
Signed-off-by: Mark Brown <broonie@kernel.org>
---
tools/testing/selftests/arm64/fp/.gitignore | 1 +
tools/testing/selftests/arm64/fp/Makefile | 3 ++-
tools/testing/selftests/arm64/fp/rdvl-sme.c | 14 ++++++++++++++
tools/testing/selftests/arm64/fp/rdvl.S | 16 ++++++++++++++++
tools/testing/selftests/arm64/fp/rdvl.h | 1 +
tools/testing/selftests/arm64/fp/vec-syscfg.c | 10 ++++++++++
6 files changed, 44 insertions(+), 1 deletion(-)
create mode 100644 tools/testing/selftests/arm64/fp/rdvl-sme.c
diff --git a/tools/testing/selftests/arm64/fp/.gitignore b/tools/testing/selftests/arm64/fp/.gitignore
index b67395903b9b..885dd592807b 100644
--- a/tools/testing/selftests/arm64/fp/.gitignore
+++ b/tools/testing/selftests/arm64/fp/.gitignore
@@ -1,4 +1,5 @@
fpsimd-test
+rdvl-sme
rdvl-sve
sve-probe-vls
sve-ptrace
diff --git a/tools/testing/selftests/arm64/fp/Makefile b/tools/testing/selftests/arm64/fp/Makefile
index ba1488c7c315..11d4fc3b7115 100644
--- a/tools/testing/selftests/arm64/fp/Makefile
+++ b/tools/testing/selftests/arm64/fp/Makefile
@@ -3,7 +3,7 @@
CFLAGS += -I../../../../../usr/include/
TEST_GEN_PROGS := sve-ptrace sve-probe-vls vec-syscfg
TEST_PROGS_EXTENDED := fpsimd-test fpsimd-stress \
- rdvl-sve \
+ rdvl-sme rdvl-sve \
sve-test sve-stress \
vlset
@@ -11,6 +11,7 @@ all: $(TEST_GEN_PROGS) $(TEST_PROGS_EXTENDED)
fpsimd-test: fpsimd-test.o asm-utils.o
$(CC) -nostdlib $^ -o $@
+rdvl-sme: rdvl-sme.o rdvl.o
rdvl-sve: rdvl-sve.o rdvl.o
sve-ptrace: sve-ptrace.o
sve-probe-vls: sve-probe-vls.o rdvl.o
diff --git a/tools/testing/selftests/arm64/fp/rdvl-sme.c b/tools/testing/selftests/arm64/fp/rdvl-sme.c
new file mode 100644
index 000000000000..49b0b2e08bac
--- /dev/null
+++ b/tools/testing/selftests/arm64/fp/rdvl-sme.c
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: GPL-2.0-only
+
+#include <stdio.h>
+
+#include "rdvl.h"
+
+int main(void)
+{
+ int vl = rdvl_sme();
+
+ printf("%d\n", vl);
+
+ return 0;
+}
diff --git a/tools/testing/selftests/arm64/fp/rdvl.S b/tools/testing/selftests/arm64/fp/rdvl.S
index c916c1c9defd..a9a028ba1b79 100644
--- a/tools/testing/selftests/arm64/fp/rdvl.S
+++ b/tools/testing/selftests/arm64/fp/rdvl.S
@@ -8,3 +8,19 @@ rdvl_sve:
hint 34 // BTI C
rdvl x0, #1
ret
+
+.globl rdvl_sme
+rdvl_sme:
+ hint 34 // BTI C
+
+ // Enter streaming mode
+ mov x16, #1
+ msr S3_3_C4_C2_2, x16
+
+ rdvl x0, #1
+
+ // Leave streaming mode
+ mov x16, #0
+ msr S3_3_C4_C2_2, x16
+
+ ret
diff --git a/tools/testing/selftests/arm64/fp/rdvl.h b/tools/testing/selftests/arm64/fp/rdvl.h
index 7c9d953fc9e7..5d323679fbc9 100644
--- a/tools/testing/selftests/arm64/fp/rdvl.h
+++ b/tools/testing/selftests/arm64/fp/rdvl.h
@@ -3,6 +3,7 @@
#ifndef RDVL_H
#define RDVL_H
+int rdvl_sme(void);
int rdvl_sve(void);
#endif
diff --git a/tools/testing/selftests/arm64/fp/vec-syscfg.c b/tools/testing/selftests/arm64/fp/vec-syscfg.c
index 272b888e018e..0b976eb1c1d1 100644
--- a/tools/testing/selftests/arm64/fp/vec-syscfg.c
+++ b/tools/testing/selftests/arm64/fp/vec-syscfg.c
@@ -53,6 +53,16 @@ static struct vec_data vec_data[] = {
.prctl_set = PR_SVE_SET_VL,
.default_vl_file = "/proc/sys/abi/sve_default_vector_length",
},
+ {
+ .name = "SME",
+ .hwcap_type = AT_HWCAP2,
+ .hwcap = HWCAP2_SME,
+ .rdvl = rdvl_sme,
+ .rdvl_binary = "./rdvl-sme",
+ .prctl_get = PR_SME_GET_VL,
+ .prctl_set = PR_SME_SET_VL,
+ .default_vl_file = "/proc/sys/abi/sme_default_vector_length",
+ },
};
static int stdio_read_integer(FILE *f, const char *what, int *val)
--
2.30.2
WARNING: multiple messages have this Message-ID (diff)
From: Mark Brown <broonie@kernel.org>
To: Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will@kernel.org>,
Shuah Khan <skhan@linuxfoundation.org>,
Shuah Khan <shuah@kernel.org>
Cc: Alan Hayward <alan.hayward@arm.com>,
Luis Machado <luis.machado@arm.com>,
Salil Akerkar <Salil.Akerkar@arm.com>,
Basant Kumar Dwivedi <Basant.KumarDwivedi@arm.com>,
Szabolcs Nagy <szabolcs.nagy@arm.com>,
linux-arm-kernel@lists.infradead.org,
linux-kselftest@vger.kernel.org, Mark Brown <broonie@kernel.org>
Subject: [PATCH v4 28/33] kselftest/arm64: Extend vector configuration API tests to cover SME
Date: Thu, 21 Oct 2021 19:07:17 +0100 [thread overview]
Message-ID: <20211021180722.3699248-29-broonie@kernel.org> (raw)
In-Reply-To: <20211021180722.3699248-1-broonie@kernel.org>
Provide RDVL helpers for SME and extend the main vector configuration tests
to cover SME.
Signed-off-by: Mark Brown <broonie@kernel.org>
---
tools/testing/selftests/arm64/fp/.gitignore | 1 +
tools/testing/selftests/arm64/fp/Makefile | 3 ++-
tools/testing/selftests/arm64/fp/rdvl-sme.c | 14 ++++++++++++++
tools/testing/selftests/arm64/fp/rdvl.S | 16 ++++++++++++++++
tools/testing/selftests/arm64/fp/rdvl.h | 1 +
tools/testing/selftests/arm64/fp/vec-syscfg.c | 10 ++++++++++
6 files changed, 44 insertions(+), 1 deletion(-)
create mode 100644 tools/testing/selftests/arm64/fp/rdvl-sme.c
diff --git a/tools/testing/selftests/arm64/fp/.gitignore b/tools/testing/selftests/arm64/fp/.gitignore
index b67395903b9b..885dd592807b 100644
--- a/tools/testing/selftests/arm64/fp/.gitignore
+++ b/tools/testing/selftests/arm64/fp/.gitignore
@@ -1,4 +1,5 @@
fpsimd-test
+rdvl-sme
rdvl-sve
sve-probe-vls
sve-ptrace
diff --git a/tools/testing/selftests/arm64/fp/Makefile b/tools/testing/selftests/arm64/fp/Makefile
index ba1488c7c315..11d4fc3b7115 100644
--- a/tools/testing/selftests/arm64/fp/Makefile
+++ b/tools/testing/selftests/arm64/fp/Makefile
@@ -3,7 +3,7 @@
CFLAGS += -I../../../../../usr/include/
TEST_GEN_PROGS := sve-ptrace sve-probe-vls vec-syscfg
TEST_PROGS_EXTENDED := fpsimd-test fpsimd-stress \
- rdvl-sve \
+ rdvl-sme rdvl-sve \
sve-test sve-stress \
vlset
@@ -11,6 +11,7 @@ all: $(TEST_GEN_PROGS) $(TEST_PROGS_EXTENDED)
fpsimd-test: fpsimd-test.o asm-utils.o
$(CC) -nostdlib $^ -o $@
+rdvl-sme: rdvl-sme.o rdvl.o
rdvl-sve: rdvl-sve.o rdvl.o
sve-ptrace: sve-ptrace.o
sve-probe-vls: sve-probe-vls.o rdvl.o
diff --git a/tools/testing/selftests/arm64/fp/rdvl-sme.c b/tools/testing/selftests/arm64/fp/rdvl-sme.c
new file mode 100644
index 000000000000..49b0b2e08bac
--- /dev/null
+++ b/tools/testing/selftests/arm64/fp/rdvl-sme.c
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: GPL-2.0-only
+
+#include <stdio.h>
+
+#include "rdvl.h"
+
+int main(void)
+{
+ int vl = rdvl_sme();
+
+ printf("%d\n", vl);
+
+ return 0;
+}
diff --git a/tools/testing/selftests/arm64/fp/rdvl.S b/tools/testing/selftests/arm64/fp/rdvl.S
index c916c1c9defd..a9a028ba1b79 100644
--- a/tools/testing/selftests/arm64/fp/rdvl.S
+++ b/tools/testing/selftests/arm64/fp/rdvl.S
@@ -8,3 +8,19 @@ rdvl_sve:
hint 34 // BTI C
rdvl x0, #1
ret
+
+.globl rdvl_sme
+rdvl_sme:
+ hint 34 // BTI C
+
+ // Enter streaming mode
+ mov x16, #1
+ msr S3_3_C4_C2_2, x16
+
+ rdvl x0, #1
+
+ // Leave streaming mode
+ mov x16, #0
+ msr S3_3_C4_C2_2, x16
+
+ ret
diff --git a/tools/testing/selftests/arm64/fp/rdvl.h b/tools/testing/selftests/arm64/fp/rdvl.h
index 7c9d953fc9e7..5d323679fbc9 100644
--- a/tools/testing/selftests/arm64/fp/rdvl.h
+++ b/tools/testing/selftests/arm64/fp/rdvl.h
@@ -3,6 +3,7 @@
#ifndef RDVL_H
#define RDVL_H
+int rdvl_sme(void);
int rdvl_sve(void);
#endif
diff --git a/tools/testing/selftests/arm64/fp/vec-syscfg.c b/tools/testing/selftests/arm64/fp/vec-syscfg.c
index 272b888e018e..0b976eb1c1d1 100644
--- a/tools/testing/selftests/arm64/fp/vec-syscfg.c
+++ b/tools/testing/selftests/arm64/fp/vec-syscfg.c
@@ -53,6 +53,16 @@ static struct vec_data vec_data[] = {
.prctl_set = PR_SVE_SET_VL,
.default_vl_file = "/proc/sys/abi/sve_default_vector_length",
},
+ {
+ .name = "SME",
+ .hwcap_type = AT_HWCAP2,
+ .hwcap = HWCAP2_SME,
+ .rdvl = rdvl_sme,
+ .rdvl_binary = "./rdvl-sme",
+ .prctl_get = PR_SME_GET_VL,
+ .prctl_set = PR_SME_SET_VL,
+ .default_vl_file = "/proc/sys/abi/sme_default_vector_length",
+ },
};
static int stdio_read_integer(FILE *f, const char *what, int *val)
--
2.30.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-10-21 18:09 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-21 18:06 [PATCH v4 00/33] arm64/sme: Initial support for the Scalable Matrix Extension Mark Brown
2021-10-21 18:06 ` Mark Brown
2021-10-21 18:06 ` [PATCH v4 01/33] arm64/sve: Make sysctl interface for SVE reusable by SME Mark Brown
2021-10-21 18:06 ` Mark Brown
2021-10-21 18:06 ` [PATCH v4 02/33] arm64/sve: Generalise vector length configuration prctl() for SME Mark Brown
2021-10-21 18:06 ` Mark Brown
2021-10-21 18:06 ` [PATCH v4 03/33] kselftest/arm64: Parameterise ptrace vector length information Mark Brown
2021-10-21 18:06 ` Mark Brown
2021-10-21 18:06 ` [PATCH v4 04/33] kselftest/arm64: Allow signal tests to trigger from a function Mark Brown
2021-10-21 18:06 ` Mark Brown
2021-10-21 18:06 ` [PATCH v4 05/33] tools/nolibc: Implement gettid() Mark Brown
2021-10-21 18:06 ` Mark Brown
2021-10-21 18:06 ` [PATCH v4 06/33] arm64/sme: Provide ABI documentation for SME Mark Brown
2021-10-21 18:06 ` Mark Brown
[not found] ` <VI1PR08MB3919C2F171F2185FB3500DD08B839@VI1PR08MB3919.eurprd08.prod.outlook.com>
2021-10-26 13:47 ` Mark Brown
2021-10-26 13:47 ` Mark Brown
2021-10-27 11:14 ` Szabolcs Nagy
2021-10-27 11:14 ` Szabolcs Nagy
2021-10-21 18:06 ` [PATCH v4 07/33] arm64/sme: System register and exception syndrome definitions Mark Brown
2021-10-21 18:06 ` Mark Brown
2021-10-21 18:06 ` [PATCH v4 08/33] arm64/sme: Define macros for manually encoding SME instructions Mark Brown
2021-10-21 18:06 ` Mark Brown
2021-10-21 18:06 ` [PATCH v4 09/33] arm64/sme: Early CPU setup for SME Mark Brown
2021-10-21 18:06 ` Mark Brown
2021-10-21 18:06 ` [PATCH v4 10/33] arm64/sme: Basic enumeration support Mark Brown
2021-10-21 18:06 ` Mark Brown
2021-10-21 18:07 ` [PATCH v4 11/33] arm64/sme: Identify supported SME vector lengths at boot Mark Brown
2021-10-21 18:07 ` Mark Brown
2021-10-21 18:07 ` [PATCH v4 12/33] arm64/sme: Implement sysctl to set the default vector length Mark Brown
2021-10-21 18:07 ` Mark Brown
2021-10-21 18:07 ` [PATCH v4 13/33] arm64/sme: Implement vector length configuration prctl()s Mark Brown
2021-10-21 18:07 ` Mark Brown
2021-10-21 18:07 ` [PATCH v4 14/33] arm64/sme: Implement support for TPIDR2 Mark Brown
2021-10-21 18:07 ` Mark Brown
2021-10-21 18:07 ` [PATCH v4 15/33] arm64/sme: Implement SVCR context switching Mark Brown
2021-10-21 18:07 ` Mark Brown
2021-10-21 18:07 ` [PATCH v4 16/33] arm64/sme: Implement streaming SVE " Mark Brown
2021-10-21 18:07 ` Mark Brown
2021-10-21 18:07 ` [PATCH v4 17/33] arm64/sme: Implement ZA " Mark Brown
2021-10-21 18:07 ` Mark Brown
2021-10-21 18:07 ` [PATCH v4 18/33] arm64/sme: Implement traps and syscall handling for SME Mark Brown
2021-10-21 18:07 ` Mark Brown
2021-10-21 18:07 ` [PATCH v4 19/33] arm64/sme: Implement streaming SVE signal handling Mark Brown
2021-10-21 18:07 ` Mark Brown
2021-10-21 18:07 ` [PATCH v4 20/33] arm64/sme: Implement ZA " Mark Brown
2021-10-21 18:07 ` Mark Brown
2021-10-21 18:07 ` [PATCH v4 21/33] arm64/sme: Implement ptrace support for streaming mode SVE registers Mark Brown
2021-10-21 18:07 ` Mark Brown
2021-10-21 18:07 ` [PATCH v4 22/33] arm64/sme: Add ptrace support for ZA Mark Brown
2021-10-21 18:07 ` Mark Brown
2021-10-21 18:07 ` [PATCH v4 23/33] arm64/sme: Disable streaming mode and ZA when flushing CPU state Mark Brown
2021-10-21 18:07 ` Mark Brown
2021-10-21 18:07 ` [PATCH v4 24/33] arm64/sme: Save and restore streaming mode over EFI runtime calls Mark Brown
2021-10-21 18:07 ` Mark Brown
2021-10-21 18:07 ` [PATCH v4 25/33] arm64/sme: Provide Kconfig for SME Mark Brown
2021-10-21 18:07 ` Mark Brown
2021-10-21 18:07 ` [PATCH v4 26/33] kselftest/arm64: sme: Add streaming SME support to vlset Mark Brown
2021-10-21 18:07 ` Mark Brown
2021-10-21 18:07 ` [PATCH v4 27/33] kselftest/arm64: Add tests for TPIDR2 Mark Brown
2021-10-21 18:07 ` Mark Brown
2021-10-21 18:07 ` Mark Brown [this message]
2021-10-21 18:07 ` [PATCH v4 28/33] kselftest/arm64: Extend vector configuration API tests to cover SME Mark Brown
2021-10-21 18:07 ` [PATCH v4 29/33] kselftest/arm64: sme: Provide streaming mode SVE stress test Mark Brown
2021-10-21 18:07 ` Mark Brown
2021-10-21 18:07 ` [PATCH v4 30/33] kselftest/arm64: Add stress test for SME ZA context switching Mark Brown
2021-10-21 18:07 ` Mark Brown
2021-10-21 18:07 ` [PATCH v4 31/33] kselftest/arm64: signal: Add SME signal handling tests Mark Brown
2021-10-21 18:07 ` Mark Brown
2021-10-21 18:07 ` [PATCH v4 32/33] kselftest/arm64: Add streaming SVE to SVE ptrace tests Mark Brown
2021-10-21 18:07 ` Mark Brown
2021-10-21 18:07 ` [PATCH v4 33/33] kselftest/arm64: Add coverage for the ZA ptrace interface Mark Brown
2021-10-21 18:07 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211021180722.3699248-29-broonie@kernel.org \
--to=broonie@kernel.org \
--cc=Basant.KumarDwivedi@arm.com \
--cc=Salil.Akerkar@arm.com \
--cc=alan.hayward@arm.com \
--cc=catalin.marinas@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=luis.machado@arm.com \
--cc=shuah@kernel.org \
--cc=skhan@linuxfoundation.org \
--cc=szabolcs.nagy@arm.com \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.