@@ -901,7 +901,7 @@ template<TF::layerDisk Layer, TF::phiRegion PHI> constexpr uint32_t NPageSum();
901
901
902
902
#include " MatchProcessor_parameters.h"
903
903
904
- template <regionType ASTYPE, regionType APTYPE, regionType VMSMEType, regionType FMTYPE, int maxFullMatchCopies , TF::layerDisk LAYER=TF::L1, TF::phiRegion PHISEC=TF::A>
904
+ template <regionType ASTYPE, regionType APTYPE, regionType VMSMEType, regionType FMTYPE, int maxFullMatchVariants , TF::layerDisk LAYER=TF::L1, TF::phiRegion PHISEC=TF::A>
905
905
void MatchCalculator (BXType bx,
906
906
ap_uint<1 > newtracklet,
907
907
ap_uint<1 >& isMatch,
@@ -913,7 +913,7 @@ void MatchCalculator(BXType bx,
913
913
const AllStubMemory<ASTYPE>* allstub,
914
914
const AllProjection<APTYPE>& proj,
915
915
ap_uint<VMStubMECMBase<VMSMEType>::kVMSMEIDSize > stubid,
916
- FullMatchMemory<FMTYPE> fullmatch[maxFullMatchCopies ]
916
+ FullMatchMemory<FMTYPE> fullmatch[maxFullMatchVariants ]
917
917
){
918
918
919
919
#pragma HLS inline
@@ -1180,7 +1180,7 @@ constexpr unsigned kNbitsrzbinMPDisk = kNbitsrzbin + 1;
1180
1180
1181
1181
// ////////////////////////////
1182
1182
// MatchProcessor
1183
- template <regionType PROJTYPE, regionType VMSMEType, unsigned kNbitsrzbinMP , regionType VMPTYPE, regionType ASTYPE, regionType FMTYPE, unsigned int nINMEM, int maxFullMatchCopies ,
1183
+ template <regionType PROJTYPE, regionType VMSMEType, unsigned kNbitsrzbinMP , regionType VMPTYPE, regionType ASTYPE, regionType FMTYPE, unsigned int nINMEM, int maxFullMatchVariants ,
1184
1184
TF::layerDisk LAYER=TF::L1, TF::phiRegion PHISEC=TF::A>
1185
1185
void MatchProcessor (BXType bx,
1186
1186
// because Vivado HLS cannot synthesize an array of
@@ -1190,7 +1190,7 @@ void MatchProcessor(BXType bx,
1190
1190
const VMStubMEMemoryCM<VMSMEType, kNbitsrzbinMP , kNbitsphibin , kNMatchEngines >& instubdata,
1191
1191
const AllStubMemory<ASTYPE>* allstub,
1192
1192
BXType& bx_o,
1193
- FullMatchMemory<FMTYPE> fullmatch[maxFullMatchCopies ]
1193
+ FullMatchMemory<FMTYPE> fullmatch[maxFullMatchVariants ]
1194
1194
){
1195
1195
#pragma HLS inline
1196
1196
@@ -1458,7 +1458,7 @@ void MatchProcessor(BXType bx,
1458
1458
1459
1459
if (hasMatch_save) {
1460
1460
isMatch = newtracklet_save ? ap_uint<1 >(0 ) : isMatch;
1461
- MatchCalculator<ASTYPE, APTYPE, VMSMEType, FMTYPE, maxFullMatchCopies , LAYER, PHISEC>
1461
+ MatchCalculator<ASTYPE, APTYPE, VMSMEType, FMTYPE, maxFullMatchVariants , LAYER, PHISEC>
1462
1462
(bx, newtracklet_save, isMatch, savedMatch, best_delta_z, best_delta_phi, best_delta_rphi, best_delta_r, allstub, allproj_save, stubindex_save,
1463
1463
fullmatch);
1464
1464
}
@@ -1483,7 +1483,6 @@ void MatchProcessor(BXType bx,
1483
1483
newtracklet_save = newtracklet;
1484
1484
allproj_save = allproj;
1485
1485
stubindex_save = stubindex;
1486
-
1487
1486
} // end MC if
1488
1487
1489
1488
0 commit comments