gitlab.arm.com will be in the maintainance mode on Wednesday June 29th 01:00 - 10:00 (UTC+1). Repositories is read only during the maintainance.

Commit 9e186511 authored by Thomas Huth's avatar Thomas Huth Committed by Paolo Bonzini
Browse files

arm/pmu: Fix inline assembly for Clang



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: Andrew Jones's avatarAndrew Jones <drjones@redhat.com>
Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
Message-Id: <20201001072234.143703-6-thuth@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Andrew Jones's avatarAndrew Jones <drjones@redhat.com>
Tested-by: Andrew Jones's avatarAndrew Jones <drjones@redhat.com>
parent 132f6f18
......@@ -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");
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment