Skip to content

Commit 7916be8

Browse files
Merge branch 'main' into spv_intel_arbitrary_floating_points
2 parents 84787a3 + 32ff987 commit 7916be8

File tree

895 files changed

+29246
-13222
lines changed

Some content is hidden

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

895 files changed

+29246
-13222
lines changed

.ci/monolithic-linux.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ enable_cir="${6}"
3232
lit_args="-v --xunit-xml-output ${BUILD_DIR}/test-results.xml --use-unique-output-file-name --timeout=1200 --time-tests --succinct"
3333

3434
start-group "CMake"
35-
export PIP_BREAK_SYSTEM_PACKAGES=1
36-
pip install -q -r "${MONOREPO_ROOT}"/.ci/all_requirements.txt
3735

3836
# Set the system llvm-symbolizer as preferred.
3937
export LLVM_SYMBOLIZER_PATH=`which llvm-symbolizer`

.ci/utils.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,10 @@ function start-group {
5252
echo "Starting $groupname"
5353
fi
5454
}
55+
56+
export PIP_BREAK_SYSTEM_PACKAGES=1
57+
pip install -q -r "${MONOREPO_ROOT}"/.ci/all_requirements.txt
58+
59+
if [[ "$GITHUB_ACTIONS" != "" ]]; then
60+
python .ci/cache_lit_timing_files.py download
61+
fi

.github/CODEOWNERS

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@
5959
/mlir/**/BufferizableOpInterfaceImpl.* @matthias-springer
6060
/mlir/Dialect/*/Transforms/Bufferize.cpp @matthias-springer
6161

62+
# DLTI Dialect in MLIR
63+
/mlir/**/Dialect/DLTI @rolfmorel
64+
/mlir/**/DataLayoutInterfaces.* @rolfmorel
65+
6266
# Linalg Dialect in MLIR.
6367
/mlir/include/mlir/Dialect/Linalg @dcaballe @nicolasvasilache @rengolin
6468
/mlir/lib/Dialect/Linalg @dcaballe @nicolasvasilache @rengolin
@@ -96,9 +100,9 @@
96100
/mlir/lib/Dialect/Tensor/Transforms/* @hanhanW @nicolasvasilache
97101

98102
# Transform Dialect in MLIR.
99-
/mlir/include/mlir/Dialect/Transform/* @ftynse @nicolasvasilache
100-
/mlir/lib/Dialect/Transform/* @ftynse @nicolasvasilache
101-
/mlir/**/*TransformOps* @ftynse @nicolasvasilache
103+
/mlir/include/mlir/Dialect/Transform/* @ftynse @nicolasvasilache @rolfmorel
104+
/mlir/lib/Dialect/Transform/* @ftynse @nicolasvasilache @rolfmorel
105+
/mlir/**/*TransformOps* @ftynse @nicolasvasilache @rolfmorel
102106

103107
# SPIR-V Dialect in MLIR.
104108
/mlir/**/SPIRV/ @antiagainst @kuhar

.github/workflows/containers/github-action-ci/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM docker.io/library/ubuntu:24.04 as base
22
ENV LLVM_SYSROOT=/opt/llvm
33

44
FROM base as stage1-toolchain
5-
ENV LLVM_VERSION=21.1.0
5+
ENV LLVM_VERSION=21.1.1
66

77
RUN apt-get update && \
88
apt-get install -y \

.github/workflows/pr-code-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333

3434
- name: Get changed files
3535
id: changed-files
36-
uses: step-security/changed-files@3dbe17c78367e7d60f00d78ae6781a35be47b4a1 # v45.0.1
36+
uses: tj-actions/changed-files@ed68ef82c095e0d48ec87eccea555d944a631a4c # v46.0.5
3737
with:
3838
separator: ","
3939
skip_initial_fetch: true

