Commit 3ee8c12071f0e3bdda25125b63c9d3fd54a7c9d8
Committed by
Wolfgang Denk
1 parent
d984fed068
Exists in
master
and in
54 other branches
crc32: Impl. linux optimized crc32()
Ported over the more efficient linux crc32() function. A quick comparsion on ppc: After changing the old crc32 to do 4 bytes in the inner loop to be able to compare with new version one can note: - old inner loop has 61 insn, new has 19 insn. - new crc32 does one 32 bit load of data to crc while the old does four 8 bits loads. - size is bit bigger for the new crc32: 1392(old) 1416(new) of text. The is because the new version shares code with crc32_no_comp() instead of duplicating code. - about 33% faster on ppc: New > crc 0 0xfffffff -> 39 secs Old > crc 0 0xfffffff -> 60 secs Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
Showing 1 changed file with 112 additions and 88 deletions Side-by-side Diff
lib_generic/crc32.c
... | ... | @@ -8,11 +8,11 @@ |
8 | 8 | * For conditions of distribution and use, see copyright notice in zlib.h |
9 | 9 | */ |
10 | 10 | |
11 | -#ifndef USE_HOSTCC /* Shut down "ANSI does not permit..." warnings */ | |
11 | +#ifndef USE_HOSTCC | |
12 | 12 | #include <common.h> |
13 | -#else | |
14 | -#include <stdint.h> | |
15 | 13 | #endif |
14 | +#include <compiler.h> | |
15 | +#include <u-boot/crc.h> | |
16 | 16 | |
17 | 17 | #if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG) |
18 | 18 | #include <watchdog.h> |
... | ... | @@ -22,6 +22,8 @@ |
22 | 22 | #define local static |
23 | 23 | #define ZEXPORT /* empty */ |
24 | 24 | |
25 | +#define tole(x) cpu_to_le32(x) | |
26 | + | |
25 | 27 | #ifdef DYNAMIC_CRC_TABLE |
26 | 28 | |
27 | 29 | local int crc_table_empty = 1; |
... | ... | @@ -70,7 +72,7 @@ |
70 | 72 | c = (uLong)n; |
71 | 73 | for (k = 0; k < 8; k++) |
72 | 74 | c = c & 1 ? poly ^ (c >> 1) : c >> 1; |
73 | - crc_table[n] = c; | |
75 | + crc_table[n] = tole(c); | |
74 | 76 | } |
75 | 77 | crc_table_empty = 0; |
76 | 78 | } |
77 | 79 | |
... | ... | @@ -78,59 +80,72 @@ |
78 | 80 | /* ======================================================================== |
79 | 81 | * Table of CRC-32's of all single-byte values (made by make_crc_table) |
80 | 82 | */ |
83 | + | |
81 | 84 | local const uint32_t crc_table[256] = { |
82 | - 0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L, | |
83 | - 0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L, | |
84 | - 0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L, | |
85 | - 0x90bf1d91L, 0x1db71064L, 0x6ab020f2L, 0xf3b97148L, 0x84be41deL, | |
86 | - 0x1adad47dL, 0x6ddde4ebL, 0xf4d4b551L, 0x83d385c7L, 0x136c9856L, | |
87 | - 0x646ba8c0L, 0xfd62f97aL, 0x8a65c9ecL, 0x14015c4fL, 0x63066cd9L, | |
88 | - 0xfa0f3d63L, 0x8d080df5L, 0x3b6e20c8L, 0x4c69105eL, 0xd56041e4L, | |
89 | - 0xa2677172L, 0x3c03e4d1L, 0x4b04d447L, 0xd20d85fdL, 0xa50ab56bL, | |
90 | - 0x35b5a8faL, 0x42b2986cL, 0xdbbbc9d6L, 0xacbcf940L, 0x32d86ce3L, | |
91 | - 0x45df5c75L, 0xdcd60dcfL, 0xabd13d59L, 0x26d930acL, 0x51de003aL, | |
92 | - 0xc8d75180L, 0xbfd06116L, 0x21b4f4b5L, 0x56b3c423L, 0xcfba9599L, | |
93 | - 0xb8bda50fL, 0x2802b89eL, 0x5f058808L, 0xc60cd9b2L, 0xb10be924L, | |
94 | - 0x2f6f7c87L, 0x58684c11L, 0xc1611dabL, 0xb6662d3dL, 0x76dc4190L, | |
95 | - 0x01db7106L, 0x98d220bcL, 0xefd5102aL, 0x71b18589L, 0x06b6b51fL, | |
96 | - 0x9fbfe4a5L, 0xe8b8d433L, 0x7807c9a2L, 0x0f00f934L, 0x9609a88eL, | |
97 | - 0xe10e9818L, 0x7f6a0dbbL, 0x086d3d2dL, 0x91646c97L, 0xe6635c01L, | |
98 | - 0x6b6b51f4L, 0x1c6c6162L, 0x856530d8L, 0xf262004eL, 0x6c0695edL, | |
99 | - 0x1b01a57bL, 0x8208f4c1L, 0xf50fc457L, 0x65b0d9c6L, 0x12b7e950L, | |
100 | - 0x8bbeb8eaL, 0xfcb9887cL, 0x62dd1ddfL, 0x15da2d49L, 0x8cd37cf3L, | |
101 | - 0xfbd44c65L, 0x4db26158L, 0x3ab551ceL, 0xa3bc0074L, 0xd4bb30e2L, | |
102 | - 0x4adfa541L, 0x3dd895d7L, 0xa4d1c46dL, 0xd3d6f4fbL, 0x4369e96aL, | |
103 | - 0x346ed9fcL, 0xad678846L, 0xda60b8d0L, 0x44042d73L, 0x33031de5L, | |
104 | - 0xaa0a4c5fL, 0xdd0d7cc9L, 0x5005713cL, 0x270241aaL, 0xbe0b1010L, | |
105 | - 0xc90c2086L, 0x5768b525L, 0x206f85b3L, 0xb966d409L, 0xce61e49fL, | |
106 | - 0x5edef90eL, 0x29d9c998L, 0xb0d09822L, 0xc7d7a8b4L, 0x59b33d17L, | |
107 | - 0x2eb40d81L, 0xb7bd5c3bL, 0xc0ba6cadL, 0xedb88320L, 0x9abfb3b6L, | |
108 | - 0x03b6e20cL, 0x74b1d29aL, 0xead54739L, 0x9dd277afL, 0x04db2615L, | |
109 | - 0x73dc1683L, 0xe3630b12L, 0x94643b84L, 0x0d6d6a3eL, 0x7a6a5aa8L, | |
110 | - 0xe40ecf0bL, 0x9309ff9dL, 0x0a00ae27L, 0x7d079eb1L, 0xf00f9344L, | |
111 | - 0x8708a3d2L, 0x1e01f268L, 0x6906c2feL, 0xf762575dL, 0x806567cbL, | |
112 | - 0x196c3671L, 0x6e6b06e7L, 0xfed41b76L, 0x89d32be0L, 0x10da7a5aL, | |
113 | - 0x67dd4accL, 0xf9b9df6fL, 0x8ebeeff9L, 0x17b7be43L, 0x60b08ed5L, | |
114 | - 0xd6d6a3e8L, 0xa1d1937eL, 0x38d8c2c4L, 0x4fdff252L, 0xd1bb67f1L, | |
115 | - 0xa6bc5767L, 0x3fb506ddL, 0x48b2364bL, 0xd80d2bdaL, 0xaf0a1b4cL, | |
116 | - 0x36034af6L, 0x41047a60L, 0xdf60efc3L, 0xa867df55L, 0x316e8eefL, | |
117 | - 0x4669be79L, 0xcb61b38cL, 0xbc66831aL, 0x256fd2a0L, 0x5268e236L, | |
118 | - 0xcc0c7795L, 0xbb0b4703L, 0x220216b9L, 0x5505262fL, 0xc5ba3bbeL, | |
119 | - 0xb2bd0b28L, 0x2bb45a92L, 0x5cb36a04L, 0xc2d7ffa7L, 0xb5d0cf31L, | |
120 | - 0x2cd99e8bL, 0x5bdeae1dL, 0x9b64c2b0L, 0xec63f226L, 0x756aa39cL, | |
121 | - 0x026d930aL, 0x9c0906a9L, 0xeb0e363fL, 0x72076785L, 0x05005713L, | |
122 | - 0x95bf4a82L, 0xe2b87a14L, 0x7bb12baeL, 0x0cb61b38L, 0x92d28e9bL, | |
123 | - 0xe5d5be0dL, 0x7cdcefb7L, 0x0bdbdf21L, 0x86d3d2d4L, 0xf1d4e242L, | |
124 | - 0x68ddb3f8L, 0x1fda836eL, 0x81be16cdL, 0xf6b9265bL, 0x6fb077e1L, | |
125 | - 0x18b74777L, 0x88085ae6L, 0xff0f6a70L, 0x66063bcaL, 0x11010b5cL, | |
126 | - 0x8f659effL, 0xf862ae69L, 0x616bffd3L, 0x166ccf45L, 0xa00ae278L, | |
127 | - 0xd70dd2eeL, 0x4e048354L, 0x3903b3c2L, 0xa7672661L, 0xd06016f7L, | |
128 | - 0x4969474dL, 0x3e6e77dbL, 0xaed16a4aL, 0xd9d65adcL, 0x40df0b66L, | |
129 | - 0x37d83bf0L, 0xa9bcae53L, 0xdebb9ec5L, 0x47b2cf7fL, 0x30b5ffe9L, | |
130 | - 0xbdbdf21cL, 0xcabac28aL, 0x53b39330L, 0x24b4a3a6L, 0xbad03605L, | |
131 | - 0xcdd70693L, 0x54de5729L, 0x23d967bfL, 0xb3667a2eL, 0xc4614ab8L, | |
132 | - 0x5d681b02L, 0x2a6f2b94L, 0xb40bbe37L, 0xc30c8ea1L, 0x5a05df1bL, | |
133 | - 0x2d02ef8dL | |
85 | +tole(0x00000000L), tole(0x77073096L), tole(0xee0e612cL), tole(0x990951baL), | |
86 | +tole(0x076dc419L), tole(0x706af48fL), tole(0xe963a535L), tole(0x9e6495a3L), | |
87 | +tole(0x0edb8832L), tole(0x79dcb8a4L), tole(0xe0d5e91eL), tole(0x97d2d988L), | |
88 | +tole(0x09b64c2bL), tole(0x7eb17cbdL), tole(0xe7b82d07L), tole(0x90bf1d91L), | |
89 | +tole(0x1db71064L), tole(0x6ab020f2L), tole(0xf3b97148L), tole(0x84be41deL), | |
90 | +tole(0x1adad47dL), tole(0x6ddde4ebL), tole(0xf4d4b551L), tole(0x83d385c7L), | |
91 | +tole(0x136c9856L), tole(0x646ba8c0L), tole(0xfd62f97aL), tole(0x8a65c9ecL), | |
92 | +tole(0x14015c4fL), tole(0x63066cd9L), tole(0xfa0f3d63L), tole(0x8d080df5L), | |
93 | +tole(0x3b6e20c8L), tole(0x4c69105eL), tole(0xd56041e4L), tole(0xa2677172L), | |
94 | +tole(0x3c03e4d1L), tole(0x4b04d447L), tole(0xd20d85fdL), tole(0xa50ab56bL), | |
95 | +tole(0x35b5a8faL), tole(0x42b2986cL), tole(0xdbbbc9d6L), tole(0xacbcf940L), | |
96 | +tole(0x32d86ce3L), tole(0x45df5c75L), tole(0xdcd60dcfL), tole(0xabd13d59L), | |
97 | +tole(0x26d930acL), tole(0x51de003aL), tole(0xc8d75180L), tole(0xbfd06116L), | |
98 | +tole(0x21b4f4b5L), tole(0x56b3c423L), tole(0xcfba9599L), tole(0xb8bda50fL), | |
99 | +tole(0x2802b89eL), tole(0x5f058808L), tole(0xc60cd9b2L), tole(0xb10be924L), | |
100 | +tole(0x2f6f7c87L), tole(0x58684c11L), tole(0xc1611dabL), tole(0xb6662d3dL), | |
101 | +tole(0x76dc4190L), tole(0x01db7106L), tole(0x98d220bcL), tole(0xefd5102aL), | |
102 | +tole(0x71b18589L), tole(0x06b6b51fL), tole(0x9fbfe4a5L), tole(0xe8b8d433L), | |
103 | +tole(0x7807c9a2L), tole(0x0f00f934L), tole(0x9609a88eL), tole(0xe10e9818L), | |
104 | +tole(0x7f6a0dbbL), tole(0x086d3d2dL), tole(0x91646c97L), tole(0xe6635c01L), | |
105 | +tole(0x6b6b51f4L), tole(0x1c6c6162L), tole(0x856530d8L), tole(0xf262004eL), | |
106 | +tole(0x6c0695edL), tole(0x1b01a57bL), tole(0x8208f4c1L), tole(0xf50fc457L), | |
107 | +tole(0x65b0d9c6L), tole(0x12b7e950L), tole(0x8bbeb8eaL), tole(0xfcb9887cL), | |
108 | +tole(0x62dd1ddfL), tole(0x15da2d49L), tole(0x8cd37cf3L), tole(0xfbd44c65L), | |
109 | +tole(0x4db26158L), tole(0x3ab551ceL), tole(0xa3bc0074L), tole(0xd4bb30e2L), | |
110 | +tole(0x4adfa541L), tole(0x3dd895d7L), tole(0xa4d1c46dL), tole(0xd3d6f4fbL), | |
111 | +tole(0x4369e96aL), tole(0x346ed9fcL), tole(0xad678846L), tole(0xda60b8d0L), | |
112 | +tole(0x44042d73L), tole(0x33031de5L), tole(0xaa0a4c5fL), tole(0xdd0d7cc9L), | |
113 | +tole(0x5005713cL), tole(0x270241aaL), tole(0xbe0b1010L), tole(0xc90c2086L), | |
114 | +tole(0x5768b525L), tole(0x206f85b3L), tole(0xb966d409L), tole(0xce61e49fL), | |
115 | +tole(0x5edef90eL), tole(0x29d9c998L), tole(0xb0d09822L), tole(0xc7d7a8b4L), | |
116 | +tole(0x59b33d17L), tole(0x2eb40d81L), tole(0xb7bd5c3bL), tole(0xc0ba6cadL), | |
117 | +tole(0xedb88320L), tole(0x9abfb3b6L), tole(0x03b6e20cL), tole(0x74b1d29aL), | |
118 | +tole(0xead54739L), tole(0x9dd277afL), tole(0x04db2615L), tole(0x73dc1683L), | |
119 | +tole(0xe3630b12L), tole(0x94643b84L), tole(0x0d6d6a3eL), tole(0x7a6a5aa8L), | |
120 | +tole(0xe40ecf0bL), tole(0x9309ff9dL), tole(0x0a00ae27L), tole(0x7d079eb1L), | |
121 | +tole(0xf00f9344L), tole(0x8708a3d2L), tole(0x1e01f268L), tole(0x6906c2feL), | |
122 | +tole(0xf762575dL), tole(0x806567cbL), tole(0x196c3671L), tole(0x6e6b06e7L), | |
123 | +tole(0xfed41b76L), tole(0x89d32be0L), tole(0x10da7a5aL), tole(0x67dd4accL), | |
124 | +tole(0xf9b9df6fL), tole(0x8ebeeff9L), tole(0x17b7be43L), tole(0x60b08ed5L), | |
125 | +tole(0xd6d6a3e8L), tole(0xa1d1937eL), tole(0x38d8c2c4L), tole(0x4fdff252L), | |
126 | +tole(0xd1bb67f1L), tole(0xa6bc5767L), tole(0x3fb506ddL), tole(0x48b2364bL), | |
127 | +tole(0xd80d2bdaL), tole(0xaf0a1b4cL), tole(0x36034af6L), tole(0x41047a60L), | |
128 | +tole(0xdf60efc3L), tole(0xa867df55L), tole(0x316e8eefL), tole(0x4669be79L), | |
129 | +tole(0xcb61b38cL), tole(0xbc66831aL), tole(0x256fd2a0L), tole(0x5268e236L), | |
130 | +tole(0xcc0c7795L), tole(0xbb0b4703L), tole(0x220216b9L), tole(0x5505262fL), | |
131 | +tole(0xc5ba3bbeL), tole(0xb2bd0b28L), tole(0x2bb45a92L), tole(0x5cb36a04L), | |
132 | +tole(0xc2d7ffa7L), tole(0xb5d0cf31L), tole(0x2cd99e8bL), tole(0x5bdeae1dL), | |
133 | +tole(0x9b64c2b0L), tole(0xec63f226L), tole(0x756aa39cL), tole(0x026d930aL), | |
134 | +tole(0x9c0906a9L), tole(0xeb0e363fL), tole(0x72076785L), tole(0x05005713L), | |
135 | +tole(0x95bf4a82L), tole(0xe2b87a14L), tole(0x7bb12baeL), tole(0x0cb61b38L), | |
136 | +tole(0x92d28e9bL), tole(0xe5d5be0dL), tole(0x7cdcefb7L), tole(0x0bdbdf21L), | |
137 | +tole(0x86d3d2d4L), tole(0xf1d4e242L), tole(0x68ddb3f8L), tole(0x1fda836eL), | |
138 | +tole(0x81be16cdL), tole(0xf6b9265bL), tole(0x6fb077e1L), tole(0x18b74777L), | |
139 | +tole(0x88085ae6L), tole(0xff0f6a70L), tole(0x66063bcaL), tole(0x11010b5cL), | |
140 | +tole(0x8f659effL), tole(0xf862ae69L), tole(0x616bffd3L), tole(0x166ccf45L), | |
141 | +tole(0xa00ae278L), tole(0xd70dd2eeL), tole(0x4e048354L), tole(0x3903b3c2L), | |
142 | +tole(0xa7672661L), tole(0xd06016f7L), tole(0x4969474dL), tole(0x3e6e77dbL), | |
143 | +tole(0xaed16a4aL), tole(0xd9d65adcL), tole(0x40df0b66L), tole(0x37d83bf0L), | |
144 | +tole(0xa9bcae53L), tole(0xdebb9ec5L), tole(0x47b2cf7fL), tole(0x30b5ffe9L), | |
145 | +tole(0xbdbdf21cL), tole(0xcabac28aL), tole(0x53b39330L), tole(0x24b4a3a6L), | |
146 | +tole(0xbad03605L), tole(0xcdd70693L), tole(0x54de5729L), tole(0x23d967bfL), | |
147 | +tole(0xb3667a2eL), tole(0xc4614ab8L), tole(0x5d681b02L), tole(0x2a6f2b94L), | |
148 | +tole(0xb40bbe37L), tole(0xc30c8ea1L), tole(0x5a05df1bL), tole(0x2d02ef8dL) | |
134 | 149 | }; |
135 | 150 | #endif |
136 | 151 | |
137 | 152 | |
138 | 153 | |
139 | 154 | |
140 | 155 | |
141 | 156 | |
142 | 157 | |
143 | 158 | |
144 | 159 | |
... | ... | @@ -148,54 +163,63 @@ |
148 | 163 | #endif |
149 | 164 | |
150 | 165 | /* ========================================================================= */ |
151 | -#define DO1(buf) crc = crc_table[((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8); | |
152 | -#define DO2(buf) DO1(buf); DO1(buf); | |
153 | -#define DO4(buf) DO2(buf); DO2(buf); | |
154 | -#define DO8(buf) DO4(buf); DO4(buf); | |
166 | +# ifdef __LITTLE_ENDIAN | |
167 | +# define DO_CRC(x) crc = tab[(crc ^ (x)) & 255] ^ (crc >> 8) | |
168 | +# else | |
169 | +# define DO_CRC(x) crc = tab[((crc >> 24) ^ (x)) & 255] ^ (crc << 8) | |
170 | +# endif | |
155 | 171 | |
156 | 172 | /* ========================================================================= */ |
157 | -uint32_t ZEXPORT crc32 (uint32_t crc, const Bytef *buf, uInt len) | |
158 | -{ | |
159 | -#ifdef DYNAMIC_CRC_TABLE | |
160 | - if (crc_table_empty) | |
161 | - make_crc_table(); | |
162 | -#endif | |
163 | - crc = crc ^ 0xffffffffL; | |
164 | - while (len >= 8) | |
165 | - { | |
166 | - DO8(buf); | |
167 | - len -= 8; | |
168 | - } | |
169 | - if (len) do { | |
170 | - DO1(buf); | |
171 | - } while (--len); | |
172 | - return crc ^ 0xffffffffL; | |
173 | -} | |
174 | 173 | |
175 | -#if defined(CONFIG_CMD_JFFS2) || defined(CONFIG_CMD_NAND) | |
176 | - | |
177 | 174 | /* No ones complement version. JFFS2 (and other things ?) |
178 | 175 | * don't use ones compliment in their CRC calculations. |
179 | 176 | */ |
180 | 177 | uint32_t ZEXPORT crc32_no_comp(uint32_t crc, const Bytef *buf, uInt len) |
181 | 178 | { |
179 | + const uint32_t *tab = crc_table; | |
180 | + const uint32_t *b =(const uint32_t *)buf; | |
181 | + size_t rem_len; | |
182 | 182 | #ifdef DYNAMIC_CRC_TABLE |
183 | 183 | if (crc_table_empty) |
184 | 184 | make_crc_table(); |
185 | 185 | #endif |
186 | - while (len >= 8) | |
187 | - { | |
188 | - DO8(buf); | |
189 | - len -= 8; | |
186 | + crc = cpu_to_le32(crc); | |
187 | + /* Align it */ | |
188 | + if (((long)b) & 3 && len) { | |
189 | + uint8_t *p = (uint8_t *)b; | |
190 | + do { | |
191 | + DO_CRC(*p++); | |
192 | + } while ((--len) && ((long)p)&3); | |
193 | + b = (uint32_t *)p; | |
190 | 194 | } |
191 | - if (len) do { | |
192 | - DO1(buf); | |
193 | - } while (--len); | |
194 | 195 | |
195 | - return crc; | |
196 | + rem_len = len & 3; | |
197 | + len = len >> 2; | |
198 | + for (--b; len; --len) { | |
199 | + /* load data 32 bits wide, xor data 32 bits wide. */ | |
200 | + crc ^= *++b; /* use pre increment for speed */ | |
201 | + DO_CRC(0); | |
202 | + DO_CRC(0); | |
203 | + DO_CRC(0); | |
204 | + DO_CRC(0); | |
205 | + } | |
206 | + len = rem_len; | |
207 | + /* And the last few bytes */ | |
208 | + if (len) { | |
209 | + uint8_t *p = (uint8_t *)(b + 1) - 1; | |
210 | + do { | |
211 | + DO_CRC(*++p); /* use pre increment for speed */ | |
212 | + } while (--len); | |
213 | + } | |
214 | + | |
215 | + return le32_to_cpu(crc); | |
196 | 216 | } |
217 | +#undef DO_CRC | |
197 | 218 | |
198 | -#endif | |
219 | +uint32_t ZEXPORT crc32 (uint32_t crc, const Bytef *p, uInt len) | |
220 | +{ | |
221 | + return crc32_no_comp(crc ^ 0xffffffffL, p, len) ^ 0xffffffffL; | |
222 | +} | |
199 | 223 | |
200 | 224 | /* |
201 | 225 | * Calculate the crc32 checksum triggering the watchdog every 'chunk_sz' bytes |