Add and use preprocessors macros for loop unrolling #32499

fwyzard · 2020-12-15T21:09:54Z

PR description:

Define preprocessor macros that exoand to pragmas controlling loop unrolling.
Two set of macrso are defined:

CMS_UNROLL_LOOP and friends are applied on both host and device compilation
CMS_DEVICE_UNROLL_LOOP and friends are only applied in device compilation, and expand to nothing on the host

The supported compilers are

CUDA nvcc
HIP (untested)
gcc
clang

Use CMS_UNROLL_LOOP instead of #pragma unroll.

PR validation:

None.

Define preprocessor macros that exoand to pragmas controlling loop unrolling. Two set of macrso are defined: - CMS_UNROLL_LOOP and friends are applied on both host and device compilation - CMS_DEVICE_UNROLL_LOOP and friends is only applied in device compilation, and expands to nothing on the host The supported compilers are - CUDA nvcc - HIP (untested) - gcc - clang

fwyzard · 2020-12-15T21:10:54Z

please test

fwyzard · 2020-12-15T21:11:02Z

@makortel FYI

cmsbuild · 2020-12-15T21:16:30Z

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-32499/20425

This PR adds an extra 40KB to repository
There are other open Pull requests which might conflict with changes you have proposed:
- File RecoLocalCalo/HcalRecProducers/src/MahiGPU.cu modified in PR(s): Squash all Patatrack developments on top of CMSSW_11_3_0_pre5 #27983

cmsbuild · 2020-12-15T21:16:57Z

A new Pull Request was created by @fwyzard (Andrea Bocci) for master.

It involves the following packages:

DataFormats/CaloRecHit
FWCore/Utilities
HeterogeneousCore/CUDAUtilities
RecoLocalCalo/HcalRecProducers

@perrotta, @smuzaffar, @Dr15Jones, @makortel, @fwyzard, @slava77, @jpata can you please review it and eventually sign? Thanks.
@makortel, @felicepantaleo, @rovere, @apsallid, @wddgit, @mariadalfonso, @abdoulline this is something you requested to watch as well.
@silviodonato, @dpiparo, @qliphy you are the release manager for this.

cms-bot commands are listed here

fwyzard · 2020-12-16T06:09:19Z

The error is likely unrelated:

>> Compiling edm plugin /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_3_X_2020-12-15-1100/src/GeneratorInterface/Herwig7Interface/plugins/Herwig7Hadronizer.cc
In file included from /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_3_X_2020-12-15-1100/src/GeneratorInterface/Herwig7Interface/interface/Herwig7Interface.h:22,
                 from /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_3_X_2020-12-15-1100/src/GeneratorInterface/Herwig7Interface/plugins/Herwig7Hadronizer.cc:27:
/data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_3_X_2020-12-15-1100/src/GeneratorInterface/Herwig7Interface/interface/HerwigUIProvider.h:7:10: fatal error: Herwig/API/HerwigUI.h: No such file or directory
    7 | #include <Herwig/API/HerwigUI.h>
      |          ^~~~~~~~~~~~~~~~~~~~~~~
compilation terminated.
gmake: *** [tmp/slc7_amd64_gcc900/src/GeneratorInterface/Herwig7Interface/plugins/GeneratorInterfaceHerwig7HadronizerPlugins/Herwig7Hadronizer.cc.o] Error 1

cmsbuild · 2020-12-16T06:09:41Z

-1

Failed Tests: Build HeaderConsistency ClangBuild
Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-fc1eb9/11723/summary.html
CMSSW: CMSSW_11_3_X_2020-12-15-1100/slc7_amd64_gcc900

The following merge commits were also included on top of IB + this PR after doing git cms-merge-topic:

Removed direct use of tbb::task from SerialTaskQueue #32482 @Dr15Jones: Removed direct use of tbb::task from SerialTaskQueue
Use esConsumes with SiPixelStatusProducer #32484 @Dr15Jones: Use esConsumes with SiPixelStatusProducer
Switching MCSmartSingleParticleFilter to use an input tag #32491 @Sam-Harper: Switching MCSmartSingleParticleFilter to use an input tag
Rename external tool herwigpp to herwig7 #32468 @Dominic-Stafford: Rename external tool herwigpp to herwig7
Use tbb:task_group in TestTBBTasksAnalyzer #32487 @Dr15Jones: Use tbb:task_group in TestTBBTasksAnalyzer
Preliminary L1T-HLT Interface for Phase-2 -- redux #32454 @trtomei: Preliminary L1T-HLT Interface for Phase-2 -- redux
Era support for the BMTF Packer #32365 @panoskatsoulis: Era support for the BMTF Packer
feat: allow for not sorting during PATJetUpdater call #32297 @andrzejnovak: feat: allow for not sorting during PATJetUpdater call
Migrate Calibration/TkAlCaRecoProducers to esConsumes and other fixes #32432 @mmusich: Migrate Calibration/TkAlCaRecoProducers to esConsumes and other fixes
Update CSCMake2DRecHit.cc #32442 @nvoytish: Update CSCMake2DRecHit.cc

