Skip to content

Commit 1d744a5

Browse files
Xor-elXor-el
committed
Rename x86-64 SIMD includes to *_x86_64.inc
Add an explicit _x86_64 suffix to all x86-64-specific SIMD .inc files under HashLib/src/Include/Simd, matching the existing *_i386.inc pattern and keeping a flat layout for future architectures. Leave CpuDetect/CpuIdQuery.inc and CpuDetect/XGetBvQuery.inc unchanged; they already branch on HASHLIB_I386_ASM for IA-32 vs x86-64 in one file. Update every {$I ..\Include\Simd\...} in the dispatch units to the new names, refresh related header comments, and i386 cross-references.
1 parent acb768e commit 1d744a5

69 files changed

Lines changed: 112 additions & 112 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎HashLib/src/Checksum/HlpAdler32Dispatch.pas‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -134,20 +134,20 @@ procedure Adler32_ProcessBlocks_Ssse3(AData: PByte; ANumBlocks: UInt32;
134134

135135
procedure Adler32_ProcessBlocks_Sse2(AData: PByte; ANumBlocks: UInt32;
136136
ASums, AConstants: Pointer);
137-
{$I ..\Include\Simd\Common\SimdProc4Begin.inc}
138-
{$I ..\Include\Simd\Adler32\Adler32BlocksSse2.inc}
137+
{$I ..\Include\Simd\Common\SimdProc4Begin_x86_64.inc}
138+
{$I ..\Include\Simd\Adler32\Adler32BlocksSse2_x86_64.inc}
139139
end;
140140

141141
procedure Adler32_ProcessBlocks_Ssse3(AData: PByte; ANumBlocks: UInt32;
142142
ASums, AConstants: Pointer);
143-
{$I ..\Include\Simd\Common\SimdProc4Begin.inc}
144-
{$I ..\Include\Simd\Adler32\Adler32BlocksSsse3.inc}
143+
{$I ..\Include\Simd\Common\SimdProc4Begin_x86_64.inc}
144+
{$I ..\Include\Simd\Adler32\Adler32BlocksSsse3_x86_64.inc}
145145
end;
146146

147147
procedure Adler32_ProcessBlocks_Avx2(AData: PByte; ANumBlocks: UInt32;
148148
ASums, AConstants: Pointer);
149-
{$I ..\Include\Simd\Common\SimdProc4Begin.inc}
150-
{$I ..\Include\Simd\Adler32\Adler32BlocksAvx2.inc}
149+
{$I ..\Include\Simd\Common\SimdProc4Begin_x86_64.inc}
150+
{$I ..\Include\Simd\Adler32\Adler32BlocksAvx2_x86_64.inc}
151151
end;
152152

153153
procedure Adler32_Update_Ssse3(AData: PByte; ALength: UInt32; ASums: Pointer);

‎HashLib/src/Checksum/HlpCRCDispatch.pas‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -371,27 +371,27 @@ procedure CRC_UpdateViaBitSerial(AData: PByte; ADataLength, AIndex: Int32;
371371
// SIMD implementations: SSE2 (IA-32); SSE2, PCLMULQDQ / VPCLMULQDQ (x86-64)
372372
// =============================================================================
373373
// SSE2 = movdqu/movq/pxor/psrldq for wide loads; table XOR stays in GPRs.
374-
// x86-64: SimdProc4Begin.inc + CRCFold*Sse2.inc. IA-32: SimdProc4Begin_i386.inc
374+
// x86-64: SimdProc4Begin_x86_64.inc + CRCFold*Sse2_x86_64.inc. IA-32: SimdProc4Begin_i386.inc
375375
// + CRCFold*Sse2_i386.inc (MSB Width/CrcMask offsets differ from x64).
376376

377377
{$IFDEF HASHLIB_X86_64_ASM}
378378

379379
function CRC_Fold_Lsb_Sse2(AData: PByte; ALength: UInt32;
380380
AState: Pointer; AConstants: Pointer): UInt64;
381-
{$I ..\Include\Simd\Common\SimdProc4Begin.inc}
382-
{$I ..\Include\Simd\CRC\CRCFoldLsbSse2.inc}
381+
{$I ..\Include\Simd\Common\SimdProc4Begin_x86_64.inc}
382+
{$I ..\Include\Simd\CRC\CRCFoldLsbSse2_x86_64.inc}
383383
end;
384384

385385
function CRC_Fold_Msb_Sse2(AData: PByte; ALength: UInt32;
386386
AState: Pointer; AConstants: Pointer): UInt64;
387-
{$I ..\Include\Simd\Common\SimdProc4Begin.inc}
388-
{$I ..\Include\Simd\CRC\CRCFoldMsbSse2.inc}
387+
{$I ..\Include\Simd\Common\SimdProc4Begin_x86_64.inc}
388+
{$I ..\Include\Simd\CRC\CRCFoldMsbSse2_x86_64.inc}
389389
end;
390390

391391
function CRC_Fold_Lsb32_Sse2(AData: PByte; ALength: UInt32;
392392
AState: Pointer; AConstants: Pointer): UInt64;
393-
{$I ..\Include\Simd\Common\SimdProc4Begin.inc}
394-
{$I ..\Include\Simd\CRC\CRCFoldLsb32Sse2.inc}
393+
{$I ..\Include\Simd\Common\SimdProc4Begin_x86_64.inc}
394+
{$I ..\Include\Simd\CRC\CRCFoldLsb32Sse2_x86_64.inc}
395395
end;
396396

397397
{$ELSE}
@@ -443,26 +443,26 @@ function CRC_Fold_Lsb32_Sse2(AData: PByte; ALength: UInt32;
443443

444444
function CRC_Fold_Pclmul(AData: PByte; ALength: UInt32;
445445
AState: Pointer; AConstants: Pointer): UInt64;
446-
{$I ..\Include\Simd\Common\SimdProc4Begin.inc}
447-
{$I ..\Include\Simd\CRC\CRCFoldPclmul.inc}
446+
{$I ..\Include\Simd\Common\SimdProc4Begin_x86_64.inc}
447+
{$I ..\Include\Simd\CRC\CRCFoldPclmul_x86_64.inc}
448448
end;
449449

450450
function CRC_Fold_Vpclmul(AData: PByte; ALength: UInt32;
451451
AState: Pointer; AConstants: Pointer): UInt64;
452-
{$I ..\Include\Simd\Common\SimdProc4Begin.inc}
453-
{$I ..\Include\Simd\CRC\CRCFoldVpclmul.inc}
452+
{$I ..\Include\Simd\Common\SimdProc4Begin_x86_64.inc}
453+
{$I ..\Include\Simd\CRC\CRCFoldVpclmul_x86_64.inc}
454454
end;
455455

456456
function CRC_Fold_Pclmul_Msb(AData: PByte; ALength: UInt32;
457457
AState: Pointer; AConstants: Pointer): UInt64;
458-
{$I ..\Include\Simd\Common\SimdProc4Begin.inc}
459-
{$I ..\Include\Simd\CRC\CRCFoldPclmulMsb.inc}
458+
{$I ..\Include\Simd\Common\SimdProc4Begin_x86_64.inc}
459+
{$I ..\Include\Simd\CRC\CRCFoldPclmulMsb_x86_64.inc}
460460
end;
461461

462462
function CRC_Fold_Vpclmul_Msb(AData: PByte; ALength: UInt32;
463463
AState: Pointer; AConstants: Pointer): UInt64;
464-
{$I ..\Include\Simd\Common\SimdProc4Begin.inc}
465-
{$I ..\Include\Simd\CRC\CRCFoldVpclmulMsb.inc}
464+
{$I ..\Include\Simd\Common\SimdProc4Begin_x86_64.inc}
465+
{$I ..\Include\Simd\CRC\CRCFoldVpclmulMsb_x86_64.inc}
466466
end;
467467

468468
{$ENDIF HASHLIB_X86_64_ASM}

‎HashLib/src/Crypto/HlpBlake2BDispatch.pas‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,13 +112,13 @@ procedure Blake2B_Compress_Sse2(AState, AMsg, ACounterFlags, AIV: Pointer);
112112
{$IFDEF HASHLIB_X86_64_ASM}
113113

114114
procedure Blake2B_Compress_Sse2(AState, AMsg, ACounterFlags, AIV: Pointer);
115-
{$I ..\Include\Simd\Common\SimdProc4Begin.inc}
116-
{$I ..\Include\Simd\Blake2B\Blake2BCompressSse2.inc}
115+
{$I ..\Include\Simd\Common\SimdProc4Begin_x86_64.inc}
116+
{$I ..\Include\Simd\Blake2B\Blake2BCompressSse2_x86_64.inc}
117117
end;
118118

119119
procedure Blake2B_Compress_Avx2(AState, AMsg, ACounterFlags, AIV: Pointer);
120-
{$I ..\Include\Simd\Common\SimdProc4Begin.inc}
121-
{$I ..\Include\Simd\Blake2B\Blake2BCompressAvx2.inc}
120+
{$I ..\Include\Simd\Common\SimdProc4Begin_x86_64.inc}
121+
{$I ..\Include\Simd\Blake2B\Blake2BCompressAvx2_x86_64.inc}
122122
end;
123123

124124
{$ENDIF HASHLIB_X86_64_ASM}

‎HashLib/src/Crypto/HlpBlake2SDispatch.pas‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,13 +110,13 @@ procedure Blake2S_Compress_Sse2(AState, AMsg, ACounterFlags, AIV: Pointer);
110110
{$IFDEF HASHLIB_X86_64_ASM}
111111

112112
procedure Blake2S_Compress_Sse2(AState, AMsg, ACounterFlags, AIV: Pointer);
113-
{$I ..\Include\Simd\Common\SimdProc4Begin.inc}
114-
{$I ..\Include\Simd\Blake2S\Blake2SCompressSse2.inc}
113+
{$I ..\Include\Simd\Common\SimdProc4Begin_x86_64.inc}
114+
{$I ..\Include\Simd\Blake2S\Blake2SCompressSse2_x86_64.inc}
115115
end;
116116

117117
procedure Blake2S_Compress_Avx2(AState, AMsg, ACounterFlags, AIV: Pointer);
118-
{$I ..\Include\Simd\Common\SimdProc4Begin.inc}
119-
{$I ..\Include\Simd\Blake2S\Blake2SCompressAvx2.inc}
118+
{$I ..\Include\Simd\Common\SimdProc4Begin_x86_64.inc}
119+
{$I ..\Include\Simd\Blake2S\Blake2SCompressAvx2_x86_64.inc}
120120
end;
121121

122122
{$ENDIF HASHLIB_X86_64_ASM}

‎HashLib/src/Crypto/HlpBlake3Dispatch.pas‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -631,25 +631,25 @@ procedure Blake3_Hash4_Sse2(AInput, AKey, AOut: Pointer;
631631
{$IFDEF HASHLIB_X86_64_ASM}
632632

633633
procedure Blake3_Compress_Sse2(AState, AMsg, ACV, ACounterFlags: Pointer);
634-
{$I ..\Include\Simd\Common\SimdProc4Begin.inc}
635-
{$I ..\Include\Simd\Blake3\Blake3CompressSse2.inc}
634+
{$I ..\Include\Simd\Common\SimdProc4Begin_x86_64.inc}
635+
{$I ..\Include\Simd\Blake3\Blake3CompressSse2_x86_64.inc}
636636
end;
637637

638638
procedure Blake3_Compress_Avx2(AState, AMsg, ACV, ACounterFlags: Pointer);
639-
{$I ..\Include\Simd\Common\SimdProc4Begin.inc}
640-
{$I ..\Include\Simd\Blake3\Blake3CompressAvx2.inc}
639+
{$I ..\Include\Simd\Common\SimdProc4Begin_x86_64.inc}
640+
{$I ..\Include\Simd\Blake3\Blake3CompressAvx2_x86_64.inc}
641641
end;
642642

643643
procedure Blake3_Hash4_Sse2(AInput, AKey, AOut: Pointer;
644644
ANumChunks: Int32; ACounter: UInt64; AFlags: UInt32);
645-
{$I ..\Include\Simd\Common\SimdProc6Begin.inc}
646-
{$I ..\Include\Simd\Blake3\Blake3Hash4Sse2.inc}
645+
{$I ..\Include\Simd\Common\SimdProc6Begin_x86_64.inc}
646+
{$I ..\Include\Simd\Blake3\Blake3Hash4Sse2_x86_64.inc}
647647
end;
648648

649649
procedure Blake3_Hash8_Avx2(AInput, AKey, AOut: Pointer;
650650
ANumChunks: Int32; ACounter: UInt64; AFlags: UInt32);
651-
{$I ..\Include\Simd\Common\SimdProc6Begin.inc}
652-
{$I ..\Include\Simd\Blake3\Blake3Hash8Avx2.inc}
651+
{$I ..\Include\Simd\Common\SimdProc6Begin_x86_64.inc}
652+
{$I ..\Include\Simd\Blake3\Blake3Hash8Avx2_x86_64.inc}
653653
end;
654654

655655
{$ENDIF HASHLIB_X86_64_ASM}

‎HashLib/src/Crypto/HlpSHA1Dispatch.pas‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,8 @@ procedure SHA1_Compress_Ssse3_Wrap(AState, AData: Pointer; ANumBlocks: UInt32);
129129

130130
procedure SHA1_Compress_ShaNi(AState, AData: Pointer; ANumBlocks: UInt32;
131131
AConstants: Pointer);
132-
{$I ..\Include\Simd\Common\SimdProc4Begin.inc}
133-
{$I ..\Include\Simd\SHA1\SHA1CompressShaNi.inc}
132+
{$I ..\Include\Simd\Common\SimdProc4Begin_x86_64.inc}
133+
{$I ..\Include\Simd\SHA1\SHA1CompressShaNi_x86_64.inc}
134134
end;
135135

136136
procedure SHA1_Compress_ShaNi_Wrap(AState, AData: Pointer; ANumBlocks: UInt32);
@@ -139,14 +139,14 @@ procedure SHA1_Compress_ShaNi_Wrap(AState, AData: Pointer; ANumBlocks: UInt32);
139139
end;
140140

141141
procedure SHA1_Compress_Sse2(AState, AData: Pointer; ANumBlocks: UInt32);
142-
{$I ..\Include\Simd\Common\SimdProc3Begin.inc}
143-
{$I ..\Include\Simd\SHA1\SHA1CompressSse2.inc}
142+
{$I ..\Include\Simd\Common\SimdProc3Begin_x86_64.inc}
143+
{$I ..\Include\Simd\SHA1\SHA1CompressSse2_x86_64.inc}
144144
end;
145145

146146
procedure SHA1_Compress_Ssse3(AState, AData: Pointer; ANumBlocks: UInt32;
147147
AConstants: Pointer);
148-
{$I ..\Include\Simd\Common\SimdProc4Begin.inc}
149-
{$I ..\Include\Simd\SHA1\SHA1CompressSsse3.inc}
148+
{$I ..\Include\Simd\Common\SimdProc4Begin_x86_64.inc}
149+
{$I ..\Include\Simd\SHA1\SHA1CompressSsse3_x86_64.inc}
150150
end;
151151

152152
procedure SHA1_Compress_Ssse3_Wrap(AState, AData: Pointer; ANumBlocks: UInt32);
@@ -156,8 +156,8 @@ procedure SHA1_Compress_Ssse3_Wrap(AState, AData: Pointer; ANumBlocks: UInt32);
156156

157157
procedure SHA1_Compress_Avx2(AState, AData: Pointer; ANumBlocks: UInt32;
158158
AConstants: Pointer);
159-
{$I ..\Include\Simd\Common\SimdProc4Begin.inc}
160-
{$I ..\Include\Simd\SHA1\SHA1CompressAvx2.inc}
159+
{$I ..\Include\Simd\Common\SimdProc4Begin_x86_64.inc}
160+
{$I ..\Include\Simd\SHA1\SHA1CompressAvx2_x86_64.inc}
161161
end;
162162

163163
procedure SHA1_Compress_Avx2_Wrap(AState, AData: Pointer; ANumBlocks: UInt32);

‎HashLib/src/Crypto/HlpSHA2_256Dispatch.pas‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ procedure SHA256_Compress_Ssse3(AState, AData: Pointer; ANumBlocks: UInt32;
120120

121121
procedure SHA256_Compress_ShaNi(AState, AData: Pointer; ANumBlocks: UInt32;
122122
AConstants: Pointer);
123-
{$I ..\Include\Simd\Common\SimdProc4Begin.inc}
124-
{$I ..\Include\Simd\SHA256\SHA256CompressShaNi.inc}
123+
{$I ..\Include\Simd\Common\SimdProc4Begin_x86_64.inc}
124+
{$I ..\Include\Simd\SHA256\SHA256CompressShaNi_x86_64.inc}
125125
end;
126126

127127
procedure SHA256_Compress_ShaNi_Wrap(AState, AData: Pointer; ANumBlocks: UInt32);
@@ -131,14 +131,14 @@ procedure SHA256_Compress_ShaNi_Wrap(AState, AData: Pointer; ANumBlocks: UInt32)
131131

132132
procedure SHA256_Compress_Sse2(AState, AData: Pointer; ANumBlocks: UInt32;
133133
AConstants: Pointer);
134-
{$I ..\Include\Simd\Common\SimdProc4Begin.inc}
135-
{$I ..\Include\Simd\SHA256\SHA256CompressSse2.inc}
134+
{$I ..\Include\Simd\Common\SimdProc4Begin_x86_64.inc}
135+
{$I ..\Include\Simd\SHA256\SHA256CompressSse2_x86_64.inc}
136136
end;
137137

138138
procedure SHA256_Compress_Ssse3(AState, AData: Pointer; ANumBlocks: UInt32;
139139
AConstants: Pointer);
140-
{$I ..\Include\Simd\Common\SimdProc4Begin.inc}
141-
{$I ..\Include\Simd\SHA256\SHA256CompressSsse3.inc}
140+
{$I ..\Include\Simd\Common\SimdProc4Begin_x86_64.inc}
141+
{$I ..\Include\Simd\SHA256\SHA256CompressSsse3_x86_64.inc}
142142
end;
143143

144144
procedure SHA256_Compress_Ssse3_Wrap(AState, AData: Pointer; ANumBlocks: UInt32);
@@ -148,8 +148,8 @@ procedure SHA256_Compress_Ssse3_Wrap(AState, AData: Pointer; ANumBlocks: UInt32)
148148

149149
procedure SHA256_Compress_Avx2(AState, AData: Pointer; ANumBlocks: UInt32;
150150
AConstants: Pointer);
151-
{$I ..\Include\Simd\Common\SimdProc4Begin.inc}
152-
{$I ..\Include\Simd\SHA256\SHA256CompressAvx2.inc}
151+
{$I ..\Include\Simd\Common\SimdProc4Begin_x86_64.inc}
152+
{$I ..\Include\Simd\SHA256\SHA256CompressAvx2_x86_64.inc}
153153
end;
154154

155155
procedure SHA256_Compress_Avx2_Wrap(AState, AData: Pointer; ANumBlocks: UInt32);

‎HashLib/src/Crypto/HlpSHA2_512Dispatch.pas‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -149,14 +149,14 @@ procedure SHA512_Compress_Ssse3_Wrap(AState, AData: Pointer; ANumBlocks: UInt32)
149149

150150
procedure SHA512_Compress_Sse2(AState, AData: Pointer; ANumBlocks: UInt32;
151151
AConstants: Pointer);
152-
{$I ..\Include\Simd\Common\SimdProc4Begin.inc}
153-
{$I ..\Include\Simd\SHA512\SHA512CompressSse2.inc}
152+
{$I ..\Include\Simd\Common\SimdProc4Begin_x86_64.inc}
153+
{$I ..\Include\Simd\SHA512\SHA512CompressSse2_x86_64.inc}
154154
end;
155155

156156
procedure SHA512_Compress_Ssse3(AState, AData: Pointer; ANumBlocks: UInt32;
157157
AConstants: Pointer);
158-
{$I ..\Include\Simd\Common\SimdProc4Begin.inc}
159-
{$I ..\Include\Simd\SHA512\SHA512CompressSsse3.inc}
158+
{$I ..\Include\Simd\Common\SimdProc4Begin_x86_64.inc}
159+
{$I ..\Include\Simd\SHA512\SHA512CompressSsse3_x86_64.inc}
160160
end;
161161

162162
procedure SHA512_Compress_Ssse3_Wrap(AState, AData: Pointer; ANumBlocks: UInt32);
@@ -166,8 +166,8 @@ procedure SHA512_Compress_Ssse3_Wrap(AState, AData: Pointer; ANumBlocks: UInt32)
166166

167167
procedure SHA512_Compress_Avx2(AState, AData: Pointer; ANumBlocks: UInt32;
168168
AConstants: Pointer);
169-
{$I ..\Include\Simd\Common\SimdProc4Begin.inc}
170-
{$I ..\Include\Simd\SHA512\SHA512CompressAvx2.inc}
169+
{$I ..\Include\Simd\Common\SimdProc4Begin_x86_64.inc}
170+
{$I ..\Include\Simd\SHA512\SHA512CompressAvx2_x86_64.inc}
171171
end;
172172

173173
procedure SHA512_Compress_Avx2_Wrap(AState, AData: Pointer; ANumBlocks: UInt32);

‎HashLib/src/Crypto/HlpSHA3Dispatch.pas‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -464,8 +464,8 @@ procedure KeccakF1600_Absorb_Scalar(AState: Pointer; AData: PByte;
464464
);
465465

466466
procedure KeccakF1600_Avx2(AState: Pointer; AConstants: Pointer);
467-
{$I ..\Include\Simd\Common\SimdProc2Begin.inc}
468-
{$I ..\Include\Simd\SHA3\KeccakF1600Avx2.inc}
467+
{$I ..\Include\Simd\Common\SimdProc2Begin_x86_64.inc}
468+
{$I ..\Include\Simd\SHA3\KeccakF1600Avx2_x86_64.inc}
469469
end;
470470

471471
procedure KeccakF1600_Avx2_Wrap(AState: Pointer);
@@ -475,8 +475,8 @@ procedure KeccakF1600_Avx2_Wrap(AState: Pointer);
475475

476476
procedure KeccakF1600_Avx2_Absorb(AState: Pointer; AData: PByte;
477477
ABlockCount: Int32; ABlockSize: Int32; AConstants: Pointer);
478-
{$I ..\Include\Simd\Common\SimdProc5Begin.inc}
479-
{$I ..\Include\Simd\SHA3\KeccakF1600Avx2Absorb.inc}
478+
{$I ..\Include\Simd\Common\SimdProc5Begin_x86_64.inc}
479+
{$I ..\Include\Simd\SHA3\KeccakF1600Avx2Absorb_x86_64.inc}
480480
end;
481481

482482
procedure KeccakF1600_Avx2_Absorb_Wrap(AState: Pointer; AData: PByte;

‎HashLib/src/Hash64/HlpXXHash3Dispatch.pas‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -133,38 +133,38 @@ procedure XXH3_InitSecret_Sse2(ACustomSecret: Pointer;
133133

134134
procedure XXH3_Accumulate512_Sse2(AAcc: Pointer; AInput: Pointer;
135135
ASecret: Pointer);
136-
{$I ..\Include\Simd\Common\SimdProc3Begin.inc}
137-
{$I ..\Include\Simd\XXH3\XXH3Acc512Sse2.inc}
136+
{$I ..\Include\Simd\Common\SimdProc3Begin_x86_64.inc}
137+
{$I ..\Include\Simd\XXH3\XXH3Acc512Sse2_x86_64.inc}
138138
end;
139139

140140
procedure XXH3_ScrambleAcc_Sse2(AAcc: Pointer; ASecret: Pointer);
141-
{$I ..\Include\Simd\Common\SimdProc2Begin.inc}
142-
{$I ..\Include\Simd\XXH3\XXH3ScrambleSse2.inc}
141+
{$I ..\Include\Simd\Common\SimdProc2Begin_x86_64.inc}
142+
{$I ..\Include\Simd\XXH3\XXH3ScrambleSse2_x86_64.inc}
143143
end;
144144

145145
procedure XXH3_InitSecret_Sse2(ACustomSecret: Pointer;
146146
ADefaultSecret: Pointer; ASeed: UInt64);
147-
{$I ..\Include\Simd\Common\SimdProc3Begin.inc}
148-
{$I ..\Include\Simd\XXH3\XXH3InitSecretSse2.inc}
147+
{$I ..\Include\Simd\Common\SimdProc3Begin_x86_64.inc}
148+
{$I ..\Include\Simd\XXH3\XXH3InitSecretSse2_x86_64.inc}
149149
end;
150150

151151
// ----- AVX2 -----
152152

153153
procedure XXH3_Accumulate512_Avx2(AAcc: Pointer; AInput: Pointer;
154154
ASecret: Pointer);
155-
{$I ..\Include\Simd\Common\SimdProc3Begin.inc}
156-
{$I ..\Include\Simd\XXH3\XXH3Acc512Avx2.inc}
155+
{$I ..\Include\Simd\Common\SimdProc3Begin_x86_64.inc}
156+
{$I ..\Include\Simd\XXH3\XXH3Acc512Avx2_x86_64.inc}
157157
end;
158158

159159
procedure XXH3_ScrambleAcc_Avx2(AAcc: Pointer; ASecret: Pointer);
160-
{$I ..\Include\Simd\Common\SimdProc2Begin.inc}
161-
{$I ..\Include\Simd\XXH3\XXH3ScrambleAvx2.inc}
160+
{$I ..\Include\Simd\Common\SimdProc2Begin_x86_64.inc}
161+
{$I ..\Include\Simd\XXH3\XXH3ScrambleAvx2_x86_64.inc}
162162
end;
163163

164164
procedure XXH3_InitSecret_Avx2(ACustomSecret: Pointer;
165165
ADefaultSecret: Pointer; ASeed: UInt64);
166-
{$I ..\Include\Simd\Common\SimdProc3Begin.inc}
167-
{$I ..\Include\Simd\XXH3\XXH3InitSecretAvx2.inc}
166+
{$I ..\Include\Simd\Common\SimdProc3Begin_x86_64.inc}
167+
{$I ..\Include\Simd\XXH3\XXH3InitSecretAvx2_x86_64.inc}
168168
end;
169169

170170
{$ENDIF HASHLIB_X86_64_ASM}

0 commit comments

Comments
 (0)