Ferdinand.llvm bump april 23

.github/workflows/llvm-project-tests.yml

@@ -66,7 +66,7 @@ jobs:
         with:
           fetch-depth: 250
       - name: Setup ccache
-        uses: hendrikmuhs/ccache-action@v1.2
+        uses: hendrikmuhs/ccache-action@v1
         with:
           # A full build of llvm, clang, lld, and lldb takes about 250MB
           # of ccache space. There's not much reason to have more than this,

.github/workflows/release-binaries.yml

@@ -0,0 +1,113 @@
+name: Release Binaries
+
+on:
+  push:
+    tags:
+      - 'llvmorg-*'
+  workflow_dispatch:
+    inputs:
+      upload:
+        description: 'Upload binaries to the release page'
+        required: true
+        default: true
+        type: boolean
+      tag:
+        description: 'Tag to build'
+        required: true
+        type: string
+
+permissions:
+  contents: read # Default everything to read-only
+
+jobs:
+  prepare:
+    name: Prepare to build binaries
+    runs-on: ubuntu-22.04
+    if: github.repository == 'llvm/llvm-project'
+    outputs:
+      release-version: ${{ steps.validate-tag.outputs.release-version }}
+      release: ${{ steps.validate-tag.outputs.release }}
+      build-dir: ${{ steps.validate-tag.outputs.build-dir }}
+      rc-flags: ${{ steps.validate-tag.outputs.rc-flags }}
+      ref: ${{ steps.validate-tag.outputs.ref }}
+
+    steps:
+    - name: Checkout LLVM
+      uses: actions/checkout@v3
+
+    - name: Validate and parse tag
+      id: validate-tag
+      # In order for the test-release.sh script to run correctly, the LLVM
+      # source needs to be at the following location relative to the build dir:
+      # | X.Y.Z-rcN | ./rcN/llvm-project
+      # | X.Y.Z     | ./final/llvm-project
+      #
+      # We also need to set divergent flags based on the release version:
+      # | X.Y.Z-rcN | -rc N -test-asserts
+      # | X.Y.Z     | -final
+      run: |
+        tag="${{ github.ref_name }}"
+        trimmed=`echo ${{ inputs.tag }} | xargs`
+        [[ "$trimmed" != "" ]] && tag="$trimmed"
+        if [ -n "${{ inputs.upload }}" ]; then
+          upload="${{ inputs.upload }}"
+        else
+          upload="true"
+        fi
+        bash .github/workflows/set-release-binary-outputs.sh "${{ github.actor }}" "$tag" "$upload"
+
+  build-binaries:
+    name: ${{ matrix.target.triple }}
+    permissions:
+      contents: write # To upload assets to release.
+    needs: prepare
+    runs-on: ${{ matrix.target.runs-on }}
+    strategy:
+      fail-fast: false
+      matrix:
+        target:
+          - triple: x86_64-linux-gnu-ubuntu-22.04
+            runs-on: ubuntu-22.04-8x32
+            debian-build-deps: >
+              chrpath
+              gcc-multilib
+              ninja-build
+
+    steps:
+    - name: Checkout LLVM
+      uses: actions/checkout@v3
+      with:
+        ref: ${{ needs.prepare.outputs.ref }}
+        path: ${{ needs.prepare.outputs.build-dir }}/llvm-project
+
+    - name: Install Brew build dependencies
+      if: matrix.target.brew-build-deps != ''
+      run: brew install ${{ matrix.target.brew-build-deps }}
+
+    - name: Install Debian build dependencies
+      if: matrix.target.debian-build-deps != ''
+      run: sudo apt install ${{ matrix.target.debian-build-deps }}
+
+    - name: Set macOS build env variables
+      if: runner.os == 'macOS'
+      run: |
+        echo "MACOSX_DEPLOYMENT_TARGET=10.9" >> $GITHUB_ENV
+
+    - name: Build and test release
+      run: |
+        ${{ needs.prepare.outputs.build-dir }}/llvm-project/llvm/utils/release/test-release.sh \
+        -release ${{ needs.prepare.outputs.release }} \
+        ${{ needs.prepare.outputs.rc-flags }} \
+        -triple ${{ matrix.target.triple }} \
+        -use-ninja \
+        -no-checkout \
+        -no-test-suite
+
+    - name: Upload binaries
+      if: ${{ always() && needs.prepare.outputs.upload == 'true' }}
+      run: |
+        ${{ needs.prepare.outputs.build-dir }}/llvm-project/llvm/utils/release/github-upload-release.py \
+        --token ${{ github.token }} \
+        --release ${{ needs.prepare.outputs.release-version }} \
+        upload \
+        --files ${{ needs.prepare.outputs.build-dir }}/clang+llvm-${{ needs.prepare.outputs.release-version }}-${{ matrix.target.triple }}.tar.xz

