From 98356c6fa5582b20ef8d3733418ec9196b11abfc Mon Sep 17 00:00:00 2001 From: Brent Yates Date: Tue, 24 Oct 2023 15:52:37 -0400 Subject: [PATCH 1/3] Fixed disk bits --- TrackletAlgorithm/MatchEngineUnit.h | 11 ++++++----- TrackletAlgorithm/MatchProcessor.h | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/TrackletAlgorithm/MatchEngineUnit.h b/TrackletAlgorithm/MatchEngineUnit.h index 8168bca6e42..5a3d3af4340 100644 --- a/TrackletAlgorithm/MatchEngineUnit.h +++ b/TrackletAlgorithm/MatchEngineUnit.h @@ -218,7 +218,9 @@ inline void step(const VMStubMECM stubmem[4][1<<(kNbitsrzbinMP+kNbits constexpr bool isDisk = LAYER > TF::L6; - constexpr unsigned int kNBitBin = !isDisk ? 3 : 4; + constexpr auto kNBitBinPS = 3; + constexpr auto kNBitBin2S = 4; + const unsigned int kNBitBin = isPSStub ? kNBitBinPS : kNBitBin2S; constexpr unsigned int kRInvSteps = 32; constexpr unsigned int kRInvBits = BITS_TO_REPRESENT(kRInvSteps - 1); @@ -242,10 +244,9 @@ inline void step(const VMStubMECM stubmem[4][1<<(kNbitsrzbinMP+kNbits //here we always use the larger number of bits for the bend // Check if stub bend and proj rinv consistent - auto const index_part1 = (VMProjType == DISK && isPSseed____) ? projrinv____.concat(stubbendReduced) : projrinv____.concat(stubbend); - auto const index_part2 = ((VMProjType == DISK && isPSseed____) ? (1 << (kRInvBits + kNBitBin)) : 0); - const ap_int<1> diskps = isDisk && isPSStub; - auto const index = diskps ? (diskps,projrinv____,stubbendReduced) : (diskps,projrinv____,stubbend); + ap_uint diskps = isDisk && isPSStub; + ap_uint projrinv_long = projrinv____; + const ap_uint<1+kNBitBin2S+kRInvBits> index = (diskps << (kNBitBin2S + kRInvBits)) + (projrinv_long << kNBitBin) + (diskps ? ap_uint(stubbendReduced) : ap_uint(stubbend)); //Check if stub bend and proj rinv consistent projseqs_[writeindex_] = projseq____; diff --git a/TrackletAlgorithm/MatchProcessor.h b/TrackletAlgorithm/MatchProcessor.h index 9252c402223..c1dc321cf73 100644 --- a/TrackletAlgorithm/MatchProcessor.h +++ b/TrackletAlgorithm/MatchProcessor.h @@ -1197,7 +1197,7 @@ void MatchProcessor(BXType bx, constexpr regionType APTYPE = TF::layerDiskType[LAYER]; //Initialize table for bend-rinv consistency - ap_uint<1> table[kNMatchEngines][(LAYER table[kNMatchEngines][LAYER Date: Wed, 25 Oct 2023 09:26:47 -0400 Subject: [PATCH 2/3] Update test vectors --- emData/download.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/emData/download.sh b/emData/download.sh index 8272d4a5ea5..ea0da1b520b 100755 --- a/emData/download.sh +++ b/emData/download.sh @@ -10,8 +10,8 @@ memprints_url_reduced="https://cernbox.cern.ch/remote.php/dav/public-files/4jZdh luts_url_reduced="https://cernbox.cern.ch/remote.php/dav/public-files/mcGz25JNu19Oqzm/LUTs.tar.gz" # Combined modules # Updated files from Jason for TP disk with extra sign bit for disks in AllInnerStubs memories. This is in cmssw PR #230 -memprints_url_cm="https://aryd.web.cern.ch/aryd/MemPrintsCM_230822.tgz" -luts_url_cm="https://cernbox.cern.ch/remote.php/dav/public-files/uoKcrxMXtjVHagL/LUTs.tar.gz" +memprints_url_cm="https://cernbox.cern.ch/remote.php/dav/public-files/ubP8YbYfNA6kOBx/MemPrints_10242023.tar.gz" +luts_url_cm="https://cernbox.cern.ch/remote.php/dav/public-files/iQusnc3zGrAU5fv/LUTs.tgz" # Reduced Combined modules memprints_url_reducedcm="https://cernbox.cern.ch/remote.php/dav/public-files/g0EIkgWgie5mBob/MemPrints.tar.gz" luts_url_reducedcm="https://cernbox.cern.ch/remote.php/dav/public-files/HT8q7fk4UvhpdPK/LUTs.tar.gz" From 3d350c0916e7554b623fbc8c0034362004c7ed25 Mon Sep 17 00:00:00 2001 From: Brent Yates Date: Wed, 25 Oct 2023 11:19:55 -0400 Subject: [PATCH 3/3] Replace test vectors (previous version for all but MP stuff) --- emData/download.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/emData/download.sh b/emData/download.sh index ea0da1b520b..ec4ea61c65e 100755 --- a/emData/download.sh +++ b/emData/download.sh @@ -10,8 +10,8 @@ memprints_url_reduced="https://cernbox.cern.ch/remote.php/dav/public-files/4jZdh luts_url_reduced="https://cernbox.cern.ch/remote.php/dav/public-files/mcGz25JNu19Oqzm/LUTs.tar.gz" # Combined modules # Updated files from Jason for TP disk with extra sign bit for disks in AllInnerStubs memories. This is in cmssw PR #230 -memprints_url_cm="https://cernbox.cern.ch/remote.php/dav/public-files/ubP8YbYfNA6kOBx/MemPrints_10242023.tar.gz" -luts_url_cm="https://cernbox.cern.ch/remote.php/dav/public-files/iQusnc3zGrAU5fv/LUTs.tgz" +memprints_url_cm="https://cernbox.cern.ch/remote.php/dav/public-files/Gfv0lbIVWBdFsoa/MemPrints_10242023.tar.gz" +luts_url_cm="https://cernbox.cern.ch/remote.php/dav/public-files/CfDiIlwterSBOSZ/LUTs.tar.gz" # Reduced Combined modules memprints_url_reducedcm="https://cernbox.cern.ch/remote.php/dav/public-files/g0EIkgWgie5mBob/MemPrints.tar.gz" luts_url_reducedcm="https://cernbox.cern.ch/remote.php/dav/public-files/HT8q7fk4UvhpdPK/LUTs.tar.gz"