MP X-Macros #213

bryates · 2021-10-26T18:04:49Z

This is the MP equivalent of PR #207. It fully compiles and runs for the MP in L3PHIC using the following test vectors

memprints_url_cm="https://aryd.web.cern.ch/aryd/MemPrints_Combined_211012.tgz"
luts_url_cm="https://aryd.web.cern.ch/aryd/LUTs_Combined_211012.tgz"

without these, there are 5 events where the HLS has an extra fullmatch output.

It also adds generate_MP.py, which is needed by the CMSSW Future Emulation code.

TrackletAlgorithm/MatchEngineUnit_parameters.h

TrackletAlgorithm/MatchProcessor_parameters.h

pwittich · 2021-12-23T15:06:41Z

TestBenches/Macros.h

@@ -1176,7 +1176,55 @@ X(TP_L3L4D_, "TP_L3L4D") \
 X(TP_L5L6A_, "TP_L5L6A") \
 X(TP_L5L6B_, "TP_L5L6B") \
 X(TP_L5L6C_, "TP_L5L6C") \
-X(TP_L5L6D_, "TP_L5L6D") 
+X(TP_L5L6D_, "TP_L5L6D") \


FWIW I think the xmacros could be simplified to just be X(TP_L5L6D) and then generate the underscore and the text substitution directly. This is more universally true for all X-macros. @bryates @aperloff

tomalin · 2022-01-12T16:09:42Z

The TC HLS module fails the CSIM CI check here, but passes it in other PRs. Does this PR need rebasing?

bryates · 2022-01-14T16:50:10Z

The TC HLS module fails the CSIM CI check here, but passes it in other PRs. Does this PR need rebasing?

I just tired to rebase with the master, but that did not fix the CI issues. @aryd could this be related to the new test vectors we're using?

tomalin · 2022-01-14T16:58:52Z

The TC HLS module fails the CSIM CI check here, but passes it in other PRs. Does this PR need rebasing?

I just tired to rebase with the master, but that did not fix the CI issues. @aryd could this be related to the new test vectors we're using?

Given that PR #219 passed the CI tests yesterday, and is apparently using the same download.sh as your PR, I'm dubious.

bryates · 2022-01-14T17:01:54Z

The TC HLS module fails the CSIM CI check here, but passes it in other PRs. Does this PR need rebasing?

I just tired to rebase with the master, but that did not fix the CI issues. @aryd could this be related to the new test vectors we're using?

Given that PR #219 passed the CI tests yesterday, and is apparently using the same download.sh as your PR, I'm dubious.

This PR is using

firmware-hls/emData/download.sh

Lines 12 to 18 in bd72f87

    
           #### test 211005/211217 #### 
        
           # Standard configuration 
        
           memprints_url="https://aryd.web.cern.ch/aryd/MemPrints_Standard_211005.tgz" 
        
           luts_url="https://aryd.web.cern.ch/aryd/LUTs_Standard_211005.tgz" 
        
           # Combined modules 
        
           memprints_url_cm="https://aryd.web.cern.ch/aryd/MemPrints_Combined_211217.tgz" 
        
           luts_url_cm="https://aryd.web.cern.ch/aryd/LUTs_Combined_211217.tgz"

while #219 is using

firmware-hls/emData/download.sh

Lines 12 to 18 in 066f4fc

    
           #### fw_synch_210611 #### 
        
           # Standard configuration 
        
           memprints_url="https://cernbox.cern.ch/index.php/s/hUJUsqvCnKv2YdQ/download" 
        
           luts_url="https://cernbox.cern.ch/index.php/s/9Yms3LCKJsg7UmF/download" 
        
           # Combined modules 
        
           memprints_url_cm="https://cernbox.cern.ch/index.php/s/RFpmFiSnFC84x0O/download" 
        
           luts_url_cm="https://cernbox.cern.ch/index.php/s/kqZu8R7Ftu0YPoO/download"

aehart · 2022-01-18T00:27:14Z

The TC HLS module fails the CSIM CI check here, but passes it in other PRs. Does this PR need rebasing?

I just tired to rebase with the master, but that did not fix the CI issues. @aryd could this be related to the new test vectors we're using?

Given that PR #219 passed the CI tests yesterday, and is apparently using the same download.sh as your PR, I'm dubious.

This PR is using

firmware-hls/emData/download.sh

Lines 12 to 18 in bd72f87

#### test 211005/211217 ####

# Standard configuration

memprints_url="https://aryd.web.cern.ch/aryd/MemPrints_Standard_211005.tgz"