.github/workflows/release-tasks.yml

@@ -45,9 +45,15 @@ jobs:
 
       - name: Build Documentation
         run: |
-          ./llvm/utils/release/build-docs.sh -srcdir llvm
+          ./llvm/utils/release/build-docs.sh -release ${{ steps.validate-tag.outputs.release-version }}
           ./llvm/utils/release/github-upload-release.py --token ${{ github.token }} --release ${{ steps.validate-tag.outputs.release-version }} upload --files *doxygen*.tar.xz
 
+      - name: Create Release Notes Artifact
+        uses: actions/download-artifact@v3
+        with:
+          name: release-notes
+          path: docs-build/html-export/
+
       - name: Clone www-releases
         if: ${{ !contains(steps.validate-tag.outputs.release-version, 'rc') }}
         uses: actions/checkout@v3

.github/workflows/set-release-binary-outputs.sh

@@ -0,0 +1,34 @@
+# Usage: set-release-binary-outputs.sh <github_user> <tag> <upload>
+
+set -e
+
+if [ -z "$GITHUB_OUTPUT" ]; then
+  export GITHUB_OUTPUT=`mktemp`
+  echo "Warning: Environment variable GITHUB_OUTPUT is not set."
+  echo "Writing output variables to $GITHUB_OUTPUT"
+fi
+
+github_user=$1
+tag=$2
+upload=$3
+
+if [[ "$github_user" != "tstellar" && "$github_user" != "tru" ]]; then
+  echo "ERROR: User not allowed: $github_user"
+  exit 1
+fi
+pattern='^llvmorg-[0-9]\+\.[0-9]\+\.[0-9]\+\(-rc[0-9]\+\)\?$'
+echo "$tag" | grep -e $pattern
+if [ $? != 0 ]; then
+  echo "ERROR: Tag '$tag' doesn't match pattern: $pattern"
+  exit 1
+fi
+release_version=`echo "$tag" | sed 's/llvmorg-//g'`
+release=`echo "$release_version" | sed 's/-.*//g'`
+build_dir=`echo "$release_version" | sed 's,^[^-]\+,final,' | sed 's,[^-]\+-rc\(.\+\),rc\1,'`
+rc_flags=`echo "$release_version" | sed 's,^[^-]\+,-final,' | sed 's,[^-]\+-rc\(.\+\),-rc \1 -test-asserts,' | sed 's,--,-,'`
+echo "release-version=$release_version" >> $GITHUB_OUTPUT
+echo "release=$release" >> $GITHUB_OUTPUT
+echo "build-dir=$build_dir" >> $GITHUB_OUTPUT
+echo "rc-flags=$rc_flags" >> $GITHUB_OUTPUT
+echo "upload=$upload" >> $GITHUB_OUTPUT
+echo "ref=$tag" >> $GITHUB_OUTPUT

.mailmap

@@ -28,6 +28,7 @@
 <[email protected]> <[email protected]>
 <[email protected]> <[email protected]>
 <[email protected]> <[email protected]>
+<[email protected]> <[email protected]>
 <[email protected]> <[email protected]>
 <[email protected]> <[email protected]>
 <[email protected]> <[email protected]>

CONTRIBUTING.md