You can see more details here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-fc1eb9/11723/git-log-recent-commits
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-fc1eb9/11723/git-merge-result

Build

I found compilation error when building:

>> Package GeneratorInterface/Herwig7Interface built
Entering library rule at src/GeneratorInterface/Herwig7Interface/plugins
>> Compiling edm plugin /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_3_X_2020-12-15-1100/src/GeneratorInterface/Herwig7Interface/plugins/Herwig7Hadronizer.cc
In file included from /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_3_X_2020-12-15-1100/src/GeneratorInterface/Herwig7Interface/interface/Herwig7Interface.h:22,
                 from /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_3_X_2020-12-15-1100/src/GeneratorInterface/Herwig7Interface/plugins/Herwig7Hadronizer.cc:27:
/data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_3_X_2020-12-15-1100/src/GeneratorInterface/Herwig7Interface/interface/HerwigUIProvider.h:7:10: fatal error: Herwig/API/HerwigUI.h: No such file or directory
    7 | #include 
      |          ^~~~~~~~~~~~~~~~~~~~~~~
compilation terminated.
gmake: *** [tmp/slc7_amd64_gcc900/src/GeneratorInterface/Herwig7Interface/plugins/GeneratorInterfaceHerwig7HadronizerPlugins/Herwig7Hadronizer.cc.o] Error 1
>> Building  edm plugin tmp/slc7_amd64_gcc900/src/GeneratorInterface/Herwig7Interface/plugins/GeneratorInterfaceHerwig7HadronizerPlugins/libGeneratorInterfaceHerwig7HadronizerPlugins.so

Clang Build

I found compilation error while trying to compile with clang. Command used:

USER_CUDA_FLAGS='--expt-relaxed-constexpr' USER_CXXFLAGS='-Wno-register -fsyntax-only' scram build -k -j 32 COMPILER='llvm compile'

>> Entering Package GeneratorInterface/Herwig7Interface
Entering library rule at src/GeneratorInterface/Herwig7Interface/plugins
>> Compiling edm plugin /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_3_X_2020-12-15-1100/src/GeneratorInterface/Herwig7Interface/plugins/Herwig7Hadronizer.cc
In file included from /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_3_X_2020-12-15-1100/src/GeneratorInterface/Herwig7Interface/plugins/Herwig7Hadronizer.cc:27:
In file included from /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_3_X_2020-12-15-1100/src/GeneratorInterface/Herwig7Interface/interface/Herwig7Interface.h:22:
/data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_3_X_2020-12-15-1100/src/GeneratorInterface/Herwig7Interface/interface/HerwigUIProvider.h:7:10: fatal error: 'Herwig/API/HerwigUI.h' file not found
#include 
         ^~~~~~~~~~~~~~~~~~~~~~~
1 error generated.
In file included from /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_3_X_2020-12-15-1100/src/GeneratorInterface/Herwig7Interface/plugins/Herwig7Hadronizer.cc:27:
In file included from /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_3_X_2020-12-15-1100/src/GeneratorInterface/Herwig7Interface/interface/Herwig7Interface.h:22:

fwyzard · 2020-12-16T06:15:22Z

@cmsbuild, please test

cmsbuild · 2020-12-16T09:05:14Z

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-fc1eb9/11737/summary.html
CMSSW: CMSSW_11_3_X_2020-12-15-2300/slc7_amd64_gcc900

Comparison Summary

Summary:

No significant changes to the logs found
Reco comparison results: 0 differences found in the comparisons
DQMHistoTests: Total files compared: 36
DQMHistoTests: Total histograms compared: 2747284
DQMHistoTests: Total failures: 4
DQMHistoTests: Total nulls: 0
DQMHistoTests: Total successes: 2747258
DQMHistoTests: Total skipped: 22
DQMHistoTests: Total Missing objects: 0
DQMHistoSizes: Histogram memory added: 0.0 KiB( 35 files compared)
Checked 153 log files, 37 edm output root files, 36 DQM output files

makortel · 2020-12-16T14:30:04Z

+1

perrotta · 2020-12-16T16:12:35Z

+1

Technical: it allows compiler dependent usage of #pragma unroll
It silences the #pragma compilation warnings when it was present but it had to be ignored
Jenkins tests pass

cmsbuild · 2020-12-16T16:13:00Z

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. @silviodonato, @dpiparo, @qliphy (and backports should be raised in the release meeting by the corresponding L2)

