| Message ID | 20201001072234.143703-6-thuth@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Update travis CI | expand |
On Thu, Oct 01, 2020 at 09:22:32AM +0200, Thomas Huth wrote: > Clang complains here: > > arm/pmu.c:201:16: error: value size does not match register size specified by > the constraint and modifier [-Werror,-Wasm-operand-widths] > : [pmcr] "r" (pmcr) > ^ > arm/pmu.c:194:18: note: use constraint modifier "w" > " msr pmcr_el0, %[pmcr]\n" > ^~~~~~~ > %w[pmcr] > arm/pmu.c:200:17: error: value size does not match register size specified by > the constraint and modifier [-Werror,-Wasm-operand-widths] > : [loop] "+r" (loop) > ^ > arm/pmu.c:196:11: note: use constraint modifier "w" > "1: subs %[loop], %[loop], #1\n" > ^~~~~~~ > %w[loop] > arm/pmu.c:200:17: error: value size does not match register size specified by > the constraint and modifier [-Werror,-Wasm-operand-widths] > : [loop] "+r" (loop) > ^ > arm/pmu.c:196:20: note: use constraint modifier "w" > "1: subs %[loop], %[loop], #1\n" > ^~~~~~~ > %w[loop] > arm/pmu.c:284:35: error: value size does not match register size specified > by the constraint and modifier [-Werror,-Wasm-operand-widths] > : [addr] "r" (addr), [pmcr] "r" (pmcr), [loop] "r" (loop) > ^ > arm/pmu.c:274:28: note: use constraint modifier "w" > " msr pmcr_el0, %[pmcr]\n" > ^~~~~~~ > %w[pmcr] > arm/pmu.c:284:54: error: value size does not match register size specified > by the constraint and modifier [-Werror,-Wasm-operand-widths] > : [addr] "r" (addr), [pmcr] "r" (pmcr), [loop] "r" (loop) > ^ > arm/pmu.c:276:23: note: use constraint modifier "w" > " mov x10, %[loop]\n" > ^~~~~~~ > %w[loop] > > pmcr should be 64-bit since it is a sysreg, but for loop we can use the > "w" modifier. > > Suggested-by: Drew Jones <drjones@redhat.com> > Signed-off-by: Thomas Huth <thuth@redhat.com> > --- > arm/pmu.c | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) > Reviewed-by: Andrew Jones <drjones@redhat.com> Tested-by: Andrew Jones <drjones@redhat.com>
On Thu, Oct 01, 2020 at 11:12:43AM +0200, Andrew Jones wrote: > On Thu, Oct 01, 2020 at 09:22:32AM +0200, Thomas Huth wrote: > > Clang complains here: > > > > arm/pmu.c:201:16: error: value size does not match register size specified by > > the constraint and modifier [-Werror,-Wasm-operand-widths] > > : [pmcr] "r" (pmcr) > > ^ > > arm/pmu.c:194:18: note: use constraint modifier "w" > > " msr pmcr_el0, %[pmcr]\n" > > ^~~~~~~ > > %w[pmcr] > > arm/pmu.c:200:17: error: value size does not match register size specified by > > the constraint and modifier [-Werror,-Wasm-operand-widths] > > : [loop] "+r" (loop) > > ^ > > arm/pmu.c:196:11: note: use constraint modifier "w" > > "1: subs %[loop], %[loop], #1\n" > > ^~~~~~~ > > %w[loop] > > arm/pmu.c:200:17: error: value size does not match register size specified by > > the constraint and modifier [-Werror,-Wasm-operand-widths] > > : [loop] "+r" (loop) > > ^ > > arm/pmu.c:196:20: note: use constraint modifier "w" > > "1: subs %[loop], %[loop], #1\n" > > ^~~~~~~ > > %w[loop] > > arm/pmu.c:284:35: error: value size does not match register size specified > > by the constraint and modifier [-Werror,-Wasm-operand-widths] > > : [addr] "r" (addr), [pmcr] "r" (pmcr), [loop] "r" (loop) > > ^ > > arm/pmu.c:274:28: note: use constraint modifier "w" > > " msr pmcr_el0, %[pmcr]\n" > > ^~~~~~~ > > %w[pmcr] > > arm/pmu.c:284:54: error: value size does not match register size specified > > by the constraint and modifier [-Werror,-Wasm-operand-widths] > > : [addr] "r" (addr), [pmcr] "r" (pmcr), [loop] "r" (loop) > > ^ > > arm/pmu.c:276:23: note: use constraint modifier "w" > > " mov x10, %[loop]\n" > > ^~~~~~~ > > %w[loop] > > > > pmcr should be 64-bit since it is a sysreg, but for loop we can use the > > "w" modifier. > > > > Suggested-by: Drew Jones <drjones@redhat.com> Not a huge deal, but I use my official first name 'Andrew' on my tags. I know, I like confusing people by flipping back and forth between Andrew and Drew... Thanks, drew a.k.a Andrew > > Signed-off-by: Thomas Huth <thuth@redhat.com> > > --- > > arm/pmu.c | 10 ++++++---- > > 1 file changed, 6 insertions(+), 4 deletions(-) > > > > Reviewed-by: Andrew Jones <drjones@redhat.com> > Tested-by: Andrew Jones <drjones@redhat.com>
On 01/10/2020 11.14, Andrew Jones wrote: > On Thu, Oct 01, 2020 at 11:12:43AM +0200, Andrew Jones wrote: >> On Thu, Oct 01, 2020 at 09:22:32AM +0200, Thomas Huth wrote: >>> Clang complains here: >>> >>> arm/pmu.c:201:16: error: value size does not match register size specified by >>> the constraint and modifier [-Werror,-Wasm-operand-widths] >>> : [pmcr] "r" (pmcr) >>> ^ >>> arm/pmu.c:194:18: note: use constraint modifier "w" >>> " msr pmcr_el0, %[pmcr]\n" >>> ^~~~~~~ >>> %w[pmcr] >>> arm/pmu.c:200:17: error: value size does not match register size specified by >>> the constraint and modifier [-Werror,-Wasm-operand-widths] >>> : [loop] "+r" (loop) >>> ^ >>> arm/pmu.c:196:11: note: use constraint modifier "w" >>> "1: subs %[loop], %[loop], #1\n" >>> ^~~~~~~ >>> %w[loop] >>> arm/pmu.c:200:17: error: value size does not match register size specified by >>> the constraint and modifier [-Werror,-Wasm-operand-widths] >>> : [loop] "+r" (loop) >>> ^ >>> arm/pmu.c:196:20: note: use constraint modifier "w" >>> "1: subs %[loop], %[loop], #1\n" >>> ^~~~~~~ >>> %w[loop] >>> arm/pmu.c:284:35: error: value size does not match register size specified >>> by the constraint and modifier [-Werror,-Wasm-operand-widths] >>> : [addr] "r" (addr), [pmcr] "r" (pmcr), [loop] "r" (loop) >>> ^ >>> arm/pmu.c:274:28: note: use constraint modifier "w" >>> " msr pmcr_el0, %[pmcr]\n" >>> ^~~~~~~ >>> %w[pmcr] >>> arm/pmu.c:284:54: error: value size does not match register size specified >>> by the constraint and modifier [-Werror,-Wasm-operand-widths] >>> : [addr] "r" (addr), [pmcr] "r" (pmcr), [loop] "r" (loop) >>> ^ >>> arm/pmu.c:276:23: note: use constraint modifier "w" >>> " mov x10, %[loop]\n" >>> ^~~~~~~ >>> %w[loop] >>> >>> pmcr should be 64-bit since it is a sysreg, but for loop we can use the >>> "w" modifier. >>> >>> Suggested-by: Drew Jones <drjones@redhat.com> > > Not a huge deal, but I use my official first name 'Andrew' on my tags. > I know, I like confusing people by flipping back and forth between > Andrew and Drew... Sorry, IIRC I simply copy-n-pasted your name and e-mail address from the MAINTAINERS file ... maybe you should fix it there to avoid such situations? Thomas
On Thu, Oct 01, 2020 at 12:50:48PM +0200, Thomas Huth wrote: > On 01/10/2020 11.14, Andrew Jones wrote: > > On Thu, Oct 01, 2020 at 11:12:43AM +0200, Andrew Jones wrote: > >> On Thu, Oct 01, 2020 at 09:22:32AM +0200, Thomas Huth wrote: > >>> Clang complains here: > >>> > >>> arm/pmu.c:201:16: error: value size does not match register size specified by > >>> the constraint and modifier [-Werror,-Wasm-operand-widths] > >>> : [pmcr] "r" (pmcr) > >>> ^ > >>> arm/pmu.c:194:18: note: use constraint modifier "w" > >>> " msr pmcr_el0, %[pmcr]\n" > >>> ^~~~~~~ > >>> %w[pmcr] > >>> arm/pmu.c:200:17: error: value size does not match register size specified by > >>> the constraint and modifier [-Werror,-Wasm-operand-widths] > >>> : [loop] "+r" (loop) > >>> ^ > >>> arm/pmu.c:196:11: note: use constraint modifier "w" > >>> "1: subs %[loop], %[loop], #1\n" > >>> ^~~~~~~ > >>> %w[loop] > >>> arm/pmu.c:200:17: error: value size does not match register size specified by > >>> the constraint and modifier [-Werror,-Wasm-operand-widths] > >>> : [loop] "+r" (loop) > >>> ^ > >>> arm/pmu.c:196:20: note: use constraint modifier "w" > >>> "1: subs %[loop], %[loop], #1\n" > >>> ^~~~~~~ > >>> %w[loop] > >>> arm/pmu.c:284:35: error: value size does not match register size specified > >>> by the constraint and modifier [-Werror,-Wasm-operand-widths] > >>> : [addr] "r" (addr), [pmcr] "r" (pmcr), [loop] "r" (loop) > >>> ^ > >>> arm/pmu.c:274:28: note: use constraint modifier "w" > >>> " msr pmcr_el0, %[pmcr]\n" > >>> ^~~~~~~ > >>> %w[pmcr] > >>> arm/pmu.c:284:54: error: value size does not match register size specified > >>> by the constraint and modifier [-Werror,-Wasm-operand-widths] > >>> : [addr] "r" (addr), [pmcr] "r" (pmcr), [loop] "r" (loop) > >>> ^ > >>> arm/pmu.c:276:23: note: use constraint modifier "w" > >>> " mov x10, %[loop]\n" > >>> ^~~~~~~ > >>> %w[loop] > >>> > >>> pmcr should be 64-bit since it is a sysreg, but for loop we can use the > >>> "w" modifier. > >>> > >>> Suggested-by: Drew Jones <drjones@redhat.com> > > > > Not a huge deal, but I use my official first name 'Andrew' on my tags. > > I know, I like confusing people by flipping back and forth between > > Andrew and Drew... > > Sorry, IIRC I simply copy-n-pasted your name and e-mail address from the > MAINTAINERS file ... maybe you should fix it there to avoid such situations? > Thanks for pointing that out. Patch sent. drew
diff --git a/arm/pmu.c b/arm/pmu.c index cece53e..831fb66 100644 --- a/arm/pmu.c +++ b/arm/pmu.c @@ -190,15 +190,16 @@ static inline uint8_t get_pmu_version(void) */ static inline void precise_instrs_loop(int loop, uint32_t pmcr) { + uint64_t pmcr64 = pmcr; asm volatile( " msr pmcr_el0, %[pmcr]\n" " isb\n" - "1: subs %[loop], %[loop], #1\n" + "1: subs %w[loop], %w[loop], #1\n" " b.gt 1b\n" " msr pmcr_el0, xzr\n" " isb\n" : [loop] "+r" (loop) - : [pmcr] "r" (pmcr) + : [pmcr] "r" (pmcr64) : "cc"); } @@ -268,8 +269,9 @@ static void test_event_introspection(void) * pmccntr read after this function returns the exact instructions executed * in the controlled block. Loads @loop times the data at @address into x9. */ -static void mem_access_loop(void *addr, int loop, uint32_t pmcr) +static void mem_access_loop(void *addr, long loop, uint32_t pmcr) { + uint64_t pmcr64 = pmcr; asm volatile( " msr pmcr_el0, %[pmcr]\n" " isb\n" @@ -281,7 +283,7 @@ asm volatile( " msr pmcr_el0, xzr\n" " isb\n" : - : [addr] "r" (addr), [pmcr] "r" (pmcr), [loop] "r" (loop) + : [addr] "r" (addr), [pmcr] "r" (pmcr64), [loop] "r" (loop) : "x9", "x10", "cc"); }
Clang complains here: arm/pmu.c:201:16: error: value size does not match register size specified by the constraint and modifier [-Werror,-Wasm-operand-widths] : [pmcr] "r" (pmcr) ^ arm/pmu.c:194:18: note: use constraint modifier "w" " msr pmcr_el0, %[pmcr]\n" ^~~~~~~ %w[pmcr] arm/pmu.c:200:17: error: value size does not match register size specified by the constraint and modifier [-Werror,-Wasm-operand-widths] : [loop] "+r" (loop) ^ arm/pmu.c:196:11: note: use constraint modifier "w" "1: subs %[loop], %[loop], #1\n" ^~~~~~~ %w[loop] arm/pmu.c:200:17: error: value size does not match register size specified by the constraint and modifier [-Werror,-Wasm-operand-widths] : [loop] "+r" (loop) ^ arm/pmu.c:196:20: note: use constraint modifier "w" "1: subs %[loop], %[loop], #1\n" ^~~~~~~ %w[loop] arm/pmu.c:284:35: error: value size does not match register size specified by the constraint and modifier [-Werror,-Wasm-operand-widths] : [addr] "r" (addr), [pmcr] "r" (pmcr), [loop] "r" (loop) ^ arm/pmu.c:274:28: note: use constraint modifier "w" " msr pmcr_el0, %[pmcr]\n" ^~~~~~~ %w[pmcr] arm/pmu.c:284:54: error: value size does not match register size specified by the constraint and modifier [-Werror,-Wasm-operand-widths] : [addr] "r" (addr), [pmcr] "r" (pmcr), [loop] "r" (loop) ^ arm/pmu.c:276:23: note: use constraint modifier "w" " mov x10, %[loop]\n" ^~~~~~~ %w[loop] pmcr should be 64-bit since it is a sysreg, but for loop we can use the "w" modifier. Suggested-by: Drew Jones <drjones@redhat.com> Signed-off-by: Thomas Huth <thuth@redhat.com> --- arm/pmu.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)