@@ -7,3 +7,12 @@ To get started with contributing, please take a look at the
 [Contributing to LLVM](https://llvm.org/docs/Contributing.html) guide. It
 describes how to get involved, raise issues and submit patches. Please note
 that at the moment the LLVM project does not use GitHub pull requests.
+
+## Getting in touch
+
+Join the [LLVM Discourse forums](https://discourse.llvm.org/), [Discord
+chat](https://discord.gg/xS7Z362), or #llvm IRC channel on
+[OFTC](https://oftc.net/).
+
+The LLVM project has adopted a [code of conduct](https://llvm.org/docs/CodeOfConduct.html) for
+participants to all modes of communication within the project.

bolt/include/bolt/Core/BinaryContext.h

@@ -1227,8 +1227,7 @@ class BinaryContext {
       Emitter = this->MCE.get();
     SmallString<256> Code;
     SmallVector<MCFixup, 4> Fixups;
-    raw_svector_ostream VecOS(Code);
-    Emitter->encodeInstruction(Inst, VecOS, Fixups, *STI);
+    Emitter->encodeInstruction(Inst, Code, Fixups, *STI);
     return Code.size();
   }
 

bolt/include/bolt/Core/BinaryFunction.h

@@ -1794,6 +1794,10 @@ class BinaryFunction {
   /// executions corresponding to this function.
   uint64_t getRawBranchCount() const { return RawBranchCount; }
 
+  /// Set the profile data about the number of branch executions corresponding
+  /// to this function.
+  void setRawBranchCount(uint64_t Count) { RawBranchCount = Count; }
+
   /// Return the execution count for functions with known profile.
   /// Return 0 if the function has no profile.
   uint64_t getKnownExecutionCount() const {

bolt/lib/Core/BinaryContext.cpp

@@ -2289,9 +2289,8 @@ bool BinaryContext::validateInstructionEncoding(
 
   SmallString<256> Code;
   SmallVector<MCFixup, 4> Fixups;
-  raw_svector_ostream VecOS(Code);
 
-  MCE->encodeInstruction(Inst, VecOS, Fixups, *STI);
+  MCE->encodeInstruction(Inst, Code, Fixups, *STI);
   auto OutputSequence = ArrayRef<uint8_t>((uint8_t *)Code.data(), Code.size());
   if (InputSequence != OutputSequence) {
     if (opts::Verbosity > 1) {

bolt/lib/Core/BinaryFunction.cpp

@@ -470,6 +470,7 @@ void BinaryFunction::print(raw_ostream &OS, std::string Annotation) {
     OS << "\n  Image       : 0x" << Twine::utohexstr(getImageAddress());
   if (ExecutionCount != COUNT_NO_PROFILE) {
     OS << "\n  Exec Count  : " << ExecutionCount;
+    OS << "\n  Branch Count: " << RawBranchCount;
     OS << "\n  Profile Acc : " << format("%.1f%%", ProfileMatchRatio * 100.0f);
   }
 
@@ -1535,8 +1536,7 @@ bool BinaryFunction::scanExternalRefs() {
     // Emit the instruction using temp emitter and generate relocations.
     SmallString<256> Code;
     SmallVector<MCFixup, 4> Fixups;
-    raw_svector_ostream VecOS(Code);
-    Emitter.MCE->encodeInstruction(Instruction, VecOS, Fixups, *BC.STI);
+    Emitter.MCE->encodeInstruction(Instruction, Code, Fixups, *BC.STI);
 
     // Create relocation for every fixup.
     for (const MCFixup &Fixup : Fixups) {
@@ -2038,6 +2038,7 @@ bool BinaryFunction::buildCFG(MCPlusBuilder::AllocatorIdTy AllocatorId) {
       MCInst *PrevInstr = PrevBB->getLastNonPseudoInstr();
       assert(PrevInstr && "no previous instruction for a fall through");
       if (MIB->isUnconditionalBranch(Instr) &&
+          !MIB->isIndirectBranch(*PrevInstr) &&
           !MIB->isUnconditionalBranch(*PrevInstr) &&
           !MIB->getConditionalTailCall(*PrevInstr) &&
           !MIB->isReturn(*PrevInstr)) {

bolt/lib/Core/DebugData.cpp

@@ -1166,7 +1166,7 @@ void DebugStrOffsetsWriter::initialize(
          "Dwarf String Offsets Byte Size is not supported.");
   uint32_t Index = 0;
   for (uint64_t Offset = 0; Offset < Contr->Size; Offset += DwarfOffsetByteSize)
-    IndexToAddressMap[Index++] = *reinterpret_cast<const uint32_t *>(
+    IndexToAddressMap[Index++] = support::endian::read32le(
         StrOffsetsSection.Data.data() + Contr->Base + Offset);
 }
 

bolt/lib/Profile/YAMLProfileReader.cpp

@@ -83,6 +83,12 @@ bool YAMLProfileReader::parseFunctionProfile(
 
   BF.setExecutionCount(YamlBF.ExecCount);
 
+  uint64_t FuncRawBranchCount = 0;
+  for (const yaml::bolt::BinaryBasicBlockProfile &YamlBB : YamlBF.Blocks)
+    for (const yaml::bolt::SuccessorInfo &YamlSI : YamlBB.Successors)
+      FuncRawBranchCount += YamlSI.Count;
+  BF.setRawBranchCount(FuncRawBranchCount);
+
   if (!opts::IgnoreHash && YamlBF.Hash != BF.computeHash(/*UseDFS=*/true)) {
     if (opts::Verbosity >= 1)
       errs() << "BOLT-WARNING: function hash mismatch\n";

bolt/lib/Rewrite/RewriteInstance.cpp

@@ -4097,7 +4097,6 @@ void RewriteInstance::mapCodeSections(RuntimeDyld &RTDyld) {
       FF.setImageAddress(0);
       FF.setImageSize(0);
       FF.setFileOffset(0);
-      BC->deregisterSection(*ColdSection);
     } else {
       FF.setAddress(NextAvailableAddress);
       FF.setImageAddress(ColdSection->getAllocAddress());
@@ -4112,6 +4111,9 @@ void RewriteInstance::mapCodeSections(RuntimeDyld &RTDyld) {
             FF.getImageAddress(), FF.getAddress(), FF.getImageSize()));
     RTDyld.reassignSectionAddress(ColdSection->getSectionID(), FF.getAddress());
 
+    if (TooLarge)
+      BC->deregisterSection(*ColdSection);
+
     NextAvailableAddress += FF.getImageSize();
   }
 

bolt/lib/Target/AArch64/AArch64MCPlusBuilder.cpp

@@ -265,7 +265,7 @@ class AArch64MCPlusBuilder : public MCPlusBuilder {
         return true;
       }
 
-      DispImm = Inst.getOperand(I).getImm() << 2;
+      DispImm = Inst.getOperand(I).getImm() * 4;
       return true;
     }
     return false;

bolt/test/X86/branch-data.test

@@ -3,18 +3,19 @@
 # Also checks that llvm-bolt disassembler and CFG builder is working properly.
 
 RUN: yaml2obj %p/Inputs/blarge.yaml &> %t.exe
-RUN: llvm-bolt %t.exe -o /dev/null --data %p/Inputs/blarge.fdata --print-cfg
+RUN: llvm-bolt %t.exe -o /dev/null --data %p/Inputs/blarge.fdata --print-cfg | FileCheck %s
 
 CHECK:    Binary Function "usqrt"
 CHECK:      State       : CFG constructed
 CHECK:      Address     : 0x401170
 CHECK:      Size        : 0x43
-CHECK:      MaxSize     : 0x50
-CHECK:      Offset      : 0x1170
+CHECK:      MaxSize     : 0x43
+CHECK:      Offset      : 0xcb0
 CHECK:      Section     : .text
 CHECK:      IsSimple    : 1
 CHECK:      BB Count    : 5
 CHECK:      Exec Count  : 199
+CHECK:      Branch Count: 7689
 CHECK:    }
 CHECK:    .LBB{{.*}}
 CHECK:      Exec Count : 199

bolt/test/X86/section-end-sym.s

@@ -1,7 +1,7 @@
 ## Check that BOLT doesn't consider end-of-section symbols (e.g., _etext) as
 ## functions.
 
-# REQUIRES: system-linux, asserts
+# REQUIRES: x86_64-linux, asserts
 
 # RUN: llvm-mc -filetype=obj -triple x86_64-unknown-linux %s -o %t.o
 # RUN: ld.lld %t.o -o %t.exe -q