Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reverting changes to unsigned variables causing Future SW CI crash #311

Merged
merged 10 commits into from
Dec 21, 2023
Merged

Reverting changes to unsigned variables causing Future SW CI crash #311

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
eaa87c0
Reverting changes to unsigned variables causing future SW CI crash
mlarson02 Dec 18, 2023
2777aa0
Temporarily casting unsigned values to signed to prevent compilation …
mlarson02 Dec 19, 2023
f5c736c
Recast to unsigned to fix CI crash
mlarson02 Dec 19, 2023
a458822
Revert "Recast to unsigned to fix CI crash"
aehart Dec 19, 2023
6113cad
Revert "Temporarily casting unsigned values to signed to prevent comp…
aehart Dec 19, 2023
8cf136a
Made template parameters signed.
aehart Dec 19, 2023
51a8ec1
static cast NDiskStubs to int
mlarson02 Dec 19, 2023
6980d5c
Revert "static cast NDiskStubs to int"
aehart Dec 20, 2023
b817a2b
Added checks to allow C-synthesis when parameters are zero.
aehart Dec 20, 2023
1c2383c
Adding comments explaining weird added logic
mlarson02 Dec 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions TrackletAlgorithm/TrackBuilder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ getFM(const BXType bx, const FullMatchMemory<RegionType> &fullMatches, const uns
}

