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

[LLVM] Update to version 18.1.6 #9386

Merged
merged 1 commit into from
Sep 4, 2024
Merged

Conversation

smuzaffar
Copy link
Contributor

Backport LLVM 18.1.6 changes from clang branch

@smuzaffar
Copy link
Contributor Author

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 3, 2024

A new Pull Request was created by @smuzaffar for branch IB/CMSSW_14_2_X/master.

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

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 3, 2024

cms-bot internal usage

@smuzaffar
Copy link
Contributor Author

please test for el8_aarch64_gcc12

@smuzaffar
Copy link
Contributor Author

please test for el9_amd64_gcc13

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 3, 2024

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-e4f41f/41238/summary.html
COMMIT: 7437274
CMSSW: CMSSW_14_2_X_2024-09-02-2300/el8_amd64_gcc12
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmsdist/9386/41238/install.sh to create a dev area with all the needed externals and cmssw changes.

Comparison Summary

Summary:

  • No significant changes to the logs found
  • Reco comparison results: 165 differences found in the comparisons
  • DQMHistoTests: Total files compared: 44
  • DQMHistoTests: Total histograms compared: 3328315
  • DQMHistoTests: Total failures: 307
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 3327988
  • DQMHistoTests: Total skipped: 20
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 43 files compared)
  • Checked 193 log files, 163 edm output root files, 44 DQM output files
  • TriggerResults: no differences found

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 3, 2024

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-e4f41f/41245/summary.html
COMMIT: 7437274
CMSSW: CMSSW_14_2_X_2024-09-02-2300/el8_aarch64_gcc12
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmsdist/9386/41245/install.sh to create a dev area with all the needed externals and cmssw changes.

@smuzaffar
Copy link
Contributor Author

smuzaffar commented Sep 3, 2024

LLVM18 clang format changes for full cmssw are available here. Total 2148 files are changed. Mojorityof changes are like [a] which were not reported by llvm17 and if clang-format from llvm17 is run on these then they will be reverted. There are other changes e.g. space around operators [b] but these are also suggested by llvm 17.

Here is the clang-format configuration changes between llvm17 and llvm18 (see https://clang.llvm.org/docs/ClangFormatStyleOptions.html for clang-format 18)

[a]

  • extra space (){} -> () {} for inline function
--- a/Alignment/CocoaDDLObjects/interface/CocoaMaterialElementary.h
+++ b/Alignment/CocoaDDLObjects/interface/CocoaMaterialElementary.h
@@ -17,7 +17,7 @@ class CocoaMaterialElementary {
 public:
   //---------- Constructors / Destructor
   CocoaMaterialElementary(ALIstring name, float density, ALIstring symbol, float A, ALIint Z);
-  ~CocoaMaterialElementary(){};
+  ~CocoaMaterialElementary() {};
 
   ALIstring getName() const { return theName; }
   float getDensity() const { return theDensity; }
  • Comments alignment
--- a/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorMuonSystemMap1D.cc
+++ b/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorMuonSystemMap1D.cc
@@ -276,7 +276,7 @@ void AlignmentMonitorMuonSystemMap1D::book() {
           }
         }
       }  // endcaps
-  }      // stations
+  }  // stations
 
   m_counter_event = 0;
   m_counter_track = 0;
@@ -322,7 +322,7 @@ void AlignmentMonitorMuonSystemMap1D::event(const edm::Event &iEvent,
           processMuonResidualsFromTrack(muonResidualsFromTrack, iEvent);
         }
       }  // end if track has acceptable momentum
-    }    // end loop over tracks
+    }  // end loop over tracks
   } else {
     const edm::Handle<reco::MuonCollection> &muons = iEvent.getHandle(muonToken_);

[b]

   math::Vector<4>::type parameterVector = covarianceMatrix * zMatrixTransposeTimesVarianceMatrixTimesXyCoordinates;
-  math::Vector<2 *numberOfPlanes>::type xyCoordinatesMinusZmatrixTimesParameters =
+  math::Vector<2 * numberOfPlanes>::type xyCoordinatesMinusZmatrixTimesParameters =
       xyCoordinates - (zMatrix * parameterVector);
-  unsigned int Filler1 = (totword)&0x000000ff;
-  unsigned int Filler2 = ((totword)&0x0000ff00) >> 8;
-  unsigned int Filler3 = ((totword)&0x00ff0000) >> 16;
-  unsigned int Filler4 = ((totword)&0xffff0000) >> 16;
-  unsigned int maskFiller4 = ((totword)&0xff000000) >> 16;
+  unsigned int Filler1 = (totword) & 0x000000ff;
+  unsigned int Filler2 = ((totword) & 0x0000ff00) >> 8;
+  unsigned int Filler3 = ((totword) & 0x00ff0000) >> 16;
+  unsigned int Filler4 = ((totword) & 0xffff0000) >> 16;
+  unsigned int maskFiller4 = ((totword) & 0xff000000) >> 16;

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 4, 2024

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-e4f41f/41241/summary.html
COMMIT: 7437274
CMSSW: CMSSW_14_2_X_2024-08-30-2300/el9_amd64_gcc13
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmsdist/9386/41241/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-e4f41f/41241/git-recent-commits.json
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-e4f41f/41241/git-merge-result

Comparison Summary

Summary:

  • You potentially added 245 lines to the logs
  • ROOTFileChecks: Some differences in event products or their sizes found
  • Reco comparison results: 58092 differences found in the comparisons
  • DQMHistoTests: Total files compared: 44
  • DQMHistoTests: Total histograms compared: 3328315
  • DQMHistoTests: Total failures: 496303
  • DQMHistoTests: Total nulls: 317
  • DQMHistoTests: Total successes: 2831675
  • DQMHistoTests: Total skipped: 20
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 5.620999999999999 KiB( 43 files compared)
  • DQMHistoSizes: changed ( 10224.0 ): -0.544 KiB SiStrip/MechanicalView
  • DQMHistoSizes: changed ( 13034.0 ): 2.776 KiB SiStrip/MechanicalView
  • DQMHistoSizes: changed ( 140.043 ): -0.004 KiB JetMET/SUSYDQM
  • DQMHistoSizes: changed ( 250202.181 ): 0.234 KiB SiStrip/MechanicalView
  • DQMHistoSizes: changed ( 25202.0 ): 0.719 KiB SiStrip/MechanicalView
  • DQMHistoSizes: changed ( 7.3 ): 2.702 KiB SiStrip/MechanicalView
  • DQMHistoSizes: changed ( 8.0 ): -0.262 KiB SiStrip/MechanicalView
  • Checked 193 log files, 163 edm output root files, 44 DQM output files

@smuzaffar
Copy link
Contributor Author

+externals

@smuzaffar smuzaffar merged commit bff455b into IB/CMSSW_14_2_X/master Sep 4, 2024
21 checks passed
@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 4, 2024

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

@smuzaffar smuzaffar deleted the 142x-llvm18 branch September 13, 2024 08:26
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.

2 participants