| Message ID | 20230727141428.962286-11-alexghiti@rivosinc.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | riscv: Allow userspace to directly access perf counters | expand |
On Thu, Jul 27, 2023 at 7:30 AM Alexandre Ghiti <alexghiti@rivosinc.com> wrote: > > riscv now supports mmaping hardware counters to userspace so adapt the test > to run on this architecture. > > Signed-off-by: Alexandre Ghiti <alexghiti@rivosinc.com> > Reviewed-by: Andrew Jones <ajones@ventanamicro.com> > Reviewed-by: Atish Patra <atishp@rivosinc.com> > --- > tools/perf/tests/mmap-basic.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/tools/perf/tests/mmap-basic.c b/tools/perf/tests/mmap-basic.c > index e68ca6229756..f5075ca774f8 100644 > --- a/tools/perf/tests/mmap-basic.c > +++ b/tools/perf/tests/mmap-basic.c > @@ -284,7 +284,7 @@ static struct test_case tests__basic_mmap[] = { > "permissions"), > TEST_CASE_REASON("User space counter reading of instructions", > mmap_user_read_instr, > -#if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) > +#if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || __riscv_xlen == 64 Same comment relating to the guard, why not defined(__riscv) ? Thanks, Ian > "permissions" > #else > "unsupported" > @@ -292,7 +292,7 @@ static struct test_case tests__basic_mmap[] = { > ), > TEST_CASE_REASON("User space counter reading of cycles", > mmap_user_read_cycles, > -#if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) > +#if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || __riscv_xlen == 64 > "permissions" > #else > "unsupported" > -- > 2.39.2 >
On Fri, Jul 28, 2023 at 10:54:02AM -0700, Ian Rogers wrote: > On Thu, Jul 27, 2023 at 7:30 AM Alexandre Ghiti <alexghiti@rivosinc.com> wrote: > > > > riscv now supports mmaping hardware counters to userspace so adapt the test > > to run on this architecture. > > > > Signed-off-by: Alexandre Ghiti <alexghiti@rivosinc.com> > > Reviewed-by: Andrew Jones <ajones@ventanamicro.com> > > Reviewed-by: Atish Patra <atishp@rivosinc.com> > > --- > > tools/perf/tests/mmap-basic.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/tools/perf/tests/mmap-basic.c b/tools/perf/tests/mmap-basic.c > > index e68ca6229756..f5075ca774f8 100644 > > --- a/tools/perf/tests/mmap-basic.c > > +++ b/tools/perf/tests/mmap-basic.c > > @@ -284,7 +284,7 @@ static struct test_case tests__basic_mmap[] = { > > "permissions"), > > TEST_CASE_REASON("User space counter reading of instructions", > > mmap_user_read_instr, > > -#if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) > > +#if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || __riscv_xlen == 64 > > Same comment relating to the guard, why not defined(__riscv) ? __riscv_xlen will always be defined for all riscv targets, so also checking __riscv isn't necessary when a specific bit width also needs to be checked. __riscv is useful for checks that don't need to be concerned with the bit width. Grepping, I see instances of both "defined(__riscv) && __riscv_xlen ==" and just "__riscv_xlen ==". IMHO, the former should be reduced to the latter, rather than creating more instances of them. Thanks, drew
diff --git a/tools/perf/tests/mmap-basic.c b/tools/perf/tests/mmap-basic.c index e68ca6229756..f5075ca774f8 100644 --- a/tools/perf/tests/mmap-basic.c +++ b/tools/perf/tests/mmap-basic.c @@ -284,7 +284,7 @@ static struct test_case tests__basic_mmap[] = { "permissions"), TEST_CASE_REASON("User space counter reading of instructions", mmap_user_read_instr, -#if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) +#if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || __riscv_xlen == 64 "permissions" #else "unsupported" @@ -292,7 +292,7 @@ static struct test_case tests__basic_mmap[] = { ), TEST_CASE_REASON("User space counter reading of cycles", mmap_user_read_cycles, -#if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) +#if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || __riscv_xlen == 64 "permissions" #else "unsupported"