// TrackBuilder top template function
template<unsigned Seed, unsigned NFMPerStubBarrel0, unsigned NFMPerStubBarrel, unsigned NFMPerStubDisk, unsigned NBarrelStubs, unsigned NDiskStubs, unsigned TPAROffset>
template<unsigned Seed, int NFMPerStubBarrel0, int NFMPerStubBarrel, int NFMPerStubDisk, int NBarrelStubs, int NDiskStubs, unsigned TPAROffset>
void TrackBuilder(
const BXType bx,
const TrackletParameterMemory trackletParameters[],
Expand All @@ -45,8 +45,8 @@ void TrackBuilder(
)
{

constexpr unsigned NFMBarrel = NFMPerStubBarrel0 + (NBarrelStubs - 1) * NFMPerStubBarrel;
constexpr unsigned NFMDisk = NDiskStubs * NFMPerStubDisk;
constexpr int NFMBarrel = NFMPerStubBarrel0 + (NBarrelStubs - 1) * NFMPerStubBarrel;
constexpr int NFMDisk = NDiskStubs * NFMPerStubDisk;

// Circular buffers for each of the input full-match memories.
FullMatch<BARREL> barrel_fm[NFMBarrel][1<<kNBitsTBBuffer];
Expand All @@ -68,14 +68,14 @@ void TrackBuilder(
#pragma HLS array_partition variable=barrel_write_index complete dim=0
#pragma HLS array_partition variable=disk_write_index complete dim=0

initialize_barrel_indices : for (unsigned short i = 0; i < NFMBarrel; i++) {
initialize_barrel_indices : for (short i = 0; NFMBarrel > 0 && i < NFMBarrel; i++) { // Note: need to have NFMBarrel > 0 to prevent compilation error due to -Werror=type-limits flag in CMSSW
#pragma HLS unroll
barrel_mem_index[i] = 0;
barrel_read_index[i] = 0;
barrel_write_index[i] = 0;
}

initialize_disk_indices : for (unsigned short i = 0; i < NFMDisk; i++) {
initialize_disk_indices : for (short i = 0; NFMDisk > 0 && i < NFMDisk; i++) { // Note: need to have NFMDisk > 0 to prevent compilation error due to -Werror=type-limits flag in CMSSW
#pragma HLS unroll
disk_mem_index[i] = 0;
disk_read_index[i] = 0;
Expand All @@ -96,20 +96,20 @@ void TrackBuilder(

// First determine the minimum tracklet ID from the current set of full
// matches.
barrel_min_id : for (unsigned short j = 0; j < NFMBarrel; j++) {
barrel_min_id : for (short j = 0; j < NFMBarrel; j++) {

const auto &barrel_stub_0 = barrel_fm[j][barrel_read_index[j]];
const auto &barrel_id_0 = barrel_stub_0.getTrackletID();
barrel_valid[j] = (!empty && barrel_id_0 != kInvalidTrackletID);

// Compare the given barrel and disk IDs against each barrel ID.
barrel_barrel_id_comp : for (unsigned short k = 0; k < NFMBarrel; k++) {
barrel_barrel_id_comp : for (short k = 0; k < NFMBarrel; k++) {
const auto &barrel_stub_1 = barrel_fm[k][barrel_read_index[k]];
const auto &barrel_id_1 = barrel_stub_1.getTrackletID();
barrel_valid[j] = (barrel_valid[j] && barrel_id_0 <= barrel_id_1);
}
// Compare the given barrel and disk IDs against each disk ID.
barrel_disk_id_comp : for (unsigned short k = 0; k < NFMDisk; k++) {
barrel_disk_id_comp : for (short k = 0; k < NFMDisk; k++) {
const auto &disk_stub_1 = disk_fm[k][disk_read_index[k]];
const auto &disk_id_1 = disk_stub_1.getTrackletID();
barrel_valid[j] = (barrel_valid[j] && barrel_id_0 <= disk_id_1);
Expand All @@ -118,20 +118,20 @@ void TrackBuilder(
min_id = (barrel_valid[j] ? barrel_id_0 : min_id);
}

disk_min_id : for (unsigned short j = 0; j < NFMDisk; j++) {
disk_min_id : for (short j = 0; j < NFMDisk; j++) {

const auto &disk_stub_0 = disk_fm[j][disk_read_index[j]];
const auto &disk_id_0 = disk_stub_0.getTrackletID();
disk_valid[j] = (!empty && disk_id_0 != kInvalidTrackletID);

// Compare the given barrel and disk IDs against each barrel ID.
disk_barrel_id_comp : for (unsigned short k = 0; k < NFMBarrel; k++) {
disk_barrel_id_comp : for (short k = 0; k < NFMBarrel; k++) {
const auto &barrel_stub_1 = barrel_fm[k][barrel_read_index[k]];
const auto &barrel_id_1 = barrel_stub_1.getTrackletID();
disk_valid[j] = (disk_valid[j] && disk_id_0 <= barrel_id_1);
}
// Compare the given barrel and disk IDs against each disk ID.
disk_disk_id_comp : for (unsigned short k = 0; k < NFMDisk; k++) {
disk_disk_id_comp : for (short k = 0; k < NFMDisk; k++) {
const auto &disk_stub_1 = disk_fm[k][disk_read_index[k]];
const auto &disk_id_1 = disk_stub_1.getTrackletID();
disk_valid[j] = (disk_valid[j] && disk_id_0 <= disk_id_1);
Expand All @@ -158,13 +158,13 @@ void TrackBuilder(
// object.
ap_uint<3> nMatches = 0; // there can be up to eight matches (3 bits)

barrel_stub_association : for (unsigned short j = 0; j < NBarrelStubs; j++) {
barrel_stub_association : for (short j = 0; j < NBarrelStubs; j++) {

const unsigned nFM = (j == 0 ? NFMPerStubBarrel0 : NFMPerStubBarrel);
const int nFM = (j == 0 ? NFMPerStubBarrel0 : NFMPerStubBarrel);
const unsigned nFMCumulative = (j == 0 ? 0 : (j == 1 ? NFMPerStubBarrel0 : NFMPerStubBarrel0 + (j - 1) * NFMPerStubBarrel));

ap_uint<1> barrel_stub_valid = false;
barrel_stub_valid : for (unsigned short k = 0; k < nFM; k++)
barrel_stub_valid : for (short k = 0; k < nFM; k++)
barrel_stub_valid = (barrel_stub_valid || barrel_valid[nFMCumulative + k]);
nMatches += (barrel_stub_valid ? 1 : 0);

Expand Down Expand Up @@ -227,10 +227,10 @@ void TrackBuilder(
}
}

disk_stub_association : for (unsigned short j = 0; j < NDiskStubs; j++) {
disk_stub_association : for (short j = 0; j < NDiskStubs; j++) {

ap_uint<1> disk_stub_valid = false;
disk_stub_valid : for (unsigned short k = 0; k < NFMPerStubDisk; k++)
disk_stub_valid : for (short k = 0; k < NFMPerStubDisk; k++)
disk_stub_valid = (disk_stub_valid || disk_valid[j * NFMPerStubDisk + k]);
nMatches += (disk_stub_valid ? 1 : 0);

Expand Down Expand Up @@ -292,7 +292,7 @@ void TrackBuilder(
// object that was constructed.
if (track.getTrackValid()) {
trackWord[nTracks] = track.getTrackWord();
barrel_stub_words: for (unsigned short j = 0 ; j < NBarrelStubs; j++) {
barrel_stub_words: for (short j = 0 ; NBarrelStubs > 0 && j < NBarrelStubs; j++) { // Note: need to have NBarrelStubs > 0 to prevent compilation error due to -Werror=type-limits flag in CMSSW
switch (j) {
case 0:
barrelStubWords[j][nTracks] = track.template getStubValid<0>() ? track.template getBarrelStubWord<0>() : typename TrackFit<NBarrelStubs, NDiskStubs>::BarrelStubWord(0);
Expand All @@ -308,7 +308,7 @@ void TrackBuilder(
break;
}
}
disk_stub_words: for (unsigned short j = 0 ; j < NDiskStubs; j++) {
disk_stub_words: for (short j = 0 ; NDiskStubs > 0 && j < NDiskStubs; j++) { // Note: need to have NDiskStubs > 0 to prevent compilation error due to -Werror=type-limits flag in CMSSW
switch (j) {
case 0:
diskStubWords[j][nTracks] = track.template getStubValid<NBarrelStubs>() ? track.template getDiskStubWord<NBarrelStubs>() : typename TrackFit<NBarrelStubs, NDiskStubs>::DiskStubWord(0);
Expand All @@ -329,7 +329,7 @@ void TrackBuilder(

// Update the circular buffer indices and read a new element from each of
// the input full-match memories.
barrel_circular_buffer_update : for (unsigned short j = 0; j < NFMBarrel; j++) {
barrel_circular_buffer_update : for (short j = 0; j < NFMBarrel; j++) {
barrel_read_index[j] += (barrel_valid[j] ? 1 : 0);
const ap_uint<kNBitsTBBuffer> barrel_next_write_index = barrel_write_index[j] + 1;
const ap_uint<1> barrel_not_full = (barrel_next_write_index != barrel_read_index[j]);
Expand All @@ -338,7 +338,7 @@ void TrackBuilder(
barrel_write_index[j] += ((empty || barrel_not_full) ? 1 : 0);
}

disk_circular_buffer_update : for (unsigned short j = 0; j < NFMDisk; j++) {
disk_circular_buffer_update : for (short j = 0; j < NFMDisk; j++) {
disk_read_index[j] += (disk_valid[j] ? 1 : 0);
const ap_uint<kNBitsTBBuffer> disk_next_write_index = disk_write_index[j] + 1;
const ap_uint<1> disk_not_full = (disk_next_write_index != disk_read_index[j]);
Expand Down