-
Notifications
You must be signed in to change notification settings - Fork 4.4k
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
Remove constexpr from ringOrder #11848
Remove constexpr from ringOrder #11848
Conversation
A new Pull Request was created by @davidlt for CMSSW_7_6_X. Remove constexpr from ringOrder It involves the following packages: RecoTracker/TkDetLayers @cmsbuild, @cvuosalo, @slava77 can you please review it and eventually sign? Thanks. |
@@ -128,7 +128,7 @@ Phase2OTECRingedLayer::groupedCompatibleDetsV( const TrajectoryStateOnSurface& s | |||
} | |||
|
|||
//order is odd rings in front of even rings | |||
constexpr int ringOrder[NOTECRINGS]{0,1,0,1,0,1,0,1,0,1,0,1,0,1,0}; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can we keep "const" here?
This is logically what it was before the change proposed here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, I don't know how that got away from me.
Can we stop modifying production code to support development platform used only for R&D? |
@VinInn I am happy to add ifdef here if required. It's L2 decision. But technically there seems to be no gain in |
fbc685a
to
4de09f0
Compare
if I understand correctly that we are patching around an ICC bug (which indeed is not likely a production cms platform..) - an ifdef sounds like the best approach. |
4de09f0
to
5e567c0
Compare
ICC segfaults due to to `constexpr` on `ringOrder`. This is reported and due to be fixed in forthcoming ICC releases (2016). Removal of `constexpr` did not change assembly in any significant, actually compiler generated 5 instructions less for this function. Signed-off-by: David Abdurachmanov <David.Abdurachmanov@cern.ch>
5e567c0
to
9d76170
Compare
I added ifdefs, but again |
@cmsbuild please test |
The tests are being triggered in jenkins. |
+1 Adding #ifdef for a special R&D compiler that has a bug with constexpr to allow it to compile CMSSW. This compiler bug might get fixed in 2016. There should be no change in run-time behavior. The code changes are satisfactory, and standard compilation is successful. Jenkins tests against baseline CMSSW_7_6_X_2015-10-16-1100 show no significant differences, as expected. |
@davidlt: |
This pull request is fully signed and it will be integrated in one of the next CMSSW_7_6_X IBs (tests are also fine). This pull request requires discussion in the ORP meeting before it's merged. @davidlange6, @Degano, @smuzaffar |
+1 |
Remove constexpr from ringOrder
ICC segfaults due to to
constexpr
onringOrder
. This is reported anddue to be fixed in forthcoming ICC releases (2016).
Removal of
constexpr
did not change assembly in any significant,actually compiler generated 5 instructions less for this function.
Signed-off-by: David Abdurachmanov David.Abdurachmanov@cern.ch