View difference between Paste ID: Fthn7yfR and Gve3VHuZ
SHOW: | | - or go back to the newest paste.
1
# Clone Vanilla DPDK and use v17.11
2
susetest:/tmp # git clone http://dpdk.org/git/dpdk
3
Cloning into 'dpdk'...
4
remote: Counting objects: 111982, done.
5
remote: Compressing objects: 100% (24184/24184), done.
6
remote: Total 111982 (delta 91667), reused 106943 (delta 87349)
7
Receiving objects: 100% (111982/111982), 37.76 MiB | 3.13 MiB/s, done.
8
Resolving deltas: 100% (91667/91667), done.
9
10
susetest:/tmp # cd dpdk/
11
susetest:/tmp/dpdk # git checkout -b 17.11 v17.11
12
Switched to a new branch '17.11'
13
14
15
16
# Clone TREX and use v2.35 
17
susetest:/tmp # git clone https://github.com/cisco-system-traffic-generator/trex-core.git
18
Cloning into 'trex-core'...
19
remote: Counting objects: 36643, done.
20
remote: Compressing objects: 100% (101/101), done.
21
remote: Total 36643 (delta 86), reused 123 (delta 72), pack-reused 36468
22
Receiving objects: 100% (36643/36643), 141.49 MiB | 1.73 MiB/s, done.
23
Resolving deltas: 100% (26312/26312), done.
24
Checking out files: 100% (4049/4049), done.
25
26
susetest:/tmp # cd trex-core/
27
susetest:/tmp/trex-core # git checkout -b 2.35 v2.35
28
Switched to a new branch '2.35'
29
30
31
# Let's do a DIFF of the problematic file. 
32
susetest:/tmp # find ./ -name rte_memcpy.h
33
./dpdk/lib/librte_eal/common/include/arch/arm/rte_memcpy.h
34
./dpdk/lib/librte_eal/common/include/arch/ppc_64/rte_memcpy.h
35
./dpdk/lib/librte_eal/common/include/arch/x86/rte_memcpy.h
36
./dpdk/lib/librte_eal/common/include/generic/rte_memcpy.h
37
./trex-core/src/dpdk/lib/librte_eal/common/include/arch/arm/rte_memcpy.h
38
./trex-core/src/dpdk/lib/librte_eal/common/include/arch/ppc_64/rte_memcpy.h
39
./trex-core/src/dpdk/lib/librte_eal/common/include/arch/x86/rte_memcpy.h
40
./trex-core/src/dpdk/lib/librte_eal/common/include/generic/rte_memcpy.h
41
42
43
susetest:/tmp # diff ./dpdk/lib/librte_eal/common/include/arch/x86/rte_memcpy.h ./trex-core/src/dpdk/lib/librte_eal/common/include/arch/x86/rte_memcpy.h
44-
susetest:/tmp # diff ./dpdk/lib/librte_eal/common/include/generic/rte_memcpy.h ./trex-core/src/dpdk/lib/librte_eal/common/include/generic/rte_memcpy.h
44+
45
# The files are the same even in size. The only files that differ are the .c
46-
# The files are the same even in size.
46+
diff ./dpdk/lib/librte_eal/common/arch/x86/rte_memcpy.c ./trex-core/src/dpdk/lib/librte_eal/common/arch/x86/rte_memcpy.c
47
56c56
48
< 	rte_memcpy_ptr = rte_memcpy_sse;
49
---
50
> 	rte_memcpy_ptr = rte_memcpy;