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

[TBB] Fix concurrent_[bounded_]queue correctness on weak memory models #8355

Merged
merged 4 commits into from
Mar 4, 2023

Conversation

smuzaffar
Copy link
Contributor

Applied uxlfoundation/oneTBB#782 patch on top of v2021.8.0 .
This should fix the testFWCoreUtilities failure in ARM IBs

@smuzaffar
Copy link
Contributor Author

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 3, 2023

A new Pull Request was created by @smuzaffar (Malik Shahzad Muzaffar) for branch IB/CMSSW_13_1_X/master.

@cmsbuild, @smuzaffar, @aandvalenzuela, @iarspider can you please review it and eventually sign? Thanks.
@perrotta, @dpiparo, @rappoccio you are the release manager for this.
cms-bot commands are listed here

@fwyzard
Copy link
Contributor

fwyzard commented Mar 3, 2023

please test for el8_ppc64le_gcc11

@smuzaffar
Copy link
Contributor Author

please test for el8_aarch64_gcc11

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 3, 2023

-1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-650752/31047/summary.html
COMMIT: 58a8d94
CMSSW: CMSSW_13_1_X_2023-03-02-2300/el8_aarch64_gcc11
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmsdist/8355/31047/install.sh to create a dev area with all the needed externals and cmssw changes.

External Build

I found compilation error when building:

Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file include/oneapi/tbb/concurrent_queue.h.rej
patching file include/oneapi/tbb/concurrent_queue.h
patching file include/oneapi/tbb/detail/_concurrent_queue_base.h
Hunk #1 succeeded at 338 (offset 2 lines).
error: Bad exit status from /data/cmsbld/jenkins_a/workspace/ib-run-pr-tests/testBuildDir/tmp/rpm-tmp.FXHOBX (%prep)


RPM build errors:
line 37: It's not recommended to have unversioned Obsoletes: Obsoletes: external+tbb+v2021.8.0-f9a18214b66c48f0e1cdde8496021d24
Bad exit status from /data/cmsbld/jenkins_a/workspace/ib-run-pr-tests/testBuildDir/tmp/rpm-tmp.FXHOBX (%prep)


@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 3, 2023

-1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-650752/31046/summary.html
COMMIT: 58a8d94
CMSSW: CMSSW_13_1_X_2023-03-03-1100/el8_amd64_gcc11
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmsdist/8355/31046/install.sh to create a dev area with all the needed externals and cmssw changes.

External Build

I found compilation error when building:

Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file include/oneapi/tbb/concurrent_queue.h.rej
patching file include/oneapi/tbb/concurrent_queue.h
patching file include/oneapi/tbb/detail/_concurrent_queue_base.h
Hunk #1 succeeded at 338 (offset 2 lines).
error: Bad exit status from /data/cmsbld/jenkins/workspace/ib-run-pr-tests/testBuildDir/tmp/rpm-tmp.YXCiAu (%prep)


RPM build errors:
line 37: It's not recommended to have unversioned Obsoletes: Obsoletes: external+tbb+v2021.8.0-cecd5e3ae11fdc708d76ad7509c71a73
Bad exit status from /data/cmsbld/jenkins/workspace/ib-run-pr-tests/testBuildDir/tmp/rpm-tmp.YXCiAu (%prep)


@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 3, 2023

-1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-650752/31050/summary.html
COMMIT: 58a8d94
CMSSW: CMSSW_13_1_X_2023-03-02-2300/el8_ppc64le_gcc11
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmsdist/8355/31050/install.sh to create a dev area with all the needed externals and cmssw changes.

External Build

I found compilation error when building:

Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file include/oneapi/tbb/concurrent_queue.h.rej
patching file include/oneapi/tbb/concurrent_queue.h
patching file include/oneapi/tbb/detail/_concurrent_queue_base.h
Hunk #1 succeeded at 338 (offset 2 lines).
error: Bad exit status from /scratch/cmsbuild/jenkins_b/workspace/ib-run-pr-tests/testBuildDir/tmp/rpm-tmp.ytCZpg (%prep)


RPM build errors:
line 37: It's not recommended to have unversioned Obsoletes: Obsoletes: external+tbb+v2021.8.0-f9a18214b66c48f0e1cdde8496021d24
Bad exit status from /scratch/cmsbuild/jenkins_b/workspace/ib-run-pr-tests/testBuildDir/tmp/rpm-tmp.ytCZpg (%prep)


@iarspider
Copy link
Contributor

please test for el8_ppc64le_gcc11

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 3, 2023

Pull request #8355 was updated.

@iarspider
Copy link
Contributor

please test for el8_aarch64_gcc11

@iarspider
Copy link
Contributor

please test

tbb.spec Outdated Show resolved Hide resolved
@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 3, 2023

-1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-650752/31056/summary.html
COMMIT: 3140f31
CMSSW: CMSSW_13_1_X_2023-03-02-2300/el8_aarch64_gcc11
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmsdist/8355/31056/install.sh to create a dev area with all the needed externals and cmssw changes.

External Build

I found compilation warning when building: See details on the summary page.

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 3, 2023

Pull request #8355 was updated.

