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.

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

Bugfix new CaloLayer1 unpacker #21486

Merged
merged 2 commits into from Nov 30, 2017
Merged

Conversation

nsmith-
Copy link
Contributor

@nsmith- nsmith- commented Nov 29, 2017

Fixes #21067

l1t::Block::payload() returns a copy of internal std::vector
which we grabbed a bare pointer to, but then it is destructed since it
is an rvalue, so the things we do with that pointer are rather naughty.

Fixed by returning const reference, as all access patterns are read-only
anyway. Propagated const-ness to bare pointer in the UCTCTP7RawData
utility.

p.s. introduced in #20914, backport to 94x necessary I suppose?

Fixes cms-sw#21067

l1t::Block::payload() returns a copy of internal std::vector
which we grabbed a bare pointer to, but then it is destructed since it
is an rvalue, so the things we do with that pointer are rather naughty.

Fixed by returning const reference, as all access patterns are read-only
anyway.  Propagated const-ness to bare pointer in the UCTCTP7RawData
utility.
@cmsbuild
Copy link
Contributor

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/PR-21486/2244

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @nsmith- (Nicholas Smith) for master.

It involves the following packages:

EventFilter/L1TRawToDigi

@cmsbuild, @rekovic, @mulhearn can you please review it and eventually sign? Thanks.
@Martin-Grunewald, @kreczko, @thomreis this is something you requested to watch as well.
@davidlange6, @slava77 you are the release manager for this.

cms-bot commands are listed here

@thomreis
Copy link
Contributor

please test

Let's see if this works.
Are other unpackers also affected by this?

@cmsbuild
Copy link
Contributor

cmsbuild commented Nov 30, 2017

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/24759/console Started: 2017/11/30 09:25

@cmsbuild
Copy link
Contributor

@cmsbuild
Copy link
Contributor

Comparison job queued.

@rekovic
Copy link
Contributor

rekovic commented Nov 30, 2017

+1

@rekovic
Copy link
Contributor

rekovic commented Nov 30, 2017

@nsmith-
Thanks.
A backport of #20914 plus the fixes from this PR, all together would comprise one backport PR.

@nsmith-
Copy link
Contributor Author

nsmith- commented Nov 30, 2017

@thomreis only in that they will be faster now.
I will double check if valgrind complains about any other bits in the unpacker, but I think it is unlikely.

@cmsbuild
Copy link
Contributor

This pull request is fully signed and it will be integrated in one of the next master IBs (tests are also fine). This pull request will now be reviewed by the release team before it's merged. @davidlange6, @slava77, @smuzaffar (and backports should be raised in the release meeting by the corresponding L2)

@nsmith-
Copy link
Contributor Author

nsmith- commented Nov 30, 2017

Follow-up: no other invalid reads in

cmsDriver.py digi -s RAW2DIGI --eventcontent=FEVTDEBUGHLT --filein=/store/data/Run2017G/HLTPhysics/RAW/v1/000/306/584/00000/1277E19C-D2C8-E711-AA4F-02163E01A5C7.root --data -n 10 --conditions=auto:run2_data --no_exec
time valgrind --tool=memcheck --suppressions=$CMSSW_RELEASE_BASE/src/Utilities/ReleaseScripts/data/cms-valgrind-memcheck.supp --num-callers=20 --xml=yes --xml-file=valgrind.xml cmsRun digi_RAW2DIGI.py

although there seem to be plenty of other leaks, valgrind.xml is 12Mb!

@nsmith-
Copy link
Contributor Author

nsmith- commented Nov 30, 2017

@rekovic actually #20914 is in 940, unless you mean a backport to <94X then I only need to port this PR to 940

$ git tag --contains 85a88428d46118e952a07217f70ef8dedd20d187 |grep -v "_X_"
CMSSW_10_0_0_pre1
CMSSW_9_4_0
CMSSW_9_4_0_patch1
CMSSW_9_4_0_pre3

@cmsbuild
Copy link
Contributor

Comparison is ready
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-21486/24759/summary.html

There are some workflows for which there are errors in the baseline:
10824.0 step 5
The results for the comparisons for these workflows could be incomplete
This means most likely that the IB is having errors in the relvals.The error does NOT come from this pull request

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 0 differences found in the comparisons
  • DQMHistoTests: Total files compared: 27
  • DQMHistoTests: Total histograms compared: 2788080
  • DQMHistoTests: Total failures: 1
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2787901
  • DQMHistoTests: Total skipped: 178
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.58000000014 KiB( 23 files compared)
  • Checked 111 log files, 8 edm output root files, 27 DQM output files

@davidlange6
Copy link
Contributor

+1

@cmsbuild cmsbuild merged commit 5beb52e into cms-sw:master Nov 30, 2017
@nsmith- nsmith- deleted the fixCaloUnpackerValgrind branch April 10, 2018 13:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants