Skip to content

Commit 17ef793

Browse files
committed
LLVM and SPIRV-LLVM-Translator pulldown (WW11 2024)
LLVM: llvm/llvm-project@ccd1608 SPIRV-LLVM-Translator: KhronosGroup/SPIRV-LLVM-Translator@d54f77c
2 parents 7616785 + 0fa4ec0 commit 17ef793

File tree

3,280 files changed

+92493
-39124
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,280 files changed

+92493
-39124
lines changed

.ci/monolithic-linux.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,4 @@ cmake -S ${MONOREPO_ROOT}/llvm -B ${BUILD_DIR} \
5454

5555
echo "--- ninja"
5656
# Targets are not escaped as they are passed as separate arguments.
57-
ninja -C "${BUILD_DIR}" ${targets}
57+
ninja -C "${BUILD_DIR}" -k 0 ${targets}

.ci/monolithic-windows.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,4 @@ cmake -S ${MONOREPO_ROOT}/llvm -B ${BUILD_DIR} \
6262

6363
echo "--- ninja"
6464
# Targets are not escaped as they are passed as separate arguments.
65-
ninja -C "${BUILD_DIR}" ${targets}
65+
ninja -C "${BUILD_DIR}" -k 0 ${targets}

.github/workflows/issue-release-workflow.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,5 +65,5 @@ jobs:
6565
release-workflow \
6666
--branch-repo-token ${{ secrets.RELEASE_WORKFLOW_PUSH_SECRET }} \
6767
--issue-number ${{ github.event.issue.number }} \
68-
--requested-by ${{ github.event.issue.user.login }} \
68+
--requested-by ${{ (github.event.action == 'opened' && github.event.issue.user.login) || github.event.comment.user.login }} \
6969
auto

.github/workflows/release-binaries.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ jobs:
3535
prepare:
3636
name: Prepare to build binaries
3737
runs-on: ubuntu-22.04
38+
if: github.repository == 'llvm/llvm-project'
3839
outputs:
3940
release-version: ${{ steps.vars.outputs.release-version }}
4041
flags: ${{ steps.vars.outputs.flags }}
@@ -47,11 +48,16 @@ jobs:
4748
- name: Checkout LLVM
4849
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
4950

51+
- name: Install Dependencies
52+
run: |
53+
pip install -r ./llvm/utils/git/requirements.txt
54+
5055
- name: Check Permissions
5156
env:
5257
GITHUB_TOKEN: ${{ github.token }}
58+
USER_TOKEN: ${{ secrets.RELEASE_TASKS_USER_TOKEN }}
5359
run: |
54-
./llvm/utils/release/./github-upload-release.py --token "$GITHUB_TOKEN" --user ${{ github.actor }} check-permissions
60+
./llvm/utils/release/./github-upload-release.py --token "$GITHUB_TOKEN" --user ${{ github.actor }} --user-token "$USER_TOKEN" check-permissions
5561
5662
- name: Collect Variables
5763
id: vars
@@ -65,8 +71,8 @@ jobs:
6571
# | X.Y.Z | -final
6672
run: |
6773
tag="${{ github.ref_name }}"
68-
trimmed=$(echo ${{ inputs.tag }} | xargs)
69-
[[ "$trimmed" != "" ]] && tag="$trimmed"
74+
trimmed=$(echo ${{ inputs.release-version }} | xargs)
75+
[[ "$trimmed" != "" ]] && tag="llvmorg-$trimmed"
7076
if [ "$tag" = "main" ]; then
7177
# If tag is main, then we've been triggered by a scheduled so pass so
7278
# use the head commit as the tag.
@@ -85,6 +91,7 @@ jobs:
8591
name: "Fill Cache ${{ matrix.os }}"
8692
needs: prepare
8793
runs-on: ${{ matrix.os }}
94+
if: github.repository == 'llvm/llvm-project'
8895
strategy:
8996
matrix:
9097
os:
@@ -119,6 +126,7 @@ jobs:
119126
- prepare
120127
- fill-cache
121128
runs-on: ${{ matrix.target.runs-on }}
129+
if: github.repository == 'llvm/llvm-project'
122130
strategy:
123131
fail-fast: false
124132
matrix:

bolt/lib/Core/DebugNames.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,8 +345,13 @@ void DWARF5AcceleratorTable::finalize() {
345345
std::optional<DWARF5AccelTable::UnitIndexAndEncoding>
346346
DWARF5AcceleratorTable::getIndexForEntry(
347347
const BOLTDWARF5AccelTableData &Value) const {
348+
// The foreign TU list immediately follows the local TU list and they both
349+
// use the same index, so that if there are N local TU entries, the index for
350+
// the first foreign TU is N.
348351
if (Value.isTU())
349-
return {{Value.getUnitID(), {dwarf::DW_IDX_type_unit, TUIndexForm}}};
352+
return {{(Value.getSecondUnitID() ? (unsigned)LocalTUList.size() : 0) +
353+
Value.getUnitID(),
354+
{dwarf::DW_IDX_type_unit, TUIndexForm}}};
350355
if (CUList.size() > 1)
351356
return {{Value.getUnitID(), {dwarf::DW_IDX_compile_unit, CUIndexForm}}};
352357
return std::nullopt;

0 commit comments

Comments
 (0)