silviodonato · 2020-12-16T16:38:24Z

+1

…#32499) (#596) Define preprocessor macros that exoand to pragmas controlling loop unrolling. Two set of macrso are defined: - CMS_UNROLL_LOOP and friends are applied on both host and device compilation - CMS_DEVICE_UNROLL_LOOP and friends is only applied in device compilation, and expands to nothing on the host The supported compilers are - CUDA nvcc - HIP (untested) - gcc - clang Use CMS_UNROLL_LOOP instead of #pragma unroll .

…#32499) Define preprocessor macros that exoand to pragmas controlling loop unrolling. Two set of macrso are defined: - CMS_UNROLL_LOOP and friends are applied on both host and device compilation - CMS_DEVICE_UNROLL_LOOP and friends is only applied in device compilation, and expands to nothing on the host The supported compilers are - CUDA nvcc - HIP (untested) - gcc - clang Use CMS_UNROLL_LOOP instead of #pragma unroll .

…sw#32499 (supported compilers: CUDA nvcc, gcc, clang).

cmsbuild added this to the CMSSW_11_3_X milestone Dec 15, 2020

cmsbuild added code-checks-pending core-pending heterogeneous-pending orp-pending pending-signatures reconstruction-pending tests-pending labels Dec 15, 2020

fwyzard added 2 commits December 15, 2020 22:10

Use CMS_UNROLL_LOOP instead of #pragma unroll

dca2f32

fwyzard force-pushed the CMS_UNROLL_LOOP branch from fab1e91 to dca2f32 Compare December 15, 2020 21:10

cmsbuild added tests-started and removed tests-pending labels Dec 15, 2020

cmsbuild added code-checks-approved and removed code-checks-pending labels Dec 15, 2020

cmsbuild added tests-rejected and removed tests-started labels Dec 16, 2020

cmsbuild added tests-started and removed tests-rejected labels Dec 16, 2020

cmsbuild added tests-approved and removed tests-started labels Dec 16, 2020

perrotta mentioned this pull request Dec 16, 2020

silence compilation warnings for MahiGPU.cu #32501

Closed

makortel mentioned this pull request Dec 16, 2020

Random DQM differences in PR tests #31644

Closed

cmsbuild added core-approved heterogeneous-approved and removed core-pending heterogeneous-pending labels Dec 16, 2020

cmsbuild added fully-signed reconstruction-approved and removed pending-signatures reconstruction-pending labels Dec 16, 2020

cmsbuild added orp-approved and removed orp-pending labels Dec 16, 2020

cmsbuild merged commit 24ed956 into cms-sw:master Dec 16, 2020

fwyzard deleted the CMS_UNROLL_LOOP branch December 27, 2020 09:27

makortel mentioned this pull request Feb 2, 2021

Adjustments in AlpakaCore/prefixScan and its test + Add helper functions to handle workdiv cms-patatrack/pixeltrack-standalone#167

Merged

ghugo83 added a commit to ghugo83/pixeltrack-standalone that referenced this pull request Feb 3, 2021

[alpaka] Add CMS_UNROLL_LOOP macro written by fwyzard from cms-sw/cms…

9dc2943

…sw#32499 (supported compilers: CUDA nvcc, gcc, clang).

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add and use preprocessors macros for loop unrolling #32499

Add and use preprocessors macros for loop unrolling #32499

fwyzard commented Dec 15, 2020 •

edited

Loading

fwyzard commented Dec 15, 2020

fwyzard commented Dec 15, 2020

cmsbuild commented Dec 15, 2020

cmsbuild commented Dec 15, 2020

fwyzard commented Dec 16, 2020

cmsbuild commented Dec 16, 2020

fwyzard commented Dec 16, 2020

cmsbuild commented Dec 16, 2020

makortel commented Dec 16, 2020

perrotta commented Dec 16, 2020

cmsbuild commented Dec 16, 2020

silviodonato commented Dec 16, 2020

Add and use preprocessors macros for loop unrolling #32499

Add and use preprocessors macros for loop unrolling #32499

Conversation

fwyzard commented Dec 15, 2020 • edited Loading

PR description:

PR validation:

fwyzard commented Dec 15, 2020

fwyzard commented Dec 15, 2020

cmsbuild commented Dec 15, 2020

cmsbuild commented Dec 15, 2020

fwyzard commented Dec 16, 2020

cmsbuild commented Dec 16, 2020

Build

Clang Build

fwyzard commented Dec 16, 2020

cmsbuild commented Dec 16, 2020

Comparison Summary

makortel commented Dec 16, 2020

perrotta commented Dec 16, 2020

cmsbuild commented Dec 16, 2020

silviodonato commented Dec 16, 2020

fwyzard commented Dec 15, 2020 •

edited

Loading