bolt/include/bolt/Core/BinaryContext.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,9 @@ class BinaryContext {
326326
/// Returns true if DWARF4 or lower is used.
327327
bool isDWARFLegacyUsed() const { return ContainsDwarfLegacy; }
328328

329+
/// Returns true if DWARFUnit is valid.
330+
bool isValidDwarfUnit(DWARFUnit &DU) const;
331+
329332
std::map<unsigned, DwarfLineTable> &getDwarfLineTables() {
330333
return DwarfLineTablesCUMap;
331334
}

bolt/include/bolt/Core/DIEBuilder.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,8 @@ class DIEBuilder {
217217
std::optional<BOLTDWARF5AccelTableData *> Parent,
218218
uint32_t NumberParentsInChain);
219219

220-
void registerUnit(DWARFUnit &DU, bool NeedSort);
220+
/// Returns true if DWARFUnit is registered successfully.
221+
bool registerUnit(DWARFUnit &DU, bool NeedSort);
221222

222223
/// \return the unique ID of \p U if it exists.
223224
std::optional<uint32_t> getUnitId(const DWARFUnit &DU);

bolt/lib/Core/BinaryContext.cpp

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1624,10 +1624,26 @@ DWARFContext *BinaryContext::getDWOContext() const {
16241624
return &DWOCUs.begin()->second->getContext();
16251625
}
16261626

1627+
bool BinaryContext::isValidDwarfUnit(DWARFUnit &DU) const {
1628+
// Invalid DWARF unit with a DWOId but lacking a dwo_name.
1629+
if (DU.getDWOId() && !DU.isDWOUnit() &&
1630+
!DU.getUnitDIE().find(
1631+
{dwarf::DW_AT_dwo_name, dwarf::DW_AT_GNU_dwo_name})) {
1632+
this->outs() << "BOLT-ERROR: broken DWARF found in CU at offset 0x"
1633+
<< Twine::utohexstr(DU.getOffset()) << " (DWOId=0x"
1634+
<< Twine::utohexstr(*(DU.getDWOId()))
1635+
<< ", missing DW_AT_dwo_name / DW_AT_GNU_dwo_name)\n";
1636+
return false;
1637+
}
1638+
return true;
1639+
}
1640+
16271641
/// Handles DWO sections that can either be in .o, .dwo or .dwp files.
16281642
void BinaryContext::preprocessDWODebugInfo() {
16291643
for (const std::unique_ptr<DWARFUnit> &CU : DwCtx->compile_units()) {
16301644
DWARFUnit *const DwarfUnit = CU.get();
1645+
if (!isValidDwarfUnit(*DwarfUnit))
1646+
continue;
16311647
if (std::optional<uint64_t> DWOId = DwarfUnit->getDWOId()) {
16321648
std::string DWOName = dwarf::toString(
16331649
DwarfUnit->getUnitDIE().find(

bolt/lib/Core/DIEBuilder.cpp

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -584,7 +584,8 @@ DWARFDie DIEBuilder::resolveDIEReference(
584584
if ((RefCU =
585585
getUnitForOffset(*this, *DwarfContext, TmpRefOffset, AttrSpec))) {
586586
/// Trying to add to current working set in case it's cross CU reference.
587-
registerUnit(*RefCU, true);
587+
if (!registerUnit(*RefCU, true))
588+
return DWARFDie();
588589
DWARFDataExtractor DebugInfoData = RefCU->getDebugInfoExtractor();
589590
if (DwarfDebugInfoEntry.extractFast(*RefCU, &TmpRefOffset, DebugInfoData,
590591
RefCU->getNextUnitOffset(), 0)) {
@@ -1008,12 +1009,14 @@ static uint64_t getHash(const DWARFUnit &DU) {
10081009
return DU.getOffset();
10091010
}
10101011

1011-
void DIEBuilder::registerUnit(DWARFUnit &DU, bool NeedSort) {
1012+
bool DIEBuilder::registerUnit(DWARFUnit &DU, bool NeedSort) {
1013+
if (!BC.isValidDwarfUnit(DU))
1014+
return false;
10121015
auto IterGlobal = AllProcessed.insert(getHash(DU));
10131016
// If DU is already in a current working set or was already processed we can
10141017
// skip it.
10151018
if (!IterGlobal.second)
1016-
return;
1019+
return true;
10171020
if (getState().Type == ProcessingType::DWARF4TUs) {
10181021
getState().DWARF4TUVector.push_back(&DU);
10191022
} else if (getState().Type == ProcessingType::DWARF5TUs) {
@@ -1034,6 +1037,7 @@ void DIEBuilder::registerUnit(DWARFUnit &DU, bool NeedSort) {
10341037
if (getState().DUList.size() == getState().CloneUnitCtxMap.size())
10351038
getState().CloneUnitCtxMap.emplace_back();
10361039
getState().DUList.push_back(&DU);
1040+
return true;
10371041
}
10381042

10391043
std::optional<uint32_t> DIEBuilder::getUnitId(const DWARFUnit &DU) {

0 commit comments

Comments
 (0)