luts_url="https://aryd.web.cern.ch/aryd/LUTs_Standard_211005.tgz"

# Combined modules

memprints_url_cm="https://aryd.web.cern.ch/aryd/MemPrints_Combined_211217.tgz"

luts_url_cm="https://aryd.web.cern.ch/aryd/LUTs_Combined_211217.tgz"

while #219 is using

firmware-hls/emData/download.sh

Lines 12 to 18 in 066f4fc

#### fw_synch_210611 ####

# Standard configuration

memprints_url="https://cernbox.cern.ch/index.php/s/hUJUsqvCnKv2YdQ/download"

luts_url="https://cernbox.cern.ch/index.php/s/9Yms3LCKJsg7UmF/download"

# Combined modules

memprints_url_cm="https://cernbox.cern.ch/index.php/s/RFpmFiSnFC84x0O/download"

luts_url_cm="https://cernbox.cern.ch/index.php/s/kqZu8R7Ftu0YPoO/download"

I'm not sure about the origin of the new test vectors, but in any case, I think we want to leave the URLs in download.sh alone in this PR. The test vectors are properly updated in #220.

bryates · 2022-01-18T18:39:04Z

@aehart I've commented out the new test vectors, and set the CI to allow the MP to fail again. This PR should be good to go.

aehart

Looks good. Approved!

bryates force-pushed the mp_xmacro branch 2 times, most recently from 87be434 to 2c461a1 Compare October 26, 2021 18:16

bryates requested review from aehart and carriganm95 October 26, 2021 18:53

bryates commented Oct 28, 2021

View reviewed changes

TrackletAlgorithm/MatchEngineUnit_parameters.h Show resolved Hide resolved

aehart reviewed Dec 6, 2021

View reviewed changes

TrackletAlgorithm/MatchProcessor_parameters.h Outdated Show resolved Hide resolved

pwittich reviewed Dec 23, 2021

View reviewed changes

bryates and others added 22 commits January 14, 2022 10:11

Updating MP

ccff4b0

Changes for TBHelper

7ac1a2c

Load all MP instances

3ee10b8

Fully working MP

76cae4e

Small fixes to match MC

9baf91e

Fixed issue with L3PHIB

5c41e42

Fixed MP script for TopFunctions

ca17b59

Added generate_MP.py

bf49a21

MP top cpp -> cc

8d3e1f2

Run generate_MP.py in download.sh

787cadd

MP top in CombinedConfig

334a3fd

Fixed gcc paths

78740e2

Added MP to Constants.h

ece2562

Improved L1 (tested PHIB and PHIC)

6c2bac1

Uncommented tables

c74ebb7

Fixed synthesis issues

bba2722

Changes to work with future SW emulation (#217)

1bd5260

Removed assert

731e5ec

Removed MEU params from generate_MP.py

06149ab

Delete MatchProcessor_parameters.h

ed14b18

Fixes to MatchProcessor - now full agreement in L1-L6

a92a1b3

Updated scripts, CI should no longer fail

bd72f87

bryates force-pushed the mp_xmacro branch from 4712fa5 to bd72f87 Compare January 14, 2022 15:11

bryates added 2 commits January 18, 2022 09:34

Commented out custom TVs, allow MP CI to fail again

2dab0c3

Fixed download.sh issue

c13b4b9

aehart approved these changes Jan 19, 2022

View reviewed changes

aehart merged commit 478efa1 into master Jan 19, 2022

aehart deleted the mp_xmacro branch January 19, 2022 14:59

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

MP X-Macros #213

MP X-Macros #213

bryates commented Oct 26, 2021 •

edited by tomalin

Loading

pwittich Dec 23, 2021

tomalin commented Jan 12, 2022

bryates commented Jan 14, 2022

tomalin commented Jan 14, 2022

bryates commented Jan 14, 2022

aehart commented Jan 18, 2022

bryates commented Jan 18, 2022

aehart left a comment

MP X-Macros #213

MP X-Macros #213

Conversation

bryates commented Oct 26, 2021 • edited by tomalin Loading

pwittich Dec 23, 2021

Choose a reason for hiding this comment

tomalin commented Jan 12, 2022

bryates commented Jan 14, 2022

tomalin commented Jan 14, 2022

bryates commented Jan 14, 2022

aehart commented Jan 18, 2022

bryates commented Jan 18, 2022

aehart left a comment

Choose a reason for hiding this comment

bryates commented Oct 26, 2021 •

edited by tomalin

Loading