diff options
author | Tyler Retzlaff <roretzla@linux.microsoft.com> | 2024-03-20 14:18:29 -0700 |
---|---|---|
committer | David Marchand <david.marchand@redhat.com> | 2024-06-14 16:38:25 +0200 |
commit | a67473caf8c69fa23dbb21bdbb99c89a59331699 (patch) | |
tree | 71345f917072bafb670c19770fd77219cca0db20 | |
parent | 96598ed61520b0ee17506f33a5f3895a7b502bee (diff) |
eal/x86: fix prefetch with C++ for MSVC
_mm_prefetch does not take a volatile qualified pointer, cast it away.
Additionally the pointer type should be char * not void * so adjust the
cast to match.
_mm_cldemote does not take a volatile qualified pointer, cast it away.
Fixes: 28a5e0b9c7f0 ("eal/x86: implement prefetch for MSVC")
Signed-off-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
-rw-r--r-- | lib/eal/x86/include/rte_prefetch.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/eal/x86/include/rte_prefetch.h b/lib/eal/x86/include/rte_prefetch.h index 715c61b545..8a9377714f 100644 --- a/lib/eal/x86/include/rte_prefetch.h +++ b/lib/eal/x86/include/rte_prefetch.h @@ -20,7 +20,7 @@ extern "C" { static inline void rte_prefetch0(const volatile void *p) { #ifdef RTE_TOOLCHAIN_MSVC - _mm_prefetch((const void *)p, _MM_HINT_T0); + _mm_prefetch((const char *)(uintptr_t)p, _MM_HINT_T0); #else asm volatile ("prefetcht0 %[p]" : : [p] "m" (*(const volatile char *)p)); #endif @@ -29,7 +29,7 @@ static inline void rte_prefetch0(const volatile void *p) static inline void rte_prefetch1(const volatile void *p) { #ifdef RTE_TOOLCHAIN_MSVC - _mm_prefetch((const void *)p, _MM_HINT_T1); + _mm_prefetch((const char *)(uintptr_t)p, _MM_HINT_T1); #else asm volatile ("prefetcht1 %[p]" : : [p] "m" (*(const volatile char *)p)); #endif @@ -38,7 +38,7 @@ static inline void rte_prefetch1(const volatile void *p) static inline void rte_prefetch2(const volatile void *p) { #ifdef RTE_TOOLCHAIN_MSVC - _mm_prefetch((const void *)p, _MM_HINT_T2); + _mm_prefetch((const char *)(uintptr_t)p, _MM_HINT_T2); #else asm volatile ("prefetcht2 %[p]" : : [p] "m" (*(const volatile char *)p)); #endif @@ -47,7 +47,7 @@ static inline void rte_prefetch2(const volatile void *p) static inline void rte_prefetch_non_temporal(const volatile void *p) { #ifdef RTE_TOOLCHAIN_MSVC - _mm_prefetch((const void *)p, _MM_HINT_NTA); + _mm_prefetch((const char *)(uintptr_t)p, _MM_HINT_NTA); #else asm volatile ("prefetchnta %[p]" : : [p] "m" (*(const volatile char *)p)); #endif @@ -58,7 +58,7 @@ static inline void rte_cldemote(const volatile void *p) { #ifdef RTE_TOOLCHAIN_MSVC - _mm_cldemote(p); + _mm_cldemote((const void *)(uintptr_t)p); #else /* * We use raw byte codes for now as only the newest compiler |