| Message ID | 1425287030-18225-1-git-send-email-zhihong.wang@intel.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers |
Return-Path: <dev-bounces@dpdk.org> X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 208975A24; Mon, 2 Mar 2015 10:04:03 +0100 (CET) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id D1CEE595A for <dev@dpdk.org>; Mon, 2 Mar 2015 10:04:00 +0100 (CET) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga103.jf.intel.com with ESMTP; 02 Mar 2015 01:01:38 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.09,674,1418112000"; d="scan'208";a="534739562" Received: from shvmail01.sh.intel.com ([10.239.29.42]) by orsmga003.jf.intel.com with ESMTP; 02 Mar 2015 01:04:04 -0800 Received: from shecgisg004.sh.intel.com (shecgisg004.sh.intel.com [10.239.29.89]) by shvmail01.sh.intel.com with ESMTP id t2293ulf018125; Mon, 2 Mar 2015 17:03:56 +0800 Received: from shecgisg004.sh.intel.com (localhost [127.0.0.1]) by shecgisg004.sh.intel.com (8.13.6/8.13.6/SuSE Linux 0.8) with ESMTP id t2293rsq018371; Mon, 2 Mar 2015 17:03:55 +0800 Received: (from zwang84@localhost) by shecgisg004.sh.intel.com (8.13.6/8.13.6/Submit) id t2293r3a018367; Mon, 2 Mar 2015 17:03:53 +0800 From: zhihong.wang@intel.com To: dev@dpdk.org Date: Mon, 2 Mar 2015 17:03:50 +0800 Message-Id: <1425287030-18225-1-git-send-email-zhihong.wang@intel.com> X-Mailer: git-send-email 1.7.4.1 Subject: [dpdk-dev] [PATCH] A fix to work around strict-aliasing rules breaking X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK <dev.dpdk.org> List-Unsubscribe: <http://dpdk.org/ml/options/dev>, <mailto:dev-request@dpdk.org?subject=unsubscribe> List-Archive: <http://dpdk.org/ml/archives/dev/> List-Post: <mailto:dev@dpdk.org> List-Help: <mailto:dev-request@dpdk.org?subject=help> List-Subscribe: <http://dpdk.org/ml/listinfo/dev>, <mailto:dev-request@dpdk.org?subject=subscribe> Errors-To: dev-bounces@dpdk.org Sender: "dev" <dev-bounces@dpdk.org> |
Commit Message
Zhihong Wang
March 2, 2015, 9:03 a.m. UTC
Fixed strict-aliasing rules breaking errors for some GCC version.
Signed-off-by: Zhihong Wang <zhihong.wang@intel.com>
---
.../common/include/arch/x86/rte_memcpy.h | 44 ++++++++++++----------
1 file changed, 24 insertions(+), 20 deletions(-)
Comments
On Mon, Mar 02, 2015 at 05:03:50PM +0800, zhihong.wang@intel.com wrote: > Fixed strict-aliasing rules breaking errors for some GCC version. > This looks messy. Also, I believe the definition of memcpy should include the "restrict" keyword to indicate that source and dest can't overlap. Might that help fix the issue? /Bruce > Signed-off-by: Zhihong Wang <zhihong.wang@intel.com> > --- > .../common/include/arch/x86/rte_memcpy.h | 44 ++++++++++++---------- > 1 file changed, 24 insertions(+), 20 deletions(-) > > diff --git a/lib/librte_eal/common/include/arch/x86/rte_memcpy.h b/lib/librte_eal/common/include/arch/x86/rte_memcpy.h > index 69a5c6f..f412099 100644 > --- a/lib/librte_eal/common/include/arch/x86/rte_memcpy.h > +++ b/lib/librte_eal/common/include/arch/x86/rte_memcpy.h > @@ -195,6 +195,8 @@ rte_mov256blocks(uint8_t *dst, const uint8_t *src, size_t n) > static inline void * > rte_memcpy(void *dst, const void *src, size_t n) > { > + uintptr_t dstu = (uintptr_t)dst; > + uintptr_t srcu = (uintptr_t)src; > void *ret = dst; > int dstofss; > int bits; > @@ -204,22 +206,22 @@ rte_memcpy(void *dst, const void *src, size_t n) > */ > if (n < 16) { > if (n & 0x01) { > - *(uint8_t *)dst = *(const uint8_t *)src; > - src = (const uint8_t *)src + 1; > - dst = (uint8_t *)dst + 1; > + *(uint8_t *)dstu = *(const uint8_t *)srcu; > + srcu = (uintptr_t)((const uint8_t *)srcu + 1); > + dstu = (uintptr_t)((uint8_t *)dstu + 1); > } > if (n & 0x02) { > - *(uint16_t *)dst = *(const uint16_t *)src; > - src = (const uint16_t *)src + 1; > - dst = (uint16_t *)dst + 1; > + *(uint16_t *)dstu = *(const uint16_t *)srcu; > + srcu = (uintptr_t)((const uint16_t *)srcu + 1); > + dstu = (uintptr_t)((uint16_t *)dstu + 1); > } > if (n & 0x04) { > - *(uint32_t *)dst = *(const uint32_t *)src; > - src = (const uint32_t *)src + 1; > - dst = (uint32_t *)dst + 1; > + *(uint32_t *)dstu = *(const uint32_t *)srcu; > + srcu = (uintptr_t)((const uint32_t *)srcu + 1); > + dstu = (uintptr_t)((uint32_t *)dstu + 1); > } > if (n & 0x08) { > - *(uint64_t *)dst = *(const uint64_t *)src; > + *(uint64_t *)dstu = *(const uint64_t *)srcu; > } > return ret; > } > @@ -458,6 +460,8 @@ static inline void * > rte_memcpy(void *dst, const void *src, size_t n) > { > __m128i xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, xmm8; > + uintptr_t dstu = (uintptr_t)dst; > + uintptr_t srcu = (uintptr_t)src; > void *ret = dst; > int dstofss; > int srcofs; > @@ -467,22 +471,22 @@ rte_memcpy(void *dst, const void *src, size_t n) > */ > if (n < 16) { > if (n & 0x01) { > - *(uint8_t *)dst = *(const uint8_t *)src; > - src = (const uint8_t *)src + 1; > - dst = (uint8_t *)dst + 1; > + *(uint8_t *)dstu = *(const uint8_t *)srcu; > + srcu = (uintptr_t)((const uint8_t *)srcu + 1); > + dstu = (uintptr_t)((uint8_t *)dstu + 1); > } > if (n & 0x02) { > - *(uint16_t *)dst = *(const uint16_t *)src; > - src = (const uint16_t *)src + 1; > - dst = (uint16_t *)dst + 1; > + *(uint16_t *)dstu = *(const uint16_t *)srcu; > + srcu = (uintptr_t)((const uint16_t *)srcu + 1); > + dstu = (uintptr_t)((uint16_t *)dstu + 1); > } > if (n & 0x04) { > - *(uint32_t *)dst = *(const uint32_t *)src; > - src = (const uint32_t *)src + 1; > - dst = (uint32_t *)dst + 1; > + *(uint32_t *)dstu = *(const uint32_t *)srcu; > + srcu = (uintptr_t)((const uint32_t *)srcu + 1); > + dstu = (uintptr_t)((uint32_t *)dstu + 1); > } > if (n & 0x08) { > - *(uint64_t *)dst = *(const uint64_t *)src; > + *(uint64_t *)dstu = *(const uint64_t *)srcu; > } > return ret; > } > -- > 1.9.3 >
On 2015-03-02 11:32, Bruce Richardson wrote: > On Mon, Mar 02, 2015 at 05:03:50PM +0800, zhihong.wang@intel.com wrote: >> Fixed strict-aliasing rules breaking errors for some GCC version. >> > > This looks messy. Also, I believe the definition of memcpy should include > the "restrict" keyword to indicate that source and dest can't overlap. Might > that help fix the issue? > Is this error related with overlapping or casting 'void *' to 'uintXX_t *' that make compiler report aliasing rule breaking? > >> Signed-off-by: Zhihong Wang <zhihong.wang@intel.com> >> --- >> .../common/include/arch/x86/rte_memcpy.h | 44 ++++++++++++---------- >> 1 file changed, 24 insertions(+), 20 deletions(-) >> >> diff --git a/lib/librte_eal/common/include/arch/x86/rte_memcpy.h b/lib/librte_eal/common/include/arch/x86/rte_memcpy.h >> index 69a5c6f..f412099 100644 >> --- a/lib/librte_eal/common/include/arch/x86/rte_memcpy.h >> +++ b/lib/librte_eal/common/include/arch/x86/rte_memcpy.h >> @@ -195,6 +195,8 @@ rte_mov256blocks(uint8_t *dst, const uint8_t *src, size_t n) >> static inline void * >> rte_memcpy(void *dst, const void *src, size_t n) >> { >> + uintptr_t dstu = (uintptr_t)dst; >> + uintptr_t srcu = (uintptr_t)src; If so maybe using union here would be good solution or 'char *'.
> -----Original Message----- > From: Richardson, Bruce > Sent: Monday, March 02, 2015 6:32 PM > To: Wang, Zhihong > Cc: dev@dpdk.org > Subject: Re: [dpdk-dev] [PATCH] A fix to work around strict-aliasing rules > breaking > > On Mon, Mar 02, 2015 at 05:03:50PM +0800, zhihong.wang@intel.com wrote: > > Fixed strict-aliasing rules breaking errors for some GCC version. > > > > This looks messy. Also, I believe the definition of memcpy should include the > "restrict" keyword to indicate that source and dest can't overlap. Might that > help fix the issue? It's actually caused by casting void * to multiple other pointer types. > > /Bruce > > > Signed-off-by: Zhihong Wang <zhihong.wang@intel.com> > > --- > > .../common/include/arch/x86/rte_memcpy.h | 44 ++++++++++++---- > ------ > > 1 file changed, 24 insertions(+), 20 deletions(-) > > > > diff --git a/lib/librte_eal/common/include/arch/x86/rte_memcpy.h > > b/lib/librte_eal/common/include/arch/x86/rte_memcpy.h > > index 69a5c6f..f412099 100644 > > --- a/lib/librte_eal/common/include/arch/x86/rte_memcpy.h > > +++ b/lib/librte_eal/common/include/arch/x86/rte_memcpy.h > > @@ -195,6 +195,8 @@ rte_mov256blocks(uint8_t *dst, const uint8_t *src, > > size_t n) static inline void * rte_memcpy(void *dst, const void > > *src, size_t n) { > > + uintptr_t dstu = (uintptr_t)dst; > > + uintptr_t srcu = (uintptr_t)src; > > void *ret = dst; > > int dstofss; > > int bits; > > @@ -204,22 +206,22 @@ rte_memcpy(void *dst, const void *src, size_t n) > > */ > > if (n < 16) { > > if (n & 0x01) { > > - *(uint8_t *)dst = *(const uint8_t *)src; > > - src = (const uint8_t *)src + 1; > > - dst = (uint8_t *)dst + 1; > > + *(uint8_t *)dstu = *(const uint8_t *)srcu; > > + srcu = (uintptr_t)((const uint8_t *)srcu + 1); > > + dstu = (uintptr_t)((uint8_t *)dstu + 1); > > } > > if (n & 0x02) { > > - *(uint16_t *)dst = *(const uint16_t *)src; > > - src = (const uint16_t *)src + 1; > > - dst = (uint16_t *)dst + 1; > > + *(uint16_t *)dstu = *(const uint16_t *)srcu; > > + srcu = (uintptr_t)((const uint16_t *)srcu + 1); > > + dstu = (uintptr_t)((uint16_t *)dstu + 1); > > } > > if (n & 0x04) { > > - *(uint32_t *)dst = *(const uint32_t *)src; > > - src = (const uint32_t *)src + 1; > > - dst = (uint32_t *)dst + 1; > > + *(uint32_t *)dstu = *(const uint32_t *)srcu; > > + srcu = (uintptr_t)((const uint32_t *)srcu + 1); > > + dstu = (uintptr_t)((uint32_t *)dstu + 1); > > } > > if (n & 0x08) { > > - *(uint64_t *)dst = *(const uint64_t *)src; > > + *(uint64_t *)dstu = *(const uint64_t *)srcu; > > } > > return ret; > > } > > @@ -458,6 +460,8 @@ static inline void * rte_memcpy(void *dst, const > > void *src, size_t n) { > > __m128i xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, > xmm8; > > + uintptr_t dstu = (uintptr_t)dst; > > + uintptr_t srcu = (uintptr_t)src; > > void *ret = dst; > > int dstofss; > > int srcofs; > > @@ -467,22 +471,22 @@ rte_memcpy(void *dst, const void *src, size_t n) > > */ > > if (n < 16) { > > if (n & 0x01) { > > - *(uint8_t *)dst = *(const uint8_t *)src; > > - src = (const uint8_t *)src + 1; > > - dst = (uint8_t *)dst + 1; > > + *(uint8_t *)dstu = *(const uint8_t *)srcu; > > + srcu = (uintptr_t)((const uint8_t *)srcu + 1); > > + dstu = (uintptr_t)((uint8_t *)dstu + 1); > > } > > if (n & 0x02) { > > - *(uint16_t *)dst = *(const uint16_t *)src; > > - src = (const uint16_t *)src + 1; > > - dst = (uint16_t *)dst + 1; > > + *(uint16_t *)dstu = *(const uint16_t *)srcu; > > + srcu = (uintptr_t)((const uint16_t *)srcu + 1); > > + dstu = (uintptr_t)((uint16_t *)dstu + 1); > > } > > if (n & 0x04) { > > - *(uint32_t *)dst = *(const uint32_t *)src; > > - src = (const uint32_t *)src + 1; > > - dst = (uint32_t *)dst + 1; > > + *(uint32_t *)dstu = *(const uint32_t *)srcu; > > + srcu = (uintptr_t)((const uint32_t *)srcu + 1); > > + dstu = (uintptr_t)((uint32_t *)dstu + 1); > > } > > if (n & 0x08) { > > - *(uint64_t *)dst = *(const uint64_t *)src; > > + *(uint64_t *)dstu = *(const uint64_t *)srcu; > > } > > return ret; > > } > > -- > > 1.9.3 > >
> -----Original Message----- > From: Wodkowski, PawelX > Sent: Monday, March 02, 2015 8:32 PM > To: Richardson, Bruce; Wang, Zhihong > Cc: dev@dpdk.org > Subject: Re: [dpdk-dev] [PATCH] A fix to work around strict-aliasing rules > breaking > > On 2015-03-02 11:32, Bruce Richardson wrote: > > On Mon, Mar 02, 2015 at 05:03:50PM +0800, zhihong.wang@intel.com > wrote: > >> Fixed strict-aliasing rules breaking errors for some GCC version. > >> > > > > This looks messy. Also, I believe the definition of memcpy should > > include the "restrict" keyword to indicate that source and dest can't > > overlap. Might that help fix the issue? > > > > Is this error related with overlapping or casting 'void *' to 'uintXX_t *' that > make compiler report aliasing rule breaking? > > > > >> Signed-off-by: Zhihong Wang <zhihong.wang@intel.com> > >> --- > >> .../common/include/arch/x86/rte_memcpy.h | 44 ++++++++++++-- > -------- > >> 1 file changed, 24 insertions(+), 20 deletions(-) > >> > >> diff --git a/lib/librte_eal/common/include/arch/x86/rte_memcpy.h > >> b/lib/librte_eal/common/include/arch/x86/rte_memcpy.h > >> index 69a5c6f..f412099 100644 > >> --- a/lib/librte_eal/common/include/arch/x86/rte_memcpy.h > >> +++ b/lib/librte_eal/common/include/arch/x86/rte_memcpy.h > >> @@ -195,6 +195,8 @@ rte_mov256blocks(uint8_t *dst, const uint8_t *src, > size_t n) > >> static inline void * > >> rte_memcpy(void *dst, const void *src, size_t n) > >> { > >> + uintptr_t dstu = (uintptr_t)dst; > >> + uintptr_t srcu = (uintptr_t)src; > > If so maybe using union here would be good solution or 'char *'. Pawel, Thanks for the suggestion! But I don't think union can work around this --- already tried in CentOS release 6.5. Anyway this is for compiler ethics only, the assembly code generated will be the same no matter what kind of method is used. Zhihong (John) > > -- > Pawel
On Wed, Mar 04, 2015 at 02:07:20AM +0000, Wang, Zhihong wrote: > > > > -----Original Message----- > > From: Richardson, Bruce > > Sent: Monday, March 02, 2015 6:32 PM > > To: Wang, Zhihong > > Cc: dev@dpdk.org > > Subject: Re: [dpdk-dev] [PATCH] A fix to work around strict-aliasing rules > > breaking > > > > On Mon, Mar 02, 2015 at 05:03:50PM +0800, zhihong.wang@intel.com wrote: > > > Fixed strict-aliasing rules breaking errors for some GCC version. > > > > > > > This looks messy. Also, I believe the definition of memcpy should include the > > "restrict" keyword to indicate that source and dest can't overlap. Might that > > help fix the issue? > > It's actually caused by casting void * to multiple other pointer types. > Yes, because two pointers of different types are not allowed to point to the same memory. If the two pointers of different types are belonging to the two different variables, the "restrict" keyword may indeed help, but that's probably not the case here. /Bruce > > > > /Bruce > > > > > Signed-off-by: Zhihong Wang <zhihong.wang@intel.com> > > > --- > > > .../common/include/arch/x86/rte_memcpy.h | 44 ++++++++++++---- > > ------ > > > 1 file changed, 24 insertions(+), 20 deletions(-) > > > > > > diff --git a/lib/librte_eal/common/include/arch/x86/rte_memcpy.h > > > b/lib/librte_eal/common/include/arch/x86/rte_memcpy.h > > > index 69a5c6f..f412099 100644 > > > --- a/lib/librte_eal/common/include/arch/x86/rte_memcpy.h > > > +++ b/lib/librte_eal/common/include/arch/x86/rte_memcpy.h > > > @@ -195,6 +195,8 @@ rte_mov256blocks(uint8_t *dst, const uint8_t *src, > > > size_t n) static inline void * rte_memcpy(void *dst, const void > > > *src, size_t n) { > > > + uintptr_t dstu = (uintptr_t)dst; > > > + uintptr_t srcu = (uintptr_t)src; > > > void *ret = dst; > > > int dstofss; > > > int bits; > > > @@ -204,22 +206,22 @@ rte_memcpy(void *dst, const void *src, size_t n) > > > */ > > > if (n < 16) { > > > if (n & 0x01) { > > > - *(uint8_t *)dst = *(const uint8_t *)src; > > > - src = (const uint8_t *)src + 1; > > > - dst = (uint8_t *)dst + 1; > > > + *(uint8_t *)dstu = *(const uint8_t *)srcu; > > > + srcu = (uintptr_t)((const uint8_t *)srcu + 1); > > > + dstu = (uintptr_t)((uint8_t *)dstu + 1); > > > } > > > if (n & 0x02) { > > > - *(uint16_t *)dst = *(const uint16_t *)src; > > > - src = (const uint16_t *)src + 1; > > > - dst = (uint16_t *)dst + 1; > > > + *(uint16_t *)dstu = *(const uint16_t *)srcu; > > > + srcu = (uintptr_t)((const uint16_t *)srcu + 1); > > > + dstu = (uintptr_t)((uint16_t *)dstu + 1); > > > } > > > if (n & 0x04) { > > > - *(uint32_t *)dst = *(const uint32_t *)src; > > > - src = (const uint32_t *)src + 1; > > > - dst = (uint32_t *)dst + 1; > > > + *(uint32_t *)dstu = *(const uint32_t *)srcu; > > > + srcu = (uintptr_t)((const uint32_t *)srcu + 1); > > > + dstu = (uintptr_t)((uint32_t *)dstu + 1); > > > } > > > if (n & 0x08) { > > > - *(uint64_t *)dst = *(const uint64_t *)src; > > > + *(uint64_t *)dstu = *(const uint64_t *)srcu; > > > } > > > return ret; > > > } > > > @@ -458,6 +460,8 @@ static inline void * rte_memcpy(void *dst, const > > > void *src, size_t n) { > > > __m128i xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, > > xmm8; > > > + uintptr_t dstu = (uintptr_t)dst; > > > + uintptr_t srcu = (uintptr_t)src; > > > void *ret = dst; > > > int dstofss; > > > int srcofs; > > > @@ -467,22 +471,22 @@ rte_memcpy(void *dst, const void *src, size_t n) > > > */ > > > if (n < 16) { > > > if (n & 0x01) { > > > - *(uint8_t *)dst = *(const uint8_t *)src; > > > - src = (const uint8_t *)src + 1; > > > - dst = (uint8_t *)dst + 1; > > > + *(uint8_t *)dstu = *(const uint8_t *)srcu; > > > + srcu = (uintptr_t)((const uint8_t *)srcu + 1); > > > + dstu = (uintptr_t)((uint8_t *)dstu + 1); > > > } > > > if (n & 0x02) { > > > - *(uint16_t *)dst = *(const uint16_t *)src; > > > - src = (const uint16_t *)src + 1; > > > - dst = (uint16_t *)dst + 1; > > > + *(uint16_t *)dstu = *(const uint16_t *)srcu; > > > + srcu = (uintptr_t)((const uint16_t *)srcu + 1); > > > + dstu = (uintptr_t)((uint16_t *)dstu + 1); > > > } > > > if (n & 0x04) { > > > - *(uint32_t *)dst = *(const uint32_t *)src; > > > - src = (const uint32_t *)src + 1; > > > - dst = (uint32_t *)dst + 1; > > > + *(uint32_t *)dstu = *(const uint32_t *)srcu; > > > + srcu = (uintptr_t)((const uint32_t *)srcu + 1); > > > + dstu = (uintptr_t)((uint32_t *)dstu + 1); > > > } > > > if (n & 0x08) { > > > - *(uint64_t *)dst = *(const uint64_t *)src; > > > + *(uint64_t *)dstu = *(const uint64_t *)srcu; > > > } > > > return ret; > > > } > > > -- > > > 1.9.3 > > >
2015-03-02 17:03, zhihong.wang@intel.com: > Fixed strict-aliasing rules breaking errors for some GCC version. > > Signed-off-by: Zhihong Wang <zhihong.wang@intel.com> > --- > .../common/include/arch/x86/rte_memcpy.h | 44 ++++++++++++---------- > 1 file changed, 24 insertions(+), 20 deletions(-) > > diff --git a/lib/librte_eal/common/include/arch/x86/rte_memcpy.h b/lib/librte_eal/common/include/arch/x86/rte_memcpy.h > index 69a5c6f..f412099 100644 > --- a/lib/librte_eal/common/include/arch/x86/rte_memcpy.h > +++ b/lib/librte_eal/common/include/arch/x86/rte_memcpy.h > @@ -195,6 +195,8 @@ rte_mov256blocks(uint8_t *dst, const uint8_t *src, size_t n) > static inline void * > rte_memcpy(void *dst, const void *src, size_t n) > { > + uintptr_t dstu = (uintptr_t)dst; > + uintptr_t srcu = (uintptr_t)src; > void *ret = dst; > int dstofss; > int bits; > @@ -204,22 +206,22 @@ rte_memcpy(void *dst, const void *src, size_t n) > */ > if (n < 16) { > if (n & 0x01) { > - *(uint8_t *)dst = *(const uint8_t *)src; > - src = (const uint8_t *)src + 1; > - dst = (uint8_t *)dst + 1; > + *(uint8_t *)dstu = *(const uint8_t *)srcu; > + srcu = (uintptr_t)((const uint8_t *)srcu + 1); > + dstu = (uintptr_t)((uint8_t *)dstu + 1); [...] Is there another solution? Are we going to acknowledge this fix?
Hi, On 3/2/2015 5:03 PM, zhihong.wang@intel.com wrote: > Fixed strict-aliasing rules breaking errors for some GCC version. > > Signed-off-by: Zhihong Wang <zhihong.wang@intel.com> > --- > .../common/include/arch/x86/rte_memcpy.h | 44 ++++++++++++---------- > 1 file changed, 24 insertions(+), 20 deletions(-) > > diff --git a/lib/librte_eal/common/include/arch/x86/rte_memcpy.h b/lib/librte_eal/common/include/arch/x86/rte_memcpy.h > index 69a5c6f..f412099 100644 > --- a/lib/librte_eal/common/include/arch/x86/rte_memcpy.h > +++ b/lib/librte_eal/common/include/arch/x86/rte_memcpy.h > @@ -195,6 +195,8 @@ rte_mov256blocks(uint8_t *dst, const uint8_t *src, size_t n) > static inline void * > rte_memcpy(void *dst, const void *src, size_t n) > { > + uintptr_t dstu = (uintptr_t)dst; > + uintptr_t srcu = (uintptr_t)src; > void *ret = dst; > int dstofss; > int bits; > @@ -204,22 +206,22 @@ rte_memcpy(void *dst, const void *src, size_t n) > */ > if (n < 16) { > if (n & 0x01) { > - *(uint8_t *)dst = *(const uint8_t *)src; > - src = (const uint8_t *)src + 1; > - dst = (uint8_t *)dst + 1; > + *(uint8_t *)dstu = *(const uint8_t *)srcu; > + srcu = (uintptr_t)((const uint8_t *)srcu + 1); > + dstu = (uintptr_t)((uint8_t *)dstu + 1); > } > if (n & 0x02) { > - *(uint16_t *)dst = *(const uint16_t *)src; > - src = (const uint16_t *)src + 1; > - dst = (uint16_t *)dst + 1; > + *(uint16_t *)dstu = *(const uint16_t *)srcu; > + srcu = (uintptr_t)((const uint16_t *)srcu + 1); > + dstu = (uintptr_t)((uint16_t *)dstu + 1); > } > if (n & 0x04) { > - *(uint32_t *)dst = *(const uint32_t *)src; > - src = (const uint32_t *)src + 1; > - dst = (uint32_t *)dst + 1; > + *(uint32_t *)dstu = *(const uint32_t *)srcu; > + srcu = (uintptr_t)((const uint32_t *)srcu + 1); > + dstu = (uintptr_t)((uint32_t *)dstu + 1); > } > if (n & 0x08) { > - *(uint64_t *)dst = *(const uint64_t *)src; > + *(uint64_t *)dstu = *(const uint64_t *)srcu; > } > return ret; > } > @@ -458,6 +460,8 @@ static inline void * > rte_memcpy(void *dst, const void *src, size_t n) > { > __m128i xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, xmm8; > + uintptr_t dstu = (uintptr_t)dst; > + uintptr_t srcu = (uintptr_t)src; > void *ret = dst; > int dstofss; > int srcofs; > @@ -467,22 +471,22 @@ rte_memcpy(void *dst, const void *src, size_t n) > */ > if (n < 16) { > if (n & 0x01) { > - *(uint8_t *)dst = *(const uint8_t *)src; > - src = (const uint8_t *)src + 1; > - dst = (uint8_t *)dst + 1; > + *(uint8_t *)dstu = *(const uint8_t *)srcu; > + srcu = (uintptr_t)((const uint8_t *)srcu + 1); > + dstu = (uintptr_t)((uint8_t *)dstu + 1); > } > if (n & 0x02) { > - *(uint16_t *)dst = *(const uint16_t *)src; > - src = (const uint16_t *)src + 1; > - dst = (uint16_t *)dst + 1; > + *(uint16_t *)dstu = *(const uint16_t *)srcu; > + srcu = (uintptr_t)((const uint16_t *)srcu + 1); > + dstu = (uintptr_t)((uint16_t *)dstu + 1); > } > if (n & 0x04) { > - *(uint32_t *)dst = *(const uint32_t *)src; > - src = (const uint32_t *)src + 1; > - dst = (uint32_t *)dst + 1; > + *(uint32_t *)dstu = *(const uint32_t *)srcu; > + srcu = (uintptr_t)((const uint32_t *)srcu + 1); > + dstu = (uintptr_t)((uint32_t *)dstu + 1); > } > if (n & 0x08) { > - *(uint64_t *)dst = *(const uint64_t *)src; > + *(uint64_t *)dstu = *(const uint64_t *)srcu; > } > return ret; > } Acked-by:Cunming Liang <cunming.liang@intel.com <mailto:cunming.liang@intel.com>>
On 3/2/2015 5:04 PM, zhihong.wang@intel.com wrote: > Fixed strict-aliasing rules breaking errors for some GCC version. > > Signed-off-by: Zhihong Wang <zhihong.wang@intel.com> > --- As this should be a quick fix, this workaround is workable. Acked-by: Michael Qiu <michael.qiu@intel.com> > .../common/include/arch/x86/rte_memcpy.h | 44 ++++++++++++---------- > 1 file changed, 24 insertions(+), 20 deletions(-) > > diff --git a/lib/librte_eal/common/include/arch/x86/rte_memcpy.h b/lib/librte_eal/common/include/arch/x86/rte_memcpy.h > index 69a5c6f..f412099 100644 > --- a/lib/librte_eal/common/include/arch/x86/rte_memcpy.h > +++ b/lib/librte_eal/common/include/arch/x86/rte_memcpy.h > @@ -195,6 +195,8 @@ rte_mov256blocks(uint8_t *dst, const uint8_t *src, size_t n) > static inline void * > rte_memcpy(void *dst, const void *src, size_t n) > { > + uintptr_t dstu = (uintptr_t)dst; > + uintptr_t srcu = (uintptr_t)src; > void *ret = dst; > int dstofss; > int bits; > @@ -204,22 +206,22 @@ rte_memcpy(void *dst, const void *src, size_t n) > */ > if (n < 16) { > if (n & 0x01) { > - *(uint8_t *)dst = *(const uint8_t *)src; > - src = (const uint8_t *)src + 1; > - dst = (uint8_t *)dst + 1; > + *(uint8_t *)dstu = *(const uint8_t *)srcu; > + srcu = (uintptr_t)((const uint8_t *)srcu + 1); > + dstu = (uintptr_t)((uint8_t *)dstu + 1); > } > if (n & 0x02) { > - *(uint16_t *)dst = *(const uint16_t *)src; > - src = (const uint16_t *)src + 1; > - dst = (uint16_t *)dst + 1; > + *(uint16_t *)dstu = *(const uint16_t *)srcu; > + srcu = (uintptr_t)((const uint16_t *)srcu + 1); > + dstu = (uintptr_t)((uint16_t *)dstu + 1); > } > if (n & 0x04) { > - *(uint32_t *)dst = *(const uint32_t *)src; > - src = (const uint32_t *)src + 1; > - dst = (uint32_t *)dst + 1; > + *(uint32_t *)dstu = *(const uint32_t *)srcu; > + srcu = (uintptr_t)((const uint32_t *)srcu + 1); > + dstu = (uintptr_t)((uint32_t *)dstu + 1); > } > if (n & 0x08) { > - *(uint64_t *)dst = *(const uint64_t *)src; > + *(uint64_t *)dstu = *(const uint64_t *)srcu; > } > return ret; > } > @@ -458,6 +460,8 @@ static inline void * > rte_memcpy(void *dst, const void *src, size_t n) > { > __m128i xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, xmm8; > + uintptr_t dstu = (uintptr_t)dst; > + uintptr_t srcu = (uintptr_t)src; > void *ret = dst; > int dstofss; > int srcofs; > @@ -467,22 +471,22 @@ rte_memcpy(void *dst, const void *src, size_t n) > */ > if (n < 16) { > if (n & 0x01) { > - *(uint8_t *)dst = *(const uint8_t *)src; > - src = (const uint8_t *)src + 1; > - dst = (uint8_t *)dst + 1; > + *(uint8_t *)dstu = *(const uint8_t *)srcu; > + srcu = (uintptr_t)((const uint8_t *)srcu + 1); > + dstu = (uintptr_t)((uint8_t *)dstu + 1); > } > if (n & 0x02) { > - *(uint16_t *)dst = *(const uint16_t *)src; > - src = (const uint16_t *)src + 1; > - dst = (uint16_t *)dst + 1; > + *(uint16_t *)dstu = *(const uint16_t *)srcu; > + srcu = (uintptr_t)((const uint16_t *)srcu + 1); > + dstu = (uintptr_t)((uint16_t *)dstu + 1); > } > if (n & 0x04) { > - *(uint32_t *)dst = *(const uint32_t *)src; > - src = (const uint32_t *)src + 1; > - dst = (uint32_t *)dst + 1; > + *(uint32_t *)dstu = *(const uint32_t *)srcu; > + srcu = (uintptr_t)((const uint32_t *)srcu + 1); > + dstu = (uintptr_t)((uint32_t *)dstu + 1); > } > if (n & 0x08) { > - *(uint64_t *)dst = *(const uint64_t *)src; > + *(uint64_t *)dstu = *(const uint64_t *)srcu; > } > return ret; > }
> > Fixed strict-aliasing rules breaking errors for some GCC version. > > > > Signed-off-by: Zhihong Wang <zhihong.wang@intel.com> > > Acked-by:Cunming Liang <cunming.liang@intel.com > <mailto:cunming.liang@intel.com>> Applied, thanks
diff --git a/lib/librte_eal/common/include/arch/x86/rte_memcpy.h b/lib/librte_eal/common/include/arch/x86/rte_memcpy.h index 69a5c6f..f412099 100644 --- a/lib/librte_eal/common/include/arch/x86/rte_memcpy.h +++ b/lib/librte_eal/common/include/arch/x86/rte_memcpy.h @@ -195,6 +195,8 @@ rte_mov256blocks(uint8_t *dst, const uint8_t *src, size_t n) static inline void * rte_memcpy(void *dst, const void *src, size_t n) { + uintptr_t dstu = (uintptr_t)dst; + uintptr_t srcu = (uintptr_t)src; void *ret = dst; int dstofss; int bits; @@ -204,22 +206,22 @@ rte_memcpy(void *dst, const void *src, size_t n) */ if (n < 16) { if (n & 0x01) { - *(uint8_t *)dst = *(const uint8_t *)src; - src = (const uint8_t *)src + 1; - dst = (uint8_t *)dst + 1; + *(uint8_t *)dstu = *(const uint8_t *)srcu; + srcu = (uintptr_t)((const uint8_t *)srcu + 1); + dstu = (uintptr_t)((uint8_t *)dstu + 1); } if (n & 0x02) { - *(uint16_t *)dst = *(const uint16_t *)src; - src = (const uint16_t *)src + 1; - dst = (uint16_t *)dst + 1; + *(uint16_t *)dstu = *(const uint16_t *)srcu; + srcu = (uintptr_t)((const uint16_t *)srcu + 1); + dstu = (uintptr_t)((uint16_t *)dstu + 1); } if (n & 0x04) { - *(uint32_t *)dst = *(const uint32_t *)src; - src = (const uint32_t *)src + 1; - dst = (uint32_t *)dst + 1; + *(uint32_t *)dstu = *(const uint32_t *)srcu; + srcu = (uintptr_t)((const uint32_t *)srcu + 1); + dstu = (uintptr_t)((uint32_t *)dstu + 1); } if (n & 0x08) { - *(uint64_t *)dst = *(const uint64_t *)src; + *(uint64_t *)dstu = *(const uint64_t *)srcu; } return ret; } @@ -458,6 +460,8 @@ static inline void * rte_memcpy(void *dst, const void *src, size_t n) { __m128i xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, xmm8; + uintptr_t dstu = (uintptr_t)dst; + uintptr_t srcu = (uintptr_t)src; void *ret = dst; int dstofss; int srcofs; @@ -467,22 +471,22 @@ rte_memcpy(void *dst, const void *src, size_t n) */ if (n < 16) { if (n & 0x01) { - *(uint8_t *)dst = *(const uint8_t *)src; - src = (const uint8_t *)src + 1; - dst = (uint8_t *)dst + 1; + *(uint8_t *)dstu = *(const uint8_t *)srcu; + srcu = (uintptr_t)((const uint8_t *)srcu + 1); + dstu = (uintptr_t)((uint8_t *)dstu + 1); } if (n & 0x02) { - *(uint16_t *)dst = *(const uint16_t *)src; - src = (const uint16_t *)src + 1; - dst = (uint16_t *)dst + 1; + *(uint16_t *)dstu = *(const uint16_t *)srcu; + srcu = (uintptr_t)((const uint16_t *)srcu + 1); + dstu = (uintptr_t)((uint16_t *)dstu + 1); } if (n & 0x04) { - *(uint32_t *)dst = *(const uint32_t *)src; - src = (const uint32_t *)src + 1; - dst = (uint32_t *)dst + 1; + *(uint32_t *)dstu = *(const uint32_t *)srcu; + srcu = (uintptr_t)((const uint32_t *)srcu + 1); + dstu = (uintptr_t)((uint32_t *)dstu + 1); } if (n & 0x08) { - *(uint64_t *)dst = *(const uint64_t *)src; + *(uint64_t *)dstu = *(const uint64_t *)srcu; } return ret; }