@iarspider
Copy link
Contributor

please test for el8_aarch64_gcc11

@iarspider
Copy link
Contributor

please test for el8_ppc64le_gcc11

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 4, 2023

-1

Failed Tests: Build
Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-650752/31060/summary.html
COMMIT: d5d58df
CMSSW: CMSSW_13_1_X_2023-03-03-1100/el8_amd64_gcc11
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmsdist/8355/31060/install.sh to create a dev area with all the needed externals and cmssw changes.

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

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

Build

I found compilation error when building:

Traceback (most recent call last):
  File "/data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_13_1_X_2023-03-03-1100/src/FWCore/Utilities/scripts/edmCheckClassVersion", line 181, in 
    raise RuntimeError("failed to load library '"+options.library+"'")
RuntimeError: failed to load library 'libCondCoreUtilities.so'
Suggestion: You can run 'scram build updateclassversion' to generate src/CondCore/Utilities/src/classes_def.xml.generated with updated ClassVersion
gmake: *** [tmp/el8_amd64_gcc11/edm_checks/libCondCoreUtilities.so] Error 1
@@@@ ----> OK  EDM Class Transients 
@@@@ ----> OK  EDM Class Transients 
@@@@ ----> OK  EDM Class Transients 
@@@@ ----> OK  EDM Class Transients 
@@@@ ----> OK  EDM Class Transients 


@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 4, 2023

-1

Failed Tests: Build
Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-650752/31061/summary.html
COMMIT: d5d58df
CMSSW: CMSSW_13_1_X_2023-03-02-2300/el8_ppc64le_gcc11
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmsdist/8355/31061/install.sh to create a dev area with all the needed externals and cmssw changes.

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

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

Build

I found compilation error when building:

RuntimeError: failed to load library 'libCondCoreUtilities.so'
Disabling gnu++: clang has no __float128 support on this target!
@@@@ ----> OK  EDM Class Transients 
>> Checking EDM Class Version for src/DataFormats/FEDRawData/src/classes_def.xml in libDataFormatsFEDRawData.so
Suggestion: You can run 'scram build updateclassversion' to generate src/CondCore/Utilities/src/classes_def.xml.generated with updated ClassVersion
gmake: *** [tmp/el8_ppc64le_gcc11/edm_checks/libCondCoreUtilities.so] Error 1
>> Checking EDM Class Version for src/DataFormats/FTLDigi/src/classes_def.xml in libDataFormatsFTLDigi.so
@@@@ ----> OK  EDM Class Transients 
>> Checking EDM Class Version for src/DataFormats/FTLRecHit/src/classes_def.xml in libDataFormatsFTLRecHit.so
@@@@ ----> OK  EDM Class Transients 
@@@@ ----> OK  EDM Class Transients 


@iarspider
Copy link
Contributor

test parameters:

  • full_cmssw = true

@iarspider
Copy link
Contributor

please test

@iarspider
Copy link
Contributor

please test for el8_aarch64_gcc11

@iarspider
Copy link
Contributor

please test for el8_ppc64le_gcc11

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 4, 2023

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-650752/31064/summary.html
COMMIT: d5d58df
CMSSW: CMSSW_13_1_X_2023-03-03-2300/el8_aarch64_gcc11
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmsdist/8355/31064/install.sh to create a dev area with all the needed externals and cmssw changes.

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

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

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 4, 2023

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-650752/31063/summary.html
COMMIT: d5d58df
CMSSW: CMSSW_13_1_X_2023-03-03-2300/el8_amd64_gcc11
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmsdist/8355/31063/install.sh to create a dev area with all the needed externals and cmssw changes.

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

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

Comparison Summary

Summary:

  • You potentially removed 178 lines from the logs
  • Reco comparison results: 8 differences found in the comparisons
  • DQMHistoTests: Total files compared: 49
  • DQMHistoTests: Total histograms compared: 3529727
  • DQMHistoTests: Total failures: 6
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 3529699
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 48 files compared)
  • Checked 213 log files, 164 edm output root files, 49 DQM output files
  • TriggerResults: no differences found

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 4, 2023

-1

Failed Tests: UnitTests
Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-650752/31067/summary.html
COMMIT: d5d58df
CMSSW: CMSSW_13_1_X_2023-03-03-2300/el8_ppc64le_gcc11
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmsdist/8355/31067/install.sh to create a dev area with all the needed externals and cmssw changes.

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

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

Unit Tests

I found errors in the following unit tests:

---> test testONNXRuntime had ERRORS

@fwyzard
Copy link
Contributor

fwyzard commented Mar 4, 2023

Nice, this did fix testFWCoreUtilities on ARM and Power :-)

@fwyzard
Copy link
Contributor

fwyzard commented Mar 4, 2023

@smuzaffar could you squash the changes into a single commit ?

@smuzaffar
Copy link
Contributor Author

+externals

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 4, 2023

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

@smuzaffar smuzaffar merged commit 89fe74f into IB/CMSSW_13_1_X/master Mar 4, 2023
@iarspider iarspider deleted the smuzaffar-patch-5 branch March 5, 2023 09: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.

4 participants